From ad821e7d9ca6475482b324b45a72095e14a1d62e Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 10 Jan 2020 15:15:15 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B02651=20rollback=20gitignore=20for=20lib?=
 =?UTF-8?q?=20tests=20dirs=20Too=20dangerous=20!=20We'll=20work=20properly?=
 =?UTF-8?q?=20on=20this=20but=20for=202.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |    6 -
 lib/composer/autoload_classmap.php            |   12 +
 lib/composer/autoload_static.php              |   12 +
 .../test/PhpParser/AutoloaderTest.php         |   15 +
 .../test/PhpParser/Builder/ClassTest.php      |  161 ++
 .../test/PhpParser/Builder/FunctionTest.php   |  106 +
 .../test/PhpParser/Builder/InterfaceTest.php  |  105 +
 .../test/PhpParser/Builder/MethodTest.php     |  163 ++
 .../test/PhpParser/Builder/NamespaceTest.php  |   46 +
 .../test/PhpParser/Builder/ParamTest.php      |  171 ++
 .../test/PhpParser/Builder/PropertyTest.php   |  147 +
 .../test/PhpParser/Builder/TraitTest.php      |   48 +
 .../test/PhpParser/Builder/UseTest.php        |   35 +
 .../test/PhpParser/BuilderFactoryTest.php     |  108 +
 .../test/PhpParser/CodeParsingTest.php        |   70 +
 .../test/PhpParser/CodeTestAbstract.php       |   61 +
 .../php-parser/test/PhpParser/CommentTest.php |   73 +
 .../PhpParser/ErrorHandler/CollectingTest.php |   22 +
 .../PhpParser/ErrorHandler/ThrowingTest.php   |   16 +
 .../php-parser/test/PhpParser/ErrorTest.php   |  106 +
 .../test/PhpParser/Lexer/EmulativeTest.php    |  133 +
 .../php-parser/test/PhpParser/LexerTest.php   |  265 ++
 .../test/PhpParser/Node/NameTest.php          |  134 +
 .../PhpParser/Node/Scalar/MagicConstTest.php  |   25 +
 .../test/PhpParser/Node/Scalar/StringTest.php |   61 +
 .../PhpParser/Node/Stmt/ClassConstTest.php    |   35 +
 .../PhpParser/Node/Stmt/ClassMethodTest.php   |   63 +
 .../test/PhpParser/Node/Stmt/ClassTest.php    |   66 +
 .../PhpParser/Node/Stmt/InterfaceTest.php     |   26 +
 .../test/PhpParser/Node/Stmt/PropertyTest.php |   44 +
 .../test/PhpParser/NodeAbstractTest.php       |  274 ++
 .../test/PhpParser/NodeDumperTest.php         |  105 +
 .../test/PhpParser/NodeTraverserTest.php      |  267 ++
 .../NodeVisitor/NameResolverTest.php          |  468 +++
 .../test/PhpParser/Parser/MultipleTest.php    |   94 +
 .../test/PhpParser/Parser/Php5Test.php        |   14 +
 .../test/PhpParser/Parser/Php7Test.php        |   14 +
 .../test/PhpParser/ParserFactoryTest.php      |   34 +
 .../php-parser/test/PhpParser/ParserTest.php  |  184 ++
 .../test/PhpParser/PrettyPrinterTest.php      |  207 ++
 .../test/PhpParser/Serializer/XMLTest.php     |  172 ++
 .../test/PhpParser/Unserializer/XMLTest.php   |  150 +
 lib/nikic/php-parser/test/bootstrap.php       |   20 +
 .../test/code/parser/blockComments.test       |   31 +
 .../php-parser/test/code/parser/comments.test |  100 +
 .../code/parser/errorHandling/eofError.test   |   32 +
 .../parser/errorHandling/lexerErrors.test     |  124 +
 .../code/parser/errorHandling/recovery.test   |  866 ++++++
 .../test/code/parser/expr/arrayDef.test       |  142 +
 .../code/parser/expr/arrayDestructuring.test  |  144 +
 .../test/code/parser/expr/assign.test         |  301 ++
 .../test/code/parser/expr/assignNewByRef.test |   39 +
 .../test/code/parser/expr/cast.test           |   72 +
 .../test/code/parser/expr/clone.test          |   13 +
 .../test/code/parser/expr/closure.test        |  142 +
 .../test/code/parser/expr/comparison.test     |  107 +
 .../test/code/parser/expr/constant_expr.test  |  621 ++++
 .../test/code/parser/expr/errorSuppress.test  |   12 +
 .../test/code/parser/expr/exit.test           |   34 +
 .../code/parser/expr/fetchAndCall/args.test   |   99 +
 .../parser/expr/fetchAndCall/constFetch.test  |   33 +
 .../expr/fetchAndCall/constantDeref.test      |  231 ++
 .../parser/expr/fetchAndCall/funcCall.test    |  132 +
 .../parser/expr/fetchAndCall/newDeref.test    |   70 +
 .../expr/fetchAndCall/objectAccess.test       |  145 +
 .../expr/fetchAndCall/simpleArrayAccess.test  |   62 +
 .../parser/expr/fetchAndCall/staticCall.test  |  173 ++
 .../fetchAndCall/staticPropertyFetch.test     |   91 +
 .../test/code/parser/expr/includeAndEval.test |   40 +
 .../test/code/parser/expr/issetAndEmpty.test  |   75 +
 .../test/code/parser/expr/listWithKeys.test   |   75 +
 .../test/code/parser/expr/logic.test          |  159 +
 .../test/code/parser/expr/math.test           |  256 ++
 .../php-parser/test/code/parser/expr/new.test |  146 +
 .../code/parser/expr/newWithoutClass.test     |   23 +
 .../test/code/parser/expr/print.test          |   12 +
 .../test/code/parser/expr/shellExec.test      |   46 +
 .../code/parser/expr/ternaryAndCoalesce.test  |  149 +
 .../expr/uvs/globalNonSimpleVarError.test     |   25 +
 .../code/parser/expr/uvs/indirectCall.test    |  481 ++++
 .../test/code/parser/expr/uvs/isset.test      |   74 +
 .../test/code/parser/expr/uvs/misc.test       |  109 +
 .../test/code/parser/expr/uvs/new.test        |   95 +
 .../code/parser/expr/uvs/staticProperty.test  |   93 +
 .../test/code/parser/expr/variable.test       |   55 +
 .../code/parser/scalar/constantString.test    |   60 +
 .../test/code/parser/scalar/docString.test    |   90 +
 .../code/parser/scalar/docStringNewlines.test |   61 +
 .../parser/scalar/encapsedNegVarOffset.test   |   72 +
 .../code/parser/scalar/encapsedString.test    |  294 ++
 .../test/code/parser/scalar/float.test        |   74 +
 .../test/code/parser/scalar/int.test          |   43 +
 .../test/code/parser/scalar/invalidOctal.test |   22 +
 .../test/code/parser/scalar/magicConst.test   |   31 +
 .../code/parser/scalar/unicodeEscape.test     |   20 +
 .../test/code/parser/semiReserved.test        |  382 +++
 .../code/parser/stmt/blocklessStatement.test  |  112 +
 .../test/code/parser/stmt/class/abstract.test |   39 +
 .../code/parser/stmt/class/anonymous.test     |  195 ++
 .../code/parser/stmt/class/conditional.test   |   33 +
 .../stmt/class/constModifierErrors.test       |  121 +
 .../parser/stmt/class/constModifiers.test     |   67 +
 .../test/code/parser/stmt/class/final.test    |   17 +
 .../parser/stmt/class/implicitPublic.test     |   92 +
 .../code/parser/stmt/class/interface.test     |   36 +
 .../test/code/parser/stmt/class/modifier.test |  215 ++
 .../test/code/parser/stmt/class/name.test     |  240 ++
 .../code/parser/stmt/class/php4Style.test     |   50 +
 .../test/code/parser/stmt/class/simple.test   |  156 +
 .../code/parser/stmt/class/staticMethod.test  |  151 +
 .../test/code/parser/stmt/class/trait.test    |  160 ++
 .../test/code/parser/stmt/const.test          |   40 +
 .../test/code/parser/stmt/controlFlow.test    |   55 +
 .../test/code/parser/stmt/declare.test        |   60 +
 .../test/code/parser/stmt/echo.test           |   32 +
 .../function/builtinTypeDeclarations.test     |   59 +
 .../test/code/parser/stmt/function/byRef.test |   41 +
 .../parser/stmt/function/conditional.test     |   33 +
 .../parser/stmt/function/defaultValues.test   |  148 +
 .../parser/stmt/function/nullableTypes.test   |   47 +
 .../parser/stmt/function/returnTypes.test     |   52 +
 .../parser/stmt/function/specialVars.test     |   51 +
 .../stmt/function/typeDeclarations.test       |   49 +
 .../code/parser/stmt/function/variadic.test   |  110 +
 .../stmt/function/variadicDefaultValue.test   |   27 +
 .../code/parser/stmt/generator/basic.test     |  280 ++
 .../stmt/generator/yieldPrecedence.test       |  230 ++
 .../stmt/generator/yieldUnaryPrecedence.test  |   48 +
 .../test/code/parser/stmt/haltCompiler.test   |   55 +
 .../stmt/haltCompilerInvalidSyntax.test       |    6 +
 .../code/parser/stmt/haltCompilerOffset.test  |   34 +
 .../stmt/haltCompilerOutermostScope.test      |    8 +
 .../test/code/parser/stmt/hashbang.test       |   26 +
 .../php-parser/test/code/parser/stmt/if.test  |  103 +
 .../test/code/parser/stmt/inlineHTML.test     |   27 +
 .../test/code/parser/stmt/loop/do.test        |   17 +
 .../test/code/parser/stmt/loop/for.test       |  110 +
 .../test/code/parser/stmt/loop/foreach.test   |  164 ++
 .../test/code/parser/stmt/loop/while.test     |   25 +
 .../test/code/parser/stmt/multiCatch.test     |   65 +
 .../code/parser/stmt/namespace/alias.test     |  168 ++
 .../code/parser/stmt/namespace/braced.test    |   42 +
 .../stmt/namespace/commentAfterNamespace.test |   22 +
 .../code/parser/stmt/namespace/groupUse.test  |  188 ++
 .../parser/stmt/namespace/groupUseErrors.test |  107 +
 .../stmt/namespace/groupUsePositions.test     |   28 +
 .../stmt/namespace/groupUseTrailingComma.test |   47 +
 .../parser/stmt/namespace/invalidName.test    |   83 +
 .../test/code/parser/stmt/namespace/mix.test  |  103 +
 .../test/code/parser/stmt/namespace/name.test |   42 +
 .../code/parser/stmt/namespace/nested.test    |   30 +
 .../code/parser/stmt/namespace/notBraced.test |   45 +
 .../stmt/namespace/nsAfterHashbang.test       |   22 +
 .../parser/stmt/namespace/outsideStmt.test    |   58 +
 .../stmt/namespace/outsideStmtInvalid.test    |  105 +
 .../test/code/parser/stmt/switch.test         |   81 +
 .../test/code/parser/stmt/tryCatch.test       |  130 +
 .../code/parser/stmt/tryWithoutCatch.test     |   27 +
 .../test/code/parser/stmt/unset.test          |   26 +
 .../test/code/prettyPrinter/comments.test     |   67 +
 .../prettyPrinter/commentsInCommaList.test    |   53 +
 .../prettyPrinter/expr/anonymousClass.test    |   27 +
 .../expr/arrayDestructuring.test              |   14 +
 .../test/code/prettyPrinter/expr/call.test    |   13 +
 .../test/code/prettyPrinter/expr/closure.test |   18 +
 .../prettyPrinter/expr/constant_deref.test    |   13 +
 .../code/prettyPrinter/expr/docStrings.test   |   86 +
 .../test/code/prettyPrinter/expr/include.test |    7 +
 .../code/prettyPrinter/expr/intrinsics.test   |   29 +
 .../test/code/prettyPrinter/expr/list.test    |   19 +
 .../code/prettyPrinter/expr/literals.test     |  154 +
 .../test/code/prettyPrinter/expr/numbers.test |   35 +
 .../code/prettyPrinter/expr/operators.test    |  144 +
 .../code/prettyPrinter/expr/parentheses.test  |   86 +
 .../prettyPrinter/expr/shortArraySyntax.test  |   11 +
 .../prettyPrinter/expr/stringEscaping.test    |   23 +
 .../test/code/prettyPrinter/expr/uvs.test     |   23 +
 .../code/prettyPrinter/expr/variables.test    |   73 +
 .../test/code/prettyPrinter/expr/yield.test   |   46 +
 .../inlineHTMLandPHPtest.file-test            |   58 +
 .../prettyPrinter/onlyInlineHTML.file-test    |   19 +
 .../test/code/prettyPrinter/onlyPHP.file-test |   16 +
 .../test/code/prettyPrinter/stmt/alias.test   |   20 +
 .../prettyPrinter/stmt/break_continue.test    |   13 +
 .../test/code/prettyPrinter/stmt/class.test   |   53 +
 .../code/prettyPrinter/stmt/class_const.test  |   20 +
 .../test/code/prettyPrinter/stmt/const.test   |   11 +
 .../test/code/prettyPrinter/stmt/declare.test |   17 +
 .../code/prettyPrinter/stmt/do_while.test     |   10 +
 .../test/code/prettyPrinter/stmt/for.test     |   28 +
 .../test/code/prettyPrinter/stmt/foreach.test |   28 +
 .../stmt/function_signatures.test             |   43 +
 .../stmt/global_static_variables.test         |   11 +
 .../test/code/prettyPrinter/stmt/goto.test    |    9 +
 .../code/prettyPrinter/stmt/groupUse.test     |   16 +
 .../prettyPrinter/stmt/haltCompiler.file-test |   27 +
 .../test/code/prettyPrinter/stmt/if.test      |   16 +
 .../code/prettyPrinter/stmt/multiCatch.test   |   19 +
 .../code/prettyPrinter/stmt/namespaces.test   |   50 +
 .../prettyPrinter/stmt/nullable_types.test    |   11 +
 .../test/code/prettyPrinter/stmt/switch.test  |   37 +
 .../test/code/prettyPrinter/stmt/throw.test   |    7 +
 .../code/prettyPrinter/stmt/traitUse.test     |   25 +
 .../code/prettyPrinter/stmt/tryCatch.test     |   24 +
 .../test/code/prettyPrinter/stmt/while.test   |   10 +
 .../tests/PEAR/ExceptionTest.php              |   78 +
 .../log/Psr/Log/Test/LoggerInterfaceTest.php  |  146 +
 lib/psr/log/Psr/Log/Test/TestLogger.php       |  147 +
 .../Adapter/AbstractRedisAdapterTest.php      |   46 +
 .../cache/Tests/Adapter/AdapterTestCase.php   |  175 ++
 .../cache/Tests/Adapter/ApcuAdapterTest.php   |  124 +
 .../cache/Tests/Adapter/ArrayAdapterTest.php  |   56 +
 .../cache/Tests/Adapter/ChainAdapterTest.php  |  115 +
 .../Tests/Adapter/DoctrineAdapterTest.php     |   32 +
 .../Tests/Adapter/FilesystemAdapterTest.php   |   61 +
 .../Tests/Adapter/MaxIdLengthAdapterTest.php  |   87 +
 .../Tests/Adapter/MemcachedAdapterTest.php    |  198 ++
 .../Adapter/NamespacedProxyAdapterTest.php    |   26 +
 .../cache/Tests/Adapter/NullAdapterTest.php   |  128 +
 .../cache/Tests/Adapter/PdoAdapterTest.php    |   73 +
 .../Tests/Adapter/PdoDbalAdapterTest.php      |   48 +
 .../Tests/Adapter/PhpArrayAdapterTest.php     |  133 +
 .../PhpArrayAdapterWithFallbackTest.php       |   49 +
 .../Tests/Adapter/PhpFilesAdapterTest.php     |   47 +
 .../cache/Tests/Adapter/PredisAdapterTest.php |   53 +
 .../Adapter/PredisClusterAdapterTest.php      |   26 +
 .../Adapter/PredisRedisClusterAdapterTest.php |   28 +
 .../cache/Tests/Adapter/ProxyAdapterTest.php  |   69 +
 .../cache/Tests/Adapter/RedisAdapterTest.php  |   92 +
 .../Tests/Adapter/RedisArrayAdapterTest.php   |   24 +
 .../Tests/Adapter/RedisClusterAdapterTest.php |   27 +
 .../Tests/Adapter/SimpleCacheAdapterTest.php  |   41 +
 .../Tests/Adapter/TagAwareAdapterTest.php     |  318 ++
 ...TagAwareAndProxyAdapterIntegrationTest.php |   38 +
 .../Tests/Adapter/TraceableAdapterTest.php    |  191 ++
 .../Adapter/TraceableTagAwareAdapterTest.php  |   37 +
 lib/symfony/cache/Tests/CacheItemTest.php     |   77 +
 .../cache/Tests/DoctrineProviderTest.php      |   45 +
 .../cache/Tests/Fixtures/ArrayCache.php       |   52 +
 .../cache/Tests/Fixtures/ExternalAdapter.php  |   76 +
 .../Tests/Simple/AbstractRedisCacheTest.php   |   46 +
 .../cache/Tests/Simple/ApcuCacheTest.php      |   35 +
 .../cache/Tests/Simple/ArrayCacheTest.php     |   25 +
 .../cache/Tests/Simple/CacheTestCase.php      |  150 +
 .../cache/Tests/Simple/ChainCacheTest.php     |  113 +
 .../cache/Tests/Simple/DoctrineCacheTest.php  |   31 +
 .../Tests/Simple/FilesystemCacheTest.php      |   34 +
 .../cache/Tests/Simple/MemcachedCacheTest.php |  172 ++
 .../Simple/MemcachedCacheTextModeTest.php     |   25 +
 .../cache/Tests/Simple/NullCacheTest.php      |   96 +
 .../cache/Tests/Simple/PdoCacheTest.php       |   47 +
 .../cache/Tests/Simple/PdoDbalCacheTest.php   |   48 +
 .../cache/Tests/Simple/PhpArrayCacheTest.php  |  143 +
 .../Simple/PhpArrayCacheWithFallbackTest.php  |   55 +
 .../cache/Tests/Simple/PhpFilesCacheTest.php  |   42 +
 .../cache/Tests/Simple/Psr6CacheTest.php      |   30 +
 .../Tests/Simple/RedisArrayCacheTest.php      |   24 +
 .../cache/Tests/Simple/RedisCacheTest.php     |   82 +
 .../Tests/Simple/RedisClusterCacheTest.php    |   27 +
 .../cache/Tests/Simple/TraceableCacheTest.php |  171 ++
 .../cache/Tests/Traits/PdoPruneableTrait.php  |   34 +
 .../class-loader/Tests/ApcClassLoaderTest.php |  200 ++
 .../Tests/ClassCollectionLoaderTest.php       |  317 ++
 .../class-loader/Tests/ClassLoaderTest.php    |  238 ++
 .../Tests/ClassMapGeneratorTest.php           |  151 +
 .../Tests/Fixtures/Apc/Namespaced/Bar.php     |   17 +
 .../Tests/Fixtures/Apc/Namespaced/Baz.php     |   17 +
 .../Tests/Fixtures/Apc/Namespaced/Foo.php     |   17 +
 .../Tests/Fixtures/Apc/Namespaced/FooBar.php  |   17 +
 .../Tests/Fixtures/Apc/Pearlike/Bar.php       |    6 +
 .../Tests/Fixtures/Apc/Pearlike/Baz.php       |    6 +
 .../Tests/Fixtures/Apc/Pearlike/Foo.php       |    6 +
 .../alpha/Apc/ApcPrefixCollision/A/Bar.php    |    6 +
 .../alpha/Apc/ApcPrefixCollision/A/Foo.php    |    6 +
 .../alpha/Apc/NamespaceCollision/A/Bar.php    |   17 +
 .../alpha/Apc/NamespaceCollision/A/Foo.php    |   17 +
 .../beta/Apc/ApcPrefixCollision/A/B/Bar.php   |    6 +
 .../beta/Apc/ApcPrefixCollision/A/B/Foo.php   |    6 +
 .../beta/Apc/NamespaceCollision/A/B/Bar.php   |   17 +
 .../beta/Apc/NamespaceCollision/A/B/Foo.php   |   17 +
 .../Apc/fallback/Apc/Pearlike/FooBar.php      |    6 +
 .../Apc/fallback/Namespaced/FooBar.php        |   17 +
 .../Tests/Fixtures/ClassesWithParents/A.php   |    7 +
 .../Fixtures/ClassesWithParents/ATrait.php    |    7 +
 .../Tests/Fixtures/ClassesWithParents/B.php   |    7 +
 .../Fixtures/ClassesWithParents/BTrait.php    |    8 +
 .../ClassesWithParents/CInterface.php         |    7 +
 .../Fixtures/ClassesWithParents/CTrait.php    |    7 +
 .../Tests/Fixtures/ClassesWithParents/D.php   |    8 +
 .../Tests/Fixtures/ClassesWithParents/E.php   |    8 +
 .../Tests/Fixtures/ClassesWithParents/F.php   |    8 +
 .../Tests/Fixtures/ClassesWithParents/G.php   |    8 +
 .../ClassesWithParents/GInterface.php         |    7 +
 .../Tests/Fixtures/DeclaredClass.php          |    7 +
 .../Tests/Fixtures/DeclaredInterface.php      |    7 +
 .../Tests/Fixtures/Namespaced/Bar.php         |   17 +
 .../Tests/Fixtures/Namespaced/Baz.php         |   17 +
 .../Tests/Fixtures/Namespaced/Foo.php         |   17 +
 .../Fixtures/Namespaced/WithComments.php      |   37 +
 .../Fixtures/Namespaced/WithDirMagic.php      |   15 +
 .../Fixtures/Namespaced/WithFileMagic.php     |   15 +
 .../Fixtures/Namespaced/WithHaltCompiler.php  |   18 +
 .../Fixtures/Namespaced/WithStrictTypes.php   |   13 +
 .../Tests/Fixtures/Namespaced2/Bar.php        |    8 +
 .../Tests/Fixtures/Namespaced2/Baz.php        |    8 +
 .../Tests/Fixtures/Namespaced2/Foo.php        |    8 +
 .../Tests/Fixtures/Pearlike/Bar.php           |    6 +
 .../Tests/Fixtures/Pearlike/Baz.php           |    6 +
 .../Tests/Fixtures/Pearlike/Foo.php           |    6 +
 .../Tests/Fixtures/Pearlike/WithComments.php  |   16 +
 .../Tests/Fixtures/Pearlike2/Bar.php          |    6 +
 .../Tests/Fixtures/Pearlike2/Baz.php          |    6 +
 .../Tests/Fixtures/Pearlike2/Foo.php          |    6 +
 .../Tests/Fixtures/WarmedClass.php            |    7 +
 .../Tests/Fixtures/WarmedInterface.php        |    7 +
 .../alpha/NamespaceCollision/A/Bar.php        |   17 +
 .../alpha/NamespaceCollision/A/Foo.php        |   17 +
 .../alpha/NamespaceCollision/C/Bar.php        |    8 +
 .../alpha/NamespaceCollision/C/Foo.php        |    8 +
 .../Fixtures/alpha/PrefixCollision/A/Bar.php  |    6 +
 .../Fixtures/alpha/PrefixCollision/A/Foo.php  |    6 +
 .../Fixtures/alpha/PrefixCollision/C/Bar.php  |    6 +
 .../Fixtures/alpha/PrefixCollision/C/Foo.php  |    6 +
 .../beta/NamespaceCollision/A/B/Bar.php       |   17 +
 .../beta/NamespaceCollision/A/B/Foo.php       |   17 +
 .../beta/NamespaceCollision/C/B/Bar.php       |    8 +
 .../beta/NamespaceCollision/C/B/Foo.php       |    8 +
 .../Fixtures/beta/PrefixCollision/A/B/Bar.php |    6 +
 .../Fixtures/beta/PrefixCollision/A/B/Foo.php |    6 +
 .../Fixtures/beta/PrefixCollision/C/B/Bar.php |    6 +
 .../Fixtures/beta/PrefixCollision/C/B/Foo.php |    6 +
 .../Tests/Fixtures/classmap/SomeClass.php     |   16 +
 .../Tests/Fixtures/classmap/SomeInterface.php |   16 +
 .../Tests/Fixtures/classmap/SomeParent.php    |   16 +
 .../Tests/Fixtures/classmap/multipleNs.php    |   25 +
 .../Tests/Fixtures/classmap/notAClass.php     |    3 +
 .../Tests/Fixtures/classmap/notPhpFile.md     |    1 +
 .../classmap/sameNsMultipleClasses.php        |   19 +
 .../Tests/Fixtures/deps/traits.php            |   37 +
 .../Fixtures/fallback/Namespaced/FooBar.php   |   17 +
 .../Fixtures/fallback/Namespaced2/FooBar.php  |    8 +
 .../Fixtures/fallback/Pearlike/FooBar.php     |    6 +
 .../Fixtures/fallback/Pearlike2/FooBar.php    |    6 +
 .../Tests/Fixtures/includepath/Foo.php        |    5 +
 .../Tests/Fixtures/php5.4/traits.php          |   32 +
 .../Tests/Fixtures/php5.5/class_cons.php      |   11 +
 .../Fixtures/psr-4/Class_With_Underscores.php |    7 +
 .../class-loader/Tests/Fixtures/psr-4/Foo.php |    7 +
 .../Lets/Go/Deeper/Class_With_Underscores.php |    7 +
 .../Fixtures/psr-4/Lets/Go/Deeper/Foo.php     |    7 +
 .../Tests/Psr4ClassLoaderTest.php             |   75 +
 .../config/Tests/ConfigCacheFactoryTest.php   |   27 +
 lib/symfony/config/Tests/ConfigCacheTest.php  |   99 +
 .../config/Tests/Definition/ArrayNodeTest.php |  237 ++
 .../Tests/Definition/BooleanNodeTest.php      |   74 +
 .../Builder/ArrayNodeDefinitionTest.php       |  362 +++
 .../Builder/BooleanNodeDefinitionTest.php     |   37 +
 .../Builder/EnumNodeDefinitionTest.php        |   73 +
 .../Definition/Builder/ExprBuilderTest.php    |  264 ++
 .../Definition/Builder/NodeBuilderTest.php    |   91 +
 .../Builder/NumericNodeDefinitionTest.php     |   89 +
 .../Definition/Builder/TreeBuilderTest.php    |  134 +
 .../Dumper/XmlReferenceDumperTest.php         |  114 +
 .../Dumper/YamlReferenceDumperTest.php        |  143 +
 .../config/Tests/Definition/EnumNodeTest.php  |   51 +
 .../Tests/Definition/FinalizationTest.php     |   74 +
 .../config/Tests/Definition/FloatNodeTest.php |   78 +
 .../Tests/Definition/IntegerNodeTest.php      |   75 +
 .../config/Tests/Definition/MergeTest.php     |  192 ++
 .../Tests/Definition/NormalizationTest.php    |  228 ++
 .../Definition/PrototypedArrayNodeTest.php    |  341 +++
 .../Tests/Definition/ScalarNodeTest.php       |  161 ++
 .../ConfigCachePassTest.php                   |   59 +
 .../Exception/FileLoaderLoadExceptionTest.php |   98 +
 lib/symfony/config/Tests/FileLocatorTest.php  |  114 +
 .../config/Tests/Fixtures/Again/foo.xml       |    0
 .../config/Tests/Fixtures/BadParent.php       |    7 +
 lib/symfony/config/Tests/Fixtures/BarNode.php |   18 +
 .../Fixtures/Builder/BarNodeDefinition.php    |   23 +
 .../Tests/Fixtures/Builder/NodeBuilder.php    |   34 +
 .../Builder/VariableNodeDefinition.php        |   18 +
 .../Configuration/ExampleConfiguration.php    |  102 +
 .../Tests/Fixtures/Resource/.hiddenFile       |    0
 .../Fixtures/Resource/ConditionalClass.php    |    9 +
 .../Tests/Fixtures/Util/document_type.xml     |    3 +
 .../config/Tests/Fixtures/Util/invalid.xml    |    2 +
 .../Tests/Fixtures/Util/invalid_schema.xml    |    2 +
 .../config/Tests/Fixtures/Util/schema.xsd     |    9 +
 .../config/Tests/Fixtures/Util/valid.xml      |    3 +
 lib/symfony/config/Tests/Fixtures/foo.xml     |    0
 .../Tests/Loader/DelegatingLoaderTest.php     |   69 +
 .../config/Tests/Loader/FileLoaderTest.php    |  128 +
 .../Tests/Loader/LoaderResolverTest.php       |   47 +
 .../config/Tests/Loader/LoaderTest.php        |  116 +
 .../Resource/ClassExistenceResourceTest.php   |   99 +
 .../Tests/Resource/ComposerResourceTest.php   |   47 +
 .../Tests/Resource/DirectoryResourceTest.php  |  181 ++
 .../Resource/FileExistenceResourceTest.php    |   71 +
 .../Tests/Resource/FileResourceTest.php       |   83 +
 .../Tests/Resource/GlobResourceTest.php       |  114 +
 .../Resource/ReflectionClassResourceTest.php  |  223 ++
 .../config/Tests/Resource/ResourceStub.php    |   34 +
 .../Tests/ResourceCheckerConfigCacheTest.php  |  150 +
 .../config/Tests/Util/XmlUtilsTest.php        |  211 ++
 lib/symfony/console/Tests/ApplicationTest.php | 1744 +++++++++++
 .../console/Tests/Command/CommandTest.php     |  430 +++
 .../console/Tests/Command/HelpCommandTest.php |   71 +
 .../console/Tests/Command/ListCommandTest.php |  113 +
 .../Tests/Command/LockableTraitTest.php       |   67 +
 .../ContainerCommandLoaderTest.php            |   59 +
 .../FactoryCommandLoaderTest.php              |   58 +
 .../AddConsoleCommandPassTest.php             |  256 ++
 .../Descriptor/AbstractDescriptorTest.php     |  107 +
 .../Descriptor/ApplicationDescriptionTest.php |   53 +
 .../Tests/Descriptor/JsonDescriptorTest.php   |   35 +
 .../Descriptor/MarkdownDescriptorTest.php     |   45 +
 .../Tests/Descriptor/ObjectsProvider.php      |   82 +
 .../Tests/Descriptor/TextDescriptorTest.php   |   53 +
 .../Tests/Descriptor/XmlDescriptorTest.php    |   27 +
 .../Tests/EventListener/ErrorListenerTest.php |  156 +
 .../console/Tests/Fixtures/BarBucCommand.php  |   11 +
 .../Tests/Fixtures/DescriptorApplication1.php |   18 +
 .../Tests/Fixtures/DescriptorApplication2.php |   26 +
 .../DescriptorApplicationMbString.php         |   24 +
 .../Tests/Fixtures/DescriptorCommand1.php     |   27 +
 .../Tests/Fixtures/DescriptorCommand2.php     |   32 +
 .../Tests/Fixtures/DescriptorCommand3.php     |   27 +
 .../Tests/Fixtures/DescriptorCommand4.php     |   25 +
 .../Fixtures/DescriptorCommandMbString.php    |   32 +
 .../console/Tests/Fixtures/DummyOutput.php    |   36 +
 .../console/Tests/Fixtures/Foo1Command.php    |   26 +
 .../console/Tests/Fixtures/Foo2Command.php    |   21 +
 .../console/Tests/Fixtures/Foo3Command.php    |   29 +
 .../console/Tests/Fixtures/Foo4Command.php    |   11 +
 .../console/Tests/Fixtures/Foo5Command.php    |   10 +
 .../console/Tests/Fixtures/Foo6Command.php    |   11 +
 .../console/Tests/Fixtures/FooCommand.php     |   33 +
 .../Tests/Fixtures/FooHiddenCommand.php       |   21 +
 .../Tests/Fixtures/FooLock2Command.php        |   28 +
 .../console/Tests/Fixtures/FooLockCommand.php |   27 +
 .../console/Tests/Fixtures/FooOptCommand.php  |   36 +
 .../Fixtures/FooSameCaseLowercaseCommand.php  |   11 +
 .../Fixtures/FooSameCaseUppercaseCommand.php  |   11 +
 .../Fixtures/FooSubnamespaced1Command.php     |   26 +
 .../Fixtures/FooSubnamespaced2Command.php     |   26 +
 .../console/Tests/Fixtures/FoobarCommand.php  |   25 +
 .../Style/SymfonyStyle/command/command_0.php  |   11 +
 .../Style/SymfonyStyle/command/command_1.php  |   13 +
 .../Style/SymfonyStyle/command/command_10.php |   17 +
 .../Style/SymfonyStyle/command/command_11.php |   12 +
 .../Style/SymfonyStyle/command/command_12.php |   13 +
 .../Style/SymfonyStyle/command/command_13.php |   14 +
 .../Style/SymfonyStyle/command/command_14.php |   17 +
 .../Style/SymfonyStyle/command/command_15.php |   14 +
 .../Style/SymfonyStyle/command/command_16.php |   15 +
 .../Style/SymfonyStyle/command/command_17.php |   13 +
 .../Style/SymfonyStyle/command/command_2.php  |   16 +
 .../Style/SymfonyStyle/command/command_3.php  |   12 +
 .../Style/SymfonyStyle/command/command_4.php  |   34 +
 .../Style/SymfonyStyle/command/command_5.php  |   37 +
 .../Style/SymfonyStyle/command/command_6.php  |   16 +
 .../Style/SymfonyStyle/command/command_7.php  |   15 +
 .../Style/SymfonyStyle/command/command_8.php  |   26 +
 .../Style/SymfonyStyle/command/command_9.php  |   11 +
 .../command/interactive_command_1.php         |   19 +
 .../output/interactive_output_1.txt           |    7 +
 .../Style/SymfonyStyle/output/output_0.txt    |    3 +
 .../Style/SymfonyStyle/output/output_1.txt    |    9 +
 .../Style/SymfonyStyle/output/output_10.txt   |    7 +
 .../Style/SymfonyStyle/output/output_11.txt   |    4 +
 .../Style/SymfonyStyle/output/output_12.txt   |    6 +
 .../Style/SymfonyStyle/output/output_13.txt   |    7 +
 .../Style/SymfonyStyle/output/output_14.txt   |    6 +
 .../Style/SymfonyStyle/output/output_15.txt   |    7 +
 .../Style/SymfonyStyle/output/output_16.txt   |    8 +
 .../Style/SymfonyStyle/output/output_17.txt   |    7 +
 .../Style/SymfonyStyle/output/output_2.txt    |   13 +
 .../Style/SymfonyStyle/output/output_3.txt    |    7 +
 .../Style/SymfonyStyle/output/output_4.txt    |   32 +
 .../Style/SymfonyStyle/output/output_5.txt    |   18 +
 .../Style/SymfonyStyle/output/output_6.txt    |    6 +
 .../Style/SymfonyStyle/output/output_7.txt    |    5 +
 .../Style/SymfonyStyle/output/output_8.txt    |    9 +
 .../Style/SymfonyStyle/output/output_9.txt    |    5 +
 .../TestAmbiguousCommandRegistering.php       |   22 +
 .../TestAmbiguousCommandRegistering2.php      |   21 +
 .../console/Tests/Fixtures/TestCommand.php    |   28 +
 .../console/Tests/Fixtures/application_1.json |  156 +
 .../console/Tests/Fixtures/application_1.md   |  172 ++
 .../console/Tests/Fixtures/application_1.txt  |   17 +
 .../console/Tests/Fixtures/application_1.xml  |  104 +
 .../console/Tests/Fixtures/application_2.json |  509 ++++
 .../console/Tests/Fixtures/application_2.md   |  431 +++
 .../console/Tests/Fixtures/application_2.txt  |   21 +
 .../console/Tests/Fixtures/application_2.xml  |  254 ++
 .../application_filtered_namespace.txt        |   16 +
 .../Tests/Fixtures/application_gethelp.txt    |    1 +
 .../Tests/Fixtures/application_mbstring.md    |  269 ++
 .../Tests/Fixtures/application_mbstring.txt   |   19 +
 .../Fixtures/application_renderexception1.txt |    5 +
 .../Fixtures/application_renderexception2.txt |    7 +
 .../Fixtures/application_renderexception3.txt |   18 +
 .../application_renderexception3decorated.txt |   18 +
 .../Fixtures/application_renderexception4.txt |    6 +
 ...plication_renderexception_doublewidth1.txt |    8 +
 ..._renderexception_doublewidth1decorated.txt |    8 +
 ...plication_renderexception_doublewidth2.txt |    9 +
 ...plication_renderexception_escapeslines.txt |    9 +
 ...application_renderexception_linebreaks.txt |   11 +
 .../Tests/Fixtures/application_run1.txt       |   17 +
 .../Tests/Fixtures/application_run2.txt       |   26 +
 .../Tests/Fixtures/application_run3.txt       |   26 +
 .../Tests/Fixtures/application_run4.txt       |    1 +
 .../console/Tests/Fixtures/command_1.json     |   15 +
 .../console/Tests/Fixtures/command_1.md       |   12 +
 .../console/Tests/Fixtures/command_1.txt      |    7 +
 .../console/Tests/Fixtures/command_1.xml      |   12 +
 .../console/Tests/Fixtures/command_2.json     |   33 +
 .../console/Tests/Fixtures/command_2.md       |   29 +
 .../console/Tests/Fixtures/command_2.txt      |   13 +
 .../console/Tests/Fixtures/command_2.xml      |   21 +
 .../Tests/Fixtures/command_mbstring.md        |   29 +
 .../Tests/Fixtures/command_mbstring.txt       |   13 +
 .../Tests/Fixtures/input_argument_1.json      |    7 +
 .../Tests/Fixtures/input_argument_1.md        |    5 +
 .../Tests/Fixtures/input_argument_1.txt       |    1 +
 .../Tests/Fixtures/input_argument_1.xml       |    5 +
 .../Tests/Fixtures/input_argument_2.json      |    7 +
 .../Tests/Fixtures/input_argument_2.md        |    7 +
 .../Tests/Fixtures/input_argument_2.txt       |    1 +
 .../Tests/Fixtures/input_argument_2.xml       |    5 +
 .../Tests/Fixtures/input_argument_3.json      |    7 +
 .../Tests/Fixtures/input_argument_3.md        |    7 +
 .../Tests/Fixtures/input_argument_3.txt       |    1 +
 .../Tests/Fixtures/input_argument_3.xml       |    7 +
 .../Tests/Fixtures/input_argument_4.json      |    7 +
 .../Tests/Fixtures/input_argument_4.md        |    8 +
 .../Tests/Fixtures/input_argument_4.txt       |    2 +
 .../Tests/Fixtures/input_argument_4.xml       |    6 +
 ...input_argument_with_default_inf_value.json |    7 +
 .../input_argument_with_default_inf_value.md  |    7 +
 .../input_argument_with_default_inf_value.txt |    1 +
 .../input_argument_with_default_inf_value.xml |    7 +
 .../Fixtures/input_argument_with_style.json   |    7 +
 .../Fixtures/input_argument_with_style.md     |    7 +
 .../Fixtures/input_argument_with_style.txt    |    1 +
 .../Fixtures/input_argument_with_style.xml    |    7 +
 .../Tests/Fixtures/input_definition_1.json    |    4 +
 .../Tests/Fixtures/input_definition_1.md      |    0
 .../Tests/Fixtures/input_definition_1.txt     |    0
 .../Tests/Fixtures/input_definition_1.xml     |    5 +
 .../Tests/Fixtures/input_definition_2.json    |   12 +
 .../Tests/Fixtures/input_definition_2.md      |    7 +
 .../Tests/Fixtures/input_definition_2.txt     |    2 +
 .../Tests/Fixtures/input_definition_2.xml     |   10 +
 .../Tests/Fixtures/input_definition_3.json    |   14 +
 .../Tests/Fixtures/input_definition_3.md      |    8 +
 .../Tests/Fixtures/input_definition_3.txt     |    2 +
 .../Tests/Fixtures/input_definition_3.xml     |    9 +
 .../Tests/Fixtures/input_definition_4.json    |   22 +
 .../Tests/Fixtures/input_definition_4.md      |   16 +
 .../Tests/Fixtures/input_definition_4.txt     |    5 +
 .../Tests/Fixtures/input_definition_4.xml     |   14 +
 .../Tests/Fixtures/input_option_1.json        |    9 +
 .../console/Tests/Fixtures/input_option_1.md  |    6 +
 .../console/Tests/Fixtures/input_option_1.txt |    1 +
 .../console/Tests/Fixtures/input_option_1.xml |    4 +
 .../Tests/Fixtures/input_option_2.json        |    9 +
 .../console/Tests/Fixtures/input_option_2.md  |    8 +
 .../console/Tests/Fixtures/input_option_2.txt |    1 +
 .../console/Tests/Fixtures/input_option_2.xml |    7 +
 .../Tests/Fixtures/input_option_3.json        |    9 +
 .../console/Tests/Fixtures/input_option_3.md  |    8 +
 .../console/Tests/Fixtures/input_option_3.txt |    1 +
 .../console/Tests/Fixtures/input_option_3.xml |    5 +
 .../Tests/Fixtures/input_option_4.json        |    9 +
 .../console/Tests/Fixtures/input_option_4.md  |    8 +
 .../console/Tests/Fixtures/input_option_4.txt |    1 +
 .../console/Tests/Fixtures/input_option_4.xml |    5 +
 .../Tests/Fixtures/input_option_5.json        |    9 +
 .../console/Tests/Fixtures/input_option_5.md  |    9 +
 .../console/Tests/Fixtures/input_option_5.txt |    2 +
 .../console/Tests/Fixtures/input_option_5.xml |    6 +
 .../Tests/Fixtures/input_option_6.json        |    9 +
 .../console/Tests/Fixtures/input_option_6.md  |    8 +
 .../console/Tests/Fixtures/input_option_6.txt |    1 +
 .../console/Tests/Fixtures/input_option_6.xml |    5 +
 .../input_option_with_default_inf_value.json  |    9 +
 .../input_option_with_default_inf_value.md    |    8 +
 .../input_option_with_default_inf_value.txt   |    1 +
 .../input_option_with_default_inf_value.xml   |    7 +
 .../Fixtures/input_option_with_style.json     |    9 +
 .../Tests/Fixtures/input_option_with_style.md |    8 +
 .../Fixtures/input_option_with_style.txt      |    1 +
 .../Fixtures/input_option_with_style.xml      |    7 +
 .../input_option_with_style_array.json        |   12 +
 .../Fixtures/input_option_with_style_array.md |    8 +
 .../input_option_with_style_array.txt         |    1 +
 .../input_option_with_style_array.xml         |    8 +
 .../OutputFormatterStyleStackTest.php         |   69 +
 .../Formatter/OutputFormatterStyleTest.php    |  100 +
 .../Tests/Formatter/OutputFormatterTest.php   |  344 +++
 .../Helper/AbstractQuestionHelperTest.php     |   34 +
 .../Tests/Helper/FormatterHelperTest.php      |  129 +
 .../console/Tests/Helper/HelperSetTest.php    |  127 +
 .../console/Tests/Helper/HelperTest.php       |   55 +
 .../Tests/Helper/ProcessHelperTest.php        |  118 +
 .../console/Tests/Helper/ProgressBarTest.php  |  805 ++++++
 .../Tests/Helper/ProgressIndicatorTest.php    |  175 ++
 .../Tests/Helper/QuestionHelperTest.php       | 1085 +++++++
 .../Helper/SymfonyQuestionHelperTest.php      |  166 ++
 .../console/Tests/Helper/TableStyleTest.php   |   26 +
 .../console/Tests/Helper/TableTest.php        |  868 ++++++
 .../console/Tests/Input/ArgvInputTest.php     |  462 +++
 .../console/Tests/Input/ArrayInputTest.php    |  173 ++
 .../console/Tests/Input/InputArgumentTest.php |  109 +
 .../Tests/Input/InputDefinitionTest.php       |  389 +++
 .../console/Tests/Input/InputOptionTest.php   |  194 ++
 lib/symfony/console/Tests/Input/InputTest.php |  137 +
 .../console/Tests/Input/StringInputTest.php   |   87 +
 .../Tests/Logger/ConsoleLoggerTest.php        |  213 ++
 .../Tests/Output/ConsoleOutputTest.php        |   42 +
 .../console/Tests/Output/NullOutputTest.php   |   88 +
 .../console/Tests/Output/OutputTest.php       |  176 ++
 .../console/Tests/Output/StreamOutputTest.php |   59 +
 .../Tests/Question/ChoiceQuestionTest.php     |   64 +
 .../Question/ConfirmationQuestionTest.php     |   62 +
 .../console/Tests/Style/SymfonyStyleTest.php  |  118 +
 lib/symfony/console/Tests/TerminalTest.php    |   97 +
 .../Tests/Tester/ApplicationTesterTest.php    |   70 +
 .../Tests/Tester/CommandTesterTest.php        |  212 ++
 .../Tests/CssSelectorConverterTest.php        |   74 +
 .../Tests/Node/AbstractNodeTest.php           |   34 +
 .../Tests/Node/AttributeNodeTest.php          |   37 +
 .../css-selector/Tests/Node/ClassNodeTest.php |   33 +
 .../Tests/Node/CombinedSelectorNodeTest.php   |   35 +
 .../Tests/Node/ElementNodeTest.php            |   35 +
 .../Tests/Node/FunctionNodeTest.php           |   47 +
 .../css-selector/Tests/Node/HashNodeTest.php  |   33 +
 .../Tests/Node/NegationNodeTest.php           |   33 +
 .../Tests/Node/PseudoNodeTest.php             |   32 +
 .../Tests/Node/SelectorNodeTest.php           |   34 +
 .../Tests/Node/SpecificityTest.php            |   63 +
 .../Parser/Handler/AbstractHandlerTest.php    |   70 +
 .../Parser/Handler/CommentHandlerTest.php     |   55 +
 .../Tests/Parser/Handler/HashHandlerTest.php  |   49 +
 .../Parser/Handler/IdentifierHandlerTest.php  |   49 +
 .../Parser/Handler/NumberHandlerTest.php      |   50 +
 .../Parser/Handler/StringHandlerTest.php      |   50 +
 .../Parser/Handler/WhitespaceHandlerTest.php  |   44 +
 .../css-selector/Tests/Parser/ParserTest.php  |  253 ++
 .../css-selector/Tests/Parser/ReaderTest.php  |  102 +
 .../Tests/Parser/Shortcut/ClassParserTest.php |   45 +
 .../Parser/Shortcut/ElementParserTest.php     |   44 +
 .../Parser/Shortcut/EmptyStringParserTest.php |   36 +
 .../Tests/Parser/Shortcut/HashParserTest.php  |   45 +
 .../Tests/Parser/TokenStreamTest.php          |   96 +
 .../Tests/XPath/Fixtures/ids.html             |   48 +
 .../Tests/XPath/Fixtures/lang.xml             |   11 +
 .../Tests/XPath/Fixtures/shakespear.html      |  308 ++
 .../Tests/XPath/TranslatorTest.php            |  413 +++
 .../debug/Resources/ext/tests/001.phpt        |  155 +
 .../debug/Resources/ext/tests/002.phpt        |   65 +
 .../debug/Resources/ext/tests/002_1.phpt      |   48 +
 .../debug/Resources/ext/tests/003.phpt        |   87 +
 .../debug/Tests/DebugClassLoaderTest.php      |  445 +++
 lib/symfony/debug/Tests/ErrorHandlerTest.php  |  646 +++++
 .../Tests/Exception/FlattenExceptionTest.php  |  302 ++
 .../debug/Tests/ExceptionHandlerTest.php      |  163 ++
 .../ClassNotFoundFatalErrorHandlerTest.php    |  180 ++
 ...UndefinedFunctionFatalErrorHandlerTest.php |   81 +
 .../UndefinedMethodFatalErrorHandlerTest.php  |   76 +
 .../debug/Tests/Fixtures/AnnotatedClass.php   |   13 +
 .../debug/Tests/Fixtures/ClassAlias.php       |    3 +
 .../Fixtures/DefinitionInEvaluatedCode.php    |   11 +
 .../debug/Tests/Fixtures/DeprecatedClass.php  |   12 +
 .../Tests/Fixtures/DeprecatedInterface.php    |   12 +
 .../ErrorHandlerThatUsesThePreviousOne.php    |   22 +
 .../Tests/Fixtures/ExtendedFinalMethod.php    |   19 +
 .../debug/Tests/Fixtures/FinalClasses.php     |   85 +
 .../debug/Tests/Fixtures/FinalMethod.php      |   26 +
 .../Tests/Fixtures/FinalMethod2Trait.php      |   10 +
 .../debug/Tests/Fixtures/InternalClass.php    |   15 +
 .../Tests/Fixtures/InternalInterface.php      |   10 +
 .../debug/Tests/Fixtures/InternalTrait.php    |   10 +
 .../debug/Tests/Fixtures/InternalTrait2.php   |   23 +
 .../Fixtures/LoggerThatSetAnErrorHandler.php  |   15 +
 .../Tests/Fixtures/NonDeprecatedInterface.php |    7 +
 .../debug/Tests/Fixtures/PEARClass.php        |    5 +
 lib/symfony/debug/Tests/Fixtures/Throwing.php |    3 +
 .../debug/Tests/Fixtures/ToStringThrower.php  |   24 +
 .../Fixtures/TraitWithInternalMethod.php      |   13 +
 .../debug/Tests/Fixtures/casemismatch.php     |    7 +
 .../debug/Tests/Fixtures/notPsr0Bis.php       |    7 +
 .../Tests/Fixtures/psr4/Psr4CaseMismatch.php  |    7 +
 .../debug/Tests/Fixtures/reallyNotPsr0.php    |    7 +
 .../debug/Tests/Fixtures2/RequiredTwice.php   |    7 +
 lib/symfony/debug/Tests/HeaderMock.php        |   38 +
 .../debug/Tests/phpt/debug_class_loader.phpt  |   27 +
 .../Tests/phpt/decorate_exception_hander.phpt |   47 +
 .../debug/Tests/phpt/exception_rethrown.phpt  |   35 +
 .../phpt/fatal_with_nested_handlers.phpt      |   42 +
 .../Argument/RewindableGeneratorTest.php      |   53 +
 .../Tests/ChildDefinitionTest.php             |  149 +
 .../AnalyzeServiceReferencesPassTest.php      |  215 ++
 .../Compiler/AutoAliasServicePassTest.php     |  108 +
 .../Compiler/AutowireExceptionPassTest.php    |  145 +
 .../Tests/Compiler/AutowirePassTest.php       |  916 ++++++
 .../AutowireRequiredMethodsPassTest.php       |   80 +
 .../CheckArgumentsValidityPassTest.php        |   78 +
 .../CheckCircularReferencesPassTest.php       |  146 +
 .../CheckDefinitionValidityPassTest.php       |  110 +
 ...tionOnInvalidReferenceBehaviorPassTest.php |   86 +
 .../CheckReferenceValidityPassTest.php        |   48 +
 .../Compiler/DecoratorServicePassTest.php     |  199 ++
 .../DefinitionErrorExceptionPassTest.php      |   51 +
 .../Compiler/ExtensionCompilerPassTest.php    |   81 +
 .../Compiler/FactoryReturnTypePassTest.php    |  123 +
 .../InlineServiceDefinitionsPassTest.php      |  358 +++
 .../Tests/Compiler/IntegrationTest.php        |  252 ++
 .../MergeExtensionConfigurationPassTest.php   |  197 ++
 .../Tests/Compiler/OptionalServiceClass.php   |   18 +
 .../Tests/Compiler/PassConfigTest.php         |   38 +
 .../PriorityTaggedServiceTraitTest.php        |   91 +
 .../RegisterEnvVarProcessorsPassTest.php      |   86 +
 .../RegisterServiceSubscribersPassTest.php    |  133 +
 .../RemoveUnusedDefinitionsPassTest.php       |  137 +
 ...ReplaceAliasByActualDefinitionPassTest.php |   69 +
 .../Compiler/ResolveBindingsPassTest.php      |  152 +
 .../ResolveChildDefinitionsPassTest.php       |  449 +++
 .../Tests/Compiler/ResolveClassPassTest.php   |   95 +
 .../ResolveDefinitionTemplatesPassTest.php    |  407 +++
 .../Compiler/ResolveFactoryClassPassTest.php  |   86 +
 .../Tests/Compiler/ResolveHotPathPassTest.php |   57 +
 .../ResolveInstanceofConditionalsPassTest.php |  262 ++
 .../ResolveInvalidReferencesPassTest.php      |  135 +
 .../ResolveNamedArgumentsPassTest.php         |  173 ++
 .../ResolveParameterPlaceHoldersPassTest.php  |  100 +
 .../Compiler/ResolvePrivatesPassTest.php      |   39 +
 .../ResolveReferencesToAliasesPassTest.php    |   89 +
 .../ResolveTaggedIteratorArgumentPassTest.php |   40 +
 .../Compiler/ServiceLocatorTagPassTest.php    |  145 +
 .../Config/AutowireServiceResourceTest.php    |  124 +
 ...ContainerParametersResourceCheckerTest.php |   78 +
 .../ContainerParametersResourceTest.php       |   43 +
 .../Tests/ContainerBuilderTest.php            | 1536 ++++++++++
 .../Tests/ContainerTest.php                   |  692 +++++
 .../Tests/CrossCheckTest.php                  |   95 +
 .../Tests/DefinitionDecoratorTest.php         |  128 +
 .../Tests/DefinitionTest.php                  |  387 +++
 .../Tests/Dumper/GraphvizDumperTest.php       |   88 +
 .../Tests/Dumper/PhpDumperTest.php            | 1184 ++++++++
 .../Tests/Dumper/XmlDumperTest.php            |  210 ++
 .../Tests/Dumper/YamlDumperTest.php           |  104 +
 .../Tests/EnvVarProcessorTest.php             |  300 ++
 .../Tests/Extension/ExtensionTest.php         |   57 +
 .../Tests/Fixtures/Bar.php                    |   26 +
 .../Tests/Fixtures/BarInterface.php           |   16 +
 .../Tests/Fixtures/CaseSensitiveClass.php     |   22 +
 ...tructorWithMandatoryArgumentsContainer.php |   10 +
 ...structorWithOptionalArgumentsContainer.php |   10 +
 .../ConstructorWithoutArgumentsContainer.php  |   10 +
 .../Container/NoConstructorContainer.php      |    9 +
 .../Tests/Fixtures/CustomDefinition.php       |   18 +
 .../Tests/Fixtures/DeprecatedClass.php        |   18 +
 .../Tests/Fixtures/FactoryDummy.php           |   44 +
 .../FactoryDummyWithoutReturnTypes.php        |   19 +
 .../Fixtures/FooForCircularWithAddCalls.php   |   19 +
 .../Tests/Fixtures/NamedArgumentsDummy.php    |   21 +
 .../Tests/Fixtures/ParentNotExists.php        |    7 +
 .../Prototype/BadClasses/MissingParent.php    |    7 +
 .../Tests/Fixtures/Prototype/Foo.php          |   14 +
 .../Tests/Fixtures/Prototype/FooInterface.php |    7 +
 .../OtherDir/AnotherSub/DeeperBaz.php         |    7 +
 .../Tests/Fixtures/Prototype/OtherDir/Baz.php |    7 +
 .../OtherDir/Component1/Dir1/Service1.php     |    7 +
 .../OtherDir/Component1/Dir2/Service2.php     |    7 +
 .../OtherDir/Component2/Dir1/Service4.php     |    7 +
 .../OtherDir/Component2/Dir2/Service5.php     |    7 +
 .../Tests/Fixtures/Prototype/Sub/Bar.php      |    7 +
 .../Fixtures/Prototype/Sub/BarInterface.php   |    7 +
 .../Tests/Fixtures/ScalarFactory.php          |   14 +
 .../Tests/Fixtures/SimilarArgumentsDummy.php  |   24 +
 .../Tests/Fixtures/StubbedTranslator.php      |   28 +
 .../Tests/Fixtures/TestDefinition1.php        |   18 +
 .../Tests/Fixtures/TestDefinition2.php        |    9 +
 .../Tests/Fixtures/TestServiceSubscriber.php  |   22 +
 .../Tests/Fixtures/array.json                 |    1 +
 .../Tests/Fixtures/config/basic.expected.yml  |   10 +
 .../Tests/Fixtures/config/basic.php           |   11 +
 .../Tests/Fixtures/config/child.expected.yml  |   15 +
 .../Tests/Fixtures/config/child.php           |   22 +
 .../Fixtures/config/defaults.expected.yml     |   27 +
 .../Tests/Fixtures/config/defaults.php        |   21 +
 .../config/factory_short_notation.php         |    9 +
 .../Fixtures/config/instanceof.expected.yml   |   21 +
 .../Tests/Fixtures/config/instanceof.php      |   22 +
 .../Tests/Fixtures/config/php7.expected.yml   |   19 +
 .../Tests/Fixtures/config/php7.php            |   19 +
 .../Fixtures/config/prototype.expected.yml    |   25 +
 .../Tests/Fixtures/config/prototype.php       |   22 +
 .../Tests/Fixtures/config/services9.php       |  128 +
 .../services_autoconfigure_with_parent.php    |    9 +
 .../Fixtures/containers/CustomContainer.php   |   17 +
 .../Tests/Fixtures/containers/container10.php |   15 +
 .../Tests/Fixtures/containers/container11.php |   13 +
 .../Tests/Fixtures/containers/container12.php |   13 +
 .../Tests/Fixtures/containers/container13.php |   18 +
 .../Tests/Fixtures/containers/container14.php |   17 +
 .../Tests/Fixtures/containers/container15.php |   12 +
 .../Tests/Fixtures/containers/container16.php |   12 +
 .../Tests/Fixtures/containers/container17.php |   11 +
 .../Tests/Fixtures/containers/container19.php |   27 +
 .../Tests/Fixtures/containers/container21.php |   21 +
 .../Tests/Fixtures/containers/container24.php |   13 +
 .../Tests/Fixtures/containers/container33.php |   12 +
 .../Tests/Fixtures/containers/container8.php  |   25 +
 .../Tests/Fixtures/containers/container9.php  |  176 ++
 .../containers/container_abstract.php         |   13 +
 .../containers/container_almost_circular.php  |  176 ++
 .../containers/container_env_in_id.php        |   22 +
 .../containers/container_inline_requires.php  |   19 +
 .../container_uninitialized_ref.php           |   49 +
 .../Fixtures/directory/import/import.yml      |    2 +
 .../Fixtures/directory/recurse/simple.ini     |    2 +
 .../Fixtures/directory/recurse/simple.yml     |    2 +
 .../Tests/Fixtures/directory/simple.php       |    3 +
 .../Tests/Fixtures/graphviz/services1.dot     |    7 +
 .../Tests/Fixtures/graphviz/services10-1.dot  |   10 +
 .../Tests/Fixtures/graphviz/services10.dot    |   10 +
 .../Tests/Fixtures/graphviz/services13.dot    |   10 +
 .../Tests/Fixtures/graphviz/services14.dot    |    7 +
 .../Tests/Fixtures/graphviz/services17.dot    |    8 +
 .../Tests/Fixtures/graphviz/services18.dot    |    8 +
 .../Tests/Fixtures/graphviz/services9.dot     |   56 +
 .../Fixtures/graphviz/services_inline.dot     |   10 +
 .../Tests/Fixtures/includes/FooVariadic.php   |   16 +
 .../Tests/Fixtures/includes/HotPath/C1.php    |    8 +
 .../Tests/Fixtures/includes/HotPath/C2.php    |    7 +
 .../Tests/Fixtures/includes/HotPath/C3.php    |    7 +
 .../Tests/Fixtures/includes/HotPath/I1.php    |    7 +
 .../Tests/Fixtures/includes/HotPath/P1.php    |    7 +
 .../Tests/Fixtures/includes/HotPath/T1.php    |    7 +
 .../Fixtures/includes/ProjectExtension.php    |   47 +
 .../includes/ProjectWithXsdExtension.php      |   19 +
 .../ProjectWithXsdExtensionInPhar.phar        |  Bin 0 -> 1161 bytes
 .../Fixtures/includes/autowiring_classes.php  |  336 +++
 .../Tests/Fixtures/includes/classes.php       |  136 +
 .../Tests/Fixtures/includes/createphar.php    |   47 +
 .../Tests/Fixtures/includes/foo.php           |   43 +
 .../Fixtures/includes/schema/project-1.0.xsd  |   13 +
 .../Tests/Fixtures/ini/almostvalid.ini        |    2 +
 .../Tests/Fixtures/ini/ini_with_wrong_ext.xml |    2 +
 .../Tests/Fixtures/ini/nonvalid.ini           |    2 +
 .../Tests/Fixtures/ini/parameters.ini         |    3 +
 .../Tests/Fixtures/ini/parameters1.ini        |    3 +
 .../Tests/Fixtures/ini/parameters2.ini        |    2 +
 .../Tests/Fixtures/ini/types.ini              |   28 +
 ...er_class_constructor_without_arguments.php |   58 +
 ...s_with_mandatory_constructor_arguments.php |   55 +
 ...ss_with_optional_constructor_arguments.php |   58 +
 ...om_container_class_without_constructor.php |   55 +
 .../Tests/Fixtures/php/php_with_wrong_ext.yml |    3 +
 .../Tests/Fixtures/php/services1-1.php        |   55 +
 .../Tests/Fixtures/php/services1.php          |   53 +
 .../Tests/Fixtures/php/services10.php         |  157 +
 .../Tests/Fixtures/php/services12.php         |  171 ++
 .../Tests/Fixtures/php/services13.php         |   70 +
 .../Tests/Fixtures/php/services19.php         |  181 ++
 .../Tests/Fixtures/php/services24.php         |   66 +
 .../Tests/Fixtures/php/services26.php         |  194 ++
 .../Tests/Fixtures/php/services33.php         |   81 +
 .../Tests/Fixtures/php/services8.php          |  167 ++
 .../Tests/Fixtures/php/services9.php          |  443 +++
 .../Tests/Fixtures/php/services9_as_files.txt |  508 ++++
 .../Tests/Fixtures/php/services9_compiled.php |  475 +++
 .../Tests/Fixtures/php/services_adawson.php   |  190 ++
 .../php/services_almost_circular_private.php  |  514 ++++
 .../php/services_almost_circular_public.php   |  640 +++++
 .../Fixtures/php/services_array_params.php    |  176 ++
 .../Fixtures/php/services_base64_env.php      |  151 +
 .../php/services_dedup_lazy_proxy.php         |   88 +
 .../Fixtures/php/services_deep_graph.php      |   93 +
 .../Tests/Fixtures/php/services_env_in_id.php |  188 ++
 .../Fixtures/php/services_inline_requires.php |  215 ++
 .../Fixtures/php/services_inline_self_ref.php |   78 +
 .../Fixtures/php/services_legacy_privates.php |  193 ++
 .../Tests/Fixtures/php/services_locator.php   |  184 ++
 .../Fixtures/php/services_non_shared_lazy.php |   92 +
 .../Fixtures/php/services_private_frozen.php  |   92 +
 .../php/services_private_in_expression.php    |   82 +
 .../Tests/Fixtures/php/services_rot13_env.php |  180 ++
 .../Fixtures/php/services_subscriber.php      |  106 +
 .../Tests/Fixtures/php/services_tsantos.php   |   87 +
 .../php/services_uninitialized_ref.php        |  134 +
 .../php/services_unsupported_characters.php   |  178 ++
 .../Tests/Fixtures/php/simple.php             |    3 +
 .../Tests/Fixtures/xml/class_from_id.xml      |    6 +
 .../Tests/Fixtures/xml/defaults_bindings.xml  |   15 +
 .../Tests/Fixtures/xml/defaults_bindings2.xml |   10 +
 .../Fixtures/xml/extension1/services.xml      |   14 +
 .../Fixtures/xml/extension2/services.xml      |   14 +
 .../Fixtures/xml/extensions/services1.xml     |   19 +
 .../Fixtures/xml/extensions/services2.xml     |   19 +
 .../Fixtures/xml/extensions/services3.xml     |   19 +
 .../Fixtures/xml/extensions/services4.xml     |    6 +
 .../Fixtures/xml/extensions/services5.xml     |   11 +
 .../Fixtures/xml/extensions/services6.xml     |   11 +
 .../Fixtures/xml/extensions/services7.xml     |   11 +
 .../xml/legacy_invalid_alias_definition.xml   |   11 +
 .../Tests/Fixtures/xml/namespaces.xml         |   17 +
 .../xml/nested_service_without_id.xml         |   10 +
 .../Tests/Fixtures/xml/nonvalid.xml           |    3 +
 .../Tests/Fixtures/xml/services1.xml          |    8 +
 .../Tests/Fixtures/xml/services10.xml         |   16 +
 .../Tests/Fixtures/xml/services13.xml         |    9 +
 .../Tests/Fixtures/xml/services14.xml         |   19 +
 .../Tests/Fixtures/xml/services2.xml          |   31 +
 .../Tests/Fixtures/xml/services21.xml         |   24 +
 .../Tests/Fixtures/xml/services22.xml         |    9 +
 .../Tests/Fixtures/xml/services23.xml         |    6 +
 .../Tests/Fixtures/xml/services24.xml         |    9 +
 .../Tests/Fixtures/xml/services28.xml         |   13 +
 .../Tests/Fixtures/xml/services3.xml          |   13 +
 .../Tests/Fixtures/xml/services4.xml          |   14 +
 .../Fixtures/xml/services4_bad_import.xml     |    9 +
 .../Tests/Fixtures/xml/services5.xml          |   25 +
 .../Tests/Fixtures/xml/services6.xml          |   69 +
 .../Tests/Fixtures/xml/services7.xml          |    9 +
 .../Tests/Fixtures/xml/services8.xml          |   38 +
 .../Tests/Fixtures/xml/services9.xml          |  147 +
 .../Tests/Fixtures/xml/services_abstract.xml  |    9 +
 .../Fixtures/xml/services_autoconfigure.xml   |    9 +
 .../services_autoconfigure_with_parent.xml    |    7 +
 .../Tests/Fixtures/xml/services_bindings.xml  |   21 +
 .../xml/services_defaults_with_parent.xml     |    9 +
 .../Fixtures/xml/services_deprecated.xml      |   11 +
 .../Tests/Fixtures/xml/services_dump_load.xml |   11 +
 .../xml/services_inline_not_candidate.xml     |   11 +
 .../Fixtures/xml/services_instanceof.xml      |   12 +
 .../xml/services_instanceof_with_parent.xml   |    9 +
 .../Fixtures/xml/services_named_args.xml      |   12 +
 .../Tests/Fixtures/xml/services_prototype.xml |    6 +
 .../Tests/Fixtures/xml/services_tsantos.xml   |   65 +
 .../Fixtures/xml/services_without_id.xml      |   12 +
 .../Fixtures/xml/tag_with_empty_name.xml      |   11 +
 .../Tests/Fixtures/xml/tag_without_name.xml   |   11 +
 .../xml/with_key_outside_collection.xml       |    9 +
 .../Tests/Fixtures/xml/withdoctype.xml        |    3 +
 .../Tests/Fixtures/xml/xml_with_wrong_ext.php |    9 +
 .../Fixtures/yaml/anonymous_services.yml      |   14 +
 .../yaml/anonymous_services_alias.yml         |    7 +
 .../yaml/anonymous_services_in_instanceof.yml |   15 +
 .../yaml/anonymous_services_in_parameters.yml |    2 +
 .../Tests/Fixtures/yaml/bad_calls.yml         |    4 +
 .../Tests/Fixtures/yaml/bad_decorates.yml     |    7 +
 .../Fixtures/yaml/bad_empty_defaults.yml      |    2 +
 .../Fixtures/yaml/bad_empty_instanceof.yml    |    2 +
 .../Tests/Fixtures/yaml/bad_format.yml        |    2 +
 .../Tests/Fixtures/yaml/bad_import.yml        |    2 +
 .../Tests/Fixtures/yaml/bad_imports.yml       |    2 +
 .../Tests/Fixtures/yaml/bad_parameters.yml    |    2 +
 .../Tests/Fixtures/yaml/bad_service.yml       |    2 +
 .../Tests/Fixtures/yaml/bad_services.yml      |    1 +
 .../Tests/Fixtures/yaml/bad_types1.yml        |    5 +
 .../Tests/Fixtures/yaml/bad_types2.yml        |    5 +
 .../Tests/Fixtures/yaml/badtag1.yml           |    5 +
 .../Tests/Fixtures/yaml/badtag2.yml           |    6 +
 .../Tests/Fixtures/yaml/badtag3.yml           |    6 +
 .../Tests/Fixtures/yaml/bar/services.yml      |    4 +
 .../Tests/Fixtures/yaml/class_from_id.yml     |    3 +
 .../Tests/Fixtures/yaml/defaults_bindings.yml |   11 +
 .../Fixtures/yaml/defaults_bindings2.yml      |    7 +
 .../Tests/Fixtures/yaml/foo/services.yml      |    4 +
 .../_child.yml                                |    4 +
 .../expected.yml                              |   10 +
 .../autoconfigure_child_not_applied/main.yml  |    7 +
 .../autoconfigure_parent_child/_child.yml     |    3 +
 .../autoconfigure_parent_child/expected.yml   |    5 +
 .../autoconfigure_parent_child/main.yml       |    7 +
 .../_child.yml                                |    3 +
 .../expected.yml                              |    6 +
 .../autoconfigure_parent_child_tags/main.yml  |    7 +
 .../integration/child_parent/expected.yml     |    9 +
 .../yaml/integration/child_parent/main.yml    |   13 +
 .../defaults_child_tags/expected.yml          |    8 +
 .../integration/defaults_child_tags/main.yml  |   18 +
 .../expected.yml                              |   26 +
 .../defaults_instanceof_importance/main.yml   |   30 +
 .../defaults_parent_child/_child.yml          |    4 +
 .../defaults_parent_child/expected.yml        |    6 +
 .../defaults_parent_child/main.yml            |    9 +
 .../instanceof_parent_child/_child.yml        |    4 +
 .../instanceof_parent_child/expected.yml      |    7 +
 .../instanceof_parent_child/main.yml          |   11 +
 .../yaml/legacy_invalid_alias_definition.yml  |    5 +
 .../yaml/legacy_invalid_definition.yml        |   10 +
 .../Tests/Fixtures/yaml/nonvalid1.yml         |    2 +
 .../Tests/Fixtures/yaml/nonvalid2.yml         |    1 +
 .../Tests/Fixtures/yaml/null_config.yml       |    1 +
 .../Tests/Fixtures/yaml/services1.yml         |   11 +
 .../Tests/Fixtures/yaml/services10.yml        |    9 +
 .../Tests/Fixtures/yaml/services11.yml        |    1 +
 .../Tests/Fixtures/yaml/services13.yml        |    3 +
 .../Tests/Fixtures/yaml/services14.yml        |    3 +
 .../Tests/Fixtures/yaml/services2.yml         |   13 +
 .../Tests/Fixtures/yaml/services21.yml        |   15 +
 .../Tests/Fixtures/yaml/services22.yml        |    8 +
 .../Tests/Fixtures/yaml/services23.yml        |    4 +
 .../Tests/Fixtures/yaml/services24.yml        |   16 +
 .../Tests/Fixtures/yaml/services26.yml        |   22 +
 .../Tests/Fixtures/yaml/services28.yml        |   34 +
 .../Tests/Fixtures/yaml/services3.yml         |    5 +
 .../Fixtures/yaml/services31_invalid_tags.yml |    6 +
 .../Tests/Fixtures/yaml/services4.yml         |    8 +
 .../Fixtures/yaml/services4_bad_import.yml    |    2 +
 .../Tests/Fixtures/yaml/services6.yml         |   43 +
 .../Tests/Fixtures/yaml/services7.yml         |    2 +
 .../Tests/Fixtures/yaml/services8.yml         |   29 +
 .../Tests/Fixtures/yaml/services9.yml         |  163 ++
 .../Tests/Fixtures/yaml/services_adawson.yml  |   28 +
 .../Fixtures/yaml/services_autoconfigure.yml  |    9 +
 .../services_autoconfigure_with_parent.yml    |    8 +
 .../Tests/Fixtures/yaml/services_bindings.yml |   16 +
 .../services_configurator_short_syntax.yml    |    8 +
 .../Fixtures/yaml/services_deep_graph.yml     |   24 +
 .../yaml/services_defaults_with_parent.yml    |   10 +
 .../Fixtures/yaml/services_dump_load.yml      |   15 +
 .../Tests/Fixtures/yaml/services_inline.yml   |   16 +
 .../Fixtures/yaml/services_instanceof.yml     |   11 +
 .../yaml/services_instanceof_with_parent.yml  |   11 +
 .../yaml/services_legacy_privates.yml         |   27 +
 .../Fixtures/yaml/services_named_args.yml     |   10 +
 .../Fixtures/yaml/services_prototype.yml      |    4 +
 .../yaml/services_prototype_namespace.yml     |   10 +
 ...s_prototype_namespace_without_resource.yml |    4 +
 .../Fixtures/yaml/services_underscore.yml     |    3 +
 .../Fixtures/yaml/tag_name_empty_string.yml   |    6 +
 .../Fixtures/yaml/tag_name_no_string.yml      |    6 +
 .../Tests/Fixtures/yaml/tag_name_only.yml     |    5 +
 .../Fixtures/yaml/yaml_with_wrong_ext.ini     |    2 +
 .../RealServiceInstantiatorTest.php           |   36 +
 .../LazyProxy/PhpDumper/NullDumperTest.php    |   34 +
 .../Tests/Loader/ClosureLoaderTest.php        |   38 +
 .../Tests/Loader/DirectoryLoaderTest.php      |   78 +
 .../Tests/Loader/FileLoaderTest.php           |  239 ++
 .../Tests/Loader/GlobFileLoaderTest.php       |   44 +
 .../Tests/Loader/IniFileLoaderTest.php        |  127 +
 .../Tests/Loader/LoaderResolverTest.php       |   62 +
 .../Tests/Loader/PhpFileLoaderTest.php        |  101 +
 .../Tests/Loader/XmlFileLoaderTest.php        |  829 ++++++
 .../Tests/Loader/YamlFileLoaderTest.php       |  736 +++++
 .../EnvPlaceholderParameterBagTest.php        |  159 +
 .../ParameterBag/FrozenParameterBagTest.php   |   56 +
 .../Tests/ParameterBag/ParameterBagTest.php   |  264 ++
 .../Tests/ParameterTest.php                   |   24 +
 .../Tests/ReferenceTest.php                   |   24 +
 .../Tests/ServiceLocatorTest.php              |  148 +
 lib/symfony/dotenv/Tests/DotenvTest.php       |  317 ++
 .../Tests/AbstractEventDispatcherTest.php     |  442 +++
 .../ContainerAwareEventDispatcherTest.php     |  210 ++
 .../Debug/TraceableEventDispatcherTest.php    |  269 ++
 .../Tests/Debug/WrappedListenerTest.php       |   64 +
 .../RegisterListenersPassTest.php             |  143 +
 .../Tests/EventDispatcherTest.php             |   22 +
 .../event-dispatcher/Tests/EventTest.php      |   55 +
 .../Tests/GenericEventTest.php                |  134 +
 .../Tests/ImmutableEventDispatcherTest.php    |  100 +
 .../filesystem/Tests/ExceptionTest.php        |   47 +
 .../filesystem/Tests/FilesystemTest.php       | 1656 +++++++++++
 .../filesystem/Tests/FilesystemTestCase.php   |  165 ++
 .../Tests/Fixtures/MockStream/MockStream.php  |   46 +
 .../filesystem/Tests/LockHandlerTest.php      |  144 +
 .../Tests/Comparator/ComparatorTest.php       |   65 +
 .../Tests/Comparator/DateComparatorTest.php   |   64 +
 .../Tests/Comparator/NumberComparatorTest.php |  108 +
 lib/symfony/finder/Tests/FinderTest.php       |  752 +++++
 lib/symfony/finder/Tests/Fixtures/.dot/a      |    0
 .../finder/Tests/Fixtures/.dot/b/c.neon       |    0
 .../finder/Tests/Fixtures/.dot/b/d.neon       |    0
 .../finder/Tests/Fixtures/A/B/C/abc.dat       |    0
 lib/symfony/finder/Tests/Fixtures/A/B/ab.dat  |    0
 lib/symfony/finder/Tests/Fixtures/A/a.dat     |    0
 .../Tests/Fixtures/copy/A/B/C/abc.dat.copy    |    0
 .../Tests/Fixtures/copy/A/B/ab.dat.copy       |    0
 .../finder/Tests/Fixtures/copy/A/a.dat.copy   |    0
 lib/symfony/finder/Tests/Fixtures/dolor.txt   |    2 +
 lib/symfony/finder/Tests/Fixtures/ipsum.txt   |    2 +
 lib/symfony/finder/Tests/Fixtures/lorem.txt   |    2 +
 lib/symfony/finder/Tests/Fixtures/one/.dot    |    1 +
 lib/symfony/finder/Tests/Fixtures/one/a       |    0
 .../finder/Tests/Fixtures/one/b/c.neon        |    0
 .../finder/Tests/Fixtures/one/b/d.neon        |    0
 .../Fixtures/r+e.gex[c]a(r)s/dir/bar.dat      |    0
 .../finder/Tests/Fixtures/with space/foo.txt  |    0
 lib/symfony/finder/Tests/GlobTest.php         |   95 +
 .../Iterator/CustomFilterIteratorTest.php     |   44 +
 .../Iterator/DateRangeFilterIteratorTest.php  |   74 +
 .../Iterator/DepthRangeFilterIteratorTest.php |   83 +
 .../ExcludeDirectoryFilterIteratorTest.php    |   80 +
 .../Iterator/FileTypeFilterIteratorTest.php   |   73 +
 .../FilecontentFilterIteratorTest.php         |   86 +
 .../Iterator/FilenameFilterIteratorTest.php   |   54 +
 .../Tests/Iterator/FilterIteratorTest.php     |   53 +
 .../finder/Tests/Iterator/Iterator.php        |   55 +
 .../Tests/Iterator/IteratorTestCase.php       |   93 +
 .../Tests/Iterator/MockFileListIterator.php   |   21 +
 .../finder/Tests/Iterator/MockSplFileInfo.php |  132 +
 .../MultiplePcreFilterIteratorTest.php        |   71 +
 .../Tests/Iterator/PathFilterIteratorTest.php |   82 +
 .../Tests/Iterator/RealIteratorTestCase.php   |  119 +
 .../RecursiveDirectoryIteratorTest.php        |   59 +
 .../Iterator/SizeRangeFilterIteratorTest.php  |   69 +
 .../Tests/Iterator/SortableIteratorTest.php   |  179 ++
 .../Test/ForwardCompatTestTrait.php           |   82 +
 .../framework-bundle/Test/KernelTestCase.php  |  231 ++
 .../framework-bundle/Test/WebTestCase.php     |   49 +
 .../AnnotationsCacheWarmerTest.php            |  152 +
 .../CacheWarmer/ClassCacheCacheWarmerTest.php |   51 +
 .../CacheWarmer/SerializerCacheWarmerTest.php |  134 +
 .../Tests/CacheWarmer/TemplateFinderTest.php  |   57 +
 .../TemplatePathsCacheWarmerTest.php          |  102 +
 .../CacheWarmer/ValidatorCacheWarmerTest.php  |  155 +
 .../framework-bundle/Tests/ClientTest.php     |   65 +
 .../CacheClearCommandTest.php                 |   92 +
 .../Fixture/TestAppKernel.php                 |   43 +
 .../CacheClearCommand/Fixture/config.yml      |    2 +
 .../Tests/Command/CachePruneCommandTest.php   |  110 +
 .../Tests/Command/RouterDebugCommandTest.php  |  123 +
 .../Tests/Command/RouterMatchCommandTest.php  |  123 +
 .../Command/TranslationDebugCommandTest.php   |  256 ++
 .../Command/TranslationUpdateCommandTest.php  |  248 ++
 .../Tests/Command/YamlLintCommandTest.php     |  182 ++
 .../Tests/Console/ApplicationTest.php         |  261 ++
 .../Descriptor/AbstractDescriptorTest.php     |  252 ++
 .../Console/Descriptor/JsonDescriptorTest.php |   27 +
 .../Descriptor/MarkdownDescriptorTest.php     |   27 +
 .../Console/Descriptor/ObjectsProvider.php    |  204 ++
 .../Console/Descriptor/TextDescriptorTest.php |   37 +
 .../Console/Descriptor/XmlDescriptorTest.php  |   27 +
 .../Controller/AbstractControllerTest.php     |   63 +
 .../Controller/ControllerNameParserTest.php   |  192 ++
 .../Controller/ControllerResolverTest.php     |  223 ++
 .../Tests/Controller/ControllerTest.php       |   27 +
 .../Tests/Controller/ControllerTraitTest.php  |  551 ++++
 .../Controller/RedirectControllerTest.php     |  321 +++
 .../Controller/TemplateControllerTest.php     |   88 +
 .../Compiler/AddCacheWarmerPassTest.php       |   66 +
 .../Compiler/AddConsoleCommandPassTest.php    |  120 +
 .../AddConstraintValidatorsPassTest.php       |   73 +
 ...AddExpressionLanguageProvidersPassTest.php |   97 +
 .../Compiler/CacheCollectorPassTest.php       |   49 +
 .../Compiler/CachePoolClearerPassTest.php     |   61 +
 .../Compiler/CachePoolPassTest.php            |  115 +
 .../Compiler/CachePoolPrunerPassTest.php      |   70 +
 .../Compiler/ConfigCachePassTest.php          |   59 +
 ...ontrollerArgumentValueResolverPassTest.php |   70 +
 .../DataCollectorTranslatorPassTest.php       |  126 +
 .../Compiler/FormPassTest.php                 |  213 ++
 .../Compiler/LoggingTranslatorPassTest.php    |   81 +
 .../Compiler/ProfilerPassTest.php             |   57 +
 .../Compiler/PropertyInfoPassTest.php         |   72 +
 .../Compiler/SerializerPassTest.php           |   73 +
 .../Compiler/TranslatorPassTest.php           |   53 +
 .../Compiler/UnusedTagsPassTest.php           |   34 +
 .../WorkflowGuardListenerPassTest.php         |  102 +
 .../DependencyInjection/ConfigurationTest.php |  496 ++++
 .../Resources/config/validation.xml           |    0
 .../Resources/config/validation.yml           |    0
 .../CustomPathBundle/src/CustomPathBundle.php |   22 +
 .../Resources/config/serialization.xml        |    0
 .../Resources/config/serialization.yml        |    0
 .../config/serializer_mapping/files/foo.xml   |    0
 .../config/serializer_mapping/files/foo.yml   |    0
 .../serializer_mapping/serialization.yaml     |    0
 .../serializer_mapping/serialization.yml      |    0
 .../Resources/config/validation.xml           |    0
 .../Resources/config/validation.yml           |    0
 .../config/validation_mapping/files/foo.xml   |    0
 .../config/validation_mapping/files/foo.yml   |    0
 .../config/validation_mapping/validation.yaml |    0
 .../config/validation_mapping/validation.yml  |    0
 .../Fixtures/TestBundle/TestBundle.php        |   18 +
 .../Fixtures/php/assets.php                   |   32 +
 .../Fixtures/php/assets_disabled.php          |    7 +
 .../assets_version_strategy_as_service.php    |    8 +
 .../Fixtures/php/cache.php                    |   29 +
 .../Fixtures/php/cache_env_var.php            |    9 +
 .../DependencyInjection/Fixtures/php/csrf.php |    9 +
 .../Fixtures/php/csrf_needs_session.php       |    7 +
 .../Fixtures/php/default_config.php           |    3 +
 .../php/esi_and_ssi_without_fragments.php     |   13 +
 .../Fixtures/php/esi_disabled.php             |    7 +
 .../Fixtures/php/form_no_csrf.php             |    9 +
 .../DependencyInjection/Fixtures/php/full.php |   84 +
 .../Fixtures/php/php_errors_disabled.php      |    8 +
 .../Fixtures/php/php_errors_enabled.php       |    8 +
 .../Fixtures/php/profiler.php                 |    7 +
 .../Fixtures/php/property_accessor.php        |    8 +
 .../Fixtures/php/property_info.php            |    7 +
 .../Fixtures/php/request.php                  |    7 +
 .../Fixtures/php/serializer_disabled.php      |    7 +
 .../Fixtures/php/serializer_enabled.php       |    7 +
 .../Fixtures/php/serializer_legacy_cache.php  |    8 +
 .../Fixtures/php/serializer_mapping.php       |   15 +
 .../Fixtures/php/session.php                  |    7 +
 .../Fixtures/php/ssi_disabled.php             |    7 +
 .../Fixtures/php/templating_disabled.php      |    5 +
 .../Fixtures/php/templating_no_assets.php     |    7 +
 .../php/templating_php_assets_disabled.php    |    8 +
 .../templating_php_translator_disabled.php    |    8 +
 .../php/templating_php_translator_enabled.php |    8 +
 .../Fixtures/php/translator_fallbacks.php     |    7 +
 .../Fixtures/php/validation_annotations.php   |    9 +
 .../Fixtures/php/validation_mapping.php       |   13 +
 .../validation_multiple_static_methods.php    |    9 +
 .../php/validation_no_static_method.php       |    9 +
 .../Fixtures/php/validation_strict_email.php  |    7 +
 .../php/validation_translation_domain.php     |    7 +
 .../Fixtures/php/web_link.php                 |    5 +
 .../workflow_with_arguments_and_service.php   |   31 +
 .../php/workflow_with_guard_expression.php    |   51 +
 ...th_multiple_transitions_with_same_name.php |   49 +
 ...flow_with_support_and_support_strategy.php |   31 +
 .../php/workflow_with_type_and_service.php    |   31 +
 ...w_without_support_and_support_strategy.php |   27 +
 .../Fixtures/php/workflows.php                |  111 +
 .../Fixtures/php/workflows_enabled.php        |    5 +
 .../php/workflows_explicitly_enabled.php      |   19 +
 ...ows_explicitly_enabled_named_workflows.php |   19 +
 .../Fixtures/php/workflows_without_type.php   |   26 +
 .../Fixtures/translations/test_paths.en.yml   |    2 +
 .../Fixtures/xml/assets.xml                   |   27 +
 .../Fixtures/xml/assets_disabled.xml          |   12 +
 .../assets_version_strategy_as_service.xml    |   14 +
 .../Fixtures/xml/cache.xml                    |   17 +
 .../Fixtures/xml/cache_env_var.xml            |   17 +
 .../DependencyInjection/Fixtures/xml/csrf.xml |   14 +
 .../Fixtures/xml/csrf_disabled.xml            |   12 +
 .../Fixtures/xml/csrf_needs_session.xml       |   12 +
 .../Fixtures/xml/default_config.xml           |    9 +
 .../xml/esi_and_ssi_without_fragments.xml     |   13 +
 .../Fixtures/xml/esi_disabled.xml             |   11 +
 .../xml/form_csrf_sets_field_name.xml         |   14 +
 .../form_csrf_under_form_sets_field_name.xml  |   14 +
 .../Fixtures/xml/form_no_csrf.xml             |   14 +
 .../DependencyInjection/Fixtures/xml/full.xml |   47 +
 .../DependencyInjection/Fixtures/xml/lock.xml |   11 +
 .../Fixtures/xml/lock_named.xml               |   22 +
 .../Fixtures/xml/php_errors_disabled.xml      |   11 +
 .../Fixtures/xml/php_errors_enabled.xml       |   11 +
 .../Fixtures/xml/profiler.xml                 |   12 +
 .../Fixtures/xml/property_accessor.xml        |   12 +
 .../Fixtures/xml/property_info.xml            |   11 +
 .../Fixtures/xml/request.xml                  |   11 +
 .../Fixtures/xml/serializer_disabled.xml      |   11 +
 .../Fixtures/xml/serializer_enabled.xml       |   11 +
 .../Fixtures/xml/serializer_legacy_cache.xml  |   11 +
 .../Fixtures/xml/serializer_mapping.xml       |   17 +
 .../Fixtures/xml/session.xml                  |   12 +
 .../Fixtures/xml/ssi_disabled.xml             |   11 +
 .../Fixtures/xml/templating_disabled.xml      |   11 +
 .../Fixtures/xml/templating_no_assets.xml     |   14 +
 .../templating_php_translator_disabled.xml    |   14 +
 .../xml/templating_php_translator_enabled.xml |   14 +
 .../Fixtures/xml/translator_fallbacks.xml     |   15 +
 .../Fixtures/xml/validation_annotations.xml   |   12 +
 .../Fixtures/xml/validation_mapping.xml       |   16 +
 .../validation_multiple_static_methods.xml    |   15 +
 .../xml/validation_no_static_method.xml       |   12 +
 .../Fixtures/xml/validation_strict_email.xml  |   11 +
 .../xml/validation_translation_domain.xml     |   11 +
 .../Fixtures/xml/web_link.xml                 |   12 +
 .../workflow_with_arguments_and_service.xml   |   24 +
 .../xml/workflow_with_guard_expression.xml    |   48 +
 ...th_multiple_transitions_with_same_name.xml |   46 +
 ...flow_with_support_and_support_strategy.xml |   21 +
 .../xml/workflow_with_type_and_service.xml    |   21 +
 ...w_without_support_and_support_strategy.xml |   20 +
 .../Fixtures/xml/workflows.xml                |   94 +
 .../Fixtures/xml/workflows_enabled.xml        |   11 +
 .../xml/workflows_explicitly_enabled.xml      |   19 +
 ...ows_explicitly_enabled_named_workflows.xml |   19 +
 .../Fixtures/xml/workflows_without_type.xml   |   21 +
 .../Fixtures/yml/assets.yml                   |   21 +
 .../Fixtures/yml/assets_disabled.yml          |    3 +
 .../assets_version_strategy_as_service.yml    |    4 +
 .../Fixtures/yml/cache.yml                    |   19 +
 .../Fixtures/yml/cache_env_var.yml            |    6 +
 .../DependencyInjection/Fixtures/yml/csrf.yml |    5 +
 .../Fixtures/yml/csrf_needs_session.yml       |    2 +
 .../Fixtures/yml/default_config.yml           |    1 +
 .../yml/esi_and_ssi_without_fragments.yml     |    7 +
 .../Fixtures/yml/esi_disabled.yml             |    3 +
 .../Fixtures/yml/form_no_csrf.yml             |    4 +
 .../DependencyInjection/Fixtures/yml/full.yml |   63 +
 .../DependencyInjection/Fixtures/yml/lock.yml |    2 +
 .../Fixtures/yml/lock_named.yml               |    9 +
 .../Fixtures/yml/php_errors_disabled.yml      |    3 +
 .../Fixtures/yml/php_errors_enabled.yml       |    4 +
 .../Fixtures/yml/profiler.yml                 |    3 +
 .../Fixtures/yml/property_accessor.yml        |    4 +
 .../Fixtures/yml/property_info.yml            |    3 +
 .../Fixtures/yml/request.yml                  |    3 +
 .../Fixtures/yml/serializer_disabled.yml      |    3 +
 .../Fixtures/yml/serializer_enabled.yml       |    3 +
 .../Fixtures/yml/serializer_legacy_cache.yml  |    4 +
 .../Fixtures/yml/serializer_mapping.yml       |   10 +
 .../Fixtures/yml/session.yml                  |    3 +
 .../Fixtures/yml/ssi_disabled.yml             |    3 +
 .../Fixtures/yml/templating_disabled.yml      |    2 +
 .../Fixtures/yml/templating_no_assets.yml     |    3 +
 .../yml/templating_php_assets_disabled.yml    |    4 +
 .../templating_php_translator_disabled.yml    |    4 +
 .../yml/templating_php_translator_enabled.yml |    4 +
 .../Fixtures/yml/translator_fallbacks.yml     |    3 +
 .../Fixtures/yml/validation_annotations.yml   |    5 +
 .../Fixtures/yml/validation_mapping.yml       |    7 +
 .../validation_multiple_static_methods.yml    |    5 +
 .../yml/validation_no_static_method.yml       |    5 +
 .../Fixtures/yml/validation_strict_email.yml  |    3 +
 .../yml/validation_translation_domain.yml     |    3 +
 .../Fixtures/yml/web_link.yml                 |    3 +
 .../workflow_with_arguments_and_service.yml   |   19 +
 .../yml/workflow_with_guard_expression.yml    |   35 +
 ...th_multiple_transitions_with_same_name.yml |   33 +
 ...flow_with_support_and_support_strategy.yml |   17 +
 .../yml/workflow_with_type_and_service.yml    |   17 +
 ...w_without_support_and_support_strategy.yml |   14 +
 .../Fixtures/yml/workflows.yml                |   80 +
 .../Fixtures/yml/workflows_enabled.yml        |    2 +
 .../yml/workflows_explicitly_enabled.yml      |   16 +
 ...ows_explicitly_enabled_named_workflows.yml |   15 +
 .../Fixtures/yml/workflows_without_type.yml   |    7 +
 .../FrameworkExtensionTest.php                | 1263 ++++++++
 .../PhpFrameworkExtensionTest.php             |   55 +
 .../XmlFrameworkExtensionTest.php             |   30 +
 .../YamlFrameworkExtensionTest.php            |   25 +
 .../config/serializer/foo.yml                 |    0
 .../config/validator/foo.xml                  |    0
 .../translations/test_default.en.xlf          |    0
 .../ResolveControllerNameSubscriberTest.php   |   63 +
 .../Tests/Fixtures/BaseBundle/BaseBundle.php  |   18 +
 .../Resources/views/base.format.engine        |    0
 .../views/controller/base.format.engine       |    0
 .../views/this.is.a.template.format.engine    |    0
 .../Tests/Fixtures/DeclaredClass.php          |    7 +
 .../Tests/Fixtures/Descriptor/alias_1.json    |    4 +
 .../Tests/Fixtures/Descriptor/alias_1.md      |    2 +
 .../Tests/Fixtures/Descriptor/alias_1.txt     |    3 +
 .../Tests/Fixtures/Descriptor/alias_1.xml     |    2 +
 .../Tests/Fixtures/Descriptor/alias_2.json    |    4 +
 .../Tests/Fixtures/Descriptor/alias_2.md      |    2 +
 .../Tests/Fixtures/Descriptor/alias_2.txt     |    3 +
 .../Tests/Fixtures/Descriptor/alias_2.xml     |    2 +
 .../Descriptor/alias_with_definition_1.json   |   20 +
 .../Descriptor/alias_with_definition_1.md     |   17 +
 .../Descriptor/alias_with_definition_1.txt    |   21 +
 .../Descriptor/alias_with_definition_1.xml    |    5 +
 .../Descriptor/alias_with_definition_2.json   |   41 +
 .../Descriptor/alias_with_definition_2.md     |   25 +
 .../Descriptor/alias_with_definition_2.txt    |   25 +
 .../Descriptor/alias_with_definition_2.xml    |   18 +
 .../Fixtures/Descriptor/array_parameter.json  |    3 +
 .../Fixtures/Descriptor/array_parameter.md    |    4 +
 .../Fixtures/Descriptor/array_parameter.txt   |    5 +
 .../Fixtures/Descriptor/array_parameter.xml   |    2 +
 .../Descriptor/builder_1_arguments.json       |   80 +
 .../Descriptor/builder_1_arguments.md         |   34 +
 .../Descriptor/builder_1_arguments.txt        |   12 +
 .../Descriptor/builder_1_arguments.xml        |   27 +
 .../Fixtures/Descriptor/builder_1_public.json |   27 +
 .../Fixtures/Descriptor/builder_1_public.md   |   33 +
 .../Fixtures/Descriptor/builder_1_public.txt  |   12 +
 .../Fixtures/Descriptor/builder_1_public.xml  |    8 +
 .../Descriptor/builder_1_services.json        |   66 +
 .../Fixtures/Descriptor/builder_1_services.md |   59 +
 .../Descriptor/builder_1_services.txt         |   14 +
 .../Descriptor/builder_1_services.xml         |   25 +
 .../Fixtures/Descriptor/builder_1_tag1.json   |   41 +
 .../Fixtures/Descriptor/builder_1_tag1.md     |   26 +
 .../Fixtures/Descriptor/builder_1_tag1.txt    |   11 +
 .../Fixtures/Descriptor/builder_1_tag1.xml    |   19 +
 .../Fixtures/Descriptor/builder_1_tags.json   |   38 +
 .../Fixtures/Descriptor/builder_1_tags.md     |   39 +
 .../Fixtures/Descriptor/builder_1_tags.txt    |   14 +
 .../Fixtures/Descriptor/builder_1_tags.xml    |   19 +
 .../Tests/Fixtures/Descriptor/callable_1.json |    4 +
 .../Tests/Fixtures/Descriptor/callable_1.md   |    3 +
 .../Tests/Fixtures/Descriptor/callable_1.txt  |    1 +
 .../Tests/Fixtures/Descriptor/callable_1.xml  |    2 +
 .../Tests/Fixtures/Descriptor/callable_2.json |    6 +
 .../Tests/Fixtures/Descriptor/callable_2.md   |    5 +
 .../Tests/Fixtures/Descriptor/callable_2.txt  |    1 +
 .../Tests/Fixtures/Descriptor/callable_2.xml  |    2 +
 .../Tests/Fixtures/Descriptor/callable_3.json |    5 +
 .../Tests/Fixtures/Descriptor/callable_3.md   |    4 +
 .../Tests/Fixtures/Descriptor/callable_3.txt  |    1 +
 .../Tests/Fixtures/Descriptor/callable_3.xml  |    2 +
 .../Tests/Fixtures/Descriptor/callable_4.json |    6 +
 .../Tests/Fixtures/Descriptor/callable_4.md   |    5 +
 .../Tests/Fixtures/Descriptor/callable_4.txt  |    1 +
 .../Tests/Fixtures/Descriptor/callable_4.xml  |    2 +
 .../Tests/Fixtures/Descriptor/callable_5.json |    7 +
 .../Tests/Fixtures/Descriptor/callable_5.md   |    6 +
 .../Tests/Fixtures/Descriptor/callable_5.txt  |    1 +
 .../Tests/Fixtures/Descriptor/callable_5.xml  |    2 +
 .../Tests/Fixtures/Descriptor/callable_6.json |    3 +
 .../Tests/Fixtures/Descriptor/callable_6.md   |    2 +
 .../Tests/Fixtures/Descriptor/callable_6.txt  |    1 +
 .../Tests/Fixtures/Descriptor/callable_6.xml  |    2 +
 .../Tests/Fixtures/Descriptor/callable_7.json |    4 +
 .../Tests/Fixtures/Descriptor/callable_7.md   |    3 +
 .../Tests/Fixtures/Descriptor/callable_7.txt  |    1 +
 .../Tests/Fixtures/Descriptor/callable_7.xml  |    2 +
 .../Descriptor/callable_from_callable.json    |    5 +
 .../Descriptor/callable_from_callable.md      |    4 +
 .../Descriptor/callable_from_callable.txt     |    1 +
 .../Descriptor/callable_from_callable.xml     |    2 +
 .../Fixtures/Descriptor/definition_1.json     |   14 +
 .../Tests/Fixtures/Descriptor/definition_1.md |   10 +
 .../Fixtures/Descriptor/definition_1.txt      |   17 +
 .../Fixtures/Descriptor/definition_1.xml      |    4 +
 .../Fixtures/Descriptor/definition_2.json     |   35 +
 .../Tests/Fixtures/Descriptor/definition_2.md |   18 +
 .../Fixtures/Descriptor/definition_2.txt      |   21 +
 .../Fixtures/Descriptor/definition_2.xml      |   17 +
 .../Descriptor/definition_arguments_1.json    |   67 +
 .../Descriptor/definition_arguments_1.md      |   11 +
 .../Descriptor/definition_arguments_1.txt     |   22 +
 .../Descriptor/definition_arguments_1.xml     |   23 +
 .../Descriptor/definition_arguments_2.json    |   36 +
 .../Descriptor/definition_arguments_2.md      |   19 +
 .../Descriptor/definition_arguments_2.txt     |   21 +
 .../Descriptor/definition_arguments_2.xml     |   17 +
 .../Descriptor/event_dispatcher_1_event1.json |   11 +
 .../Descriptor/event_dispatcher_1_event1.md   |   12 +
 .../Descriptor/event_dispatcher_1_event1.txt  |   11 +
 .../Descriptor/event_dispatcher_1_event1.xml  |    5 +
 .../Descriptor/event_dispatcher_1_events.json |   20 +
 .../Descriptor/event_dispatcher_1_events.md   |   22 +
 .../Descriptor/event_dispatcher_1_events.txt  |   23 +
 .../Descriptor/event_dispatcher_1_events.xml  |   10 +
 .../Tests/Fixtures/Descriptor/parameter.json  |    3 +
 .../Tests/Fixtures/Descriptor/parameter.md    |    4 +
 .../Tests/Fixtures/Descriptor/parameter.txt   |    6 +
 .../Tests/Fixtures/Descriptor/parameter.xml   |    2 +
 .../Fixtures/Descriptor/parameters_1.json     |   10 +
 .../Tests/Fixtures/Descriptor/parameters_1.md |    7 +
 .../Fixtures/Descriptor/parameters_1.txt      |   13 +
 .../Fixtures/Descriptor/parameters_1.xml      |    7 +
 .../Tests/Fixtures/Descriptor/route_1.json    |   20 +
 .../Tests/Fixtures/Descriptor/route_1.md      |   15 +
 .../Tests/Fixtures/Descriptor/route_1.txt     |   17 +
 .../Tests/Fixtures/Descriptor/route_1.xml     |   20 +
 .../Tests/Fixtures/Descriptor/route_2.json    |   16 +
 .../Tests/Fixtures/Descriptor/route_2.md      |   13 +
 .../Tests/Fixtures/Descriptor/route_2.txt     |   17 +
 .../Tests/Fixtures/Descriptor/route_2.xml     |   14 +
 .../Descriptor/route_collection_1.json        |   38 +
 .../Fixtures/Descriptor/route_collection_1.md |   37 +
 .../Descriptor/route_collection_1.txt         |    7 +
 .../Descriptor/route_collection_1.xml         |   35 +
 .../BaseBundle/views/base.format.engine       |    0
 .../views/controller/custom.format.engine     |    0
 .../Resources/translations/messages.fr.yml    |    1 +
 .../Resources/views/resource.format.engine    |    0
 .../views/this.is.a.template.format.engine    |    0
 .../Resources/views/translation.html.php      |   49 +
 .../Tests/Fixtures/Serialization/Author.php   |    8 +
 .../Tests/Fixtures/Serialization/Person.php   |    8 +
 .../Serialization/Resources/author.yml        |    4 +
 .../Resources/does_not_exist.yaml             |    1 +
 .../Serialization/Resources/person.xml        |   13 +
 .../TemplatePathsCache/templates-empty.php    |    2 +
 .../Fixtures/TemplatePathsCache/templates.php |    3 +
 .../Controller/DefaultController.php          |   21 +
 .../Fabpot/FooBundle/FabpotFooBundle.php      |   30 +
 .../Controller/DefaultController.php          |   21 +
 .../Controller/Sub/DefaultController.php      |   21 +
 .../Controller/Test/DefaultController.php     |   21 +
 .../TestBundle/FooBundle/FooBundle.php        |   23 +
 .../Controller/DefaultController.php          |   21 +
 .../Cms/FooBundle/SensioCmsFooBundle.php      |   23 +
 .../Controller/DefaultController.php          |   21 +
 .../Sensio/FooBundle/SensioFooBundle.php      |   23 +
 .../Tests/Fixtures/Validation/Article.php     |    8 +
 .../Tests/Fixtures/Validation/Author.php      |    8 +
 .../Tests/Fixtures/Validation/Category.php    |   17 +
 .../Tests/Fixtures/Validation/Person.php      |    8 +
 .../Fixtures/Validation/Resources/author.yml  |    4 +
 .../Validation/Resources/categories.yml       |    9 +
 .../Validation/Resources/does_not_exist.yaml  |    1 +
 .../Fixtures/Validation/Resources/person.xml  |   29 +
 .../Tests/Fixtures/Validation/SubCategory.php |   13 +
 .../Tests/Fixtures/WarmedClass.php            |    7 +
 .../Tests/Fixtures/templates.php              |    5 +
 .../Tests/Functional/AbstractWebTestCase.php  |   73 +
 .../Functional/AnnotatedControllerTest.php    |   39 +
 .../Tests/Functional/AutowiringTypesTest.php  |   86 +
 .../AutowiringTypes/AutowiredServices.php     |   61 +
 .../Controller/AnnotatedController.php        |   51 +
 .../Controller/FragmentController.php         |   57 +
 .../Controller/ProfilerController.php         |   26 +
 .../Controller/SessionController.php          |   81 +
 .../Controller/SubRequestController.php       |   66 +
 .../SubRequestServiceResolutionController.php |   38 +
 .../AnnotationReaderPass.php                  |   24 +
 .../Config/CustomConfig.php                   |   31 +
 .../DependencyInjection/Configuration.php     |   37 +
 .../DependencyInjection/TestExtension.php     |   54 +
 .../TestBundle/Resources/config/routing.yml   |   54 +
 .../Bundle/TestBundle/TestBundle.php          |   33 +
 .../Functional/CachePoolClearCommandTest.php  |  100 +
 .../Tests/Functional/CachePoolsTest.php       |  103 +
 .../Functional/ConfigDebugCommandTest.php     |   78 +
 .../ConfigDumpReferenceCommandTest.php        |   85 +
 .../Functional/ContainerDebugCommandTest.php  |   66 +
 .../Tests/Functional/ContainerDumpTest.php    |   32 +
 .../Functional/DebugAutowiringCommandTest.php |   63 +
 .../Tests/Functional/FragmentTest.php         |   38 +
 .../Tests/Functional/ProfilerTest.php         |   46 +
 .../Tests/Functional/PropertyInfoTest.php     |   35 +
 .../Tests/Functional/SerializerTest.php       |   52 +
 .../Tests/Functional/SessionTest.php          |  153 +
 .../Tests/Functional/SubRequestsTest.php      |   31 +
 .../app/AnnotatedController/bundles.php       |   18 +
 .../app/AnnotatedController/config.yml        |    2 +
 .../app/AnnotatedController/routing.yml       |    4 +
 .../Tests/Functional/app/AppKernel.php        |  100 +
 .../app/AutowiringTypes/bundles.php           |   18 +
 .../Functional/app/AutowiringTypes/config.yml |   11 +
 .../AutowiringTypes/no_annotations_cache.yml  |    6 +
 .../Functional/app/CachePoolClear/bundles.php |   18 +
 .../Functional/app/CachePoolClear/config.yml  |   22 +
 .../Functional/app/CachePools/bundles.php     |   18 +
 .../Functional/app/CachePools/config.yml      |   14 +
 .../app/CachePools/redis_config.yml           |   17 +
 .../app/CachePools/redis_custom_config.yml    |   28 +
 .../Functional/app/ConfigDump/bundles.php     |   18 +
 .../Functional/app/ConfigDump/config.yml      |   10 +
 .../Functional/app/ContainerDebug/bundles.php |   18 +
 .../Functional/app/ContainerDebug/config.yml  |   10 +
 .../Functional/app/ContainerDump/bundles.php  |   18 +
 .../Functional/app/ContainerDump/config.yml   |   21 +
 .../ControllerServiceResolution/bundles.php   |   18 +
 .../ControllerServiceResolution/config.yml    |   10 +
 .../ControllerServiceResolution/routing.yml   |    4 +
 .../Tests/Functional/app/Fragment/bundles.php |   18 +
 .../Tests/Functional/app/Fragment/config.yml  |    7 +
 .../Tests/Functional/app/Fragment/routing.yml |    2 +
 .../Tests/Functional/app/Profiler/bundles.php |   18 +
 .../Tests/Functional/app/Profiler/config.yml  |    7 +
 .../Tests/Functional/app/Profiler/routing.yml |    2 +
 .../app/Resources/views/fragment.html.php     |   14 +
 .../Functional/app/Serializer/bundles.php     |   16 +
 .../Functional/app/Serializer/config.yml      |   10 +
 .../Tests/Functional/app/Session/bundles.php  |   18 +
 .../Tests/Functional/app/Session/config.yml   |    7 +
 .../Tests/Functional/app/Session/routing.yml  |    2 +
 .../Tests/Functional/app/config/default.yml   |    2 +
 .../Tests/Functional/app/config/framework.yml |   13 +
 .../Tests/Kernel/ConcreteMicroKernel.php      |  113 +
 .../Tests/Kernel/MicroKernelTraitTest.php     |   42 +
 .../Tests/Routing/DelegatingLoaderTest.php    |   20 +
 .../Routing/RedirectableUrlMatcherTest.php    |   61 +
 .../Tests/Routing/RouterTest.php              |  275 ++
 .../Tests/Templating/DelegatingEngineTest.php |  123 +
 .../Tests/Templating/GlobalVariablesTest.php  |  106 +
 .../Templating/Helper/AssetsHelperTest.php    |   45 +
 .../Fixtures/StubTemplateNameParser.php       |   43 +
 .../Helper/Fixtures/StubTranslator.php        |   35 +
 .../Helper/FormHelperDivLayoutTest.php        |  157 +
 .../Helper/FormHelperTableLayoutTest.php      |  132 +
 .../Templating/Helper/RequestHelperTest.php   |   54 +
 .../Resources/Child/form_label.html.php       |    1 +
 .../Custom/_name_c_entry_label.html.php       |    2 +
 .../Custom/_names_entry_label.html.php        |    4 +
 .../Resources/Custom/_text_id_widget.html.php |    3 +
 .../Resources/Parent/form_label.html.php      |    1 +
 .../Parent/form_widget_simple.html.php        |    2 +
 .../Templating/Helper/SessionHelperTest.php   |   75 +
 .../Templating/Helper/StopwatchHelperTest.php |   39 +
 .../Templating/Loader/TemplateLocatorTest.php |   96 +
 .../Tests/Templating/PhpEngineTest.php        |   74 +
 .../Templating/TemplateFilenameParserTest.php |   56 +
 .../Templating/TemplateNameParserTest.php     |  107 +
 .../Templating/TemplateReferenceTest.php      |   28 +
 .../Tests/Templating/TemplateTest.php         |   36 +
 .../Tests/Templating/TimedPhpEngineTest.php   |  116 +
 .../framework-bundle/Tests/TestCase.php       |   18 +
 .../Tests/Translation/PhpExtractorTest.php    |   98 +
 .../Tests/Translation/TranslatorTest.php      |  492 ++++
 .../ConstraintValidatorFactoryTest.php        |   97 +
 .../Tests/AcceptHeaderItemTest.php            |  113 +
 .../Tests/AcceptHeaderTest.php                |  103 +
 .../Tests/ApacheRequestTest.php               |   93 +
 .../Tests/BinaryFileResponseTest.php          |  364 +++
 .../http-foundation/Tests/CookieTest.php      |  246 ++
 .../Tests/ExpressionRequestMatcherTest.php    |   67 +
 .../http-foundation/Tests/File/FakeFile.php   |   45 +
 .../http-foundation/Tests/File/FileTest.php   |  180 ++
 .../http-foundation/Tests/File/Fixtures/-test |  Bin 0 -> 35 bytes
 .../Tests/File/Fixtures/.unknownextension     |    1 +
 .../Fixtures/case-sensitive-mime-type.xlsm    |  Bin 0 -> 4791 bytes
 .../Tests/File/Fixtures/directory/.empty      |    0
 .../Tests/File/Fixtures/other-file.example    |    0
 .../http-foundation/Tests/File/Fixtures/test  |  Bin 0 -> 35 bytes
 .../Tests/File/Fixtures/test.gif              |  Bin 0 -> 35 bytes
 .../Tests/File/MimeType/MimeTypeTest.php      |   99 +
 .../Tests/File/UploadedFileTest.php           |  298 ++
 .../http-foundation/Tests/FileBagTest.php     |  173 ++
 .../Fixtures/response-functional/common.inc   |   43 +
 .../cookie_max_age.expected                   |   11 +
 .../response-functional/cookie_max_age.php    |   10 +
 .../cookie_raw_urlencode.expected             |   10 +
 .../cookie_raw_urlencode.php                  |   12 +
 .../cookie_samesite_lax.expected              |    9 +
 .../cookie_samesite_lax.php                   |    8 +
 .../cookie_samesite_strict.expected           |    9 +
 .../cookie_samesite_strict.php                |    8 +
 .../cookie_urlencode.expected                 |   11 +
 .../response-functional/cookie_urlencode.php  |   15 +
 .../invalid_cookie_name.expected              |    6 +
 .../invalid_cookie_name.php                   |   11 +
 .../http-foundation/Tests/HeaderBagTest.php   |  213 ++
 .../http-foundation/Tests/IpUtilsTest.php     |  104 +
 .../Tests/JsonResponseTest.php                |  262 ++
 .../Tests/ParameterBagTest.php                |  194 ++
 .../Tests/RedirectResponseTest.php            |   92 +
 .../Tests/RequestMatcherTest.php              |  151 +
 .../Tests/RequestStackTest.php                |   70 +
 .../http-foundation/Tests/RequestTest.php     | 2451 ++++++++++++++++
 .../Tests/ResponseFunctionalTest.php          |   58 +
 .../Tests/ResponseHeaderBagTest.php           |  359 +++
 .../http-foundation/Tests/ResponseTest.php    | 1008 +++++++
 .../Tests/ResponseTestCase.php                |   89 +
 .../http-foundation/Tests/ServerBagTest.php   |  170 ++
 .../Session/Attribute/AttributeBagTest.php    |  186 ++
 .../Attribute/NamespacedAttributeBagTest.php  |  204 ++
 .../Session/Flash/AutoExpireFlashBagTest.php  |  161 ++
 .../Tests/Session/Flash/FlashBagTest.php      |  157 +
 .../Tests/Session/SessionTest.php             |  288 ++
 .../Handler/AbstractSessionHandlerTest.php    |   61 +
 .../Storage/Handler/Fixtures/common.inc       |  151 +
 .../Handler/Fixtures/empty_destroys.expected  |   17 +
 .../Handler/Fixtures/empty_destroys.php       |    8 +
 .../Handler/Fixtures/read_only.expected       |   14 +
 .../Storage/Handler/Fixtures/read_only.php    |    8 +
 .../Handler/Fixtures/regenerate.expected      |   24 +
 .../Storage/Handler/Fixtures/regenerate.php   |   10 +
 .../Storage/Handler/Fixtures/storage.expected |   20 +
 .../Storage/Handler/Fixtures/storage.php      |   24 +
 .../Handler/Fixtures/with_cookie.expected     |   15 +
 .../Storage/Handler/Fixtures/with_cookie.php  |    8 +
 .../Fixtures/with_cookie_and_session.expected |   24 +
 .../Fixtures/with_cookie_and_session.php      |   13 +
 .../Handler/MemcacheSessionHandlerTest.php    |  135 +
 .../Handler/MemcachedSessionHandlerTest.php   |  145 +
 .../Handler/MongoDbSessionHandlerTest.php     |  330 +++
 .../Handler/NativeFileSessionHandlerTest.php  |   75 +
 .../Handler/NativeSessionHandlerTest.php      |   38 +
 .../Handler/NullSessionHandlerTest.php        |   59 +
 .../Storage/Handler/PdoSessionHandlerTest.php |  405 +++
 .../Handler/StrictSessionHandlerTest.php      |  189 ++
 .../Handler/WriteCheckSessionHandlerTest.php  |   97 +
 .../Tests/Session/Storage/MetadataBagTest.php |  139 +
 .../Storage/MockArraySessionStorageTest.php   |  129 +
 .../Storage/MockFileSessionStorageTest.php    |  125 +
 .../Storage/NativeSessionStorageTest.php      |  288 ++
 .../Storage/PhpBridgeSessionStorageTest.php   |   96 +
 .../Storage/Proxy/AbstractProxyTest.php       |  113 +
 .../Session/Storage/Proxy/NativeProxyTest.php |   38 +
 .../Storage/Proxy/SessionHandlerProxyTest.php |  158 +
 .../Tests/StreamedResponseTest.php            |  140 +
 .../Tests/schema/http-status-codes.rng        |   31 +
 .../Tests/schema/iana-registry.rng            |  198 ++
 .../http-kernel/Tests/Bundle/BundleTest.php   |  105 +
 .../CacheClearer/ChainCacheClearerTest.php    |   61 +
 .../CacheClearer/Psr6CacheClearerTest.php     |   67 +
 .../CacheWarmer/CacheWarmerAggregateTest.php  |  107 +
 .../Tests/CacheWarmer/CacheWarmerTest.php     |   66 +
 lib/symfony/http-kernel/Tests/ClientTest.php  |  179 ++
 .../Config/EnvParametersResourceTest.php      |  110 +
 .../Tests/Config/FileLocatorTest.php          |   48 +
 .../ServiceValueResolverTest.php              |  130 +
 .../Tests/Controller/ArgumentResolverTest.php |  341 +++
 .../ContainerControllerResolverTest.php       |  298 ++
 .../Controller/ControllerResolverTest.php     |  325 +++
 .../ArgumentMetadataFactoryTest.php           |  148 +
 .../ArgumentMetadataTest.php                  |   44 +
 .../Tests/DataCollector/Compiler.log          |    4 +
 .../DataCollector/ConfigDataCollectorTest.php |   66 +
 .../Tests/DataCollector/DataCollectorTest.php |   38 +
 .../DataCollector/DumpDataCollectorTest.php   |  135 +
 .../ExceptionDataCollectorTest.php            |   59 +
 .../DataCollector/LoggerDataCollectorTest.php |  144 +
 .../DataCollector/MemoryDataCollectorTest.php |   59 +
 .../RequestDataCollectorTest.php              |  334 +++
 .../DataCollector/TimeDataCollectorTest.php   |   57 +
 .../DataCollector/Util/ValueExporterTest.php  |   51 +
 .../Tests/Debug/FileLinkFormatterTest.php     |   66 +
 .../Debug/TraceableEventDispatcherTest.php    |  119 +
 .../AddAnnotatedClassesToCachePassTest.php    |   99 +
 ...ontrollerArgumentValueResolverPassTest.php |   67 +
 .../FragmentRendererPassTest.php              |   70 +
 .../LazyLoadingFragmentHandlerTest.php        |   66 +
 .../DependencyInjection/LoggerPassTest.php    |   56 +
 .../MergeExtensionConfigurationPassTest.php   |   50 +
 ...sterControllerArgumentLocatorsPassTest.php |  397 +++
 ...mptyControllerArgumentLocatorsPassTest.php |  148 +
 .../ResettableServicePassTest.php             |   76 +
 .../ServicesResetterTest.php                  |   42 +
 .../FilterControllerArgumentsEventTest.php    |   17 +
 .../GetResponseForExceptionEventTest.php      |   27 +
 .../AddRequestFormatsListenerTest.php         |   84 +
 .../DebugHandlersListenerTest.php             |  155 +
 .../Tests/EventListener/DumpListenerTest.php  |   81 +
 .../EventListener/ExceptionListenerTest.php   |  178 ++
 .../EventListener/FragmentListenerTest.php    |  118 +
 .../EventListener/LocaleListenerTest.php      |  102 +
 .../EventListener/ProfilerListenerTest.php    |   70 +
 .../EventListener/ResponseListenerTest.php    |   95 +
 .../EventListener/RouterListenerTest.php      |  222 ++
 .../EventListener/SaveSessionListenerTest.php |   49 +
 .../EventListener/SessionListenerTest.php     |  121 +
 .../EventListener/SurrogateListenerTest.php   |   67 +
 .../EventListener/TestSessionListenerTest.php |  221 ++
 .../EventListener/TranslatorListenerTest.php  |  118 +
 .../ValidateRequestListenerTest.php           |   46 +
 .../AccessDeniedHttpExceptionTest.php         |   13 +
 .../Exception/BadRequestHttpExceptionTest.php |   13 +
 .../Exception/ConflictHttpExceptionTest.php   |   13 +
 .../Tests/Exception/GoneHttpExceptionTest.php |   13 +
 .../Tests/Exception/HttpExceptionTest.php     |   53 +
 .../LengthRequiredHttpExceptionTest.php       |   13 +
 .../MethodNotAllowedHttpExceptionTest.php     |   24 +
 .../NotAcceptableHttpExceptionTest.php        |   13 +
 .../Exception/NotFoundHttpExceptionTest.php   |   13 +
 .../PreconditionFailedHttpExceptionTest.php   |   13 +
 .../PreconditionRequiredHttpExceptionTest.php |   13 +
 .../ServiceUnavailableHttpExceptionTest.php   |   29 +
 .../TooManyRequestsHttpExceptionTest.php      |   29 +
 .../UnauthorizedHttpExceptionTest.php         |   24 +
 .../UnprocessableEntityHttpExceptionTest.php  |   13 +
 .../UnsupportedMediaTypeHttpExceptionTest.php |   13 +
 .../Tests/Fixtures/123/Kernel123.php          |   37 +
 .../Fixtures/BaseBundle/Resources/foo.txt     |    0
 .../Fixtures/BaseBundle/Resources/hide.txt    |    0
 .../Fixtures/Bundle1Bundle/Resources/foo.txt  |    0
 .../Tests/Fixtures/Bundle1Bundle/bar.txt      |    0
 .../Tests/Fixtures/Bundle1Bundle/foo.txt      |    0
 .../Tests/Fixtures/Bundle2Bundle/foo.txt      |    0
 .../Fixtures/ChildBundle/Resources/foo.txt    |    0
 .../Fixtures/ChildBundle/Resources/hide.txt   |    0
 .../Tests/Fixtures/ClearableService.php       |   13 +
 .../Controller/BasicTypesController.php       |   19 +
 .../Fixtures/Controller/ExtendingRequest.php  |   18 +
 .../Fixtures/Controller/ExtendingSession.php  |   18 +
 .../Controller/NullableController.php         |   19 +
 .../Controller/VariadicController.php         |   19 +
 .../DataCollector/CloneVarDataCollector.php   |   46 +
 .../ExtensionAbsentBundle.php                 |   18 +
 .../ExtensionNotValidExtension.php            |   20 +
 .../ExtensionNotValidBundle.php               |   18 +
 .../Command/FooCommand.php                    |   22 +
 .../ExtensionPresentExtension.php             |   22 +
 .../ExtensionPresentBundle.php                |   18 +
 .../Tests/Fixtures/KernelForOverrideName.php  |   28 +
 .../Tests/Fixtures/KernelForTest.php          |   42 +
 .../Tests/Fixtures/KernelWithoutBundles.php   |   33 +
 .../Tests/Fixtures/ResettableService.php      |   13 +
 .../Fixtures/Resources/BaseBundle/hide.txt    |    0
 .../Fixtures/Resources/Bundle1Bundle/foo.txt  |    0
 .../Fixtures/Resources/ChildBundle/foo.txt    |    0
 .../Fixtures/Resources/FooBundle/foo.txt      |    0
 .../http-kernel/Tests/Fixtures/TestClient.php |   31 +
 .../Fragment/EsiFragmentRendererTest.php      |  114 +
 .../Tests/Fragment/FragmentHandlerTest.php    |   93 +
 .../Fragment/HIncludeFragmentRendererTest.php |  100 +
 .../Fragment/InlineFragmentRendererTest.php   |  318 ++
 .../Fragment/RoutableFragmentRendererTest.php |   94 +
 .../Fragment/SsiFragmentRendererTest.php      |   93 +
 .../http-kernel/Tests/HttpCache/EsiTest.php   |  244 ++
 .../Tests/HttpCache/HttpCacheTest.php         | 1526 ++++++++++
 .../Tests/HttpCache/HttpCacheTestCase.php     |  185 ++
 .../HttpCache/ResponseCacheStrategyTest.php   |  469 +++
 .../http-kernel/Tests/HttpCache/SsiTest.php   |  211 ++
 .../http-kernel/Tests/HttpCache/StoreTest.php |  301 ++
 .../Tests/HttpCache/SubRequestHandlerTest.php |  153 +
 .../Tests/HttpCache/TestHttpKernel.php        |  102 +
 .../HttpCache/TestMultipleHttpKernel.php      |   81 +
 .../http-kernel/Tests/HttpKernelTest.php      |  395 +++
 lib/symfony/http-kernel/Tests/KernelTest.php  | 1073 +++++++
 .../http-kernel/Tests/Log/LoggerTest.php      |  206 ++
 lib/symfony/http-kernel/Tests/Logger.php      |   91 +
 .../Profiler/FileProfilerStorageTest.php      |  350 +++
 .../Tests/Profiler/ProfilerTest.php           |  105 +
 .../http-kernel/Tests/TestHttpKernel.php      |   42 +
 .../http-kernel/Tests/UriSignerTest.php       |   76 +
 .../routing/Tests/Annotation/RouteTest.php    |   48 +
 .../routing/Tests/CompiledRouteTest.php       |   27 +
 .../RoutingResolverPassTest.php               |   36 +
 .../AnnotatedClasses/AbstractClass.php        |   21 +
 .../Fixtures/AnnotatedClasses/BarClass.php    |   19 +
 .../Fixtures/AnnotatedClasses/BazClass.php    |   19 +
 .../AnnotatedClasses/EncodingClass.php        |   10 +
 .../Fixtures/AnnotatedClasses/FooClass.php    |   16 +
 .../Fixtures/AnnotatedClasses/FooTrait.php    |   13 +
 .../Tests/Fixtures/CustomCompiledRoute.php    |   18 +
 .../Tests/Fixtures/CustomRouteCompiler.php    |   26 +
 .../Tests/Fixtures/CustomXmlFileLoader.php    |   26 +
 .../AnonymousClassInTrait.php                 |   24 +
 .../OtherAnnotatedClasses/NoStartTagClass.php |    3 +
 .../OtherAnnotatedClasses/VariadicClass.php   |   19 +
 .../Tests/Fixtures/RedirectableUrlMatcher.php |   30 +
 .../routing/Tests/Fixtures/annotated.php      |    0
 .../routing/Tests/Fixtures/bad_format.yml     |    3 +
 lib/symfony/routing/Tests/Fixtures/bar.xml    |    0
 .../controller/import__controller.xml         |   10 +
 .../controller/import__controller.yml         |    4 +
 .../Fixtures/controller/import_controller.xml |    8 +
 .../Fixtures/controller/import_controller.yml |    3 +
 .../controller/import_override_defaults.xml   |   10 +
 .../controller/import_override_defaults.yml   |    5 +
 .../Fixtures/controller/override_defaults.xml |   10 +
 .../Fixtures/controller/override_defaults.yml |    5 +
 .../Tests/Fixtures/controller/routing.xml     |   14 +
 .../Tests/Fixtures/controller/routing.yml     |   11 +
 .../Fixtures/directory/recurse/routes1.yml    |    2 +
 .../Fixtures/directory/recurse/routes2.yml    |    2 +
 .../Tests/Fixtures/directory/routes3.yml      |    2 +
 .../Fixtures/directory_import/import.yml      |    3 +
 .../Tests/Fixtures/dumper/url_matcher0.php    |   37 +
 .../Tests/Fixtures/dumper/url_matcher1.php    |  318 ++
 .../Tests/Fixtures/dumper/url_matcher2.php    |  380 +++
 .../Tests/Fixtures/dumper/url_matcher3.php    |   55 +
 .../Tests/Fixtures/dumper/url_matcher4.php    |  112 +
 .../Tests/Fixtures/dumper/url_matcher5.php    |  209 ++
 .../Tests/Fixtures/dumper/url_matcher6.php    |  213 ++
 .../Tests/Fixtures/dumper/url_matcher7.php    |  249 ++
 lib/symfony/routing/Tests/Fixtures/empty.yml  |    0
 .../routing/Tests/Fixtures/file_resource.yml  |    0
 lib/symfony/routing/Tests/Fixtures/foo.xml    |    0
 lib/symfony/routing/Tests/Fixtures/foo1.xml   |    0
 .../routing/Tests/Fixtures/glob/bar.xml       |    8 +
 .../routing/Tests/Fixtures/glob/bar.yml       |    4 +
 .../routing/Tests/Fixtures/glob/baz.xml       |    8 +
 .../routing/Tests/Fixtures/glob/baz.yml       |    4 +
 .../Tests/Fixtures/glob/import_multiple.xml   |    8 +
 .../Tests/Fixtures/glob/import_multiple.yml   |    2 +
 .../Tests/Fixtures/glob/import_single.xml     |    8 +
 .../Tests/Fixtures/glob/import_single.yml     |    2 +
 .../routing/Tests/Fixtures/glob/php_dsl.php   |    7 +
 .../Tests/Fixtures/glob/php_dsl_bar.php       |   12 +
 .../Tests/Fixtures/glob/php_dsl_baz.php       |   12 +
 .../routing/Tests/Fixtures/incomplete.yml     |    2 +
 .../routing/Tests/Fixtures/list_defaults.xml  |   20 +
 .../Tests/Fixtures/list_in_list_defaults.xml  |   22 +
 .../Tests/Fixtures/list_in_map_defaults.xml   |   22 +
 .../Tests/Fixtures/list_null_values.xml       |   22 +
 .../routing/Tests/Fixtures/localized/utf8.xml |   13 +
 .../routing/Tests/Fixtures/map_defaults.xml   |   20 +
 .../Tests/Fixtures/map_in_list_defaults.xml   |   22 +
 .../Tests/Fixtures/map_in_map_defaults.xml    |   22 +
 .../Tests/Fixtures/map_null_values.xml        |   22 +
 .../routing/Tests/Fixtures/missing_id.xml     |    8 +
 .../routing/Tests/Fixtures/missing_path.xml   |    8 +
 .../Tests/Fixtures/namespaceprefix.xml        |   16 +
 .../Fixtures/nonesense_resource_plus_path.yml |    3 +
 .../nonesense_type_without_resource.yml       |    3 +
 .../routing/Tests/Fixtures/nonvalid.xml       |   10 +
 .../routing/Tests/Fixtures/nonvalid.yml       |    1 +
 .../routing/Tests/Fixtures/nonvalid2.yml      |    1 +
 .../routing/Tests/Fixtures/nonvalidkeys.yml   |    3 +
 .../routing/Tests/Fixtures/nonvalidnode.xml   |    8 +
 .../routing/Tests/Fixtures/nonvalidroute.xml  |   12 +
 .../routing/Tests/Fixtures/null_values.xml    |   12 +
 .../routing/Tests/Fixtures/php_dsl.php        |   22 +
 .../routing/Tests/Fixtures/php_dsl_sub.php    |   14 +
 .../Tests/Fixtures/scalar_defaults.xml        |   33 +
 .../Tests/Fixtures/special_route_name.yml     |    2 +
 .../routing/Tests/Fixtures/validpattern.php   |   18 +
 .../routing/Tests/Fixtures/validpattern.xml   |   15 +
 .../routing/Tests/Fixtures/validpattern.yml   |   13 +
 .../routing/Tests/Fixtures/validresource.php  |   18 +
 .../routing/Tests/Fixtures/validresource.xml  |   13 +
 .../routing/Tests/Fixtures/validresource.yml  |    8 +
 .../Fixtures/with_define_path_variable.php    |    5 +
 .../routing/Tests/Fixtures/withdoctype.xml    |    3 +
 .../Dumper/PhpGeneratorDumperTest.php         |  177 ++
 .../Tests/Generator/UrlGeneratorTest.php      |  747 +++++
 .../Loader/AbstractAnnotationLoaderTest.php   |   33 +
 .../Loader/AnnotationClassLoaderTest.php      |  348 +++
 .../Loader/AnnotationDirectoryLoaderTest.php  |  110 +
 .../Tests/Loader/AnnotationFileLoaderTest.php |   94 +
 .../Tests/Loader/ClosureLoaderTest.php        |   49 +
 .../Tests/Loader/DirectoryLoaderTest.php      |   74 +
 .../Tests/Loader/GlobFileLoaderTest.php       |   45 +
 .../Tests/Loader/ObjectRouteLoaderTest.php    |  117 +
 .../Tests/Loader/PhpFileLoaderTest.php        |  133 +
 .../Tests/Loader/XmlFileLoaderTest.php        |  399 +++
 .../Tests/Loader/YamlFileLoaderTest.php       |  202 ++
 .../DumpedRedirectableUrlMatcherTest.php      |   43 +
 .../Tests/Matcher/DumpedUrlMatcherTest.php    |   44 +
 .../Matcher/Dumper/DumperCollectionTest.php   |   34 +
 .../Matcher/Dumper/PhpMatcherDumperTest.php   |  454 +++
 .../Dumper/StaticPrefixCollectionTest.php     |  175 ++
 .../Matcher/RedirectableUrlMatcherTest.php    |  150 +
 .../Tests/Matcher/TraceableUrlMatcherTest.php |  126 +
 .../routing/Tests/Matcher/UrlMatcherTest.php  |  616 ++++
 .../routing/Tests/RequestContextTest.php      |  160 ++
 .../Tests/RouteCollectionBuilderTest.php      |  362 +++
 .../routing/Tests/RouteCollectionTest.php     |  305 ++
 .../routing/Tests/RouteCompilerTest.php       |  379 +++
 lib/symfony/routing/Tests/RouteTest.php       |  258 ++
 lib/symfony/routing/Tests/RouterTest.php      |  157 +
 .../stopwatch/Tests/StopwatchEventTest.php    |  210 ++
 .../stopwatch/Tests/StopwatchPeriodTest.php   |   67 +
 lib/symfony/stopwatch/Tests/StopwatchTest.php |  182 ++
 .../twig-bridge/Tests/AppVariableTest.php     |  264 ++
 .../Tests/Command/DebugCommandTest.php        |  125 +
 .../Tests/Command/LintCommandTest.php         |  127 +
 ...AbstractBootstrap3HorizontalLayoutTest.php |  166 ++
 .../AbstractBootstrap3LayoutTest.php          | 2546 +++++++++++++++++
 ...AbstractBootstrap4HorizontalLayoutTest.php |  217 ++
 .../AbstractBootstrap4LayoutTest.php          |  986 +++++++
 .../Tests/Extension/CodeExtensionTest.php     |   69 +
 .../Tests/Extension/DumpExtensionTest.php     |  145 +
 .../Extension/ExpressionExtensionTest.php     |   30 +
 .../Fixtures/StubFilesystemLoader.php         |   25 +
 .../Extension/Fixtures/StubTranslator.php     |   35 +
 .../templates/form/child_label.html.twig      |    3 +
 .../templates/form/custom_widgets.html.twig   |   19 +
 .../form/page_dynamic_extends.html.twig       |    1 +
 .../templates/form/parent_label.html.twig     |    3 +
 .../Fixtures/templates/form/theme.html.twig   |    4 +
 .../templates/form/theme_extends.html.twig    |    6 +
 .../templates/form/theme_use.html.twig        |    6 +
 ...xtensionBootstrap3HorizontalLayoutTest.php |  106 +
 .../FormExtensionBootstrap3LayoutTest.php     |  156 +
 ...xtensionBootstrap4HorizontalLayoutTest.php |  108 +
 .../FormExtensionBootstrap4LayoutTest.php     |  160 ++
 .../Extension/FormExtensionDivLayoutTest.php  |  258 ++
 .../FormExtensionTableLayoutTest.php          |  130 +
 .../Tests/Extension/FormExtensionTest.php     |   76 +
 .../Extension/HttpFoundationExtensionTest.php |  143 +
 .../Extension/HttpKernelExtensionTest.php     |   86 +
 .../Tests/Extension/RoutingExtensionTest.php  |   54 +
 .../Tests/Extension/RuntimeLoaderProvider.php |   27 +
 .../Extension/StopwatchExtensionTest.php      |   74 +
 .../Extension/TranslationExtensionTest.php    |  213 ++
 .../Tests/Extension/WebLinkExtensionTest.php  |   92 +
 .../Tests/Extension/WorkflowExtensionTest.php |   83 +
 .../Fixtures/extractor/syntax_error.twig      |    1 +
 .../extractor/with_translations.html.twig     |    1 +
 .../twig-bridge/Tests/Node/DumpNodeTest.php   |  128 +
 .../twig-bridge/Tests/Node/FormThemeTest.php  |  111 +
 .../Node/SearchAndRenderBlockNodeTest.php     |  280 ++
 .../twig-bridge/Tests/Node/TransNodeTest.php  |   66 +
 .../Tests/NodeVisitor/ScopeTest.php           |   25 +
 ...ranslationDefaultDomainNodeVisitorTest.php |   93 +
 .../TranslationNodeVisitorTest.php            |   67 +
 .../Tests/NodeVisitor/TwigNodeProvider.php    |   88 +
 .../TokenParser/FormThemeTokenParserTest.php  |  123 +
 .../Tests/Translation/TwigExtractorTest.php   |  140 +
 .../twig-bridge/Tests/TwigEngineTest.php      |   79 +
 .../Tests/ContainerAwareRuntimeLoaderTest.php |   41 +
 .../Controller/ExceptionControllerTest.php    |   92 +
 .../Controller/PreviewErrorControllerTest.php |   53 +
 .../Compiler/ExtensionPassTest.php            |   46 +
 .../Compiler/TwigEnvironmentPassTest.php      |   45 +
 .../Compiler/TwigLoaderPassTest.php           |   95 +
 .../DependencyInjection/ConfigurationTest.php |   31 +
 .../Resources/views/layout.html.twig          |    1 +
 .../Resources/views/layout.html.twig          |    1 +
 .../Resources/views/layout.html.twig          |    1 +
 .../Resources/views/layout.html.twig          |    1 +
 .../TwigBundle/views/layout.html.twig         |    1 +
 .../Fixtures/Resources/views/layout.html.twig |    1 +
 .../php/customTemplateEscapingGuesser.php     |    6 +
 .../Fixtures/php/empty.php                    |    3 +
 .../Fixtures/php/extra.php                    |    7 +
 .../Fixtures/php/formats.php                  |   14 +
 .../DependencyInjection/Fixtures/php/full.php |   27 +
 .../bundles/BarBundle/layout.html.twig        |    1 +
 .../bundles/TwigBundle/layout.html.twig       |    1 +
 .../Fixtures/templates/layout.html.twig       |    1 +
 .../xml/customTemplateEscapingGuesser.xml     |   10 +
 .../Fixtures/xml/empty.xml                    |   10 +
 .../Fixtures/xml/extra.xml                    |   12 +
 .../Fixtures/xml/formats.xml                  |   12 +
 .../DependencyInjection/Fixtures/xml/full.xml |   19 +
 .../yml/customTemplateEscapingGuesser.yml     |    3 +
 .../Fixtures/yml/empty.yml                    |    1 +
 .../Fixtures/yml/extra.yml                    |    3 +
 .../Fixtures/yml/formats.yml                  |    9 +
 .../DependencyInjection/Fixtures/yml/full.yml |   21 +
 .../DependencyInjection/TwigExtensionTest.php |  355 +++
 .../BarBundle/Resources/views/index.html.twig |    1 +
 .../Fixtures/templates/Foo/index.html.twig    |    1 +
 .../Resources/BarBundle/views/base.html.twig  |    0
 .../Resources/views/layout.html.twig          |    1 +
 .../Resources/views/sub/sub.html.twig         |    1 +
 .../Tests/Functional/CacheWarmingTest.php     |  124 +
 .../Tests/Functional/EmptyAppTest.php         |   51 +
 .../Functional/NoTemplatingEntryTest.php      |   80 +
 .../Resources/config/empty_routing.yml        |    0
 .../Resources/views/index.html.twig           |    1 +
 .../Tests/Loader/FilesystemLoaderTest.php     |  125 +
 .../Tests/TemplateIteratorTest.php            |   44 +
 lib/symfony/twig-bundle/Tests/TestCase.php    |   18 +
 .../var-dumper/Test/VarDumperTestTrait.php    |   63 +
 .../var-dumper/Tests/Caster/CasterTest.php    |  181 ++
 .../Tests/Caster/DateCasterTest.php           |  426 +++
 .../Tests/Caster/ExceptionCasterTest.php      |  227 ++
 .../var-dumper/Tests/Caster/PdoCasterTest.php |   64 +
 .../Tests/Caster/RedisCasterTest.php          |   84 +
 .../Tests/Caster/ReflectionCasterTest.php     |  270 ++
 .../var-dumper/Tests/Caster/SplCasterTest.php |  232 ++
 .../Tests/Caster/StubCasterTest.php           |  192 ++
 .../Tests/Caster/XmlReaderCasterTest.php      |  248 ++
 .../var-dumper/Tests/Cloner/DataTest.php      |  115 +
 .../var-dumper/Tests/Cloner/VarClonerTest.php |  505 ++++
 .../var-dumper/Tests/Dumper/CliDumperTest.php |  591 ++++
 .../var-dumper/Tests/Dumper/FunctionsTest.php |   57 +
 .../Tests/Dumper/HtmlDumperTest.php           |  168 ++
 .../Tests/Fixtures/FooInterface.php           |   11 +
 .../Tests/Fixtures/GeneratorDemo.php          |   21 +
 .../Tests/Fixtures/NotLoadableClass.php       |    7 +
 .../var-dumper/Tests/Fixtures/Php74.php       |   14 +
 .../var-dumper/Tests/Fixtures/Twig.php        |   38 +
 .../var-dumper/Tests/Fixtures/dumb-var.php    |   40 +
 .../var-dumper/Tests/Fixtures/xml_reader.xml  |   10 +
 .../Tests/Test/VarDumperTestTraitTest.php     |   41 +
 .../Controller/ProfilerControllerTest.php     |  200 ++
 .../Csp/ContentSecurityPolicyHandlerTest.php  |  207 ++
 .../DependencyInjection/ConfigurationTest.php |   64 +
 .../WebProfilerExtensionTest.php              |  136 +
 .../WebDebugToolbarListenerTest.php           |  341 +++
 .../Tests/Fixtures/profile.data               |    1 +
 .../Tests/Profiler/TemplateManagerTest.php    |  171 ++
 .../Tests/Resources/IconTest.php              |   30 +
 .../web-profiler-bundle/Tests/TestCase.php    |   18 +
 .../yaml/Tests/Command/LintCommandTest.php    |  137 +
 lib/symfony/yaml/Tests/DumperTest.php         |  606 ++++
 .../yaml/Tests/Fixtures/YtsAnchorAlias.yml    |   31 +
 .../yaml/Tests/Fixtures/YtsBasicTests.yml     |  202 ++
 .../yaml/Tests/Fixtures/YtsBlockMapping.yml   |   51 +
 .../Tests/Fixtures/YtsDocumentSeparator.yml   |   85 +
 .../yaml/Tests/Fixtures/YtsErrorTests.yml     |   25 +
 .../Tests/Fixtures/YtsFlowCollections.yml     |   60 +
 .../yaml/Tests/Fixtures/YtsFoldedScalars.yml  |  176 ++
 .../Tests/Fixtures/YtsNullsAndEmpties.yml     |   45 +
 .../Fixtures/YtsSpecificationExamples.yml     | 1701 +++++++++++
 .../yaml/Tests/Fixtures/YtsTypeTransfers.yml  |  266 ++
 lib/symfony/yaml/Tests/Fixtures/arrow.gif     |  Bin 0 -> 185 bytes
 .../Tests/Fixtures/booleanMappingKeys.yml     |   11 +
 .../yaml/Tests/Fixtures/embededPhp.yml        |    1 +
 .../yaml/Tests/Fixtures/escapedCharacters.yml |  155 +
 lib/symfony/yaml/Tests/Fixtures/index.yml     |   18 +
 .../Fixtures/legacyBooleanMappingKeys.yml     |   23 +
 .../Tests/Fixtures/legacyNonStringKeys.yml    |    2 +
 .../Tests/Fixtures/legacyNullMappingKey.yml   |    9 +
 .../multiple_lines_as_literal_block.yml       |   14 +
 ...eral_block_leading_space_in_first_line.yml |    4 +
 .../yaml/Tests/Fixtures/nonStringKeys.yml     |    3 +
 .../yaml/Tests/Fixtures/not_readable.yml      |   18 +
 .../yaml/Tests/Fixtures/nullMappingKey.yml    |    9 +
 .../Tests/Fixtures/numericMappingKeys.yml     |   23 +
 .../yaml/Tests/Fixtures/sfComments.yml        |   76 +
 lib/symfony/yaml/Tests/Fixtures/sfCompact.yml |  159 +
 .../yaml/Tests/Fixtures/sfMergeKey.yml        |   61 +
 lib/symfony/yaml/Tests/Fixtures/sfObjects.yml |   11 +
 lib/symfony/yaml/Tests/Fixtures/sfQuotes.yml  |   33 +
 lib/symfony/yaml/Tests/Fixtures/sfTests.yml   |  140 +
 .../Tests/Fixtures/unindentedCollections.yml  |   82 +
 lib/symfony/yaml/Tests/InlineTest.php         |  784 +++++
 lib/symfony/yaml/Tests/ParseExceptionTest.php |   34 +
 lib/symfony/yaml/Tests/ParserTest.php         | 2319 +++++++++++++++
 lib/symfony/yaml/Tests/YamlTest.php           |   40 +
 lib/twig/twig/lib/Twig/Test/Function.php      |   38 +
 .../lib/Twig/Test/IntegrationTestCase.php     |   11 +
 lib/twig/twig/lib/Twig/Test/Method.php        |   42 +
 lib/twig/twig/lib/Twig/Test/Node.php          |   40 +
 lib/twig/twig/lib/Twig/Test/NodeTestCase.php  |   11 +
 2086 files changed, 151849 insertions(+), 6 deletions(-)
 create mode 100644 lib/nikic/php-parser/test/PhpParser/AutoloaderTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/ClassTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/MethodTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/NamespaceTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/PropertyTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/TraitTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Builder/UseTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/CodeParsingTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/CodeTestAbstract.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/CommentTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/ErrorHandler/CollectingTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/ErrorTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/LexerTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Node/NameTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Node/Scalar/MagicConstTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Node/Scalar/StringTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassConstTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassMethodTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Node/Stmt/InterfaceTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Node/Stmt/PropertyTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/NodeAbstractTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/NodeDumperTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/NodeTraverserTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/NodeVisitor/NameResolverTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Parser/Php5Test.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Parser/Php7Test.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/ParserFactoryTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/ParserTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Serializer/XMLTest.php
 create mode 100644 lib/nikic/php-parser/test/PhpParser/Unserializer/XMLTest.php
 create mode 100644 lib/nikic/php-parser/test/bootstrap.php
 create mode 100644 lib/nikic/php-parser/test/code/parser/blockComments.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/comments.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/errorHandling/eofError.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/errorHandling/lexerErrors.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/errorHandling/recovery.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/arrayDef.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/arrayDestructuring.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/assign.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/assignNewByRef.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/cast.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/clone.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/closure.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/comparison.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/constant_expr.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/errorSuppress.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/exit.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/args.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/constFetch.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/constantDeref.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/funcCall.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/newDeref.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/objectAccess.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/simpleArrayAccess.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticCall.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticPropertyFetch.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/includeAndEval.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/issetAndEmpty.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/listWithKeys.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/logic.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/math.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/new.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/newWithoutClass.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/print.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/shellExec.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/ternaryAndCoalesce.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/uvs/globalNonSimpleVarError.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/uvs/indirectCall.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/uvs/isset.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/uvs/misc.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/uvs/new.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/uvs/staticProperty.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/expr/variable.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/constantString.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/docString.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/docStringNewlines.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/encapsedNegVarOffset.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/encapsedString.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/float.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/int.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/invalidOctal.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/magicConst.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/scalar/unicodeEscape.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/semiReserved.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/blocklessStatement.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/abstract.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/anonymous.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/conditional.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/constModifierErrors.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/constModifiers.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/final.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/implicitPublic.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/interface.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/modifier.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/name.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/php4Style.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/simple.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/staticMethod.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/class/trait.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/const.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/controlFlow.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/declare.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/echo.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/builtinTypeDeclarations.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/byRef.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/conditional.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/defaultValues.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/nullableTypes.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/returnTypes.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/specialVars.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/typeDeclarations.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/variadic.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/function/variadicDefaultValue.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/generator/basic.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/generator/yieldPrecedence.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/generator/yieldUnaryPrecedence.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/haltCompiler.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/haltCompilerInvalidSyntax.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/haltCompilerOffset.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/haltCompilerOutermostScope.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/hashbang.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/if.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/inlineHTML.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/loop/do.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/loop/for.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/loop/foreach.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/loop/while.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/multiCatch.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/alias.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/braced.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/commentAfterNamespace.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUse.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUseErrors.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUsePositions.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUseTrailingComma.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/invalidName.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/mix.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/name.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/nested.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/notBraced.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/nsAfterHashbang.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/outsideStmt.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/namespace/outsideStmtInvalid.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/switch.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/tryCatch.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/tryWithoutCatch.test
 create mode 100644 lib/nikic/php-parser/test/code/parser/stmt/unset.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/comments.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/commentsInCommaList.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/anonymousClass.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/arrayDestructuring.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/call.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/closure.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/constant_deref.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/docStrings.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/include.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/intrinsics.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/list.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/literals.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/numbers.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/operators.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/parentheses.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/shortArraySyntax.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/stringEscaping.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/uvs.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/variables.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/expr/yield.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/inlineHTMLandPHPtest.file-test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/onlyInlineHTML.file-test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/onlyPHP.file-test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/alias.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/break_continue.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/class.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/class_const.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/const.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/declare.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/do_while.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/for.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/foreach.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/function_signatures.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/global_static_variables.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/goto.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/groupUse.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/haltCompiler.file-test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/if.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/multiCatch.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/namespaces.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/nullable_types.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/switch.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/throw.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/traitUse.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/tryCatch.test
 create mode 100644 lib/nikic/php-parser/test/code/prettyPrinter/stmt/while.test
 create mode 100644 lib/pear/pear_exception/tests/PEAR/ExceptionTest.php
 create mode 100644 lib/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
 create mode 100644 lib/psr/log/Psr/Log/Test/TestLogger.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/AdapterTestCase.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/ChainAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/NullAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/PdoAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/PredisAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/RedisAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
 create mode 100644 lib/symfony/cache/Tests/CacheItemTest.php
 create mode 100644 lib/symfony/cache/Tests/DoctrineProviderTest.php
 create mode 100644 lib/symfony/cache/Tests/Fixtures/ArrayCache.php
 create mode 100644 lib/symfony/cache/Tests/Fixtures/ExternalAdapter.php
 create mode 100644 lib/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/ApcuCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/ArrayCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/CacheTestCase.php
 create mode 100644 lib/symfony/cache/Tests/Simple/ChainCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/DoctrineCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/FilesystemCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/MemcachedCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/NullCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/PdoCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/Psr6CacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/RedisCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Simple/TraceableCacheTest.php
 create mode 100644 lib/symfony/cache/Tests/Traits/PdoPruneableTrait.php
 create mode 100644 lib/symfony/class-loader/Tests/ApcClassLoaderTest.php
 create mode 100644 lib/symfony/class-loader/Tests/ClassCollectionLoaderTest.php
 create mode 100644 lib/symfony/class-loader/Tests/ClassLoaderTest.php
 create mode 100644 lib/symfony/class-loader/Tests/ClassMapGeneratorTest.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Baz.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/FooBar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Baz.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/A.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/ATrait.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/B.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/BTrait.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CInterface.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CTrait.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/D.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/E.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/F.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/G.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/GInterface.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/DeclaredClass.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/DeclaredInterface.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced/Baz.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithComments.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithDirMagic.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithFileMagic.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithHaltCompiler.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithStrictTypes.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Baz.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Pearlike/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Pearlike/Baz.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Pearlike/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Pearlike/WithComments.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Baz.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/WarmedClass.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/WarmedInterface.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/C/B/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/C/B/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/A/B/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/A/B/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/C/B/Bar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/C/B/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/classmap/SomeClass.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/classmap/SomeInterface.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/classmap/SomeParent.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/classmap/multipleNs.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/classmap/notAClass.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/classmap/notPhpFile.md
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/classmap/sameNsMultipleClasses.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/deps/traits.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/fallback/Namespaced/FooBar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/fallback/Namespaced2/FooBar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/fallback/Pearlike/FooBar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/fallback/Pearlike2/FooBar.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/includepath/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/php5.4/traits.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/php5.5/class_cons.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/psr-4/Class_With_Underscores.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/psr-4/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Class_With_Underscores.php
 create mode 100644 lib/symfony/class-loader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Foo.php
 create mode 100644 lib/symfony/class-loader/Tests/Psr4ClassLoaderTest.php
 create mode 100644 lib/symfony/config/Tests/ConfigCacheFactoryTest.php
 create mode 100644 lib/symfony/config/Tests/ConfigCacheTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/ArrayNodeTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/BooleanNodeTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Builder/ExprBuilderTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Builder/NodeBuilderTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Builder/NumericNodeDefinitionTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Builder/TreeBuilderTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/EnumNodeTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/FinalizationTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/FloatNodeTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/IntegerNodeTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/MergeTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/NormalizationTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/PrototypedArrayNodeTest.php
 create mode 100644 lib/symfony/config/Tests/Definition/ScalarNodeTest.php
 create mode 100644 lib/symfony/config/Tests/DependencyInjection/ConfigCachePassTest.php
 create mode 100644 lib/symfony/config/Tests/Exception/FileLoaderLoadExceptionTest.php
 create mode 100644 lib/symfony/config/Tests/FileLocatorTest.php
 create mode 100644 lib/symfony/config/Tests/Fixtures/Again/foo.xml
 create mode 100644 lib/symfony/config/Tests/Fixtures/BadParent.php
 create mode 100644 lib/symfony/config/Tests/Fixtures/BarNode.php
 create mode 100644 lib/symfony/config/Tests/Fixtures/Builder/BarNodeDefinition.php
 create mode 100644 lib/symfony/config/Tests/Fixtures/Builder/NodeBuilder.php
 create mode 100644 lib/symfony/config/Tests/Fixtures/Builder/VariableNodeDefinition.php
 create mode 100644 lib/symfony/config/Tests/Fixtures/Configuration/ExampleConfiguration.php
 create mode 100644 lib/symfony/config/Tests/Fixtures/Resource/.hiddenFile
 create mode 100644 lib/symfony/config/Tests/Fixtures/Resource/ConditionalClass.php
 create mode 100644 lib/symfony/config/Tests/Fixtures/Util/document_type.xml
 create mode 100644 lib/symfony/config/Tests/Fixtures/Util/invalid.xml
 create mode 100644 lib/symfony/config/Tests/Fixtures/Util/invalid_schema.xml
 create mode 100644 lib/symfony/config/Tests/Fixtures/Util/schema.xsd
 create mode 100644 lib/symfony/config/Tests/Fixtures/Util/valid.xml
 create mode 100644 lib/symfony/config/Tests/Fixtures/foo.xml
 create mode 100644 lib/symfony/config/Tests/Loader/DelegatingLoaderTest.php
 create mode 100644 lib/symfony/config/Tests/Loader/FileLoaderTest.php
 create mode 100644 lib/symfony/config/Tests/Loader/LoaderResolverTest.php
 create mode 100644 lib/symfony/config/Tests/Loader/LoaderTest.php
 create mode 100644 lib/symfony/config/Tests/Resource/ClassExistenceResourceTest.php
 create mode 100644 lib/symfony/config/Tests/Resource/ComposerResourceTest.php
 create mode 100644 lib/symfony/config/Tests/Resource/DirectoryResourceTest.php
 create mode 100644 lib/symfony/config/Tests/Resource/FileExistenceResourceTest.php
 create mode 100644 lib/symfony/config/Tests/Resource/FileResourceTest.php
 create mode 100644 lib/symfony/config/Tests/Resource/GlobResourceTest.php
 create mode 100644 lib/symfony/config/Tests/Resource/ReflectionClassResourceTest.php
 create mode 100644 lib/symfony/config/Tests/Resource/ResourceStub.php
 create mode 100644 lib/symfony/config/Tests/ResourceCheckerConfigCacheTest.php
 create mode 100644 lib/symfony/config/Tests/Util/XmlUtilsTest.php
 create mode 100644 lib/symfony/console/Tests/ApplicationTest.php
 create mode 100644 lib/symfony/console/Tests/Command/CommandTest.php
 create mode 100644 lib/symfony/console/Tests/Command/HelpCommandTest.php
 create mode 100644 lib/symfony/console/Tests/Command/ListCommandTest.php
 create mode 100644 lib/symfony/console/Tests/Command/LockableTraitTest.php
 create mode 100644 lib/symfony/console/Tests/CommandLoader/ContainerCommandLoaderTest.php
 create mode 100644 lib/symfony/console/Tests/CommandLoader/FactoryCommandLoaderTest.php
 create mode 100644 lib/symfony/console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
 create mode 100644 lib/symfony/console/Tests/Descriptor/AbstractDescriptorTest.php
 create mode 100644 lib/symfony/console/Tests/Descriptor/ApplicationDescriptionTest.php
 create mode 100644 lib/symfony/console/Tests/Descriptor/JsonDescriptorTest.php
 create mode 100644 lib/symfony/console/Tests/Descriptor/MarkdownDescriptorTest.php
 create mode 100644 lib/symfony/console/Tests/Descriptor/ObjectsProvider.php
 create mode 100644 lib/symfony/console/Tests/Descriptor/TextDescriptorTest.php
 create mode 100644 lib/symfony/console/Tests/Descriptor/XmlDescriptorTest.php
 create mode 100644 lib/symfony/console/Tests/EventListener/ErrorListenerTest.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/BarBucCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DescriptorApplication1.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DescriptorApplication2.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DescriptorApplicationMbString.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DescriptorCommand1.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DescriptorCommand2.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DescriptorCommand3.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DescriptorCommand4.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DescriptorCommandMbString.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/DummyOutput.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Foo1Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Foo2Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Foo3Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Foo4Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Foo5Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Foo6Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooHiddenCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooLock2Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooLockCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooOptCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooSameCaseLowercaseCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooSameCaseUppercaseCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooSubnamespaced1Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FooSubnamespaced2Command.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/FoobarCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_12.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_13.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_14.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_15.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_16.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_17.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/interactive_output_1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_12.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_13.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_14.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_15.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_16.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_17.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/TestAmbiguousCommandRegistering.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/TestCommand.php
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_1.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_1.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_1.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_2.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_2.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_2.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_filtered_namespace.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_gethelp.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_mbstring.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_mbstring.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception3.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception3decorated.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception4.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception_escapeslines.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_renderexception_linebreaks.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_run1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_run2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_run3.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/application_run4.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_1.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_1.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_1.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_2.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_2.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_2.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_mbstring.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/command_mbstring.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_1.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_1.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_1.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_2.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_2.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_2.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_3.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_3.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_3.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_3.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_4.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_4.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_4.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_4.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_with_style.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_with_style.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_with_style.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_argument_with_style.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_1.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_1.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_1.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_2.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_2.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_2.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_3.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_3.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_3.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_3.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_4.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_4.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_4.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_definition_4.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_1.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_1.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_1.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_1.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_2.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_2.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_2.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_2.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_3.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_3.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_3.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_3.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_4.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_4.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_4.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_4.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_5.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_5.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_5.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_5.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_6.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_6.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_6.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_6.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_style.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_style.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_style.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_style.xml
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_style_array.json
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_style_array.md
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_style_array.txt
 create mode 100644 lib/symfony/console/Tests/Fixtures/input_option_with_style_array.xml
 create mode 100644 lib/symfony/console/Tests/Formatter/OutputFormatterStyleStackTest.php
 create mode 100644 lib/symfony/console/Tests/Formatter/OutputFormatterStyleTest.php
 create mode 100644 lib/symfony/console/Tests/Formatter/OutputFormatterTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/AbstractQuestionHelperTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/FormatterHelperTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/HelperSetTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/HelperTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/ProcessHelperTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/ProgressBarTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/ProgressIndicatorTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/QuestionHelperTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/TableStyleTest.php
 create mode 100644 lib/symfony/console/Tests/Helper/TableTest.php
 create mode 100644 lib/symfony/console/Tests/Input/ArgvInputTest.php
 create mode 100644 lib/symfony/console/Tests/Input/ArrayInputTest.php
 create mode 100644 lib/symfony/console/Tests/Input/InputArgumentTest.php
 create mode 100644 lib/symfony/console/Tests/Input/InputDefinitionTest.php
 create mode 100644 lib/symfony/console/Tests/Input/InputOptionTest.php
 create mode 100644 lib/symfony/console/Tests/Input/InputTest.php
 create mode 100644 lib/symfony/console/Tests/Input/StringInputTest.php
 create mode 100644 lib/symfony/console/Tests/Logger/ConsoleLoggerTest.php
 create mode 100644 lib/symfony/console/Tests/Output/ConsoleOutputTest.php
 create mode 100644 lib/symfony/console/Tests/Output/NullOutputTest.php
 create mode 100644 lib/symfony/console/Tests/Output/OutputTest.php
 create mode 100644 lib/symfony/console/Tests/Output/StreamOutputTest.php
 create mode 100644 lib/symfony/console/Tests/Question/ChoiceQuestionTest.php
 create mode 100644 lib/symfony/console/Tests/Question/ConfirmationQuestionTest.php
 create mode 100644 lib/symfony/console/Tests/Style/SymfonyStyleTest.php
 create mode 100644 lib/symfony/console/Tests/TerminalTest.php
 create mode 100644 lib/symfony/console/Tests/Tester/ApplicationTesterTest.php
 create mode 100644 lib/symfony/console/Tests/Tester/CommandTesterTest.php
 create mode 100644 lib/symfony/css-selector/Tests/CssSelectorConverterTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/AbstractNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/AttributeNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/ClassNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/CombinedSelectorNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/ElementNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/FunctionNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/HashNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/NegationNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/PseudoNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/SelectorNodeTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Node/SpecificityTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Handler/AbstractHandlerTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Handler/CommentHandlerTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Handler/HashHandlerTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Handler/IdentifierHandlerTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Handler/NumberHandlerTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Handler/StringHandlerTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Handler/WhitespaceHandlerTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/ParserTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/ReaderTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Shortcut/ClassParserTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Shortcut/ElementParserTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Shortcut/EmptyStringParserTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/Shortcut/HashParserTest.php
 create mode 100644 lib/symfony/css-selector/Tests/Parser/TokenStreamTest.php
 create mode 100644 lib/symfony/css-selector/Tests/XPath/Fixtures/ids.html
 create mode 100644 lib/symfony/css-selector/Tests/XPath/Fixtures/lang.xml
 create mode 100644 lib/symfony/css-selector/Tests/XPath/Fixtures/shakespear.html
 create mode 100644 lib/symfony/css-selector/Tests/XPath/TranslatorTest.php
 create mode 100644 lib/symfony/debug/Resources/ext/tests/001.phpt
 create mode 100644 lib/symfony/debug/Resources/ext/tests/002.phpt
 create mode 100644 lib/symfony/debug/Resources/ext/tests/002_1.phpt
 create mode 100644 lib/symfony/debug/Resources/ext/tests/003.phpt
 create mode 100644 lib/symfony/debug/Tests/DebugClassLoaderTest.php
 create mode 100644 lib/symfony/debug/Tests/ErrorHandlerTest.php
 create mode 100644 lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php
 create mode 100644 lib/symfony/debug/Tests/ExceptionHandlerTest.php
 create mode 100644 lib/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
 create mode 100644 lib/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
 create mode 100644 lib/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/AnnotatedClass.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/ClassAlias.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/DefinitionInEvaluatedCode.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/DeprecatedClass.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/DeprecatedInterface.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/ExtendedFinalMethod.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/FinalClasses.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/FinalMethod.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/FinalMethod2Trait.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/InternalClass.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/InternalInterface.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/InternalTrait.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/InternalTrait2.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/LoggerThatSetAnErrorHandler.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/NonDeprecatedInterface.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/PEARClass.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/Throwing.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/ToStringThrower.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/TraitWithInternalMethod.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/casemismatch.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/notPsr0Bis.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures/reallyNotPsr0.php
 create mode 100644 lib/symfony/debug/Tests/Fixtures2/RequiredTwice.php
 create mode 100644 lib/symfony/debug/Tests/HeaderMock.php
 create mode 100644 lib/symfony/debug/Tests/phpt/debug_class_loader.phpt
 create mode 100644 lib/symfony/debug/Tests/phpt/decorate_exception_hander.phpt
 create mode 100644 lib/symfony/debug/Tests/phpt/exception_rethrown.phpt
 create mode 100644 lib/symfony/debug/Tests/phpt/fatal_with_nested_handlers.phpt
 create mode 100644 lib/symfony/dependency-injection/Tests/Argument/RewindableGeneratorTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ChildDefinitionTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/AutoAliasServicePassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/AutowireExceptionPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/CheckArgumentsValidityPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/CheckCircularReferencesPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/CheckReferenceValidityPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/DecoratorServicePassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ExtensionCompilerPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/FactoryReturnTypePassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/IntegrationTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/OptionalServiceClass.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/PassConfigTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveClassPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveFactoryClassPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveHotPathPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveInvalidReferencesPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolvePrivatesPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Compiler/ServiceLocatorTagPassTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Config/AutowireServiceResourceTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceCheckerTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ContainerBuilderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ContainerTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/CrossCheckTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/DefinitionTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Dumper/GraphvizDumperTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Dumper/XmlDumperTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Dumper/YamlDumperTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/EnvVarProcessorTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Extension/ExtensionTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Bar.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/BarInterface.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/CaseSensitiveClass.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithMandatoryArgumentsContainer.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithOptionalArgumentsContainer.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithoutArgumentsContainer.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Container/NoConstructorContainer.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/CustomDefinition.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/DeprecatedClass.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/FactoryDummy.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/FactoryDummyWithoutReturnTypes.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/FooForCircularWithAddCalls.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/NamedArgumentsDummy.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ParentNotExists.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/BadClasses/MissingParent.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Foo.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/FooInterface.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/AnotherSub/DeeperBaz.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Baz.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir1/Service1.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir2/Service2.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir1/Service4.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir2/Service5.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Sub/Bar.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Sub/BarInterface.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ScalarFactory.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/SimilarArgumentsDummy.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/StubbedTranslator.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/TestDefinition1.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/TestDefinition2.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/TestServiceSubscriber.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/array.json
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/basic.expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/basic.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/child.expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/child.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/defaults.expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/defaults.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/factory_short_notation.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/instanceof.expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/instanceof.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/php7.expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/php7.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/prototype.expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/prototype.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/services9.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/config/services_autoconfigure_with_parent.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/CustomContainer.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container10.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container11.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container12.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container13.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container14.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container15.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container16.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container17.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container19.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container21.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container24.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container33.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container8.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container9.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container_abstract.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container_almost_circular.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container_env_in_id.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container_inline_requires.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/containers/container_uninitialized_ref.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/directory/import/import.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/directory/recurse/simple.ini
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/directory/recurse/simple.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/directory/simple.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services1.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services10-1.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services10.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services13.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services14.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services17.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services18.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services9.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services_inline.dot
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/FooVariadic.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C1.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C2.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C3.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/I1.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/P1.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/T1.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectExtension.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtension.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/autowiring_classes.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/classes.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/createphar.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/foo.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/includes/schema/project-1.0.xsd
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ini/almostvalid.ini
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ini/ini_with_wrong_ext.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ini/nonvalid.ini
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters.ini
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters1.ini
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters2.ini
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/ini/types.ini
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_without_constructor.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/php_with_wrong_ext.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services1-1.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services1.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services10.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services12.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services13.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services19.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services24.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services26.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services33.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services8.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services9.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services9_as_files.txt
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services9_compiled.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_adawson.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_private.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_public.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_array_params.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_base64_env.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_dedup_lazy_proxy.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_deep_graph.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_env_in_id.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_requires.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_self_ref.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_legacy_privates.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_locator.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_non_shared_lazy.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_frozen.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_in_expression.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_rot13_env.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_subscriber.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_tsantos.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_uninitialized_ref.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/services_unsupported_characters.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/php/simple.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/class_from_id.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/defaults_bindings.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/defaults_bindings2.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extension1/services.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extension2/services.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services1.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services2.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services3.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services4.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services5.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services6.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services7.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/legacy_invalid_alias_definition.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/namespaces.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/nested_service_without_id.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/nonvalid.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services1.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services10.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services13.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services14.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services2.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services21.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services22.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services23.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services24.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services28.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services3.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services4.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services4_bad_import.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services5.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services7.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services8.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services9.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_abstract.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_autoconfigure.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_autoconfigure_with_parent.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_bindings.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_defaults_with_parent.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_deprecated.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_dump_load.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_inline_not_candidate.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_instanceof.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_instanceof_with_parent.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_named_args.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_prototype.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_tsantos.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/services_without_id.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/tag_with_empty_name.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/tag_without_name.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/with_key_outside_collection.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/withdoctype.xml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/xml/xml_with_wrong_ext.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_alias.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_in_instanceof.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_in_parameters.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_calls.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_decorates.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_empty_defaults.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_empty_instanceof.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_format.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_import.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_imports.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_parameters.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_service.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_services.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_types1.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_types2.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag1.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag2.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag3.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/bar/services.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/class_from_id.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/defaults_bindings.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/defaults_bindings2.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/foo/services.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/_child.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/main.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/_child.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/main.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/_child.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/main.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/child_parent/expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/child_parent/main.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_child_tags/expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_child_tags/main.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/main.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/_child.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/main.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/_child.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/expected.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/main.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/legacy_invalid_alias_definition.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/legacy_invalid_definition.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/nonvalid1.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/nonvalid2.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/null_config.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services1.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services10.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services11.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services13.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services14.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services2.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services21.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services22.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services23.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services24.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services26.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services28.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services3.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services31_invalid_tags.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services4.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services4_bad_import.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services7.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services8.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services9.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_adawson.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_autoconfigure.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_autoconfigure_with_parent.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_bindings.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_configurator_short_syntax.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_deep_graph.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_defaults_with_parent.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_dump_load.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_inline.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_instanceof.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_instanceof_with_parent.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_legacy_privates.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_named_args.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype_namespace.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype_namespace_without_resource.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_underscore.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_empty_string.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_no_string.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_only.yml
 create mode 100644 lib/symfony/dependency-injection/Tests/Fixtures/yaml/yaml_with_wrong_ext.ini
 create mode 100644 lib/symfony/dependency-injection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/ClosureLoaderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/DirectoryLoaderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/GlobFileLoaderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/IniFileLoaderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/LoaderResolverTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/PhpFileLoaderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ParameterBag/FrozenParameterBagTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ParameterTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ReferenceTest.php
 create mode 100644 lib/symfony/dependency-injection/Tests/ServiceLocatorTest.php
 create mode 100644 lib/symfony/dotenv/Tests/DotenvTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/Debug/WrappedListenerTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/EventDispatcherTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/EventTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/GenericEventTest.php
 create mode 100644 lib/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
 create mode 100644 lib/symfony/filesystem/Tests/ExceptionTest.php
 create mode 100644 lib/symfony/filesystem/Tests/FilesystemTest.php
 create mode 100644 lib/symfony/filesystem/Tests/FilesystemTestCase.php
 create mode 100644 lib/symfony/filesystem/Tests/Fixtures/MockStream/MockStream.php
 create mode 100644 lib/symfony/filesystem/Tests/LockHandlerTest.php
 create mode 100644 lib/symfony/finder/Tests/Comparator/ComparatorTest.php
 create mode 100644 lib/symfony/finder/Tests/Comparator/DateComparatorTest.php
 create mode 100644 lib/symfony/finder/Tests/Comparator/NumberComparatorTest.php
 create mode 100644 lib/symfony/finder/Tests/FinderTest.php
 create mode 100644 lib/symfony/finder/Tests/Fixtures/.dot/a
 create mode 100644 lib/symfony/finder/Tests/Fixtures/.dot/b/c.neon
 create mode 100644 lib/symfony/finder/Tests/Fixtures/.dot/b/d.neon
 create mode 100644 lib/symfony/finder/Tests/Fixtures/A/B/C/abc.dat
 create mode 100644 lib/symfony/finder/Tests/Fixtures/A/B/ab.dat
 create mode 100644 lib/symfony/finder/Tests/Fixtures/A/a.dat
 create mode 100644 lib/symfony/finder/Tests/Fixtures/copy/A/B/C/abc.dat.copy
 create mode 100644 lib/symfony/finder/Tests/Fixtures/copy/A/B/ab.dat.copy
 create mode 100644 lib/symfony/finder/Tests/Fixtures/copy/A/a.dat.copy
 create mode 100644 lib/symfony/finder/Tests/Fixtures/dolor.txt
 create mode 100644 lib/symfony/finder/Tests/Fixtures/ipsum.txt
 create mode 100644 lib/symfony/finder/Tests/Fixtures/lorem.txt
 create mode 100644 lib/symfony/finder/Tests/Fixtures/one/.dot
 create mode 100644 lib/symfony/finder/Tests/Fixtures/one/a
 create mode 100644 lib/symfony/finder/Tests/Fixtures/one/b/c.neon
 create mode 100644 lib/symfony/finder/Tests/Fixtures/one/b/d.neon
 create mode 100644 lib/symfony/finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat
 create mode 100644 lib/symfony/finder/Tests/Fixtures/with space/foo.txt
 create mode 100644 lib/symfony/finder/Tests/GlobTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/DepthRangeFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/FileTypeFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/FilecontentFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/FilenameFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/FilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/Iterator.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/IteratorTestCase.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/MockFileListIterator.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/MockSplFileInfo.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
 create mode 100644 lib/symfony/finder/Tests/Iterator/SortableIteratorTest.php
 create mode 100644 lib/symfony/framework-bundle/Test/ForwardCompatTestTrait.php
 create mode 100644 lib/symfony/framework-bundle/Test/KernelTestCase.php
 create mode 100644 lib/symfony/framework-bundle/Test/WebTestCase.php
 create mode 100644 lib/symfony/framework-bundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/CacheWarmer/ClassCacheCacheWarmerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/CacheWarmer/TemplateFinderTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/ClientTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/Fixture/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/CachePruneCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/RouterDebugCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/RouterMatchCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/TranslationDebugCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/TranslationUpdateCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Command/YamlLintCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Console/ApplicationTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Console/Descriptor/JsonDescriptorTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Console/Descriptor/MarkdownDescriptorTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Console/Descriptor/ObjectsProvider.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Console/Descriptor/TextDescriptorTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Console/Descriptor/XmlDescriptorTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Controller/AbstractControllerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Controller/ControllerNameParserTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Controller/ControllerResolverTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Controller/ControllerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Controller/ControllerTraitTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Controller/RedirectControllerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Controller/TemplateControllerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CacheCollectorPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ControllerArgumentValueResolverPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/FormPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/ConfigurationTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serialization.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serialization.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/files/foo.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/files/foo.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/files/foo.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/files/foo.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/cache.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/csrf.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/default_config.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/full.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/php_errors_disabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/php_errors_enabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/profiler.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/property_accessor.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/property_info.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/request.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_disabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_enabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/session.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_disabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_assets_disabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_disabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_enabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/translator_fallbacks.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_annotations.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_mapping.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/web_link.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_arguments_and_service.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_type_and_service.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_without_support_and_support_strategy.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_without_type.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/translations/test_paths.en.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets_version_strategy_as_service.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/cache.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf_disabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf_needs_session.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/default_config.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_sets_field_name.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/full.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/php_errors_disabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/php_errors_enabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/profiler.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/property_accessor.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/property_info.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/request.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_disabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_enabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_mapping.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/session.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_disabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_disabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_enabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/translator_fallbacks.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_annotations.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_mapping.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_multiple_static_methods.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_no_static_method.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/web_link.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_arguments_and_service.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_type_and_service.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_without_support_and_support_strategy.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_without_type.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets_disabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets_version_strategy_as_service.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/cache.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/cache_env_var.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/csrf.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/csrf_needs_session.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/default_config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/esi_and_ssi_without_fragments.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/esi_disabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/form_no_csrf.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/full.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/lock.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/php_errors_disabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/php_errors_enabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/profiler.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/property_accessor.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/property_info.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/request.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_disabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_enabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_legacy_cache.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_mapping.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/session.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/ssi_disabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_disabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_assets_disabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_translator_disabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_translator_enabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/translator_fallbacks.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_annotations.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_mapping.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_multiple_static_methods.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_no_static_method.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_translation_domain.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/web_link.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_arguments_and_service.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_type_and_service.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_without_support_and_support_strategy.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_enabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled_named_workflows.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_without_type.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/FrameworkExtensionTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/YamlFrameworkExtensionTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/config/serializer/foo.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/config/validator/foo.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/DependencyInjection/translations/test_default.en.xlf
 create mode 100644 lib/symfony/framework-bundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/BaseBundle.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/base.format.engine
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/controller/base.format.engine
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/this.is.a.template.format.engine
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/DeclaredClass.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.json
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.md
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.txt
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Resources/BaseBundle/views/base.format.engine
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Resources/BaseBundle/views/controller/custom.format.engine
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Resources/translations/messages.fr.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/resource.format.engine
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/this.is.a.template.format.engine
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/translation.html.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Author.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Person.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/author.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/does_not_exist.yaml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/person.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TemplatePathsCache/templates-empty.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TemplatePathsCache/templates.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/Controller/DefaultController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/FabpotFooBundle.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/DefaultController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/Sub/DefaultController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/Test/DefaultController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/FooBundle.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/Controller/DefaultController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/SensioCmsFooBundle.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/Controller/DefaultController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/SensioFooBundle.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/Article.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/Author.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/Category.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/Person.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/author.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/categories.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/does_not_exist.yaml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/person.xml
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/Validation/SubCategory.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/WarmedClass.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Fixtures/templates.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/AbstractWebTestCase.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/AnnotatedControllerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/AutowiringTypesTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestServiceResolutionController.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/Config/CustomConfig.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/Configuration.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/CachePoolClearCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/CachePoolsTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/ConfigDebugCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/ContainerDebugCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/ContainerDumpTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/DebugAutowiringCommandTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/FragmentTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/ProfilerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/PropertyInfoTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/SerializerTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/SessionTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/SubRequestsTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/routing.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/AppKernel.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/no_annotations_cache.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/CachePoolClear/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/CachePoolClear/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/CachePools/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/CachePools/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/CachePools/redis_config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/CachePools/redis_custom_config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ConfigDump/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ConfigDump/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ContainerDebug/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ContainerDebug/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ContainerDump/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ContainerDump/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/routing.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Fragment/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Fragment/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Fragment/routing.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Profiler/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Profiler/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Profiler/routing.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Resources/views/fragment.html.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Serializer/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Serializer/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Session/bundles.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Session/config.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/Session/routing.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/config/default.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Functional/app/config/framework.yml
 create mode 100644 lib/symfony/framework-bundle/Tests/Kernel/ConcreteMicroKernel.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Kernel/MicroKernelTraitTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Routing/DelegatingLoaderTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Routing/RedirectableUrlMatcherTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Routing/RouterTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/DelegatingEngineTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/GlobalVariablesTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/AssetsHelperTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/Fixtures/StubTranslator.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/RequestHelperTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Child/form_label.html.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_names_entry_label.html.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_text_id_widget.html.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Parent/form_label.html.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/SessionHelperTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Helper/StopwatchHelperTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/Loader/TemplateLocatorTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/PhpEngineTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/TemplateFilenameParserTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/TemplateNameParserTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/TemplateReferenceTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/TemplateTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Templating/TimedPhpEngineTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/TestCase.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Translation/PhpExtractorTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Translation/TranslatorTest.php
 create mode 100644 lib/symfony/framework-bundle/Tests/Validator/ConstraintValidatorFactoryTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/AcceptHeaderItemTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/AcceptHeaderTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/ApacheRequestTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/BinaryFileResponseTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/CookieTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/ExpressionRequestMatcherTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/File/FakeFile.php
 create mode 100644 lib/symfony/http-foundation/Tests/File/FileTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/File/Fixtures/-test
 create mode 100644 lib/symfony/http-foundation/Tests/File/Fixtures/.unknownextension
 create mode 100644 lib/symfony/http-foundation/Tests/File/Fixtures/case-sensitive-mime-type.xlsm
 create mode 100644 lib/symfony/http-foundation/Tests/File/Fixtures/directory/.empty
 create mode 100644 lib/symfony/http-foundation/Tests/File/Fixtures/other-file.example
 create mode 100644 lib/symfony/http-foundation/Tests/File/Fixtures/test
 create mode 100644 lib/symfony/http-foundation/Tests/File/Fixtures/test.gif
 create mode 100644 lib/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/File/UploadedFileTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/FileBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.php
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.php
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.php
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.php
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php
 create mode 100644 lib/symfony/http-foundation/Tests/HeaderBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/IpUtilsTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/JsonResponseTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/ParameterBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/RedirectResponseTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/RequestMatcherTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/RequestStackTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/RequestTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/ResponseFunctionalTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/ResponseTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/ResponseTestCase.php
 create mode 100644 lib/symfony/http-foundation/Tests/ServerBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Attribute/AttributeBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/SessionTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/common.inc
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/read_only.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/read_only.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.expected
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/MetadataBagTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/StreamedResponseTest.php
 create mode 100644 lib/symfony/http-foundation/Tests/schema/http-status-codes.rng
 create mode 100644 lib/symfony/http-foundation/Tests/schema/iana-registry.rng
 create mode 100644 lib/symfony/http-kernel/Tests/Bundle/BundleTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/CacheClearer/ChainCacheClearerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/ClientTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Config/EnvParametersResourceTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Config/FileLocatorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/Compiler.log
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/DataCollectorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/ExceptionDataCollectorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DataCollector/Util/ValueExporterTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Debug/FileLinkFormatterTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/LoggerPassTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/DependencyInjection/ServicesResetterTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Event/FilterControllerArgumentsEventTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Event/GetResponseForExceptionEventTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/AddRequestFormatsListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/DebugHandlersListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/DumpListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/LocaleListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/ResponseListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/SaveSessionListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/SurrogateListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/TranslatorListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/AccessDeniedHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/BadRequestHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/ConflictHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/GoneHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/HttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/LengthRequiredHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/NotAcceptableHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/NotFoundHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/123/Kernel123.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/BaseBundle/Resources/foo.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/BaseBundle/Resources/hide.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/Resources/foo.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/bar.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/foo.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Bundle2Bundle/foo.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ChildBundle/Resources/foo.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ChildBundle/Resources/hide.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ClearableService.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Controller/BasicTypesController.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Controller/ExtendingRequest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Controller/ExtendingSession.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Controller/NullableController.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Controller/VariadicController.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ExtensionAbsentBundle/ExtensionAbsentBundle.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ExtensionNotValidBundle/DependencyInjection/ExtensionNotValidExtension.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ExtensionNotValidBundle/ExtensionNotValidBundle.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/Command/FooCommand.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/ExtensionPresentBundle.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/KernelForOverrideName.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/KernelWithoutBundles.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/ResettableService.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Resources/BaseBundle/hide.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Resources/Bundle1Bundle/foo.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Resources/ChildBundle/foo.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/Resources/FooBundle/foo.txt
 create mode 100644 lib/symfony/http-kernel/Tests/Fixtures/TestClient.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/EsiTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/HttpCacheTestCase.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/ResponseCacheStrategyTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/SsiTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/StoreTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/SubRequestHandlerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/TestHttpKernel.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpCache/TestMultipleHttpKernel.php
 create mode 100644 lib/symfony/http-kernel/Tests/HttpKernelTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/KernelTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Log/LoggerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Logger.php
 create mode 100644 lib/symfony/http-kernel/Tests/Profiler/FileProfilerStorageTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/Profiler/ProfilerTest.php
 create mode 100644 lib/symfony/http-kernel/Tests/TestHttpKernel.php
 create mode 100644 lib/symfony/http-kernel/Tests/UriSignerTest.php
 create mode 100644 lib/symfony/routing/Tests/Annotation/RouteTest.php
 create mode 100644 lib/symfony/routing/Tests/CompiledRouteTest.php
 create mode 100644 lib/symfony/routing/Tests/DependencyInjection/RoutingResolverPassTest.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/AbstractClass.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/BarClass.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/BazClass.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/EncodingClass.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/FooClass.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/CustomCompiledRoute.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/CustomRouteCompiler.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/AnonymousClassInTrait.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/NoStartTagClass.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/VariadicClass.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/RedirectableUrlMatcher.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/annotated.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/bad_format.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/bar.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/import__controller.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/import__controller.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/import_controller.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/import_controller.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/import_override_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/import_override_defaults.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/override_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/override_defaults.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/routing.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/controller/routing.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/directory/recurse/routes1.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/directory/recurse/routes2.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/directory/routes3.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/directory_import/import.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/empty.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/file_resource.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/foo.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/foo1.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/bar.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/bar.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/baz.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/baz.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/import_multiple.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/import_multiple.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/import_single.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/import_single.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/php_dsl.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/php_dsl_bar.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/glob/php_dsl_baz.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/incomplete.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/list_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/list_in_list_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/list_in_map_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/list_null_values.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/localized/utf8.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/map_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/map_in_list_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/map_in_map_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/map_null_values.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/missing_id.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/missing_path.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/namespaceprefix.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/nonesense_resource_plus_path.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/nonesense_type_without_resource.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/nonvalid.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/nonvalid.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/nonvalid2.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/nonvalidkeys.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/nonvalidnode.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/nonvalidroute.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/null_values.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/php_dsl.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/php_dsl_sub.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/scalar_defaults.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/special_route_name.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/validpattern.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/validpattern.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/validpattern.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/validresource.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/validresource.xml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/validresource.yml
 create mode 100644 lib/symfony/routing/Tests/Fixtures/with_define_path_variable.php
 create mode 100644 lib/symfony/routing/Tests/Fixtures/withdoctype.xml
 create mode 100644 lib/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
 create mode 100644 lib/symfony/routing/Tests/Generator/UrlGeneratorTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/AbstractAnnotationLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/AnnotationFileLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/ClosureLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/DirectoryLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/GlobFileLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/ObjectRouteLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/PhpFileLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
 create mode 100644 lib/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
 create mode 100644 lib/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php
 create mode 100644 lib/symfony/routing/Tests/Matcher/Dumper/DumperCollectionTest.php
 create mode 100644 lib/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
 create mode 100644 lib/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
 create mode 100644 lib/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php
 create mode 100644 lib/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php
 create mode 100644 lib/symfony/routing/Tests/Matcher/UrlMatcherTest.php
 create mode 100644 lib/symfony/routing/Tests/RequestContextTest.php
 create mode 100644 lib/symfony/routing/Tests/RouteCollectionBuilderTest.php
 create mode 100644 lib/symfony/routing/Tests/RouteCollectionTest.php
 create mode 100644 lib/symfony/routing/Tests/RouteCompilerTest.php
 create mode 100644 lib/symfony/routing/Tests/RouteTest.php
 create mode 100644 lib/symfony/routing/Tests/RouterTest.php
 create mode 100644 lib/symfony/stopwatch/Tests/StopwatchEventTest.php
 create mode 100644 lib/symfony/stopwatch/Tests/StopwatchPeriodTest.php
 create mode 100644 lib/symfony/stopwatch/Tests/StopwatchTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/AppVariableTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Command/DebugCommandTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Command/LintCommandTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3LayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap4LayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/CodeExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/DumpExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/ExpressionExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/StubFilesystemLoader.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/StubTranslator.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/child_label.html.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/parent_label.html.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme.html.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme_use.html.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/FormExtensionDivLayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/FormExtensionTableLayoutTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/FormExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/HttpFoundationExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/HttpKernelExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/RoutingExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/RuntimeLoaderProvider.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/StopwatchExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/TranslationExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/WebLinkExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Extension/WorkflowExtensionTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Fixtures/extractor/syntax_error.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Fixtures/extractor/with_translations.html.twig
 create mode 100644 lib/symfony/twig-bridge/Tests/Node/DumpNodeTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Node/FormThemeTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Node/SearchAndRenderBlockNodeTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Node/TransNodeTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/NodeVisitor/ScopeTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/NodeVisitor/TranslationNodeVisitorTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/NodeVisitor/TwigNodeProvider.php
 create mode 100644 lib/symfony/twig-bridge/Tests/TokenParser/FormThemeTokenParserTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/Translation/TwigExtractorTest.php
 create mode 100644 lib/symfony/twig-bridge/Tests/TwigEngineTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/ContainerAwareRuntimeLoaderTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/Controller/ExceptionControllerTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/Controller/PreviewErrorControllerTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigEnvironmentPassTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/ConfigurationTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Resources/TwigBundle/views/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Resources/views/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/customTemplateEscapingGuesser.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/empty.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/extra.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/formats.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/full.php
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/bundles/BarBundle/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/bundles/TwigBundle/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/customTemplateEscapingGuesser.xml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/empty.xml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/extra.xml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/formats.xml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/full.xml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/customTemplateEscapingGuesser.yml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/empty.yml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/extra.yml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/formats.yml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/full.yml
 create mode 100644 lib/symfony/twig-bundle/Tests/DependencyInjection/TwigExtensionTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/Fixtures/templates/BarBundle/Resources/views/index.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/Fixtures/templates/Foo/index.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/BarBundle/views/base.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/views/layout.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/views/sub/sub.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/Functional/CacheWarmingTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/Functional/EmptyAppTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/Functional/NoTemplatingEntryTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/Functional/Resources/config/empty_routing.yml
 create mode 100644 lib/symfony/twig-bundle/Tests/Functional/Resources/views/index.html.twig
 create mode 100644 lib/symfony/twig-bundle/Tests/Loader/FilesystemLoaderTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/TemplateIteratorTest.php
 create mode 100644 lib/symfony/twig-bundle/Tests/TestCase.php
 create mode 100644 lib/symfony/var-dumper/Test/VarDumperTestTrait.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/CasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/DateCasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/PdoCasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/SplCasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/StubCasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Caster/XmlReaderCasterTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Cloner/DataTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Cloner/VarClonerTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Dumper/CliDumperTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Dumper/FunctionsTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php
 create mode 100644 lib/symfony/var-dumper/Tests/Fixtures/FooInterface.php
 create mode 100644 lib/symfony/var-dumper/Tests/Fixtures/GeneratorDemo.php
 create mode 100644 lib/symfony/var-dumper/Tests/Fixtures/NotLoadableClass.php
 create mode 100644 lib/symfony/var-dumper/Tests/Fixtures/Php74.php
 create mode 100644 lib/symfony/var-dumper/Tests/Fixtures/Twig.php
 create mode 100644 lib/symfony/var-dumper/Tests/Fixtures/dumb-var.php
 create mode 100644 lib/symfony/var-dumper/Tests/Fixtures/xml_reader.xml
 create mode 100644 lib/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/Controller/ProfilerControllerTest.php
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/DependencyInjection/ConfigurationTest.php
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/EventListener/WebDebugToolbarListenerTest.php
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/Fixtures/profile.data
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/Profiler/TemplateManagerTest.php
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/Resources/IconTest.php
 create mode 100644 lib/symfony/web-profiler-bundle/Tests/TestCase.php
 create mode 100644 lib/symfony/yaml/Tests/Command/LintCommandTest.php
 create mode 100644 lib/symfony/yaml/Tests/DumperTest.php
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/arrow.gif
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/booleanMappingKeys.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/embededPhp.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/index.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/legacyBooleanMappingKeys.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/legacyNonStringKeys.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/legacyNullMappingKey.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block_leading_space_in_first_line.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/nonStringKeys.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/not_readable.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/nullMappingKey.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/numericMappingKeys.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/sfComments.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/sfCompact.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/sfObjects.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/sfQuotes.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/sfTests.yml
 create mode 100644 lib/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
 create mode 100644 lib/symfony/yaml/Tests/InlineTest.php
 create mode 100644 lib/symfony/yaml/Tests/ParseExceptionTest.php
 create mode 100644 lib/symfony/yaml/Tests/ParserTest.php
 create mode 100644 lib/symfony/yaml/Tests/YamlTest.php
 create mode 100644 lib/twig/twig/lib/Twig/Test/Function.php
 create mode 100644 lib/twig/twig/lib/Twig/Test/IntegrationTestCase.php
 create mode 100644 lib/twig/twig/lib/Twig/Test/Method.php
 create mode 100644 lib/twig/twig/lib/Twig/Test/Node.php
 create mode 100644 lib/twig/twig/lib/Twig/Test/NodeTestCase.php

diff --git a/.gitignore b/.gitignore
index fc9107066..51f650a97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,12 +15,6 @@
 # composer reserver directory, from sources, populate/update using "composer install"
 vendor/*
 test/vendor/*
-# remove tests from libs (N°2651)
-/lib/**/test/**
-/lib/**/tests/**
-/lib/**/Test/**
-/lib/**/Tests/**
-!/lib/twig/**/Expression/Test/**
 
 # all datas but listing prevention
 /data/**
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 79227041e..72abb91b0 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -596,6 +596,9 @@ return array(
     'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
     'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
     'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
+    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
     'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
     'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
     'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',
@@ -835,6 +838,9 @@ return array(
     'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser' => $vendorDir . '/symfony/framework-bundle/Templating/TemplateNameParser.php',
     'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference' => $vendorDir . '/symfony/framework-bundle/Templating/TemplateReference.php',
     'Symfony\\Bundle\\FrameworkBundle\\Templating\\TimedPhpEngine' => $vendorDir . '/symfony/framework-bundle/Templating/TimedPhpEngine.php',
+    'Symfony\\Bundle\\FrameworkBundle\\Test\\ForwardCompatTestTrait' => $vendorDir . '/symfony/framework-bundle/Test/ForwardCompatTestTrait.php',
+    'Symfony\\Bundle\\FrameworkBundle\\Test\\KernelTestCase' => $vendorDir . '/symfony/framework-bundle/Test/KernelTestCase.php',
+    'Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase' => $vendorDir . '/symfony/framework-bundle/Test/WebTestCase.php',
     'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor' => $vendorDir . '/symfony/framework-bundle/Translation/PhpExtractor.php',
     'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpStringTokenParser' => $vendorDir . '/symfony/framework-bundle/Translation/PhpStringTokenParser.php',
     'Symfony\\Bundle\\FrameworkBundle\\Translation\\TranslationLoader' => $vendorDir . '/symfony/framework-bundle/Translation/TranslationLoader.php',
@@ -1647,6 +1653,7 @@ return array(
     'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
     'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Dumper/HtmlDumper.php',
     'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+    'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
     'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php',
     'Symfony\\Component\\Yaml\\Command\\LintCommand' => $vendorDir . '/symfony/yaml/Command/LintCommand.php',
     'Symfony\\Component\\Yaml\\Dumper' => $vendorDir . '/symfony/yaml/Dumper.php',
@@ -2049,6 +2056,11 @@ return array(
     'Twig_Test' => $vendorDir . '/twig/twig/lib/Twig/Test.php',
     'Twig_TestCallableInterface' => $vendorDir . '/twig/twig/lib/Twig/TestCallableInterface.php',
     'Twig_TestInterface' => $vendorDir . '/twig/twig/lib/Twig/TestInterface.php',
+    'Twig_Test_Function' => $vendorDir . '/twig/twig/lib/Twig/Test/Function.php',
+    'Twig_Test_IntegrationTestCase' => $vendorDir . '/twig/twig/lib/Twig/Test/IntegrationTestCase.php',
+    'Twig_Test_Method' => $vendorDir . '/twig/twig/lib/Twig/Test/Method.php',
+    'Twig_Test_Node' => $vendorDir . '/twig/twig/lib/Twig/Test/Node.php',
+    'Twig_Test_NodeTestCase' => $vendorDir . '/twig/twig/lib/Twig/Test/NodeTestCase.php',
     'Twig_Token' => $vendorDir . '/twig/twig/lib/Twig/Token.php',
     'Twig_TokenParser' => $vendorDir . '/twig/twig/lib/Twig/TokenParser.php',
     'Twig_TokenParserBroker' => $vendorDir . '/twig/twig/lib/Twig/TokenParserBroker.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index c473bbec4..44b851639 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -826,6 +826,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
         'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
         'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
+        'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+        'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+        'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
         'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
         'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
         'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',
@@ -1065,6 +1068,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TemplateNameParser.php',
         'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TemplateReference.php',
         'Symfony\\Bundle\\FrameworkBundle\\Templating\\TimedPhpEngine' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TimedPhpEngine.php',
+        'Symfony\\Bundle\\FrameworkBundle\\Test\\ForwardCompatTestTrait' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/ForwardCompatTestTrait.php',
+        'Symfony\\Bundle\\FrameworkBundle\\Test\\KernelTestCase' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/KernelTestCase.php',
+        'Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/WebTestCase.php',
         'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/PhpExtractor.php',
         'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpStringTokenParser' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/PhpStringTokenParser.php',
         'Symfony\\Bundle\\FrameworkBundle\\Translation\\TranslationLoader' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/TranslationLoader.php',
@@ -1877,6 +1883,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
         'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/HtmlDumper.php',
         'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+        'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
         'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php',
         'Symfony\\Component\\Yaml\\Command\\LintCommand' => __DIR__ . '/..' . '/symfony/yaml/Command/LintCommand.php',
         'Symfony\\Component\\Yaml\\Dumper' => __DIR__ . '/..' . '/symfony/yaml/Dumper.php',
@@ -2279,6 +2286,11 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Twig_Test' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test.php',
         'Twig_TestCallableInterface' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TestCallableInterface.php',
         'Twig_TestInterface' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TestInterface.php',
+        'Twig_Test_Function' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Function.php',
+        'Twig_Test_IntegrationTestCase' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/IntegrationTestCase.php',
+        'Twig_Test_Method' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Method.php',
+        'Twig_Test_Node' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Node.php',
+        'Twig_Test_NodeTestCase' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/NodeTestCase.php',
         'Twig_Token' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Token.php',
         'Twig_TokenParser' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TokenParser.php',
         'Twig_TokenParserBroker' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TokenParserBroker.php',
diff --git a/lib/nikic/php-parser/test/PhpParser/AutoloaderTest.php b/lib/nikic/php-parser/test/PhpParser/AutoloaderTest.php
new file mode 100644
index 000000000..8eeded839
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/AutoloaderTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace PhpParser;
+
+/* The autoloader is already active at this point, so we only check effects here. */
+
+class AutoloaderTest extends \PHPUnit_Framework_TestCase {
+    public function testClassExists() {
+        $this->assertTrue(class_exists('PhpParser\NodeVisitorAbstract'));
+        $this->assertFalse(class_exists('PHPParser_NodeVisitor_NameResolver'));
+
+        $this->assertFalse(class_exists('PhpParser\FooBar'));
+        $this->assertFalse(class_exists('PHPParser_FooBar'));
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/ClassTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/ClassTest.php
new file mode 100644
index 000000000..0f7418212
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/ClassTest.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment;
+use PhpParser\Node;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt;
+
+class ClassTest extends \PHPUnit_Framework_TestCase
+{
+    protected function createClassBuilder($class) {
+        return new Class_($class);
+    }
+
+    public function testExtendsImplements() {
+        $node = $this->createClassBuilder('SomeLogger')
+            ->extend('BaseLogger')
+            ->implement('Namespaced\Logger', new Name('SomeInterface'))
+            ->implement('\Fully\Qualified', 'namespace\NamespaceRelative')
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Class_('SomeLogger', array(
+                'extends' => new Name('BaseLogger'),
+                'implements' => array(
+                    new Name('Namespaced\Logger'),
+                    new Name('SomeInterface'),
+                    new Name\FullyQualified('Fully\Qualified'),
+                    new Name\Relative('NamespaceRelative'),
+                ),
+            )),
+            $node
+        );
+    }
+
+    public function testAbstract() {
+        $node = $this->createClassBuilder('Test')
+            ->makeAbstract()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Class_('Test', array(
+                'flags' => Stmt\Class_::MODIFIER_ABSTRACT
+            )),
+            $node
+        );
+    }
+
+    public function testFinal() {
+        $node = $this->createClassBuilder('Test')
+            ->makeFinal()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Class_('Test', array(
+                'flags' => Stmt\Class_::MODIFIER_FINAL
+            )),
+            $node
+        );
+    }
+
+    public function testStatementOrder() {
+        $method = new Stmt\ClassMethod('testMethod');
+        $property = new Stmt\Property(
+            Stmt\Class_::MODIFIER_PUBLIC,
+            array(new Stmt\PropertyProperty('testProperty'))
+        );
+        $const = new Stmt\ClassConst(array(
+            new Node\Const_('TEST_CONST', new Node\Scalar\String_('ABC'))
+        ));
+        $use = new Stmt\TraitUse(array(new Name('SomeTrait')));
+
+        $node = $this->createClassBuilder('Test')
+            ->addStmt($method)
+            ->addStmt($property)
+            ->addStmts(array($const, $use))
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Class_('Test', array(
+                'stmts' => array($use, $const, $property, $method)
+            )),
+            $node
+        );
+    }
+
+    public function testDocComment() {
+        $docComment = <<<'DOC'
+/**
+ * Test
+ */
+DOC;
+        $class = $this->createClassBuilder('Test')
+            ->setDocComment($docComment)
+            ->getNode();
+
+        $this->assertEquals(
+            new Stmt\Class_('Test', array(), array(
+                'comments' => array(
+                    new Comment\Doc($docComment)
+                )
+            )),
+            $class
+        );
+
+        $class = $this->createClassBuilder('Test')
+            ->setDocComment(new Comment\Doc($docComment))
+            ->getNode();
+
+        $this->assertEquals(
+            new Stmt\Class_('Test', array(), array(
+                'comments' => array(
+                    new Comment\Doc($docComment)
+                )
+            )),
+            $class
+        );
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unexpected node of type "Stmt_Echo"
+     */
+    public function testInvalidStmtError() {
+        $this->createClassBuilder('Test')
+            ->addStmt(new Stmt\Echo_(array()))
+        ;
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Doc comment must be a string or an instance of PhpParser\Comment\Doc
+     */
+    public function testInvalidDocComment() {
+        $this->createClassBuilder('Test')
+            ->setDocComment(new Comment('Test'));
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Name cannot be empty
+     */
+    public function testEmptyName() {
+        $this->createClassBuilder('Test')
+            ->extend('');
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Name must be a string or an instance of PhpParser\Node\Name
+     */
+    public function testInvalidName() {
+        $this->createClassBuilder('Test')
+            ->extend(array('Foo'));
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php
new file mode 100644
index 000000000..f6a9381d6
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment;
+use PhpParser\Node;
+use PhpParser\Node\Expr\Print_;
+use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\Stmt;
+
+class FunctionTest extends \PHPUnit_Framework_TestCase
+{
+    public function createFunctionBuilder($name) {
+        return new Function_($name);
+    }
+
+    public function testReturnByRef() {
+        $node = $this->createFunctionBuilder('test')
+            ->makeReturnByRef()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Function_('test', array(
+                'byRef' => true
+            )),
+            $node
+        );
+    }
+
+    public function testParams() {
+        $param1 = new Node\Param('test1');
+        $param2 = new Node\Param('test2');
+        $param3 = new Node\Param('test3');
+
+        $node = $this->createFunctionBuilder('test')
+            ->addParam($param1)
+            ->addParams(array($param2, $param3))
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Function_('test', array(
+                'params' => array($param1, $param2, $param3)
+            )),
+            $node
+        );
+    }
+
+    public function testStmts() {
+        $stmt1 = new Print_(new String_('test1'));
+        $stmt2 = new Print_(new String_('test2'));
+        $stmt3 = new Print_(new String_('test3'));
+
+        $node = $this->createFunctionBuilder('test')
+            ->addStmt($stmt1)
+            ->addStmts(array($stmt2, $stmt3))
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Function_('test', array(
+                'stmts' => array($stmt1, $stmt2, $stmt3)
+            )),
+            $node
+        );
+    }
+
+    public function testDocComment() {
+        $node = $this->createFunctionBuilder('test')
+            ->setDocComment('/** Test */')
+            ->getNode();
+
+        $this->assertEquals(new Stmt\Function_('test', array(), array(
+            'comments' => array(new Comment\Doc('/** Test */'))
+        )), $node);
+    }
+
+    public function testReturnType() {
+        $node = $this->createFunctionBuilder('test')
+            ->setReturnType('void')
+            ->getNode();
+
+        $this->assertEquals(new Stmt\Function_('test', array(
+            'returnType' => 'void'
+        ), array()), $node);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage void type cannot be nullable
+     */
+    public function testInvalidNullableVoidType() {
+        $this->createFunctionBuilder('test')->setReturnType('?void');
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Expected parameter node, got "Name"
+     */
+    public function testInvalidParamError() {
+        $this->createFunctionBuilder('test')
+            ->addParam(new Node\Name('foo'))
+        ;
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php
new file mode 100644
index 000000000..72c586688
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment;
+use PhpParser\Node;
+use PhpParser\Node\Scalar\DNumber;
+use PhpParser\Node\Stmt;
+
+class InterfaceTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var Interface_ */
+    protected $builder;
+
+    protected function setUp() {
+        $this->builder = new Interface_('Contract');
+    }
+
+    private function dump($node) {
+        $pp = new \PhpParser\PrettyPrinter\Standard;
+        return $pp->prettyPrint(array($node));
+    }
+
+    public function testEmpty() {
+        $contract = $this->builder->getNode();
+        $this->assertInstanceOf('PhpParser\Node\Stmt\Interface_', $contract);
+        $this->assertSame('Contract', $contract->name);
+    }
+
+    public function testExtending() {
+        $contract = $this->builder->extend('Space\Root1', 'Root2')->getNode();
+        $this->assertEquals(
+            new Stmt\Interface_('Contract', array(
+                'extends' => array(
+                    new Node\Name('Space\Root1'),
+                    new Node\Name('Root2')
+                ),
+            )), $contract
+        );
+    }
+
+    public function testAddMethod() {
+        $method = new Stmt\ClassMethod('doSomething');
+        $contract = $this->builder->addStmt($method)->getNode();
+        $this->assertSame(array($method), $contract->stmts);
+    }
+
+    public function testAddConst() {
+        $const = new Stmt\ClassConst(array(
+            new Node\Const_('SPEED_OF_LIGHT', new DNumber(299792458.0))
+        ));
+        $contract = $this->builder->addStmt($const)->getNode();
+        $this->assertSame(299792458.0, $contract->stmts[0]->consts[0]->value->value);
+    }
+
+    public function testOrder() {
+        $const = new Stmt\ClassConst(array(
+            new Node\Const_('SPEED_OF_LIGHT', new DNumber(299792458))
+        ));
+        $method = new Stmt\ClassMethod('doSomething');
+        $contract = $this->builder
+            ->addStmt($method)
+            ->addStmt($const)
+            ->getNode()
+        ;
+
+        $this->assertInstanceOf('PhpParser\Node\Stmt\ClassConst', $contract->stmts[0]);
+        $this->assertInstanceOf('PhpParser\Node\Stmt\ClassMethod', $contract->stmts[1]);
+    }
+
+    public function testDocComment() {
+        $node = $this->builder
+            ->setDocComment('/** Test */')
+            ->getNode();
+
+        $this->assertEquals(new Stmt\Interface_('Contract', array(), array(
+            'comments' => array(new Comment\Doc('/** Test */'))
+        )), $node);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unexpected node of type "Stmt_PropertyProperty"
+     */
+    public function testInvalidStmtError() {
+        $this->builder->addStmt(new Stmt\PropertyProperty('invalid'));
+    }
+
+    public function testFullFunctional() {
+        $const = new Stmt\ClassConst(array(
+            new Node\Const_('SPEED_OF_LIGHT', new DNumber(299792458))
+        ));
+        $method = new Stmt\ClassMethod('doSomething');
+        $contract = $this->builder
+            ->addStmt($method)
+            ->addStmt($const)
+            ->getNode()
+        ;
+
+        eval($this->dump($contract));
+
+        $this->assertTrue(interface_exists('Contract', false));
+    }
+}
+
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/MethodTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/MethodTest.php
new file mode 100644
index 000000000..21c5617a2
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/MethodTest.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment;
+use PhpParser\Node;
+use PhpParser\Node\Expr\Print_;
+use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\Stmt;
+
+class MethodTest extends \PHPUnit_Framework_TestCase
+{
+    public function createMethodBuilder($name) {
+        return new Method($name);
+    }
+
+    public function testModifiers() {
+        $node = $this->createMethodBuilder('test')
+            ->makePublic()
+            ->makeAbstract()
+            ->makeStatic()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\ClassMethod('test', array(
+                'flags' => Stmt\Class_::MODIFIER_PUBLIC
+                         | Stmt\Class_::MODIFIER_ABSTRACT
+                         | Stmt\Class_::MODIFIER_STATIC,
+                'stmts' => null,
+            )),
+            $node
+        );
+
+        $node = $this->createMethodBuilder('test')
+            ->makeProtected()
+            ->makeFinal()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\ClassMethod('test', array(
+                'flags' => Stmt\Class_::MODIFIER_PROTECTED
+                         | Stmt\Class_::MODIFIER_FINAL
+            )),
+            $node
+        );
+
+        $node = $this->createMethodBuilder('test')
+            ->makePrivate()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\ClassMethod('test', array(
+                'type' => Stmt\Class_::MODIFIER_PRIVATE
+            )),
+            $node
+        );
+    }
+
+    public function testReturnByRef() {
+        $node = $this->createMethodBuilder('test')
+            ->makeReturnByRef()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\ClassMethod('test', array(
+                'byRef' => true
+            )),
+            $node
+        );
+    }
+
+    public function testParams() {
+        $param1 = new Node\Param('test1');
+        $param2 = new Node\Param('test2');
+        $param3 = new Node\Param('test3');
+
+        $node = $this->createMethodBuilder('test')
+            ->addParam($param1)
+            ->addParams(array($param2, $param3))
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\ClassMethod('test', array(
+                'params' => array($param1, $param2, $param3)
+            )),
+            $node
+        );
+    }
+
+    public function testStmts() {
+        $stmt1 = new Print_(new String_('test1'));
+        $stmt2 = new Print_(new String_('test2'));
+        $stmt3 = new Print_(new String_('test3'));
+
+        $node = $this->createMethodBuilder('test')
+            ->addStmt($stmt1)
+            ->addStmts(array($stmt2, $stmt3))
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\ClassMethod('test', array(
+                'stmts' => array($stmt1, $stmt2, $stmt3)
+            )),
+            $node
+        );
+    }
+    public function testDocComment() {
+        $node = $this->createMethodBuilder('test')
+            ->setDocComment('/** Test */')
+            ->getNode();
+
+        $this->assertEquals(new Stmt\ClassMethod('test', array(), array(
+            'comments' => array(new Comment\Doc('/** Test */'))
+        )), $node);
+    }
+
+    public function testReturnType() {
+        $node = $this->createMethodBuilder('test')
+            ->setReturnType('bool')
+            ->getNode();
+        $this->assertEquals(new Stmt\ClassMethod('test', array(
+            'returnType' => 'bool'
+        ), array()), $node);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Cannot add statements to an abstract method
+     */
+    public function testAddStmtToAbstractMethodError() {
+        $this->createMethodBuilder('test')
+            ->makeAbstract()
+            ->addStmt(new Print_(new String_('test')))
+        ;
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Cannot make method with statements abstract
+     */
+    public function testMakeMethodWithStmtsAbstractError() {
+        $this->createMethodBuilder('test')
+            ->addStmt(new Print_(new String_('test')))
+            ->makeAbstract()
+        ;
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Expected parameter node, got "Name"
+     */
+    public function testInvalidParamError() {
+        $this->createMethodBuilder('test')
+            ->addParam(new Node\Name('foo'))
+        ;
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/NamespaceTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/NamespaceTest.php
new file mode 100644
index 000000000..88131fc33
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/NamespaceTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment\Doc;
+use PhpParser\Node;
+use PhpParser\Node\Stmt;
+
+class NamespaceTest extends \PHPUnit_Framework_TestCase
+{
+    protected function createNamespaceBuilder($fqn) {
+        return new Namespace_($fqn);
+    }
+
+    public function testCreation() {
+        $stmt1 = new Stmt\Class_('SomeClass');
+        $stmt2 = new Stmt\Interface_('SomeInterface');
+        $stmt3 = new Stmt\Function_('someFunction');
+        $docComment = new Doc('/** Test */');
+        $expected = new Stmt\Namespace_(
+            new Node\Name('Name\Space'),
+            array($stmt1, $stmt2, $stmt3),
+            array('comments' => array($docComment))
+        );
+
+        $node = $this->createNamespaceBuilder('Name\Space')
+            ->addStmt($stmt1)
+            ->addStmts(array($stmt2, $stmt3))
+            ->setDocComment($docComment)
+            ->getNode()
+        ;
+        $this->assertEquals($expected, $node);
+
+        $node = $this->createNamespaceBuilder(new Node\Name(array('Name', 'Space')))
+            ->setDocComment($docComment)
+            ->addStmts(array($stmt1, $stmt2))
+            ->addStmt($stmt3)
+            ->getNode()
+        ;
+        $this->assertEquals($expected, $node);
+
+        $node = $this->createNamespaceBuilder(null)->getNode();
+        $this->assertNull($node->name);
+        $this->assertEmpty($node->stmts);
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/ParamTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
new file mode 100644
index 000000000..e67ae99f2
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace PhpParser\Builder;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Scalar;
+
+class ParamTest extends \PHPUnit_Framework_TestCase
+{
+    public function createParamBuilder($name) {
+        return new Param($name);
+    }
+
+    /**
+     * @dataProvider provideTestDefaultValues
+     */
+    public function testDefaultValues($value, $expectedValueNode) {
+        $node = $this->createParamBuilder('test')
+            ->setDefault($value)
+            ->getNode()
+        ;
+
+        $this->assertEquals($expectedValueNode, $node->default);
+    }
+
+    public function provideTestDefaultValues() {
+        return array(
+            array(
+                null,
+                new Expr\ConstFetch(new Node\Name('null'))
+            ),
+            array(
+                true,
+                new Expr\ConstFetch(new Node\Name('true'))
+            ),
+            array(
+                false,
+                new Expr\ConstFetch(new Node\Name('false'))
+            ),
+            array(
+                31415,
+                new Scalar\LNumber(31415)
+            ),
+            array(
+                3.1415,
+                new Scalar\DNumber(3.1415)
+            ),
+            array(
+                'Hallo World',
+                new Scalar\String_('Hallo World')
+            ),
+            array(
+                array(1, 2, 3),
+                new Expr\Array_(array(
+                    new Expr\ArrayItem(new Scalar\LNumber(1)),
+                    new Expr\ArrayItem(new Scalar\LNumber(2)),
+                    new Expr\ArrayItem(new Scalar\LNumber(3)),
+                ))
+            ),
+            array(
+                array('foo' => 'bar', 'bar' => 'foo'),
+                new Expr\Array_(array(
+                    new Expr\ArrayItem(
+                        new Scalar\String_('bar'),
+                        new Scalar\String_('foo')
+                    ),
+                    new Expr\ArrayItem(
+                        new Scalar\String_('foo'),
+                        new Scalar\String_('bar')
+                    ),
+                ))
+            ),
+            array(
+                new Scalar\MagicConst\Dir,
+                new Scalar\MagicConst\Dir
+            )
+        );
+    }
+
+    /**
+     * @dataProvider provideTestTypeHints
+     */
+    public function testTypeHints($typeHint, $expectedType) {
+        $node = $this->createParamBuilder('test')
+            ->setTypeHint($typeHint)
+            ->getNode()
+        ;
+        $type = $node->type;
+
+        /* Manually implement comparison to avoid __toString stupidity */
+        if ($expectedType instanceof Node\NullableType) {
+            $this->assertInstanceOf(get_class($expectedType), $type);
+            $expectedType = $expectedType->type;
+            $type = $type->type;
+        }
+
+        if ($expectedType instanceof Node\Name) {
+            $this->assertInstanceOf(get_class($expectedType), $type);
+            $this->assertEquals($expectedType, $type);
+        } else {
+            $this->assertSame($expectedType, $type);
+        }
+    }
+
+    public function provideTestTypeHints() {
+        return array(
+            array('array', 'array'),
+            array('callable', 'callable'),
+            array('bool', 'bool'),
+            array('int', 'int'),
+            array('float', 'float'),
+            array('string', 'string'),
+            array('iterable', 'iterable'),
+            array('object', 'object'),
+            array('Array', 'array'),
+            array('CALLABLE', 'callable'),
+            array('Some\Class', new Node\Name('Some\Class')),
+            array('\Foo', new Node\Name\FullyQualified('Foo')),
+            array('self', new Node\Name('self')),
+            array('?array', new Node\NullableType('array')),
+            array('?Some\Class', new Node\NullableType(new Node\Name('Some\Class'))),
+            array(new Node\Name('Some\Class'), new Node\Name('Some\Class')),
+            array(new Node\NullableType('int'), new Node\NullableType('int')),
+            array(
+                new Node\NullableType(new Node\Name('Some\Class')),
+                new Node\NullableType(new Node\Name('Some\Class'))
+            ),
+        );
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Parameter type cannot be void
+     */
+    public function testVoidTypeError() {
+        $this->createParamBuilder('test')->setTypeHint('void');
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Type must be a string, or an instance of Name or NullableType
+     */
+    public function testInvalidTypeError() {
+        $this->createParamBuilder('test')->setTypeHint(new \stdClass);
+    }
+
+    public function testByRef() {
+        $node = $this->createParamBuilder('test')
+            ->makeByRef()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Node\Param('test', null, null, true),
+            $node
+        );
+    }
+
+    public function testVariadic() {
+        $node = $this->createParamBuilder('test')
+            ->makeVariadic()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Node\Param('test', null, null, false, true),
+            $node
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/PropertyTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/PropertyTest.php
new file mode 100644
index 000000000..de8f4ce63
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/PropertyTest.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Name;
+use PhpParser\Node\Scalar;
+use PhpParser\Node\Stmt;
+
+class PropertyTest extends \PHPUnit_Framework_TestCase
+{
+    public function createPropertyBuilder($name) {
+        return new Property($name);
+    }
+
+    public function testModifiers() {
+        $node = $this->createPropertyBuilder('test')
+            ->makePrivate()
+            ->makeStatic()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Property(
+                Stmt\Class_::MODIFIER_PRIVATE
+              | Stmt\Class_::MODIFIER_STATIC,
+                array(
+                    new Stmt\PropertyProperty('test')
+                )
+            ),
+            $node
+        );
+
+        $node = $this->createPropertyBuilder('test')
+            ->makeProtected()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Property(
+                Stmt\Class_::MODIFIER_PROTECTED,
+                array(
+                    new Stmt\PropertyProperty('test')
+                )
+            ),
+            $node
+        );
+
+        $node = $this->createPropertyBuilder('test')
+            ->makePublic()
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\Property(
+                Stmt\Class_::MODIFIER_PUBLIC,
+                array(
+                    new Stmt\PropertyProperty('test')
+                )
+            ),
+            $node
+        );
+    }
+
+    public function testDocComment() {
+        $node = $this->createPropertyBuilder('test')
+            ->setDocComment('/** Test */')
+            ->getNode();
+
+        $this->assertEquals(new Stmt\Property(
+            Stmt\Class_::MODIFIER_PUBLIC,
+            array(
+                new Stmt\PropertyProperty('test')
+            ),
+            array(
+                'comments' => array(new Comment\Doc('/** Test */'))
+            )
+        ), $node);
+    }
+
+    /**
+     * @dataProvider provideTestDefaultValues
+     */
+    public function testDefaultValues($value, $expectedValueNode) {
+        $node = $this->createPropertyBuilder('test')
+            ->setDefault($value)
+            ->getNode()
+        ;
+
+        $this->assertEquals($expectedValueNode, $node->props[0]->default);
+    }
+
+    public function provideTestDefaultValues() {
+        return array(
+            array(
+                null,
+                new Expr\ConstFetch(new Name('null'))
+            ),
+            array(
+                true,
+                new Expr\ConstFetch(new Name('true'))
+            ),
+            array(
+                false,
+                new Expr\ConstFetch(new Name('false'))
+            ),
+            array(
+                31415,
+                new Scalar\LNumber(31415)
+            ),
+            array(
+                3.1415,
+                new Scalar\DNumber(3.1415)
+            ),
+            array(
+                'Hallo World',
+                new Scalar\String_('Hallo World')
+            ),
+            array(
+                array(1, 2, 3),
+                new Expr\Array_(array(
+                    new Expr\ArrayItem(new Scalar\LNumber(1)),
+                    new Expr\ArrayItem(new Scalar\LNumber(2)),
+                    new Expr\ArrayItem(new Scalar\LNumber(3)),
+                ))
+            ),
+            array(
+                array('foo' => 'bar', 'bar' => 'foo'),
+                new Expr\Array_(array(
+                    new Expr\ArrayItem(
+                        new Scalar\String_('bar'),
+                        new Scalar\String_('foo')
+                    ),
+                    new Expr\ArrayItem(
+                        new Scalar\String_('foo'),
+                        new Scalar\String_('bar')
+                    ),
+                ))
+            ),
+            array(
+                new Scalar\MagicConst\Dir,
+                new Scalar\MagicConst\Dir
+            )
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/TraitTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/TraitTest.php
new file mode 100644
index 000000000..874bc4d27
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/TraitTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt;
+
+class TraitTest extends \PHPUnit_Framework_TestCase
+{
+    protected function createTraitBuilder($class) {
+        return new Trait_($class);
+    }
+
+    public function testStmtAddition() {
+        $method1 = new Stmt\ClassMethod('test1');
+        $method2 = new Stmt\ClassMethod('test2');
+        $method3 = new Stmt\ClassMethod('test3');
+        $prop = new Stmt\Property(Stmt\Class_::MODIFIER_PUBLIC, array(
+            new Stmt\PropertyProperty('test')
+        ));
+        $use = new Stmt\TraitUse([new Name('OtherTrait')]);
+        $trait = $this->createTraitBuilder('TestTrait')
+            ->setDocComment('/** Nice trait */')
+            ->addStmt($method1)
+            ->addStmts([$method2, $method3])
+            ->addStmt($prop)
+            ->addStmt($use)
+            ->getNode();
+        $this->assertEquals(new Stmt\Trait_('TestTrait', [
+            'stmts' => [$use, $prop, $method1, $method2, $method3]
+        ], [
+            'comments' => [
+                new Comment\Doc('/** Nice trait */')
+            ]
+        ]), $trait);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unexpected node of type "Stmt_Echo"
+     */
+    public function testInvalidStmtError() {
+        $this->createTraitBuilder('Test')
+            ->addStmt(new Stmt\Echo_(array()))
+        ;
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Builder/UseTest.php b/lib/nikic/php-parser/test/PhpParser/Builder/UseTest.php
new file mode 100644
index 000000000..adaeb3a5e
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Builder/UseTest.php
@@ -0,0 +1,35 @@
+<?php
+
+use PhpParser\Builder;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt;
+
+class UseTest extends \PHPUnit_Framework_TestCase
+{
+    protected function createUseBuilder($name, $type = Stmt\Use_::TYPE_NORMAL) {
+        return new Builder\Use_($name, $type);
+    }
+
+    public function testCreation() {
+        $node = $this->createUseBuilder('Foo\Bar')->getNode();
+        $this->assertEquals(new Stmt\Use_(array(
+            new Stmt\UseUse(new Name('Foo\Bar'), 'Bar')
+        )), $node);
+
+        $node = $this->createUseBuilder(new Name('Foo\Bar'))->as('XYZ')->getNode();
+        $this->assertEquals(new Stmt\Use_(array(
+            new Stmt\UseUse(new Name('Foo\Bar'), 'XYZ')
+        )), $node);
+
+        $node = $this->createUseBuilder('foo\bar', Stmt\Use_::TYPE_FUNCTION)->as('foo')->getNode();
+        $this->assertEquals(new Stmt\Use_(array(
+            new Stmt\UseUse(new Name('foo\bar'), 'foo')
+        ), Stmt\Use_::TYPE_FUNCTION), $node);
+    }
+
+    public function testNonExistingMethod() {
+        $this->setExpectedException('LogicException', 'Method "foo" does not exist');
+        $builder = $this->createUseBuilder('Test');
+        $builder->foo();
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php b/lib/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php
new file mode 100644
index 000000000..1c3ef18df
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace PhpParser;
+
+use PhpParser\Node\Expr;
+
+class BuilderFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideTestFactory
+     */
+    public function testFactory($methodName, $className) {
+        $factory = new BuilderFactory;
+        $this->assertInstanceOf($className, $factory->$methodName('test'));
+    }
+
+    public function provideTestFactory() {
+        return array(
+            array('namespace', 'PhpParser\Builder\Namespace_'),
+            array('class',     'PhpParser\Builder\Class_'),
+            array('interface', 'PhpParser\Builder\Interface_'),
+            array('trait',     'PhpParser\Builder\Trait_'),
+            array('method',    'PhpParser\Builder\Method'),
+            array('function',  'PhpParser\Builder\Function_'),
+            array('property',  'PhpParser\Builder\Property'),
+            array('param',     'PhpParser\Builder\Param'),
+            array('use',       'PhpParser\Builder\Use_'),
+        );
+    }
+
+    public function testNonExistingMethod() {
+        $this->setExpectedException('LogicException', 'Method "foo" does not exist');
+        $factory = new BuilderFactory();
+        $factory->foo();
+    }
+
+    public function testIntegration() {
+        $factory = new BuilderFactory;
+        $node = $factory->namespace('Name\Space')
+            ->addStmt($factory->use('Foo\Bar\SomeOtherClass'))
+            ->addStmt($factory->use('Foo\Bar')->as('A'))
+            ->addStmt($factory
+                ->class('SomeClass')
+                ->extend('SomeOtherClass')
+                ->implement('A\Few', '\Interfaces')
+                ->makeAbstract()
+
+                ->addStmt($factory->method('firstMethod'))
+
+                ->addStmt($factory->method('someMethod')
+                    ->makePublic()
+                    ->makeAbstract()
+                    ->addParam($factory->param('someParam')->setTypeHint('SomeClass'))
+                    ->setDocComment('/**
+                                      * This method does something.
+                                      *
+                                      * @param SomeClass And takes a parameter
+                                      */'))
+
+                ->addStmt($factory->method('anotherMethod')
+                    ->makeProtected()
+                    ->addParam($factory->param('someParam')->setDefault('test'))
+                    ->addStmt(new Expr\Print_(new Expr\Variable('someParam'))))
+
+                ->addStmt($factory->property('someProperty')->makeProtected())
+                ->addStmt($factory->property('anotherProperty')
+                    ->makePrivate()
+                    ->setDefault(array(1, 2, 3))))
+            ->getNode()
+        ;
+
+        $expected = <<<'EOC'
+<?php
+
+namespace Name\Space;
+
+use Foo\Bar\SomeOtherClass;
+use Foo\Bar as A;
+abstract class SomeClass extends SomeOtherClass implements A\Few, \Interfaces
+{
+    protected $someProperty;
+    private $anotherProperty = array(1, 2, 3);
+    function firstMethod()
+    {
+    }
+    /**
+     * This method does something.
+     *
+     * @param SomeClass And takes a parameter
+     */
+    public abstract function someMethod(SomeClass $someParam);
+    protected function anotherMethod($someParam = 'test')
+    {
+        print $someParam;
+    }
+}
+EOC;
+
+        $stmts = array($node);
+        $prettyPrinter = new PrettyPrinter\Standard();
+        $generated = $prettyPrinter->prettyPrintFile($stmts);
+
+        $this->assertEquals(
+            str_replace("\r\n", "\n", $expected),
+            str_replace("\r\n", "\n", $generated)
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/CodeParsingTest.php b/lib/nikic/php-parser/test/PhpParser/CodeParsingTest.php
new file mode 100644
index 000000000..1a4a9ad1d
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/CodeParsingTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace PhpParser;
+
+require_once __DIR__ . '/CodeTestAbstract.php';
+
+class CodeParsingTest extends CodeTestAbstract
+{
+    /**
+     * @dataProvider provideTestParse
+     */
+    public function testParse($name, $code, $expected, $modeLine) {
+        if (null !== $modeLine) {
+            $modes = array_fill_keys(explode(',', $modeLine), true);
+        } else {
+            $modes = [];
+        }
+
+
+        $lexer = new Lexer\Emulative(array('usedAttributes' => array(
+            'startLine', 'endLine', 'startFilePos', 'endFilePos', 'comments'
+        )));
+        $parser5 = new Parser\Php5($lexer);
+        $parser7 = new Parser\Php7($lexer);
+
+        $dumpPositions = isset($modes['positions']);
+        $output5 = $this->getParseOutput($parser5, $code, $dumpPositions);
+        $output7 = $this->getParseOutput($parser7, $code, $dumpPositions);
+
+        if (isset($modes['php5'])) {
+            $this->assertSame($expected, $output5, $name);
+            $this->assertNotSame($expected, $output7, $name);
+        } else if (isset($modes['php7'])) {
+            $this->assertNotSame($expected, $output5, $name);
+            $this->assertSame($expected, $output7, $name);
+        } else {
+            $this->assertSame($expected, $output5, $name);
+            $this->assertSame($expected, $output7, $name);
+        }
+    }
+
+    private function getParseOutput(Parser $parser, $code, $dumpPositions) {
+        $errors = new ErrorHandler\Collecting;
+        $stmts = $parser->parse($code, $errors);
+
+        $output = '';
+        foreach ($errors->getErrors() as $error) {
+            $output .= $this->formatErrorMessage($error, $code) . "\n";
+        }
+
+        if (null !== $stmts) {
+            $dumper = new NodeDumper(['dumpComments' => true, 'dumpPositions' => $dumpPositions]);
+            $output .= $dumper->dump($stmts, $code);
+        }
+
+        return canonicalize($output);
+    }
+
+    public function provideTestParse() {
+        return $this->getTests(__DIR__ . '/../code/parser', 'test');
+    }
+
+    private function formatErrorMessage(Error $e, $code) {
+        if ($e->hasColumnInfo()) {
+            return $e->getMessageWithColumnInfo($code);
+        } else {
+            return $e->getMessage();
+        }
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/CodeTestAbstract.php b/lib/nikic/php-parser/test/PhpParser/CodeTestAbstract.php
new file mode 100644
index 000000000..369ee41b8
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/CodeTestAbstract.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace PhpParser;
+
+abstract class CodeTestAbstract extends \PHPUnit_Framework_TestCase
+{
+    protected function getTests($directory, $fileExtension) {
+        $directory = realpath($directory);
+        $it = new \RecursiveDirectoryIterator($directory);
+        $it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::LEAVES_ONLY);
+        $it = new \RegexIterator($it, '(\.' . preg_quote($fileExtension) . '$)');
+
+        $tests = array();
+        foreach ($it as $file) {
+            $fileName = $file->getPathname();
+            $fileContents = file_get_contents($fileName);
+            $fileContents = canonicalize($fileContents);
+
+            // evaluate @@{expr}@@ expressions
+            $fileContents = preg_replace_callback(
+                '/@@\{(.*?)\}@@/',
+                function($matches) {
+                    return eval('return ' . $matches[1] . ';');
+                },
+                $fileContents
+            );
+
+            // parse sections
+            $parts = preg_split("/\n-----(?:\n|$)/", $fileContents);
+
+            // first part is the name
+            $name = array_shift($parts) . ' (' . $fileName . ')';
+            $shortName = ltrim(str_replace($directory, '', $fileName), '/\\');
+
+            // multiple sections possible with always two forming a pair
+            $chunks = array_chunk($parts, 2);
+            foreach ($chunks as $i => $chunk) {
+                $dataSetName = $shortName . (count($chunks) > 1 ? '#' . $i : '');
+                list($expected, $mode) = $this->extractMode($chunk[1]);
+                $tests[$dataSetName] = array($name, $chunk[0], $expected, $mode);
+            }
+        }
+
+        return $tests;
+    }
+
+    private function extractMode($expected) {
+        $firstNewLine = strpos($expected, "\n");
+        if (false === $firstNewLine) {
+            $firstNewLine = strlen($expected);
+        }
+
+        $firstLine = substr($expected, 0, $firstNewLine);
+        if (0 !== strpos($firstLine, '!!')) {
+            return [$expected, null];
+        }
+
+        $expected = (string) substr($expected, $firstNewLine + 1);
+        return [$expected, substr($firstLine, 2)];
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/CommentTest.php b/lib/nikic/php-parser/test/PhpParser/CommentTest.php
new file mode 100644
index 000000000..081dd57b7
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/CommentTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace PhpParser;
+
+class CommentTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetSet() {
+        $comment = new Comment('/* Some comment */', 1, 10);
+
+        $this->assertSame('/* Some comment */', $comment->getText());
+        $this->assertSame('/* Some comment */', (string) $comment);
+        $this->assertSame(1, $comment->getLine());
+        $this->assertSame(10, $comment->getFilePos());
+    }
+
+    /**
+     * @dataProvider provideTestReformatting
+     */
+    public function testReformatting($commentText, $reformattedText) {
+        $comment = new Comment($commentText);
+        $this->assertSame($reformattedText, $comment->getReformattedText());
+    }
+
+    public function provideTestReformatting() {
+        return array(
+            array('// Some text' . "\n", '// Some text'),
+            array('/* Some text */', '/* Some text */'),
+            array(
+                '/**
+     * Some text.
+     * Some more text.
+     */',
+                '/**
+ * Some text.
+ * Some more text.
+ */'
+            ),
+            array(
+                '/*
+        Some text.
+        Some more text.
+    */',
+                '/*
+    Some text.
+    Some more text.
+*/'
+            ),
+            array(
+                '/* Some text.
+       More text.
+       Even more text. */',
+                '/* Some text.
+   More text.
+   Even more text. */'
+            ),
+            array(
+                '/* Some text.
+       More text.
+         Indented text. */',
+                '/* Some text.
+   More text.
+     Indented text. */',
+            ),
+            // invalid comment -> no reformatting
+            array(
+                'hallo
+    world',
+                'hallo
+    world',
+            ),
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/PhpParser/ErrorHandler/CollectingTest.php b/lib/nikic/php-parser/test/PhpParser/ErrorHandler/CollectingTest.php
new file mode 100644
index 000000000..37429817e
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/ErrorHandler/CollectingTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace PhpParser\ErrorHandler;
+
+use PhpParser\Error;
+
+class CollectingTest extends \PHPUnit_Framework_TestCase {
+    public function testHandleError() {
+        $errorHandler = new Collecting();
+        $this->assertFalse($errorHandler->hasErrors());
+        $this->assertEmpty($errorHandler->getErrors());
+
+        $errorHandler->handleError($e1 = new Error('Test 1'));
+        $errorHandler->handleError($e2 = new Error('Test 2'));
+        $this->assertTrue($errorHandler->hasErrors());
+        $this->assertSame([$e1, $e2], $errorHandler->getErrors());
+
+        $errorHandler->clearErrors();
+        $this->assertFalse($errorHandler->hasErrors());
+        $this->assertEmpty($errorHandler->getErrors());
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php b/lib/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php
new file mode 100644
index 000000000..d7df7c267
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace PhpParser\ErrorHandler;
+
+use PhpParser\Error;
+
+class ThrowingTest extends \PHPUnit_Framework_TestCase {
+    /**
+     * @expectedException \PhpParser\Error
+     * @expectedExceptionMessage Test
+     */
+    public function testHandleError() {
+        $errorHandler = new Throwing();
+        $errorHandler->handleError(new Error('Test'));
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/PhpParser/ErrorTest.php b/lib/nikic/php-parser/test/PhpParser/ErrorTest.php
new file mode 100644
index 000000000..59e880c30
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/ErrorTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace PhpParser;
+
+class ErrorTest extends \PHPUnit_Framework_TestCase
+{
+    public function testConstruct() {
+        $attributes = array(
+            'startLine' => 10,
+            'endLine' => 11,
+        );
+        $error = new Error('Some error', $attributes);
+
+        $this->assertSame('Some error', $error->getRawMessage());
+        $this->assertSame($attributes, $error->getAttributes());
+        $this->assertSame(10, $error->getStartLine());
+        $this->assertSame(11, $error->getEndLine());
+        $this->assertSame('Some error on line 10', $error->getMessage());
+
+        return $error;
+    }
+
+    /**
+     * @depends testConstruct
+     */
+    public function testSetMessageAndLine(Error $error) {
+        $error->setRawMessage('Some other error');
+        $this->assertSame('Some other error', $error->getRawMessage());
+
+        $error->setStartLine(15);
+        $this->assertSame(15, $error->getStartLine());
+        $this->assertSame('Some other error on line 15', $error->getMessage());
+    }
+
+    public function testUnknownLine() {
+        $error = new Error('Some error');
+
+        $this->assertSame(-1, $error->getStartLine());
+        $this->assertSame(-1, $error->getEndLine());
+        $this->assertSame('Some error on unknown line', $error->getMessage());
+    }
+
+    /** @dataProvider provideTestColumnInfo */
+    public function testColumnInfo($code, $startPos, $endPos, $startColumn, $endColumn) {
+        $error = new Error('Some error', array(
+            'startFilePos' => $startPos,
+            'endFilePos' => $endPos,
+        ));
+
+        $this->assertSame(true, $error->hasColumnInfo());
+        $this->assertSame($startColumn, $error->getStartColumn($code));
+        $this->assertSame($endColumn, $error->getEndColumn($code));
+
+    }
+
+    public function provideTestColumnInfo() {
+        return array(
+            // Error at "bar"
+            array("<?php foo bar baz", 10, 12, 11, 13),
+            array("<?php\nfoo bar baz", 10, 12, 5, 7),
+            array("<?php foo\nbar baz", 10, 12, 1, 3),
+            array("<?php foo bar\nbaz", 10, 12, 11, 13),
+            array("<?php\r\nfoo bar baz", 11, 13, 5, 7),
+            // Error at "baz"
+            array("<?php foo bar baz", 14, 16, 15, 17),
+            array("<?php foo bar\nbaz", 14, 16, 1, 3),
+            // Error at string literal
+            array("<?php foo 'bar\nbaz' xyz", 10, 18, 11, 4),
+            array("<?php\nfoo 'bar\nbaz' xyz", 10, 18, 5, 4),
+            array("<?php foo\n'\nbarbaz\n'\nxyz", 10, 19, 1, 1),
+            // Error over full string
+            array("<?php", 0, 4, 1, 5),
+            array("<?\nphp", 0, 5, 1, 3),
+        );
+    }
+
+    public function testNoColumnInfo() {
+        $error = new Error('Some error', 3);
+
+        $this->assertSame(false, $error->hasColumnInfo());
+        try {
+            $error->getStartColumn('');
+            $this->fail('Expected RuntimeException');
+        } catch (\RuntimeException $e) {
+            $this->assertSame('Error does not have column information', $e->getMessage());
+        }
+        try {
+            $error->getEndColumn('');
+            $this->fail('Expected RuntimeException');
+        } catch (\RuntimeException $e) {
+            $this->assertSame('Error does not have column information', $e->getMessage());
+        }
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Invalid position information
+     */
+    public function testInvalidPosInfo() {
+        $error = new Error('Some error', array(
+            'startFilePos' => 10,
+            'endFilePos' => 11,
+        ));
+        $error->getStartColumn('code');
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php b/lib/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php
new file mode 100644
index 000000000..f1fe6183a
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace PhpParser\Lexer;
+
+use PhpParser\LexerTest;
+use PhpParser\Parser\Tokens;
+
+require_once __DIR__ . '/../LexerTest.php';
+
+class EmulativeTest extends LexerTest
+{
+    protected function getLexer(array $options = array()) {
+        return new Emulative($options);
+    }
+
+    /**
+     * @dataProvider provideTestReplaceKeywords
+     */
+    public function testReplaceKeywords($keyword, $expectedToken) {
+        $lexer = $this->getLexer();
+        $lexer->startLexing('<?php ' . $keyword);
+
+        $this->assertSame($expectedToken, $lexer->getNextToken());
+        $this->assertSame(0, $lexer->getNextToken());
+    }
+
+    /**
+     * @dataProvider provideTestReplaceKeywords
+     */
+    public function testNoReplaceKeywordsAfterObjectOperator($keyword) {
+        $lexer = $this->getLexer();
+        $lexer->startLexing('<?php ->' . $keyword);
+
+        $this->assertSame(Tokens::T_OBJECT_OPERATOR, $lexer->getNextToken());
+        $this->assertSame(Tokens::T_STRING, $lexer->getNextToken());
+        $this->assertSame(0, $lexer->getNextToken());
+    }
+
+    public function provideTestReplaceKeywords() {
+        return array(
+            // PHP 5.5
+            array('finally',       Tokens::T_FINALLY),
+            array('yield',         Tokens::T_YIELD),
+
+            // PHP 5.4
+            array('callable',      Tokens::T_CALLABLE),
+            array('insteadof',     Tokens::T_INSTEADOF),
+            array('trait',         Tokens::T_TRAIT),
+            array('__TRAIT__',     Tokens::T_TRAIT_C),
+
+            // PHP 5.3
+            array('__DIR__',       Tokens::T_DIR),
+            array('goto',          Tokens::T_GOTO),
+            array('namespace',     Tokens::T_NAMESPACE),
+            array('__NAMESPACE__', Tokens::T_NS_C),
+        );
+    }
+
+    /**
+     * @dataProvider provideTestLexNewFeatures
+     */
+    public function testLexNewFeatures($code, array $expectedTokens) {
+        $lexer = $this->getLexer();
+        $lexer->startLexing('<?php ' . $code);
+
+        foreach ($expectedTokens as $expectedToken) {
+            list($expectedTokenType, $expectedTokenText) = $expectedToken;
+            $this->assertSame($expectedTokenType, $lexer->getNextToken($text));
+            $this->assertSame($expectedTokenText, $text);
+        }
+        $this->assertSame(0, $lexer->getNextToken());
+    }
+
+    /**
+     * @dataProvider provideTestLexNewFeatures
+     */
+    public function testLeaveStuffAloneInStrings($code) {
+        $stringifiedToken = '"' . addcslashes($code, '"\\') . '"';
+
+        $lexer = $this->getLexer();
+        $lexer->startLexing('<?php ' . $stringifiedToken);
+
+        $this->assertSame(Tokens::T_CONSTANT_ENCAPSED_STRING, $lexer->getNextToken($text));
+        $this->assertSame($stringifiedToken, $text);
+        $this->assertSame(0, $lexer->getNextToken());
+    }
+
+    public function provideTestLexNewFeatures() {
+        return array(
+            array('yield from', array(
+                array(Tokens::T_YIELD_FROM, 'yield from'),
+            )),
+            array("yield\r\nfrom", array(
+                array(Tokens::T_YIELD_FROM, "yield\r\nfrom"),
+            )),
+            array('...', array(
+                array(Tokens::T_ELLIPSIS, '...'),
+            )),
+            array('**', array(
+                array(Tokens::T_POW, '**'),
+            )),
+            array('**=', array(
+                array(Tokens::T_POW_EQUAL, '**='),
+            )),
+            array('??', array(
+                array(Tokens::T_COALESCE, '??'),
+            )),
+            array('<=>', array(
+                array(Tokens::T_SPACESHIP, '<=>'),
+            )),
+            array('0b1010110', array(
+                array(Tokens::T_LNUMBER, '0b1010110'),
+            )),
+            array('0b1011010101001010110101010010101011010101010101101011001110111100', array(
+                array(Tokens::T_DNUMBER, '0b1011010101001010110101010010101011010101010101101011001110111100'),
+            )),
+            array('\\', array(
+                array(Tokens::T_NS_SEPARATOR, '\\'),
+            )),
+            array("<<<'NOWDOC'\nNOWDOC;\n", array(
+                array(Tokens::T_START_HEREDOC, "<<<'NOWDOC'\n"),
+                array(Tokens::T_END_HEREDOC, 'NOWDOC'),
+                array(ord(';'), ';'),
+            )),
+            array("<<<'NOWDOC'\nFoobar\nNOWDOC;\n", array(
+                array(Tokens::T_START_HEREDOC, "<<<'NOWDOC'\n"),
+                array(Tokens::T_ENCAPSED_AND_WHITESPACE, "Foobar\n"),
+                array(Tokens::T_END_HEREDOC, 'NOWDOC'),
+                array(ord(';'), ';'),
+            )),
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/LexerTest.php b/lib/nikic/php-parser/test/PhpParser/LexerTest.php
new file mode 100644
index 000000000..bf7a5d32f
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/LexerTest.php
@@ -0,0 +1,265 @@
+<?php
+
+namespace PhpParser;
+
+use PhpParser\Parser\Tokens;
+
+class LexerTest extends \PHPUnit_Framework_TestCase
+{
+    /* To allow overwriting in parent class */
+    protected function getLexer(array $options = array()) {
+        return new Lexer($options);
+    }
+
+    /**
+     * @dataProvider provideTestError
+     */
+    public function testError($code, $messages) {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM does not throw warnings from token_get_all()');
+        }
+
+        $errorHandler = new ErrorHandler\Collecting();
+        $lexer = $this->getLexer(['usedAttributes' => [
+            'comments', 'startLine', 'endLine', 'startFilePos', 'endFilePos'
+        ]]);
+        $lexer->startLexing($code, $errorHandler);
+        $errors = $errorHandler->getErrors();
+
+        $this->assertSame(count($messages), count($errors));
+        for ($i = 0; $i < count($messages); $i++) {
+            $this->assertSame($messages[$i], $errors[$i]->getMessageWithColumnInfo($code));
+        }
+    }
+
+    public function provideTestError() {
+        return array(
+            array("<?php /*", array("Unterminated comment from 1:7 to 1:9")),
+            array("<?php \1", array("Unexpected character \"\1\" (ASCII 1) from 1:7 to 1:7")),
+            array("<?php \0", array("Unexpected null byte from 1:7 to 1:7")),
+            // Error with potentially emulated token
+            array("<?php ?? \0", array("Unexpected null byte from 1:10 to 1:10")),
+            array("<?php\n\0\1 foo /* bar", array(
+                "Unexpected null byte from 2:1 to 2:1",
+                "Unexpected character \"\1\" (ASCII 1) from 2:2 to 2:2",
+                "Unterminated comment from 2:8 to 2:14"
+            )),
+        );
+    }
+
+    /**
+     * @dataProvider provideTestLex
+     */
+    public function testLex($code, $options, $tokens) {
+        $lexer = $this->getLexer($options);
+        $lexer->startLexing($code);
+        while ($id = $lexer->getNextToken($value, $startAttributes, $endAttributes)) {
+            $token = array_shift($tokens);
+
+            $this->assertSame($token[0], $id);
+            $this->assertSame($token[1], $value);
+            $this->assertEquals($token[2], $startAttributes);
+            $this->assertEquals($token[3], $endAttributes);
+        }
+    }
+
+    public function provideTestLex() {
+        return array(
+            // tests conversion of closing PHP tag and drop of whitespace and opening tags
+            array(
+                '<?php tokens ?>plaintext',
+                array(),
+                array(
+                    array(
+                        Tokens::T_STRING, 'tokens',
+                        array('startLine' => 1), array('endLine' => 1)
+                    ),
+                    array(
+                        ord(';'), '?>',
+                        array('startLine' => 1), array('endLine' => 1)
+                    ),
+                    array(
+                        Tokens::T_INLINE_HTML, 'plaintext',
+                        array('startLine' => 1, 'hasLeadingNewline' => false),
+                        array('endLine' => 1)
+                    ),
+                )
+            ),
+            // tests line numbers
+            array(
+                '<?php' . "\n" . '$ token /** doc' . "\n" . 'comment */ $',
+                array(),
+                array(
+                    array(
+                        ord('$'), '$',
+                        array('startLine' => 2), array('endLine' => 2)
+                    ),
+                    array(
+                        Tokens::T_STRING, 'token',
+                        array('startLine' => 2), array('endLine' => 2)
+                    ),
+                    array(
+                        ord('$'), '$',
+                        array(
+                            'startLine' => 3,
+                            'comments' => array(
+                                new Comment\Doc('/** doc' . "\n" . 'comment */', 2, 14),
+                            )
+                        ),
+                        array('endLine' => 3)
+                    ),
+                )
+            ),
+            // tests comment extraction
+            array(
+                '<?php /* comment */ // comment' . "\n" . '/** docComment 1 *//** docComment 2 */ token',
+                array(),
+                array(
+                    array(
+                        Tokens::T_STRING, 'token',
+                        array(
+                            'startLine' => 2,
+                            'comments' => array(
+                                new Comment('/* comment */', 1, 6),
+                                new Comment('// comment' . "\n", 1, 20),
+                                new Comment\Doc('/** docComment 1 */', 2, 31),
+                                new Comment\Doc('/** docComment 2 */', 2, 50),
+                            ),
+                        ),
+                        array('endLine' => 2)
+                    ),
+                )
+            ),
+            // tests differing start and end line
+            array(
+                '<?php "foo' . "\n" . 'bar"',
+                array(),
+                array(
+                    array(
+                        Tokens::T_CONSTANT_ENCAPSED_STRING, '"foo' . "\n" . 'bar"',
+                        array('startLine' => 1), array('endLine' => 2)
+                    ),
+                )
+            ),
+            // tests exact file offsets
+            array(
+                '<?php "a";' . "\n" . '// foo' . "\n" . '"b";',
+                array('usedAttributes' => array('startFilePos', 'endFilePos')),
+                array(
+                    array(
+                        Tokens::T_CONSTANT_ENCAPSED_STRING, '"a"',
+                        array('startFilePos' => 6), array('endFilePos' => 8)
+                    ),
+                    array(
+                        ord(';'), ';',
+                        array('startFilePos' => 9), array('endFilePos' => 9)
+                    ),
+                    array(
+                        Tokens::T_CONSTANT_ENCAPSED_STRING, '"b"',
+                        array('startFilePos' => 18), array('endFilePos' => 20)
+                    ),
+                    array(
+                        ord(';'), ';',
+                        array('startFilePos' => 21), array('endFilePos' => 21)
+                    ),
+                )
+            ),
+            // tests token offsets
+            array(
+                '<?php "a";' . "\n" . '// foo' . "\n" . '"b";',
+                array('usedAttributes' => array('startTokenPos', 'endTokenPos')),
+                array(
+                    array(
+                        Tokens::T_CONSTANT_ENCAPSED_STRING, '"a"',
+                        array('startTokenPos' => 1), array('endTokenPos' => 1)
+                    ),
+                    array(
+                        ord(';'), ';',
+                        array('startTokenPos' => 2), array('endTokenPos' => 2)
+                    ),
+                    array(
+                        Tokens::T_CONSTANT_ENCAPSED_STRING, '"b"',
+                        array('startTokenPos' => 5), array('endTokenPos' => 5)
+                    ),
+                    array(
+                        ord(';'), ';',
+                        array('startTokenPos' => 6), array('endTokenPos' => 6)
+                    ),
+                )
+            ),
+            // tests all attributes being disabled
+            array(
+                '<?php /* foo */ $bar;',
+                array('usedAttributes' => array()),
+                array(
+                    array(
+                        Tokens::T_VARIABLE, '$bar',
+                        array(), array()
+                    ),
+                    array(
+                        ord(';'), ';',
+                        array(), array()
+                    )
+                )
+            ),
+            // tests no tokens
+            array(
+                '',
+                array(),
+                array()
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider provideTestHaltCompiler
+     */
+    public function testHandleHaltCompiler($code, $remaining) {
+        $lexer = $this->getLexer();
+        $lexer->startLexing($code);
+
+        while (Tokens::T_HALT_COMPILER !== $lexer->getNextToken());
+
+        $this->assertSame($remaining, $lexer->handleHaltCompiler());
+        $this->assertSame(0, $lexer->getNextToken());
+    }
+
+    public function provideTestHaltCompiler() {
+        return array(
+            array('<?php ... __halt_compiler();Remaining Text', 'Remaining Text'),
+            array('<?php ... __halt_compiler ( ) ;Remaining Text', 'Remaining Text'),
+            array('<?php ... __halt_compiler() ?>Remaining Text', 'Remaining Text'),
+            //array('<?php ... __halt_compiler();' . "\0", "\0"),
+            //array('<?php ... __halt_compiler /* */ ( ) ;Remaining Text', 'Remaining Text'),
+        );
+    }
+
+    /**
+     * @expectedException \PhpParser\Error
+     * @expectedExceptionMessage __HALT_COMPILER must be followed by "();"
+     */
+    public function testHandleHaltCompilerError() {
+        $lexer = $this->getLexer();
+        $lexer->startLexing('<?php ... __halt_compiler invalid ();');
+
+        while (Tokens::T_HALT_COMPILER !== $lexer->getNextToken());
+        $lexer->handleHaltCompiler();
+    }
+
+    public function testGetTokens() {
+        $code = '<?php "a";' . "\n" . '// foo' . "\n" . '"b";';
+        $expectedTokens = array(
+            array(T_OPEN_TAG, '<?php ', 1),
+            array(T_CONSTANT_ENCAPSED_STRING, '"a"', 1),
+            ';',
+            array(T_WHITESPACE, "\n", 1),
+            array(T_COMMENT, '// foo' . "\n", 2),
+            array(T_CONSTANT_ENCAPSED_STRING, '"b"', 3),
+            ';',
+        );
+
+        $lexer = $this->getLexer();
+        $lexer->startLexing($code);
+        $this->assertSame($expectedTokens, $lexer->getTokens());
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Node/NameTest.php b/lib/nikic/php-parser/test/PhpParser/Node/NameTest.php
new file mode 100644
index 000000000..76a89c3ec
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Node/NameTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace PhpParser\Node;
+
+class NameTest extends \PHPUnit_Framework_TestCase
+{
+    public function testConstruct() {
+        $name = new Name(array('foo', 'bar'));
+        $this->assertSame(array('foo', 'bar'), $name->parts);
+
+        $name = new Name('foo\bar');
+        $this->assertSame(array('foo', 'bar'), $name->parts);
+
+        $name = new Name($name);
+        $this->assertSame(array('foo', 'bar'), $name->parts);
+    }
+
+    public function testGet() {
+        $name = new Name('foo');
+        $this->assertSame('foo', $name->getFirst());
+        $this->assertSame('foo', $name->getLast());
+
+        $name = new Name('foo\bar');
+        $this->assertSame('foo', $name->getFirst());
+        $this->assertSame('bar', $name->getLast());
+    }
+
+    public function testToString() {
+        $name = new Name('foo\bar');
+
+        $this->assertSame('foo\bar', (string) $name);
+        $this->assertSame('foo\bar', $name->toString());
+    }
+
+    public function testSlice() {
+        $name = new Name('foo\bar\baz');
+        $this->assertEquals(new Name('foo\bar\baz'), $name->slice(0));
+        $this->assertEquals(new Name('bar\baz'), $name->slice(1));
+        $this->assertNull($name->slice(3));
+        $this->assertEquals(new Name('foo\bar\baz'), $name->slice(-3));
+        $this->assertEquals(new Name('bar\baz'), $name->slice(-2));
+        $this->assertEquals(new Name('foo\bar'), $name->slice(0, -1));
+        $this->assertNull($name->slice(0, -3));
+        $this->assertEquals(new Name('bar'), $name->slice(1, -1));
+        $this->assertNull($name->slice(1, -2));
+        $this->assertEquals(new Name('bar'), $name->slice(-2, 1));
+        $this->assertEquals(new Name('bar'), $name->slice(-2, -1));
+        $this->assertNull($name->slice(-2, -2));
+    }
+
+    /**
+     * @expectedException \OutOfBoundsException
+     * @expectedExceptionMessage Offset 4 is out of bounds
+     */
+    public function testSliceOffsetTooLarge() {
+        (new Name('foo\bar\baz'))->slice(4);
+    }
+
+    /**
+     * @expectedException \OutOfBoundsException
+     * @expectedExceptionMessage Offset -4 is out of bounds
+     */
+    public function testSliceOffsetTooSmall() {
+        (new Name('foo\bar\baz'))->slice(-4);
+    }
+
+    /**
+     * @expectedException \OutOfBoundsException
+     * @expectedExceptionMessage Length 4 is out of bounds
+     */
+    public function testSliceLengthTooLarge() {
+        (new Name('foo\bar\baz'))->slice(0, 4);
+    }
+
+    /**
+     * @expectedException \OutOfBoundsException
+     * @expectedExceptionMessage Length -4 is out of bounds
+     */
+    public function testSliceLengthTooSmall() {
+        (new Name('foo\bar\baz'))->slice(0, -4);
+    }
+
+    public function testConcat() {
+        $this->assertEquals(new Name('foo\bar\baz'), Name::concat('foo', 'bar\baz'));
+        $this->assertEquals(
+            new Name\FullyQualified('foo\bar'),
+            Name\FullyQualified::concat(['foo'], new Name('bar'))
+        );
+
+        $attributes = ['foo' => 'bar'];
+        $this->assertEquals(
+            new Name\Relative('foo\bar\baz', $attributes),
+            Name\Relative::concat(new Name\FullyQualified('foo\bar'), 'baz', $attributes)
+        );
+
+        $this->assertEquals(new Name('foo'), Name::concat(null, 'foo'));
+        $this->assertEquals(new Name('foo'), Name::concat('foo', null));
+        $this->assertNull(Name::concat(null, null));
+    }
+
+    public function testIs() {
+        $name = new Name('foo');
+        $this->assertTrue ($name->isUnqualified());
+        $this->assertFalse($name->isQualified());
+        $this->assertFalse($name->isFullyQualified());
+        $this->assertFalse($name->isRelative());
+
+        $name = new Name('foo\bar');
+        $this->assertFalse($name->isUnqualified());
+        $this->assertTrue ($name->isQualified());
+        $this->assertFalse($name->isFullyQualified());
+        $this->assertFalse($name->isRelative());
+
+        $name = new Name\FullyQualified('foo');
+        $this->assertFalse($name->isUnqualified());
+        $this->assertFalse($name->isQualified());
+        $this->assertTrue ($name->isFullyQualified());
+        $this->assertFalse($name->isRelative());
+
+        $name = new Name\Relative('foo');
+        $this->assertFalse($name->isUnqualified());
+        $this->assertFalse($name->isQualified());
+        $this->assertFalse($name->isFullyQualified());
+        $this->assertTrue ($name->isRelative());
+    }
+
+    /**
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage Expected string, array of parts or Name instance
+     */
+    public function testInvalidArg() {
+        Name::concat('foo', new \stdClass);
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/PhpParser/Node/Scalar/MagicConstTest.php b/lib/nikic/php-parser/test/PhpParser/Node/Scalar/MagicConstTest.php
new file mode 100644
index 000000000..3141f563d
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Node/Scalar/MagicConstTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpParser\Node\Scalar;
+
+class MagicConstTest extends \PHPUnit_Framework_TestCase {
+    /**
+     * @dataProvider provideTestGetName
+     */
+    public function testGetName(MagicConst $magicConst, $name) {
+        $this->assertSame($name, $magicConst->getName());
+    }
+
+    public function provideTestGetName() {
+        return array(
+            array(new MagicConst\Class_, '__CLASS__'),
+            array(new MagicConst\Dir, '__DIR__'),
+            array(new MagicConst\File, '__FILE__'),
+            array(new MagicConst\Function_, '__FUNCTION__'),
+            array(new MagicConst\Line, '__LINE__'),
+            array(new MagicConst\Method, '__METHOD__'),
+            array(new MagicConst\Namespace_, '__NAMESPACE__'),
+            array(new MagicConst\Trait_, '__TRAIT__'),
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/PhpParser/Node/Scalar/StringTest.php b/lib/nikic/php-parser/test/PhpParser/Node/Scalar/StringTest.php
new file mode 100644
index 000000000..be3903578
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Node/Scalar/StringTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace PhpParser\Node\Scalar;
+
+class StringTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideTestParseEscapeSequences
+     */
+    public function testParseEscapeSequences($expected, $string, $quote) {
+        $this->assertSame(
+            $expected,
+            String_::parseEscapeSequences($string, $quote)
+        );
+    }
+
+    /**
+     * @dataProvider provideTestParse
+     */
+    public function testCreate($expected, $string) {
+        $this->assertSame(
+            $expected,
+            String_::parse($string)
+        );
+    }
+
+    public function provideTestParseEscapeSequences() {
+        return array(
+            array('"',              '\\"',              '"'),
+            array('\\"',            '\\"',              '`'),
+            array('\\"\\`',         '\\"\\`',           null),
+            array("\\\$\n\r\t\f\v", '\\\\\$\n\r\t\f\v', null),
+            array("\x1B",           '\e',               null),
+            array(chr(255),         '\xFF',             null),
+            array(chr(255),         '\377',             null),
+            array(chr(0),           '\400',             null),
+            array("\0",             '\0',               null),
+            array('\xFF',           '\\\\xFF',          null),
+        );
+    }
+
+    public function provideTestParse() {
+        $tests = array(
+            array('A', '\'A\''),
+            array('A', 'b\'A\''),
+            array('A', '"A"'),
+            array('A', 'b"A"'),
+            array('\\', '\'\\\\\''),
+            array('\'', '\'\\\'\''),
+        );
+
+        foreach ($this->provideTestParseEscapeSequences() as $i => $test) {
+            // skip second and third tests, they aren't for double quotes
+            if ($i != 1 && $i != 2) {
+                $tests[] = array($test[0], '"' . $test[1] . '"');
+            }
+        }
+
+        return $tests;
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassConstTest.php b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassConstTest.php
new file mode 100644
index 000000000..610972c6b
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassConstTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace PhpParser\Node\Stmt;
+
+class ClassConstTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideModifiers
+     */
+    public function testModifiers($modifier) {
+        $node = new ClassConst(
+            array(), // invalid
+            constant('PhpParser\Node\Stmt\Class_::MODIFIER_' . strtoupper($modifier))
+        );
+
+        $this->assertTrue($node->{'is' . $modifier}());
+    }
+
+    public function testNoModifiers() {
+        $node = new ClassConst(array(), 0);
+
+        $this->assertTrue($node->isPublic());
+        $this->assertFalse($node->isProtected());
+        $this->assertFalse($node->isPrivate());
+        $this->assertFalse($node->isStatic());
+    }
+
+    public function provideModifiers() {
+        return array(
+            array('public'),
+            array('protected'),
+            array('private'),
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassMethodTest.php b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassMethodTest.php
new file mode 100644
index 000000000..fa8aed808
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassMethodTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace PhpParser\Node\Stmt;
+
+class ClassMethodTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideModifiers
+     */
+    public function testModifiers($modifier) {
+        $node = new ClassMethod('foo', array(
+            'type' => constant('PhpParser\Node\Stmt\Class_::MODIFIER_' . strtoupper($modifier))
+        ));
+
+        $this->assertTrue($node->{'is' . $modifier}());
+    }
+
+    public function testNoModifiers() {
+        $node = new ClassMethod('foo', array('type' => 0));
+
+        $this->assertTrue($node->isPublic());
+        $this->assertFalse($node->isProtected());
+        $this->assertFalse($node->isPrivate());
+        $this->assertFalse($node->isAbstract());
+        $this->assertFalse($node->isFinal());
+        $this->assertFalse($node->isStatic());
+    }
+
+    public function provideModifiers() {
+        return array(
+            array('public'),
+            array('protected'),
+            array('private'),
+            array('abstract'),
+            array('final'),
+            array('static'),
+        );
+    }
+
+    /**
+     * Checks that implicit public modifier detection for method is working
+     *
+     * @dataProvider implicitPublicModifiers
+     *
+     * @param integer $modifier Node type modifier
+     */
+    public function testImplicitPublic($modifier)
+    {
+        $node = new ClassMethod('foo', array(
+            'type' => constant('PhpParser\Node\Stmt\Class_::MODIFIER_' . strtoupper($modifier))
+        ));
+
+        $this->assertTrue($node->isPublic(), 'Node should be implicitly public');
+    }
+
+    public function implicitPublicModifiers() {
+        return array(
+            array('abstract'),
+            array('final'),
+            array('static'),
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassTest.php b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassTest.php
new file mode 100644
index 000000000..75d49e3a8
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/ClassTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace PhpParser\Node\Stmt;
+
+class ClassTest extends \PHPUnit_Framework_TestCase
+{
+    public function testIsAbstract() {
+        $class = new Class_('Foo', array('type' => Class_::MODIFIER_ABSTRACT));
+        $this->assertTrue($class->isAbstract());
+
+        $class = new Class_('Foo');
+        $this->assertFalse($class->isAbstract());
+    }
+
+    public function testIsFinal() {
+        $class = new Class_('Foo', array('type' => Class_::MODIFIER_FINAL));
+        $this->assertTrue($class->isFinal());
+
+        $class = new Class_('Foo');
+        $this->assertFalse($class->isFinal());
+    }
+
+    public function testGetMethods() {
+        $methods = array(
+            new ClassMethod('foo'),
+            new ClassMethod('bar'),
+            new ClassMethod('fooBar'),
+        );
+        $class = new Class_('Foo', array(
+            'stmts' => array(
+                new TraitUse(array()),
+                $methods[0],
+                new ClassConst(array()),
+                $methods[1],
+                new Property(0, array()),
+                $methods[2],
+            )
+        ));
+
+        $this->assertSame($methods, $class->getMethods());
+    }
+
+    public function testGetMethod() {
+        $methodConstruct = new ClassMethod('__CONSTRUCT');
+        $methodTest = new ClassMethod('test');
+        $class = new Class_('Foo', array(
+            'stmts' => array(
+                new ClassConst(array()),
+                $methodConstruct,
+                new Property(0, array()),
+                $methodTest,
+            )
+        ));
+
+        $this->assertSame($methodConstruct, $class->getMethod('__construct'));
+        $this->assertSame($methodTest, $class->getMethod('test'));
+        $this->assertNull($class->getMethod('nonExisting'));
+    }
+
+    public function testDeprecatedTypeNode() {
+        $class = new Class_('Foo', array('type' => Class_::MODIFIER_ABSTRACT));
+        $this->assertTrue($class->isAbstract());
+        $this->assertSame(Class_::MODIFIER_ABSTRACT, $class->flags);
+        $this->assertSame(Class_::MODIFIER_ABSTRACT, $class->type);
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Node/Stmt/InterfaceTest.php b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/InterfaceTest.php
new file mode 100644
index 000000000..c49905826
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/InterfaceTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace PhpParser\Node\Stmt;
+
+use PhpParser\Node;
+
+class InterfaceTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetMethods() {
+        $methods = array(
+            new ClassMethod('foo'),
+            new ClassMethod('bar'),
+        );
+        $interface = new Class_('Foo', array(
+            'stmts' => array(
+                new Node\Stmt\ClassConst(array(new Node\Const_('C1', new Node\Scalar\String_('C1')))),
+                $methods[0],
+                new Node\Stmt\ClassConst(array(new Node\Const_('C2', new Node\Scalar\String_('C2')))),
+                $methods[1],
+                new Node\Stmt\ClassConst(array(new Node\Const_('C3', new Node\Scalar\String_('C3')))),
+            )
+        ));
+
+        $this->assertSame($methods, $interface->getMethods());
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Node/Stmt/PropertyTest.php b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/PropertyTest.php
new file mode 100644
index 000000000..bcfc0c6bd
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Node/Stmt/PropertyTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpParser\Node\Stmt;
+
+class PropertyTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideModifiers
+     */
+    public function testModifiers($modifier) {
+        $node = new Property(
+            constant('PhpParser\Node\Stmt\Class_::MODIFIER_' . strtoupper($modifier)),
+            array() // invalid
+        );
+
+        $this->assertTrue($node->{'is' . $modifier}());
+    }
+
+    public function testNoModifiers() {
+        $node = new Property(0, array());
+
+        $this->assertTrue($node->isPublic());
+        $this->assertFalse($node->isProtected());
+        $this->assertFalse($node->isPrivate());
+        $this->assertFalse($node->isStatic());
+    }
+
+    public function testStaticImplicitlyPublic() {
+        $node = new Property(Class_::MODIFIER_STATIC, array());
+        $this->assertTrue($node->isPublic());
+        $this->assertFalse($node->isProtected());
+        $this->assertFalse($node->isPrivate());
+        $this->assertTrue($node->isStatic());
+    }
+
+    public function provideModifiers() {
+        return array(
+            array('public'),
+            array('protected'),
+            array('private'),
+            array('static'),
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/NodeAbstractTest.php b/lib/nikic/php-parser/test/PhpParser/NodeAbstractTest.php
new file mode 100644
index 000000000..7fd0a39c7
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/NodeAbstractTest.php
@@ -0,0 +1,274 @@
+<?php
+
+namespace PhpParser;
+
+class DummyNode extends NodeAbstract {
+    public $subNode1;
+    public $subNode2;
+
+    public function __construct($subNode1, $subNode2, $attributes) {
+        parent::__construct($attributes);
+        $this->subNode1 = $subNode1;
+        $this->subNode2 = $subNode2;
+    }
+
+    public function getSubNodeNames() {
+        return array('subNode1', 'subNode2');
+    }
+
+    // This method is only overwritten because the node is located in an unusual namespace
+    public function getType() {
+        return 'Dummy';
+    }
+}
+
+class NodeAbstractTest extends \PHPUnit_Framework_TestCase
+{
+    public function provideNodes() {
+        $attributes = array(
+            'startLine' => 10,
+            'comments'  => array(
+                new Comment('// Comment' . "\n"),
+                new Comment\Doc('/** doc comment */'),
+            ),
+        );
+
+        $node = new DummyNode('value1', 'value2', $attributes);
+        $node->notSubNode = 'value3';
+
+        return array(
+            array($attributes, $node),
+        );
+    }
+
+    /**
+     * @dataProvider provideNodes
+     */
+    public function testConstruct(array $attributes, Node $node) {
+        $this->assertSame('Dummy', $node->getType());
+        $this->assertSame(array('subNode1', 'subNode2'), $node->getSubNodeNames());
+        $this->assertSame(10, $node->getLine());
+        $this->assertSame('/** doc comment */', $node->getDocComment()->getText());
+        $this->assertSame('value1', $node->subNode1);
+        $this->assertSame('value2', $node->subNode2);
+        $this->assertTrue(isset($node->subNode1));
+        $this->assertTrue(isset($node->subNode2));
+        $this->assertFalse(isset($node->subNode3));
+        $this->assertSame($attributes, $node->getAttributes());
+
+        return $node;
+    }
+
+    /**
+     * @dataProvider provideNodes
+     */
+    public function testGetDocComment(array $attributes, Node $node) {
+        $this->assertSame('/** doc comment */', $node->getDocComment()->getText());
+        array_pop($node->getAttribute('comments')); // remove doc comment
+        $this->assertNull($node->getDocComment());
+        array_pop($node->getAttribute('comments')); // remove comment
+        $this->assertNull($node->getDocComment());
+    }
+
+    public function testSetDocComment() {
+        $node = new DummyNode(null, null, []);
+
+        // Add doc comment to node without comments
+        $docComment = new Comment\Doc('/** doc */');
+        $node->setDocComment($docComment);
+        $this->assertSame($docComment, $node->getDocComment());
+
+        // Replace it
+        $docComment = new Comment\Doc('/** doc 2 */');
+        $node->setDocComment($docComment);
+        $this->assertSame($docComment, $node->getDocComment());
+
+        // Add docmment to node with other comments
+        $c1 = new Comment('/* foo */');
+        $c2 = new Comment('/* bar */');
+        $docComment = new Comment\Doc('/** baz */');
+        $node->setAttribute('comments', [$c1, $c2]);
+        $node->setDocComment($docComment);
+        $this->assertSame([$c1, $c2, $docComment], $node->getAttribute('comments'));
+    }
+
+    /**
+     * @dataProvider provideNodes
+     */
+    public function testChange(array $attributes, Node $node) {
+        // change of line
+        $node->setLine(15);
+        $this->assertSame(15, $node->getLine());
+
+        // direct modification
+        $node->subNode = 'newValue';
+        $this->assertSame('newValue', $node->subNode);
+
+        // indirect modification
+        $subNode =& $node->subNode;
+        $subNode = 'newNewValue';
+        $this->assertSame('newNewValue', $node->subNode);
+
+        // removal
+        unset($node->subNode);
+        $this->assertFalse(isset($node->subNode));
+    }
+
+    /**
+     * @dataProvider provideNodes
+     */
+    public function testIteration(array $attributes, Node $node) {
+        // Iteration is simple object iteration over properties,
+        // not over subnodes
+        $i = 0;
+        foreach ($node as $key => $value) {
+            if ($i === 0) {
+                $this->assertSame('subNode1', $key);
+                $this->assertSame('value1', $value);
+            } else if ($i === 1) {
+                $this->assertSame('subNode2', $key);
+                $this->assertSame('value2', $value);
+            } else if ($i === 2) {
+                $this->assertSame('notSubNode', $key);
+                $this->assertSame('value3', $value);
+            } else {
+                throw new \Exception;
+            }
+            $i++;
+        }
+        $this->assertSame(3, $i);
+    }
+
+    public function testAttributes() {
+        /** @var $node Node */
+        $node = $this->getMockForAbstractClass('PhpParser\NodeAbstract');
+
+        $this->assertEmpty($node->getAttributes());
+
+        $node->setAttribute('key', 'value');
+        $this->assertTrue($node->hasAttribute('key'));
+        $this->assertSame('value', $node->getAttribute('key'));
+
+        $this->assertFalse($node->hasAttribute('doesNotExist'));
+        $this->assertNull($node->getAttribute('doesNotExist'));
+        $this->assertSame('default', $node->getAttribute('doesNotExist', 'default'));
+
+        $node->setAttribute('null', null);
+        $this->assertTrue($node->hasAttribute('null'));
+        $this->assertNull($node->getAttribute('null'));
+        $this->assertNull($node->getAttribute('null', 'default'));
+
+        $this->assertSame(
+            array(
+                'key'  => 'value',
+                'null' => null,
+            ),
+            $node->getAttributes()
+        );
+    }
+
+    public function testJsonSerialization() {
+        $code = <<<'PHP'
+<?php
+// comment
+/** doc comment */
+function functionName(&$a = 0, $b = 1.0) {
+    echo 'Foo';
+}
+PHP;
+        $expected = <<<'JSON'
+[
+    {
+        "nodeType": "Stmt_Function",
+        "byRef": false,
+        "name": "functionName",
+        "params": [
+            {
+                "nodeType": "Param",
+                "type": null,
+                "byRef": true,
+                "variadic": false,
+                "name": "a",
+                "default": {
+                    "nodeType": "Scalar_LNumber",
+                    "value": 0,
+                    "attributes": {
+                        "startLine": 4,
+                        "endLine": 4,
+                        "kind": 10
+                    }
+                },
+                "attributes": {
+                    "startLine": 4,
+                    "endLine": 4
+                }
+            },
+            {
+                "nodeType": "Param",
+                "type": null,
+                "byRef": false,
+                "variadic": false,
+                "name": "b",
+                "default": {
+                    "nodeType": "Scalar_DNumber",
+                    "value": 1,
+                    "attributes": {
+                        "startLine": 4,
+                        "endLine": 4
+                    }
+                },
+                "attributes": {
+                    "startLine": 4,
+                    "endLine": 4
+                }
+            }
+        ],
+        "returnType": null,
+        "stmts": [
+            {
+                "nodeType": "Stmt_Echo",
+                "exprs": [
+                    {
+                        "nodeType": "Scalar_String",
+                        "value": "Foo",
+                        "attributes": {
+                            "startLine": 5,
+                            "endLine": 5,
+                            "kind": 1
+                        }
+                    }
+                ],
+                "attributes": {
+                    "startLine": 5,
+                    "endLine": 5
+                }
+            }
+        ],
+        "attributes": {
+            "startLine": 4,
+            "comments": [
+                {
+                    "nodeType": "Comment",
+                    "text": "\/\/ comment\n",
+                    "line": 2,
+                    "filePos": 6
+                },
+                {
+                    "nodeType": "Comment_Doc",
+                    "text": "\/** doc comment *\/",
+                    "line": 3,
+                    "filePos": 17
+                }
+            ],
+            "endLine": 6
+        }
+    }
+]
+JSON;
+
+        $parser = new Parser\Php7(new Lexer());
+        $stmts = $parser->parse(canonicalize($code));
+        $json = json_encode($stmts, JSON_PRETTY_PRINT);
+        $this->assertEquals(canonicalize($expected), canonicalize($json));
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/NodeDumperTest.php b/lib/nikic/php-parser/test/PhpParser/NodeDumperTest.php
new file mode 100644
index 000000000..9bb65a747
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/NodeDumperTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace PhpParser;
+
+class NodeDumperTest extends \PHPUnit_Framework_TestCase
+{
+    private function canonicalize($string) {
+        return str_replace("\r\n", "\n", $string);
+    }
+
+    /**
+     * @dataProvider provideTestDump
+     */
+    public function testDump($node, $dump) {
+        $dumper = new NodeDumper;
+
+        $this->assertSame($this->canonicalize($dump), $this->canonicalize($dumper->dump($node)));
+    }
+
+    public function provideTestDump() {
+        return array(
+            array(
+                array(),
+'array(
+)'
+            ),
+            array(
+                array('Foo', 'Bar', 'Key' => 'FooBar'),
+'array(
+    0: Foo
+    1: Bar
+    Key: FooBar
+)'
+            ),
+            array(
+                new Node\Name(array('Hallo', 'World')),
+'Name(
+    parts: array(
+        0: Hallo
+        1: World
+    )
+)'
+            ),
+            array(
+                new Node\Expr\Array_(array(
+                    new Node\Expr\ArrayItem(new Node\Scalar\String_('Foo'))
+                )),
+'Expr_Array(
+    items: array(
+        0: Expr_ArrayItem(
+            key: null
+            value: Scalar_String(
+                value: Foo
+            )
+            byRef: false
+        )
+    )
+)'
+            ),
+        );
+    }
+
+    public function testDumpWithPositions() {
+        $parser = (new ParserFactory)->create(
+            ParserFactory::ONLY_PHP7,
+            new Lexer(['usedAttributes' => ['startLine', 'endLine', 'startFilePos', 'endFilePos']])
+        );
+        $dumper = new NodeDumper(['dumpPositions' => true]);
+
+        $code = "<?php\n\$a = 1;\necho \$a;";
+        $expected = <<<'OUT'
+array(
+    0: Expr_Assign[2:1 - 2:6](
+        var: Expr_Variable[2:1 - 2:2](
+            name: a
+        )
+        expr: Scalar_LNumber[2:6 - 2:6](
+            value: 1
+        )
+    )
+    1: Stmt_Echo[3:1 - 3:8](
+        exprs: array(
+            0: Expr_Variable[3:6 - 3:7](
+                name: a
+            )
+        )
+    )
+)
+OUT;
+
+        $stmts = $parser->parse($code);
+        $dump = $dumper->dump($stmts, $code);
+
+        $this->assertSame($this->canonicalize($expected), $this->canonicalize($dump));
+    }
+
+    /**
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage Can only dump nodes and arrays.
+     */
+    public function testError() {
+        $dumper = new NodeDumper;
+        $dumper->dump(new \stdClass);
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/NodeTraverserTest.php b/lib/nikic/php-parser/test/PhpParser/NodeTraverserTest.php
new file mode 100644
index 000000000..9d27edcb6
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/NodeTraverserTest.php
@@ -0,0 +1,267 @@
+<?php
+
+namespace PhpParser;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Scalar\String_;
+
+class NodeTraverserTest extends \PHPUnit_Framework_TestCase
+{
+    public function testNonModifying() {
+        $str1Node = new String_('Foo');
+        $str2Node = new String_('Bar');
+        $echoNode = new Node\Stmt\Echo_(array($str1Node, $str2Node));
+        $stmts    = array($echoNode);
+
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+
+        $visitor->expects($this->at(0))->method('beforeTraverse')->with($stmts);
+        $visitor->expects($this->at(1))->method('enterNode')->with($echoNode);
+        $visitor->expects($this->at(2))->method('enterNode')->with($str1Node);
+        $visitor->expects($this->at(3))->method('leaveNode')->with($str1Node);
+        $visitor->expects($this->at(4))->method('enterNode')->with($str2Node);
+        $visitor->expects($this->at(5))->method('leaveNode')->with($str2Node);
+        $visitor->expects($this->at(6))->method('leaveNode')->with($echoNode);
+        $visitor->expects($this->at(7))->method('afterTraverse')->with($stmts);
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+
+        $this->assertEquals($stmts, $traverser->traverse($stmts));
+    }
+
+    public function testModifying() {
+        $str1Node  = new String_('Foo');
+        $str2Node  = new String_('Bar');
+        $printNode = new Expr\Print_($str1Node);
+
+        // first visitor changes the node, second verifies the change
+        $visitor1 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor2 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+
+        // replace empty statements with string1 node
+        $visitor1->expects($this->at(0))->method('beforeTraverse')->with(array())
+                 ->will($this->returnValue(array($str1Node)));
+        $visitor2->expects($this->at(0))->method('beforeTraverse')->with(array($str1Node));
+
+        // replace string1 node with print node
+        $visitor1->expects($this->at(1))->method('enterNode')->with($str1Node)
+                 ->will($this->returnValue($printNode));
+        $visitor2->expects($this->at(1))->method('enterNode')->with($printNode);
+
+        // replace string1 node with string2 node
+        $visitor1->expects($this->at(2))->method('enterNode')->with($str1Node)
+                 ->will($this->returnValue($str2Node));
+        $visitor2->expects($this->at(2))->method('enterNode')->with($str2Node);
+
+        // replace string2 node with string1 node again
+        $visitor1->expects($this->at(3))->method('leaveNode')->with($str2Node)
+                 ->will($this->returnValue($str1Node));
+        $visitor2->expects($this->at(3))->method('leaveNode')->with($str1Node);
+
+        // replace print node with string1 node again
+        $visitor1->expects($this->at(4))->method('leaveNode')->with($printNode)
+                 ->will($this->returnValue($str1Node));
+        $visitor2->expects($this->at(4))->method('leaveNode')->with($str1Node);
+
+        // replace string1 node with empty statements again
+        $visitor1->expects($this->at(5))->method('afterTraverse')->with(array($str1Node))
+                 ->will($this->returnValue(array()));
+        $visitor2->expects($this->at(5))->method('afterTraverse')->with(array());
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor1);
+        $traverser->addVisitor($visitor2);
+
+        // as all operations are reversed we end where we start
+        $this->assertEquals(array(), $traverser->traverse(array()));
+    }
+
+    public function testRemove() {
+        $str1Node = new String_('Foo');
+        $str2Node = new String_('Bar');
+
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+
+        // remove the string1 node, leave the string2 node
+        $visitor->expects($this->at(2))->method('leaveNode')->with($str1Node)
+                ->will($this->returnValue(false));
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+
+        $this->assertEquals(array($str2Node), $traverser->traverse(array($str1Node, $str2Node)));
+    }
+
+    public function testMerge() {
+        $strStart  = new String_('Start');
+        $strMiddle = new String_('End');
+        $strEnd    = new String_('Middle');
+        $strR1     = new String_('Replacement 1');
+        $strR2     = new String_('Replacement 2');
+
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+
+        // replace strMiddle with strR1 and strR2 by merge
+        $visitor->expects($this->at(4))->method('leaveNode')->with($strMiddle)
+                ->will($this->returnValue(array($strR1, $strR2)));
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+
+        $this->assertEquals(
+            array($strStart, $strR1, $strR2, $strEnd),
+            $traverser->traverse(array($strStart, $strMiddle, $strEnd))
+        );
+    }
+
+    public function testDeepArray() {
+        $strNode = new String_('Foo');
+        $stmts = array(array(array($strNode)));
+
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor->expects($this->at(1))->method('enterNode')->with($strNode);
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+
+        $this->assertEquals($stmts, $traverser->traverse($stmts));
+    }
+
+    public function testDontTraverseChildren() {
+        $strNode = new String_('str');
+        $printNode = new Expr\Print_($strNode);
+        $varNode = new Expr\Variable('foo');
+        $mulNode = new Expr\BinaryOp\Mul($varNode, $varNode);
+        $negNode = new Expr\UnaryMinus($mulNode);
+        $stmts = array($printNode, $negNode);
+
+        $visitor1 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor2 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+
+        $visitor1->expects($this->at(1))->method('enterNode')->with($printNode)
+            ->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CHILDREN));
+        $visitor2->expects($this->at(1))->method('enterNode')->with($printNode);
+
+        $visitor1->expects($this->at(2))->method('leaveNode')->with($printNode);
+        $visitor2->expects($this->at(2))->method('leaveNode')->with($printNode);
+
+        $visitor1->expects($this->at(3))->method('enterNode')->with($negNode);
+        $visitor2->expects($this->at(3))->method('enterNode')->with($negNode);
+
+        $visitor1->expects($this->at(4))->method('enterNode')->with($mulNode);
+        $visitor2->expects($this->at(4))->method('enterNode')->with($mulNode)
+            ->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CHILDREN));
+
+        $visitor1->expects($this->at(5))->method('leaveNode')->with($mulNode);
+        $visitor2->expects($this->at(5))->method('leaveNode')->with($mulNode);
+
+        $visitor1->expects($this->at(6))->method('leaveNode')->with($negNode);
+        $visitor2->expects($this->at(6))->method('leaveNode')->with($negNode);
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor1);
+        $traverser->addVisitor($visitor2);
+
+        $this->assertEquals($stmts, $traverser->traverse($stmts));
+    }
+
+    public function testStopTraversal() {
+        $varNode1 = new Expr\Variable('a');
+        $varNode2 = new Expr\Variable('b');
+        $varNode3 = new Expr\Variable('c');
+        $mulNode = new Expr\BinaryOp\Mul($varNode1, $varNode2);
+        $printNode = new Expr\Print_($varNode3);
+        $stmts = [$mulNode, $printNode];
+
+        // From enterNode() with array parent
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor->expects($this->at(1))->method('enterNode')->with($mulNode)
+            ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
+        $visitor->expects($this->at(2))->method('afterTraverse');
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+        $this->assertEquals($stmts, $traverser->traverse($stmts));
+
+        // From enterNode with Node parent
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor->expects($this->at(2))->method('enterNode')->with($varNode1)
+            ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
+        $visitor->expects($this->at(3))->method('afterTraverse');
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+        $this->assertEquals($stmts, $traverser->traverse($stmts));
+
+        // From leaveNode with Node parent
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor->expects($this->at(3))->method('leaveNode')->with($varNode1)
+            ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
+        $visitor->expects($this->at(4))->method('afterTraverse');
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+        $this->assertEquals($stmts, $traverser->traverse($stmts));
+
+        // From leaveNode with array parent
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor->expects($this->at(6))->method('leaveNode')->with($mulNode)
+            ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
+        $visitor->expects($this->at(7))->method('afterTraverse');
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+        $this->assertEquals($stmts, $traverser->traverse($stmts));
+
+        // Check that pending array modifications are still carried out
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor->expects($this->at(6))->method('leaveNode')->with($mulNode)
+            ->will($this->returnValue(NodeTraverser::REMOVE_NODE));
+        $visitor->expects($this->at(7))->method('enterNode')->with($printNode)
+            ->will($this->returnValue(NodeTraverser::STOP_TRAVERSAL));
+        $visitor->expects($this->at(8))->method('afterTraverse');
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+        $this->assertEquals([$printNode], $traverser->traverse($stmts));
+
+    }
+
+    public function testRemovingVisitor() {
+        $visitor1 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor2 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor3 = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor1);
+        $traverser->addVisitor($visitor2);
+        $traverser->addVisitor($visitor3);
+
+        $preExpected = array($visitor1, $visitor2, $visitor3);
+        $this->assertAttributeSame($preExpected, 'visitors', $traverser, 'The appropriate visitors have not been added');
+
+        $traverser->removeVisitor($visitor2);
+
+        $postExpected = array(0 => $visitor1, 2 => $visitor3);
+        $this->assertAttributeSame($postExpected, 'visitors', $traverser, 'The appropriate visitors are not present after removal');
+    }
+
+    public function testNoCloneNodes() {
+        $stmts = array(new Node\Stmt\Echo_(array(new String_('Foo'), new String_('Bar'))));
+
+        $traverser = new NodeTraverser;
+
+        $this->assertSame($stmts, $traverser->traverse($stmts));
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage leaveNode() may only return an array if the parent structure is an array
+     */
+    public function testReplaceByArrayOnlyAllowedIfParentIsArray() {
+        $stmts = array(new Node\Expr\UnaryMinus(new Node\Scalar\LNumber(42)));
+
+        $visitor = $this->getMockBuilder('PhpParser\NodeVisitor')->getMock();
+        $visitor->method('leaveNode')->willReturn(array(new Node\Scalar\DNumber(42.0)));
+
+        $traverser = new NodeTraverser();
+        $traverser->addVisitor($visitor);
+        $traverser->traverse($stmts);
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/NodeVisitor/NameResolverTest.php b/lib/nikic/php-parser/test/PhpParser/NodeVisitor/NameResolverTest.php
new file mode 100644
index 000000000..031337459
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/NodeVisitor/NameResolverTest.php
@@ -0,0 +1,468 @@
+<?php
+
+namespace PhpParser\NodeVisitor;
+
+use PhpParser;
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt;
+
+class NameResolverTest extends \PHPUnit_Framework_TestCase
+{
+    private function canonicalize($string) {
+        return str_replace("\r\n", "\n", $string);
+    }
+
+    /**
+     * @covers PhpParser\NodeVisitor\NameResolver
+     */
+    public function testResolveNames() {
+        $code = <<<'EOC'
+<?php
+
+namespace Foo {
+    use Hallo as Hi;
+
+    new Bar();
+    new Hi();
+    new Hi\Bar();
+    new \Bar();
+    new namespace\Bar();
+
+    bar();
+    hi();
+    Hi\bar();
+    foo\bar();
+    \bar();
+    namespace\bar();
+}
+namespace {
+    use Hallo as Hi;
+
+    new Bar();
+    new Hi();
+    new Hi\Bar();
+    new \Bar();
+    new namespace\Bar();
+
+    bar();
+    hi();
+    Hi\bar();
+    foo\bar();
+    \bar();
+    namespace\bar();
+}
+namespace Bar {
+    use function foo\bar as baz;
+    use const foo\BAR as BAZ;
+    use foo as bar;
+
+    bar();
+    baz();
+    bar\foo();
+    baz\foo();
+    BAR();
+    BAZ();
+    BAR\FOO();
+    BAZ\FOO();
+
+    bar;
+    baz;
+    bar\foo;
+    baz\foo;
+    BAR;
+    BAZ;
+    BAR\FOO;
+    BAZ\FOO;
+}
+namespace Baz {
+    use A\T\{B\C, D\E};
+    use function X\T\{b\c, d\e};
+    use const Y\T\{B\C, D\E};
+    use Z\T\{G, function f, const K};
+
+    new C;
+    new E;
+    new C\D;
+    new E\F;
+    new G;
+
+    c();
+    e();
+    f();
+    C;
+    E;
+    K;
+}
+EOC;
+        $expectedCode = <<<'EOC'
+namespace Foo {
+    use Hallo as Hi;
+    new \Foo\Bar();
+    new \Hallo();
+    new \Hallo\Bar();
+    new \Bar();
+    new \Foo\Bar();
+    bar();
+    hi();
+    \Hallo\bar();
+    \Foo\foo\bar();
+    \bar();
+    \Foo\bar();
+}
+namespace {
+    use Hallo as Hi;
+    new \Bar();
+    new \Hallo();
+    new \Hallo\Bar();
+    new \Bar();
+    new \Bar();
+    \bar();
+    \hi();
+    \Hallo\bar();
+    \foo\bar();
+    \bar();
+    \bar();
+}
+namespace Bar {
+    use function foo\bar as baz;
+    use const foo\BAR as BAZ;
+    use foo as bar;
+    bar();
+    \foo\bar();
+    \foo\foo();
+    \Bar\baz\foo();
+    BAR();
+    \foo\bar();
+    \foo\FOO();
+    \Bar\BAZ\FOO();
+    bar;
+    baz;
+    \foo\foo;
+    \Bar\baz\foo;
+    BAR;
+    \foo\BAR;
+    \foo\FOO;
+    \Bar\BAZ\FOO;
+}
+namespace Baz {
+    use A\T\{B\C, D\E};
+    use function X\T\{b\c, d\e};
+    use const Y\T\{B\C, D\E};
+    use Z\T\{G, function f, const K};
+    new \A\T\B\C();
+    new \A\T\D\E();
+    new \A\T\B\C\D();
+    new \A\T\D\E\F();
+    new \Z\T\G();
+    \X\T\b\c();
+    \X\T\d\e();
+    \Z\T\f();
+    \Y\T\B\C;
+    \Y\T\D\E;
+    \Z\T\K;
+}
+EOC;
+
+        $parser        = new PhpParser\Parser\Php7(new PhpParser\Lexer\Emulative);
+        $prettyPrinter = new PhpParser\PrettyPrinter\Standard;
+        $traverser     = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver);
+
+        $stmts = $parser->parse($code);
+        $stmts = $traverser->traverse($stmts);
+
+        $this->assertSame(
+            $this->canonicalize($expectedCode),
+            $prettyPrinter->prettyPrint($stmts)
+        );
+    }
+
+    /**
+     * @covers PhpParser\NodeVisitor\NameResolver
+     */
+    public function testResolveLocations() {
+        $code = <<<'EOC'
+<?php
+namespace NS;
+
+class A extends B implements C, D {
+    use E, F, G {
+        f as private g;
+        E::h as i;
+        E::j insteadof F, G;
+    }
+}
+
+interface A extends C, D {
+    public function a(A $a) : A;
+}
+
+function fn(A $a) : A {}
+function fn2(array $a) : array {}
+function(A $a) : A {};
+
+function fn3(?A $a) : ?A {}
+function fn4(?array $a) : ?array {}
+
+A::b();
+A::$b;
+A::B;
+new A;
+$a instanceof A;
+
+namespace\a();
+namespace\A;
+
+try {
+    $someThing;
+} catch (A $a) {
+    $someThingElse;
+}
+EOC;
+        $expectedCode = <<<'EOC'
+namespace NS;
+
+class A extends \NS\B implements \NS\C, \NS\D
+{
+    use \NS\E, \NS\F, \NS\G {
+        f as private g;
+        \NS\E::h as i;
+        \NS\E::j insteadof \NS\F, \NS\G;
+    }
+}
+interface A extends \NS\C, \NS\D
+{
+    public function a(\NS\A $a) : \NS\A;
+}
+function fn(\NS\A $a) : \NS\A
+{
+}
+function fn2(array $a) : array
+{
+}
+function (\NS\A $a) : \NS\A {
+};
+function fn3(?\NS\A $a) : ?\NS\A
+{
+}
+function fn4(?array $a) : ?array
+{
+}
+\NS\A::b();
+\NS\A::$b;
+\NS\A::B;
+new \NS\A();
+$a instanceof \NS\A;
+\NS\a();
+\NS\A;
+try {
+    $someThing;
+} catch (\NS\A $a) {
+    $someThingElse;
+}
+EOC;
+
+        $parser        = new PhpParser\Parser\Php7(new PhpParser\Lexer\Emulative);
+        $prettyPrinter = new PhpParser\PrettyPrinter\Standard;
+        $traverser     = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver);
+
+        $stmts = $parser->parse($code);
+        $stmts = $traverser->traverse($stmts);
+
+        $this->assertSame(
+            $this->canonicalize($expectedCode),
+            $prettyPrinter->prettyPrint($stmts)
+        );
+    }
+
+    public function testNoResolveSpecialName() {
+        $stmts = array(new Node\Expr\New_(new Name('self')));
+
+        $traverser = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver);
+
+        $this->assertEquals($stmts, $traverser->traverse($stmts));
+    }
+
+    public function testAddDeclarationNamespacedName() {
+        $nsStmts = array(
+            new Stmt\Class_('A'),
+            new Stmt\Interface_('B'),
+            new Stmt\Function_('C'),
+            new Stmt\Const_(array(
+                new Node\Const_('D', new Node\Scalar\LNumber(42))
+            )),
+            new Stmt\Trait_('E'),
+            new Expr\New_(new Stmt\Class_(null)),
+        );
+
+        $traverser = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver);
+
+        $stmts = $traverser->traverse([new Stmt\Namespace_(new Name('NS'), $nsStmts)]);
+        $this->assertSame('NS\\A', (string) $stmts[0]->stmts[0]->namespacedName);
+        $this->assertSame('NS\\B', (string) $stmts[0]->stmts[1]->namespacedName);
+        $this->assertSame('NS\\C', (string) $stmts[0]->stmts[2]->namespacedName);
+        $this->assertSame('NS\\D', (string) $stmts[0]->stmts[3]->consts[0]->namespacedName);
+        $this->assertSame('NS\\E', (string) $stmts[0]->stmts[4]->namespacedName);
+        $this->assertObjectNotHasAttribute('namespacedName', $stmts[0]->stmts[5]->class);
+
+        $stmts = $traverser->traverse([new Stmt\Namespace_(null, $nsStmts)]);
+        $this->assertSame('A',     (string) $stmts[0]->stmts[0]->namespacedName);
+        $this->assertSame('B',     (string) $stmts[0]->stmts[1]->namespacedName);
+        $this->assertSame('C',     (string) $stmts[0]->stmts[2]->namespacedName);
+        $this->assertSame('D',     (string) $stmts[0]->stmts[3]->consts[0]->namespacedName);
+        $this->assertSame('E',     (string) $stmts[0]->stmts[4]->namespacedName);
+        $this->assertObjectNotHasAttribute('namespacedName', $stmts[0]->stmts[5]->class);
+    }
+
+    public function testAddRuntimeResolvedNamespacedName() {
+        $stmts = array(
+            new Stmt\Namespace_(new Name('NS'), array(
+                new Expr\FuncCall(new Name('foo')),
+                new Expr\ConstFetch(new Name('FOO')),
+            )),
+            new Stmt\Namespace_(null, array(
+                new Expr\FuncCall(new Name('foo')),
+                new Expr\ConstFetch(new Name('FOO')),
+            )),
+        );
+
+        $traverser = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver);
+        $stmts = $traverser->traverse($stmts);
+        
+        $this->assertSame('NS\\foo', (string) $stmts[0]->stmts[0]->name->getAttribute('namespacedName'));
+        $this->assertSame('NS\\FOO', (string) $stmts[0]->stmts[1]->name->getAttribute('namespacedName'));
+
+        $this->assertFalse($stmts[1]->stmts[0]->name->hasAttribute('namespacedName'));
+        $this->assertFalse($stmts[1]->stmts[1]->name->hasAttribute('namespacedName'));
+    }
+
+    /**
+     * @dataProvider provideTestError
+     */
+    public function testError(Node $stmt, $errorMsg) {
+        $this->setExpectedException('PhpParser\Error', $errorMsg);
+
+        $traverser = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver);
+        $traverser->traverse(array($stmt));
+    }
+
+    public function provideTestError() {
+        return array(
+            array(
+                new Stmt\Use_(array(
+                    new Stmt\UseUse(new Name('A\B'), 'B', 0, array('startLine' => 1)),
+                    new Stmt\UseUse(new Name('C\D'), 'B', 0, array('startLine' => 2)),
+                ), Stmt\Use_::TYPE_NORMAL),
+                'Cannot use C\D as B because the name is already in use on line 2'
+            ),
+            array(
+                new Stmt\Use_(array(
+                    new Stmt\UseUse(new Name('a\b'), 'b', 0, array('startLine' => 1)),
+                    new Stmt\UseUse(new Name('c\d'), 'B', 0, array('startLine' => 2)),
+                ), Stmt\Use_::TYPE_FUNCTION),
+                'Cannot use function c\d as B because the name is already in use on line 2'
+            ),
+            array(
+                new Stmt\Use_(array(
+                    new Stmt\UseUse(new Name('A\B'), 'B', 0, array('startLine' => 1)),
+                    new Stmt\UseUse(new Name('C\D'), 'B', 0, array('startLine' => 2)),
+                ), Stmt\Use_::TYPE_CONSTANT),
+                'Cannot use const C\D as B because the name is already in use on line 2'
+            ),
+            array(
+                new Expr\New_(new Name\FullyQualified('self', array('startLine' => 3))),
+                "'\\self' is an invalid class name on line 3"
+            ),
+            array(
+                new Expr\New_(new Name\Relative('self', array('startLine' => 3))),
+                "'\\self' is an invalid class name on line 3"
+            ),
+            array(
+                new Expr\New_(new Name\FullyQualified('PARENT', array('startLine' => 3))),
+                "'\\PARENT' is an invalid class name on line 3"
+            ),
+            array(
+                new Expr\New_(new Name\Relative('STATIC', array('startLine' => 3))),
+                "'\\STATIC' is an invalid class name on line 3"
+            ),
+        );
+    }
+
+    public function testClassNameIsCaseInsensitive()
+    {
+        $source = <<<'EOC'
+<?php
+namespace Foo;
+use Bar\Baz;
+$test = new baz();
+EOC;
+
+        $parser = new PhpParser\Parser\Php7(new PhpParser\Lexer\Emulative);
+        $stmts = $parser->parse($source);
+
+        $traverser = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver);
+
+        $stmts = $traverser->traverse($stmts);
+        $stmt = $stmts[0];
+
+        $this->assertSame(array('Bar', 'Baz'), $stmt->stmts[1]->expr->class->parts);
+    }
+
+    public function testSpecialClassNamesAreCaseInsensitive() {
+        $source = <<<'EOC'
+<?php
+namespace Foo;
+
+class Bar
+{
+    public static function method()
+    {
+        SELF::method();
+        PARENT::method();
+        STATIC::method();
+    }
+}
+EOC;
+
+        $parser = new PhpParser\Parser\Php7(new PhpParser\Lexer\Emulative);
+        $stmts = $parser->parse($source);
+
+        $traverser = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver);
+
+        $stmts = $traverser->traverse($stmts);
+        $classStmt = $stmts[0];
+        $methodStmt = $classStmt->stmts[0]->stmts[0];
+
+        $this->assertSame('SELF', (string)$methodStmt->stmts[0]->class);
+        $this->assertSame('PARENT', (string)$methodStmt->stmts[1]->class);
+        $this->assertSame('STATIC', (string)$methodStmt->stmts[2]->class);
+    }
+
+    public function testAddOriginalNames() {
+        $traverser = new PhpParser\NodeTraverser;
+        $traverser->addVisitor(new NameResolver(null, ['preserveOriginalNames' => true]));
+
+        $n1 = new Name('Bar');
+        $n2 = new Name('bar');
+        $origStmts = [
+            new Stmt\Namespace_(new Name('Foo'), [
+                new Expr\ClassConstFetch($n1, 'FOO'),
+                new Expr\FuncCall($n2),
+            ])
+        ];
+
+        $stmts = $traverser->traverse($origStmts);
+
+        $this->assertSame($n1, $stmts[0]->stmts[0]->class->getAttribute('originalName'));
+        $this->assertSame($n2, $stmts[0]->stmts[1]->name->getAttribute('originalName'));
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php b/lib/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php
new file mode 100644
index 000000000..01d3b6040
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Parser/MultipleTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace PhpParser\Parser;
+
+use PhpParser\Error;
+use PhpParser\Lexer;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Stmt;
+use PhpParser\ParserTest;
+
+require_once __DIR__ . '/../ParserTest.php';
+
+class MultipleTest extends ParserTest {
+    // This provider is for the generic parser tests, just pick an arbitrary order here
+    protected function getParser(Lexer $lexer) {
+        return new Multiple([new Php5($lexer), new Php7($lexer)]);
+    }
+
+    private function getPrefer7() {
+        $lexer = new Lexer(['usedAttributes' => []]);
+        return new Multiple([new Php7($lexer), new Php5($lexer)]);
+    }
+
+    private function getPrefer5() {
+        $lexer = new Lexer(['usedAttributes' => []]);
+        return new Multiple([new Php5($lexer), new Php7($lexer)]);
+    }
+
+    /** @dataProvider provideTestParse */
+    public function testParse($code, Multiple $parser, $expected) {
+        $this->assertEquals($expected, $parser->parse($code));
+    }
+
+    public function provideTestParse() {
+        return [
+            [
+                // PHP 7 only code
+                '<?php class Test { function function() {} }',
+                $this->getPrefer5(),
+                [
+                    new Stmt\Class_('Test', ['stmts' => [
+                        new Stmt\ClassMethod('function')
+                    ]]),
+                ]
+            ],
+            [
+                // PHP 5 only code
+                '<?php global $$a->b;',
+                $this->getPrefer7(),
+                [
+                    new Stmt\Global_([
+                        new Expr\Variable(new Expr\PropertyFetch(new Expr\Variable('a'), 'b'))
+                    ])
+                ]
+            ],
+            [
+                // Different meaning (PHP 5)
+                '<?php $$a[0];',
+                $this->getPrefer5(),
+                [
+                    new Expr\Variable(
+                        new Expr\ArrayDimFetch(new Expr\Variable('a'), LNumber::fromString('0'))
+                    )
+                ]
+            ],
+            [
+                // Different meaning (PHP 7)
+                '<?php $$a[0];',
+                $this->getPrefer7(),
+                [
+                    new Expr\ArrayDimFetch(
+                        new Expr\Variable(new Expr\Variable('a')), LNumber::fromString('0')
+                    )
+                ]
+            ],
+        ];
+    }
+
+    public function testThrownError() {
+        $this->setExpectedException('PhpParser\Error', 'FAIL A');
+
+        $parserA = $this->getMockBuilder('PhpParser\Parser')->getMock();
+        $parserA->expects($this->at(0))
+            ->method('parse')->will($this->throwException(new Error('FAIL A')));
+
+        $parserB = $this->getMockBuilder('PhpParser\Parser')->getMock();
+        $parserB->expects($this->at(0))
+            ->method('parse')->will($this->throwException(new Error('FAIL B')));
+
+        $parser = new Multiple([$parserA, $parserB]);
+        $parser->parse('dummy');
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/PhpParser/Parser/Php5Test.php b/lib/nikic/php-parser/test/PhpParser/Parser/Php5Test.php
new file mode 100644
index 000000000..58c4e617c
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Parser/Php5Test.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace PhpParser\Parser;
+
+use PhpParser\Lexer;
+use PhpParser\ParserTest;
+
+require_once __DIR__ . '/../ParserTest.php';
+
+class Php5Test extends ParserTest {
+    protected function getParser(Lexer $lexer) {
+        return new Php5($lexer);
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Parser/Php7Test.php b/lib/nikic/php-parser/test/PhpParser/Parser/Php7Test.php
new file mode 100644
index 000000000..d6ab9e19f
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Parser/Php7Test.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace PhpParser\Parser;
+
+use PhpParser\Lexer;
+use PhpParser\ParserTest;
+
+require_once __DIR__ . '/../ParserTest.php';
+
+class Php7Test extends ParserTest {
+    protected function getParser(Lexer $lexer) {
+        return new Php7($lexer);
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/ParserFactoryTest.php b/lib/nikic/php-parser/test/PhpParser/ParserFactoryTest.php
new file mode 100644
index 000000000..49c01115e
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/ParserFactoryTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace PhpParser;
+
+/* This test is very weak, because PHPUnit's assertEquals assertion is way too slow dealing with the
+ * large objects involved here. So we just do some basic instanceof tests instead. */
+class ParserFactoryTest extends \PHPUnit_Framework_TestCase {
+    /** @dataProvider provideTestCreate */
+    public function testCreate($kind, $lexer, $expected) {
+        $this->assertInstanceOf($expected, (new ParserFactory)->create($kind, $lexer));
+    }
+
+    public function provideTestCreate() {
+        $lexer = new Lexer();
+        return [
+            [
+                ParserFactory::PREFER_PHP7, $lexer,
+                'PhpParser\Parser\Multiple'
+            ],
+            [
+                ParserFactory::PREFER_PHP5, null,
+                'PhpParser\Parser\Multiple'
+            ],
+            [
+                ParserFactory::ONLY_PHP7, null,
+                'PhpParser\Parser\Php7'
+            ],
+            [
+                ParserFactory::ONLY_PHP5, $lexer,
+                'PhpParser\Parser\Php5'
+            ]
+        ];
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/PhpParser/ParserTest.php b/lib/nikic/php-parser/test/PhpParser/ParserTest.php
new file mode 100644
index 000000000..0dabba216
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/ParserTest.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace PhpParser;
+
+use PhpParser\Comment;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Scalar;
+use PhpParser\Node\Scalar\String_;
+
+abstract class ParserTest extends \PHPUnit_Framework_TestCase
+{
+    /** @returns Parser */
+    abstract protected function getParser(Lexer $lexer);
+
+    /**
+     * @expectedException \PhpParser\Error
+     * @expectedExceptionMessage Syntax error, unexpected EOF on line 1
+     */
+    public function testParserThrowsSyntaxError() {
+        $parser = $this->getParser(new Lexer());
+        $parser->parse('<?php foo');
+    }
+
+    /**
+     * @expectedException \PhpParser\Error
+     * @expectedExceptionMessage Cannot use foo as self because 'self' is a special class name on line 1
+     */
+    public function testParserThrowsSpecialError() {
+        $parser = $this->getParser(new Lexer());
+        $parser->parse('<?php use foo as self;');
+    }
+
+    /**
+     * @expectedException \PhpParser\Error
+     * @expectedExceptionMessage Unterminated comment on line 1
+     */
+    public function testParserThrowsLexerError() {
+        $parser = $this->getParser(new Lexer());
+        $parser->parse('<?php /*');
+    }
+
+    public function testAttributeAssignment() {
+        $lexer = new Lexer(array(
+            'usedAttributes' => array(
+                'comments', 'startLine', 'endLine',
+                'startTokenPos', 'endTokenPos',
+            )
+        ));
+
+        $code = <<<'EOC'
+<?php
+/** Doc comment */
+function test($a) {
+    // Line
+    // Comments
+    echo $a;
+}
+EOC;
+        $code = canonicalize($code);
+
+        $parser = $this->getParser($lexer);
+        $stmts = $parser->parse($code);
+
+        /** @var \PhpParser\Node\Stmt\Function_ $fn */
+        $fn = $stmts[0];
+        $this->assertInstanceOf('PhpParser\Node\Stmt\Function_', $fn);
+        $this->assertEquals(array(
+            'comments' => array(
+                new Comment\Doc('/** Doc comment */', 2, 6),
+            ),
+            'startLine' => 3,
+            'endLine' => 7,
+            'startTokenPos' => 3,
+            'endTokenPos' => 21,
+        ), $fn->getAttributes());
+
+        $param = $fn->params[0];
+        $this->assertInstanceOf('PhpParser\Node\Param', $param);
+        $this->assertEquals(array(
+            'startLine' => 3,
+            'endLine' => 3,
+            'startTokenPos' => 7,
+            'endTokenPos' => 7,
+        ), $param->getAttributes());
+
+        /** @var \PhpParser\Node\Stmt\Echo_ $echo */
+        $echo = $fn->stmts[0];
+        $this->assertInstanceOf('PhpParser\Node\Stmt\Echo_', $echo);
+        $this->assertEquals(array(
+            'comments' => array(
+                new Comment("// Line\n", 4, 49),
+                new Comment("// Comments\n", 5, 61),
+            ),
+            'startLine' => 6,
+            'endLine' => 6,
+            'startTokenPos' => 16,
+            'endTokenPos' => 19,
+        ), $echo->getAttributes());
+
+        /** @var \PhpParser\Node\Expr\Variable $var */
+        $var = $echo->exprs[0];
+        $this->assertInstanceOf('PhpParser\Node\Expr\Variable', $var);
+        $this->assertEquals(array(
+            'startLine' => 6,
+            'endLine' => 6,
+            'startTokenPos' => 18,
+            'endTokenPos' => 18,
+        ), $var->getAttributes());
+    }
+
+    /**
+     * @expectedException \RangeException
+     * @expectedExceptionMessage The lexer returned an invalid token (id=999, value=foobar)
+     */
+    public function testInvalidToken() {
+        $lexer = new InvalidTokenLexer;
+        $parser = $this->getParser($lexer);
+        $parser->parse('dummy');
+    }
+
+    /**
+     * @dataProvider provideTestExtraAttributes
+     */
+    public function testExtraAttributes($code, $expectedAttributes) {
+        $parser = $this->getParser(new Lexer);
+        $stmts = $parser->parse("<?php $code;");
+        $attributes = $stmts[0]->getAttributes();
+        foreach ($expectedAttributes as $name => $value) {
+            $this->assertSame($value, $attributes[$name]);
+        }
+    }
+
+    public function provideTestExtraAttributes() {
+        return array(
+            array('0', ['kind' => Scalar\LNumber::KIND_DEC]),
+            array('9', ['kind' => Scalar\LNumber::KIND_DEC]),
+            array('07', ['kind' => Scalar\LNumber::KIND_OCT]),
+            array('0xf', ['kind' => Scalar\LNumber::KIND_HEX]),
+            array('0XF', ['kind' => Scalar\LNumber::KIND_HEX]),
+            array('0b1', ['kind' => Scalar\LNumber::KIND_BIN]),
+            array('0B1', ['kind' => Scalar\LNumber::KIND_BIN]),
+            array('[]', ['kind' => Expr\Array_::KIND_SHORT]),
+            array('array()', ['kind' => Expr\Array_::KIND_LONG]),
+            array("'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]),
+            array("b'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]),
+            array("B'foo'", ['kind' => String_::KIND_SINGLE_QUOTED]),
+            array('"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]),
+            array('b"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]),
+            array('B"foo"', ['kind' => String_::KIND_DOUBLE_QUOTED]),
+            array('"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]),
+            array('b"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]),
+            array('B"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]),
+            array("<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']),
+            array("<<<STR\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']),
+            array("<<<\"STR\"\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']),
+            array("b<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']),
+            array("B<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']),
+            array("<<< \t 'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']),
+            // HHVM doesn't support this due to a lexer bug
+            // (https://github.com/facebook/hhvm/issues/6970)
+            // array("<<<'\xff'\n\xff\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => "\xff"]),
+            array("<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']),
+            array("b<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']),
+            array("B<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']),
+            array("<<< \t \"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']),
+            array("die", ['kind' => Expr\Exit_::KIND_DIE]),
+            array("die('done')", ['kind' => Expr\Exit_::KIND_DIE]),
+            array("exit", ['kind' => Expr\Exit_::KIND_EXIT]),
+            array("exit(1)", ['kind' => Expr\Exit_::KIND_EXIT]),
+            array("?>Foo", ['hasLeadingNewline' => false]),
+            array("?>\nFoo", ['hasLeadingNewline' => true]),
+            array("namespace Foo;", ['kind' => Node\Stmt\Namespace_::KIND_SEMICOLON]),
+            array("namespace Foo {}", ['kind' => Node\Stmt\Namespace_::KIND_BRACED]),
+            array("namespace {}", ['kind' => Node\Stmt\Namespace_::KIND_BRACED]),
+        );
+    }
+}
+
+class InvalidTokenLexer extends Lexer {
+    public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) {
+        $value = 'foobar';
+        return 999;
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php b/lib/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php
new file mode 100644
index 000000000..908c18b2b
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php
@@ -0,0 +1,207 @@
+<?php
+
+namespace PhpParser;
+
+use PhpParser\Comment;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Name;
+use PhpParser\Node\Scalar\DNumber;
+use PhpParser\Node\Scalar\Encapsed;
+use PhpParser\Node\Scalar\EncapsedStringPart;
+use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\Stmt;
+use PhpParser\PrettyPrinter\Standard;
+
+require_once __DIR__ . '/CodeTestAbstract.php';
+
+class PrettyPrinterTest extends CodeTestAbstract
+{
+    protected function doTestPrettyPrintMethod($method, $name, $code, $expected, $modeLine) {
+        $lexer = new Lexer\Emulative;
+        $parser5 = new Parser\Php5($lexer);
+        $parser7 = new Parser\Php7($lexer);
+
+        list($version, $options) = $this->parseModeLine($modeLine);
+        $prettyPrinter = new Standard($options);
+
+        try {
+            $output5 = canonicalize($prettyPrinter->$method($parser5->parse($code)));
+        } catch (Error $e) {
+            $output5 = null;
+            if ('php7' !== $version) {
+                throw $e;
+            }
+        }
+
+        try {
+            $output7 = canonicalize($prettyPrinter->$method($parser7->parse($code)));
+        } catch (Error $e) {
+            $output7 = null;
+            if ('php5' !== $version) {
+                throw $e;
+            }
+        }
+
+        if ('php5' === $version) {
+            $this->assertSame($expected, $output5, $name);
+            $this->assertNotSame($expected, $output7, $name);
+        } else if ('php7' === $version) {
+            $this->assertSame($expected, $output7, $name);
+            $this->assertNotSame($expected, $output5, $name);
+        } else {
+            $this->assertSame($expected, $output5, $name);
+            $this->assertSame($expected, $output7, $name);
+        }
+    }
+
+    /**
+     * @dataProvider provideTestPrettyPrint
+     * @covers PhpParser\PrettyPrinter\Standard<extended>
+     */
+    public function testPrettyPrint($name, $code, $expected, $mode) {
+        $this->doTestPrettyPrintMethod('prettyPrint', $name, $code, $expected, $mode);
+    }
+
+    /**
+     * @dataProvider provideTestPrettyPrintFile
+     * @covers PhpParser\PrettyPrinter\Standard<extended>
+     */
+    public function testPrettyPrintFile($name, $code, $expected, $mode) {
+        $this->doTestPrettyPrintMethod('prettyPrintFile', $name, $code, $expected, $mode);
+    }
+
+    public function provideTestPrettyPrint() {
+        return $this->getTests(__DIR__ . '/../code/prettyPrinter', 'test');
+    }
+
+    public function provideTestPrettyPrintFile() {
+        return $this->getTests(__DIR__ . '/../code/prettyPrinter', 'file-test');
+    }
+
+    public function testPrettyPrintExpr() {
+        $prettyPrinter = new Standard;
+        $expr = new Expr\BinaryOp\Mul(
+            new Expr\BinaryOp\Plus(new Expr\Variable('a'), new Expr\Variable('b')),
+            new Expr\Variable('c')
+        );
+        $this->assertEquals('($a + $b) * $c', $prettyPrinter->prettyPrintExpr($expr));
+
+        $expr = new Expr\Closure(array(
+            'stmts' => array(new Stmt\Return_(new String_("a\nb")))
+        ));
+        $this->assertEquals("function () {\n    return 'a\nb';\n}", $prettyPrinter->prettyPrintExpr($expr));
+    }
+
+    public function testCommentBeforeInlineHTML() {
+        $prettyPrinter = new PrettyPrinter\Standard;
+        $comment = new Comment\Doc("/**\n * This is a comment\n */");
+        $stmts = [new Stmt\InlineHTML('Hello World!', ['comments' => [$comment]])];
+        $expected = "<?php\n\n/**\n * This is a comment\n */\n?>\nHello World!";
+        $this->assertSame($expected, $prettyPrinter->prettyPrintFile($stmts));
+    }
+
+    private function parseModeLine($modeLine) {
+        $parts = explode(' ', $modeLine, 2);
+        $version = isset($parts[0]) ? $parts[0] : 'both';
+        $options = isset($parts[1]) ? json_decode($parts[1], true) : [];
+        return [$version, $options];
+    }
+
+    public function testArraySyntaxDefault() {
+        $prettyPrinter = new Standard(['shortArraySyntax' => true]);
+        $expr = new Expr\Array_([
+            new Expr\ArrayItem(new String_('val'), new String_('key'))
+        ]);
+        $expected = "['key' => 'val']";
+        $this->assertSame($expected, $prettyPrinter->prettyPrintExpr($expr));
+    }
+
+    /**
+     * @dataProvider provideTestKindAttributes
+     */
+    public function testKindAttributes($node, $expected) {
+        $prttyPrinter = new PrettyPrinter\Standard;
+        $result = $prttyPrinter->prettyPrintExpr($node);
+        $this->assertSame($expected, $result);
+    }
+
+    public function provideTestKindAttributes() {
+        $nowdoc = ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR'];
+        $heredoc = ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR'];
+        return [
+            // Defaults to single quoted
+            [new String_('foo'), "'foo'"],
+            // Explicit single/double quoted
+            [new String_('foo', ['kind' => String_::KIND_SINGLE_QUOTED]), "'foo'"],
+            [new String_('foo', ['kind' => String_::KIND_DOUBLE_QUOTED]), '"foo"'],
+            // Fallback from doc string if no label
+            [new String_('foo', ['kind' => String_::KIND_NOWDOC]), "'foo'"],
+            [new String_('foo', ['kind' => String_::KIND_HEREDOC]), '"foo"'],
+            // Fallback if string contains label
+            [new String_("A\nB\nC", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'A']), "'A\nB\nC'"],
+            [new String_("A\nB\nC", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'B']), "'A\nB\nC'"],
+            [new String_("A\nB\nC", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'C']), "'A\nB\nC'"],
+            [new String_("STR;", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']), "'STR;'"],
+            // Doc string if label not contained (or not in ending position)
+            [new String_("foo", $nowdoc), "<<<'STR'\nfoo\nSTR\n"],
+            [new String_("foo", $heredoc), "<<<STR\nfoo\nSTR\n"],
+            [new String_("STRx", $nowdoc), "<<<'STR'\nSTRx\nSTR\n"],
+            [new String_("xSTR", $nowdoc), "<<<'STR'\nxSTR\nSTR\n"],
+            // Empty doc string variations (encapsed variant does not occur naturally)
+            [new String_("", $nowdoc), "<<<'STR'\nSTR\n"],
+            [new String_("", $heredoc), "<<<STR\nSTR\n"],
+            [new Encapsed([new EncapsedStringPart('')], $heredoc), "<<<STR\nSTR\n"],
+            // Encapsed doc string variations
+            [new Encapsed([new EncapsedStringPart('foo')], $heredoc), "<<<STR\nfoo\nSTR\n"],
+            [new Encapsed([new EncapsedStringPart('foo'), new Expr\Variable('y')], $heredoc), "<<<STR\nfoo{\$y}\nSTR\n"],
+            [new Encapsed([new EncapsedStringPart("\nSTR"), new Expr\Variable('y')], $heredoc), "<<<STR\n\nSTR{\$y}\nSTR\n"],
+            [new Encapsed([new EncapsedStringPart("\nSTR"), new Expr\Variable('y')], $heredoc), "<<<STR\n\nSTR{\$y}\nSTR\n"],
+            [new Encapsed([new Expr\Variable('y'), new EncapsedStringPart("STR\n")], $heredoc), "<<<STR\n{\$y}STR\n\nSTR\n"],
+            // Encapsed doc string fallback
+            [new Encapsed([new Expr\Variable('y'), new EncapsedStringPart("\nSTR")], $heredoc), '"{$y}\\nSTR"'],
+            [new Encapsed([new EncapsedStringPart("STR\n"), new Expr\Variable('y')], $heredoc), '"STR\\n{$y}"'],
+            [new Encapsed([new EncapsedStringPart("STR")], $heredoc), '"STR"'],
+        ];
+    }
+
+    /** @dataProvider provideTestUnnaturalLiterals */
+    public function testUnnaturalLiterals($node, $expected) {
+        $prttyPrinter = new PrettyPrinter\Standard;
+        $result = $prttyPrinter->prettyPrintExpr($node);
+        $this->assertSame($expected, $result);
+    }
+
+    public function provideTestUnnaturalLiterals() {
+        return [
+            [new LNumber(-1), '-1'],
+            [new LNumber(-PHP_INT_MAX - 1), '(-' . PHP_INT_MAX . '-1)'],
+            [new LNumber(-1, ['kind' => LNumber::KIND_BIN]), '-0b1'],
+            [new LNumber(-1, ['kind' => LNumber::KIND_OCT]), '-01'],
+            [new LNumber(-1, ['kind' => LNumber::KIND_HEX]), '-0x1'],
+            [new DNumber(\INF), '\INF'],
+            [new DNumber(-\INF), '-\INF'],
+            [new DNumber(-\NAN), '\NAN'],
+        ];
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Cannot pretty-print AST with Error nodes
+     */
+    public function testPrettyPrintWithError() {
+        $stmts = [new Expr\PropertyFetch(new Expr\Variable('a'), new Expr\Error())];
+        $prettyPrinter = new PrettyPrinter\Standard;
+        $prettyPrinter->prettyPrint($stmts);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Cannot pretty-print AST with Error nodes
+     */
+    public function testPrettyPrintWithErrorInClassConstFetch() {
+        $stmts = [new Expr\ClassConstFetch(new Name('Foo'), new Expr\Error())];
+        $prettyPrinter = new PrettyPrinter\Standard;
+        $prettyPrinter->prettyPrint($stmts);
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Serializer/XMLTest.php b/lib/nikic/php-parser/test/PhpParser/Serializer/XMLTest.php
new file mode 100644
index 000000000..e1186f4d5
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Serializer/XMLTest.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace PhpParser\Serializer;
+
+use PhpParser;
+
+class XMLTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PhpParser\Serializer\XML<extended>
+     */
+    public function testSerialize() {
+        $code = <<<CODE
+<?php
+// comment
+/** doc comment */
+function functionName(&\$a = 0, \$b = 1.0) {
+    echo 'Foo';
+}
+CODE;
+        $xml = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<AST xmlns:node="http://nikic.github.com/PHPParser/XML/node" xmlns:subNode="http://nikic.github.com/PHPParser/XML/subNode" xmlns:attribute="http://nikic.github.com/PHPParser/XML/attribute" xmlns:scalar="http://nikic.github.com/PHPParser/XML/scalar">
+ <scalar:array>
+  <node:Stmt_Function>
+   <attribute:startLine>
+    <scalar:int>4</scalar:int>
+   </attribute:startLine>
+   <attribute:comments>
+    <scalar:array>
+     <comment isDocComment="false" line="2">// comment
+</comment>
+     <comment isDocComment="true" line="3">/** doc comment */</comment>
+    </scalar:array>
+   </attribute:comments>
+   <attribute:endLine>
+    <scalar:int>6</scalar:int>
+   </attribute:endLine>
+   <subNode:byRef>
+    <scalar:false/>
+   </subNode:byRef>
+   <subNode:name>
+    <scalar:string>functionName</scalar:string>
+   </subNode:name>
+   <subNode:params>
+    <scalar:array>
+     <node:Param>
+      <attribute:startLine>
+       <scalar:int>4</scalar:int>
+      </attribute:startLine>
+      <attribute:endLine>
+       <scalar:int>4</scalar:int>
+      </attribute:endLine>
+      <subNode:type>
+       <scalar:null/>
+      </subNode:type>
+      <subNode:byRef>
+       <scalar:true/>
+      </subNode:byRef>
+      <subNode:variadic>
+       <scalar:false/>
+      </subNode:variadic>
+      <subNode:name>
+       <scalar:string>a</scalar:string>
+      </subNode:name>
+      <subNode:default>
+       <node:Scalar_LNumber>
+        <attribute:startLine>
+         <scalar:int>4</scalar:int>
+        </attribute:startLine>
+        <attribute:endLine>
+         <scalar:int>4</scalar:int>
+        </attribute:endLine>
+        <attribute:kind>
+         <scalar:int>10</scalar:int>
+        </attribute:kind>
+        <subNode:value>
+         <scalar:int>0</scalar:int>
+        </subNode:value>
+       </node:Scalar_LNumber>
+      </subNode:default>
+     </node:Param>
+     <node:Param>
+      <attribute:startLine>
+       <scalar:int>4</scalar:int>
+      </attribute:startLine>
+      <attribute:endLine>
+       <scalar:int>4</scalar:int>
+      </attribute:endLine>
+      <subNode:type>
+       <scalar:null/>
+      </subNode:type>
+      <subNode:byRef>
+       <scalar:false/>
+      </subNode:byRef>
+      <subNode:variadic>
+       <scalar:false/>
+      </subNode:variadic>
+      <subNode:name>
+       <scalar:string>b</scalar:string>
+      </subNode:name>
+      <subNode:default>
+       <node:Scalar_DNumber>
+        <attribute:startLine>
+         <scalar:int>4</scalar:int>
+        </attribute:startLine>
+        <attribute:endLine>
+         <scalar:int>4</scalar:int>
+        </attribute:endLine>
+        <subNode:value>
+         <scalar:float>1</scalar:float>
+        </subNode:value>
+       </node:Scalar_DNumber>
+      </subNode:default>
+     </node:Param>
+    </scalar:array>
+   </subNode:params>
+   <subNode:returnType>
+    <scalar:null/>
+   </subNode:returnType>
+   <subNode:stmts>
+    <scalar:array>
+     <node:Stmt_Echo>
+      <attribute:startLine>
+       <scalar:int>5</scalar:int>
+      </attribute:startLine>
+      <attribute:endLine>
+       <scalar:int>5</scalar:int>
+      </attribute:endLine>
+      <subNode:exprs>
+       <scalar:array>
+        <node:Scalar_String>
+         <attribute:startLine>
+          <scalar:int>5</scalar:int>
+         </attribute:startLine>
+         <attribute:endLine>
+          <scalar:int>5</scalar:int>
+         </attribute:endLine>
+         <attribute:kind>
+          <scalar:int>1</scalar:int>
+         </attribute:kind>
+         <subNode:value>
+          <scalar:string>Foo</scalar:string>
+         </subNode:value>
+        </node:Scalar_String>
+       </scalar:array>
+      </subNode:exprs>
+     </node:Stmt_Echo>
+    </scalar:array>
+   </subNode:stmts>
+  </node:Stmt_Function>
+ </scalar:array>
+</AST>
+XML;
+
+        $parser     = new PhpParser\Parser\Php7(new PhpParser\Lexer);
+        $serializer = new XML;
+
+        $code = str_replace("\r\n", "\n", $code);
+        $stmts = $parser->parse($code);
+        $this->assertXmlStringEqualsXmlString($xml, $serializer->serialize($stmts));
+    }
+
+    /**
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage Unexpected node type
+     */
+    public function testError() {
+        $serializer = new XML;
+        $serializer->serialize(array(new \stdClass));
+    }
+}
diff --git a/lib/nikic/php-parser/test/PhpParser/Unserializer/XMLTest.php b/lib/nikic/php-parser/test/PhpParser/Unserializer/XMLTest.php
new file mode 100644
index 000000000..3bc86dbed
--- /dev/null
+++ b/lib/nikic/php-parser/test/PhpParser/Unserializer/XMLTest.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace PhpParser\Unserializer;
+
+use PhpParser\Comment;
+use PhpParser\Node\Scalar;
+
+class XMLTest extends \PHPUnit_Framework_TestCase
+{
+    public function testNode() {
+        $xml = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<AST xmlns:node="http://nikic.github.com/PHPParser/XML/node" xmlns:subNode="http://nikic.github.com/PHPParser/XML/subNode" xmlns:attribute="http://nikic.github.com/PHPParser/XML/attribute" xmlns:scalar="http://nikic.github.com/PHPParser/XML/scalar">
+ <node:Scalar_String line="1" docComment="/** doc comment */">
+  <attribute:startLine>
+   <scalar:int>1</scalar:int>
+  </attribute:startLine>
+  <attribute:comments>
+   <scalar:array>
+    <comment isDocComment="false" line="2">// comment
+</comment>
+    <comment isDocComment="true" line="3">/** doc comment */</comment>
+   </scalar:array>
+  </attribute:comments>
+  <subNode:value>
+   <scalar:string>Test</scalar:string>
+  </subNode:value>
+ </node:Scalar_String>
+</AST>
+XML;
+
+        $unserializer  = new XML;
+        $this->assertEquals(
+            new Scalar\String_('Test', array(
+                'startLine' => 1,
+                'comments'  => array(
+                    new Comment('// comment' . "\n", 2),
+                    new Comment\Doc('/** doc comment */', 3),
+                ),
+            )),
+            $unserializer->unserialize($xml)
+        );
+    }
+
+    public function testEmptyNode() {
+        $xml = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<AST xmlns:node="http://nikic.github.com/PHPParser/XML/node">
+ <node:Scalar_MagicConst_Class />
+</AST>
+XML;
+
+        $unserializer  = new XML;
+
+        $this->assertEquals(
+            new Scalar\MagicConst\Class_,
+            $unserializer->unserialize($xml)
+        );
+    }
+
+    public function testScalars() {
+        $xml = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<AST xmlns:scalar="http://nikic.github.com/PHPParser/XML/scalar">
+ <scalar:array>
+  <scalar:array></scalar:array>
+  <scalar:array/>
+  <scalar:string>test</scalar:string>
+  <scalar:string></scalar:string>
+  <scalar:string/>
+  <scalar:int>1</scalar:int>
+  <scalar:float>1</scalar:float>
+  <scalar:float>1.5</scalar:float>
+  <scalar:true/>
+  <scalar:false/>
+  <scalar:null/>
+ </scalar:array>
+</AST>
+XML;
+        $result = array(
+            array(), array(),
+            'test', '', '',
+            1,
+            1, 1.5,
+            true, false, null
+        );
+
+        $unserializer  = new XML;
+        $this->assertEquals($result, $unserializer->unserialize($xml));
+    }
+
+    /**
+     * @expectedException        \DomainException
+     * @expectedExceptionMessage AST root element not found
+     */
+    public function testWrongRootElementError() {
+        $xml = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<notAST/>
+XML;
+
+        $unserializer = new XML;
+        $unserializer->unserialize($xml);
+    }
+
+    /**
+     * @dataProvider             provideTestErrors
+     */
+    public function testErrors($xml, $errorMsg) {
+        $this->setExpectedException('DomainException', $errorMsg);
+
+        $xml = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<AST xmlns:scalar="http://nikic.github.com/PHPParser/XML/scalar"
+     xmlns:node="http://nikic.github.com/PHPParser/XML/node"
+     xmlns:subNode="http://nikic.github.com/PHPParser/XML/subNode"
+     xmlns:foo="http://nikic.github.com/PHPParser/XML/foo">
+ $xml
+</AST>
+XML;
+
+        $unserializer = new XML;
+        $unserializer->unserialize($xml);
+    }
+
+    public function provideTestErrors() {
+        return array(
+            array('<scalar:true>test</scalar:true>',   '"true" scalar must be empty'),
+            array('<scalar:false>test</scalar:false>', '"false" scalar must be empty'),
+            array('<scalar:null>test</scalar:null>',   '"null" scalar must be empty'),
+            array('<scalar:foo>bar</scalar:foo>',      'Unknown scalar type "foo"'),
+            array('<scalar:int>x</scalar:int>',        '"x" is not a valid int'),
+            array('<scalar:float>x</scalar:float>',    '"x" is not a valid float'),
+            array('',                                  'Expected node or scalar'),
+            array('<foo:bar>test</foo:bar>',           'Unexpected node of type "foo:bar"'),
+            array(
+                '<node:Scalar_String><foo:bar>test</foo:bar></node:Scalar_String>',
+                'Expected sub node or attribute, got node of type "foo:bar"'
+            ),
+            array(
+                '<node:Scalar_String><subNode:value/></node:Scalar_String>',
+                'Expected node or scalar'
+            ),
+            array(
+                '<node:Foo><subNode:value/></node:Foo>',
+                'Unknown node type "Foo"'
+            ),
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/test/bootstrap.php b/lib/nikic/php-parser/test/bootstrap.php
new file mode 100644
index 000000000..9526b648b
--- /dev/null
+++ b/lib/nikic/php-parser/test/bootstrap.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace PhpParser;
+
+require __DIR__ . '/../vendor/autoload.php';
+
+function canonicalize($str) {
+    // normalize EOL style
+    $str = str_replace("\r\n", "\n", $str);
+
+    // trim newlines at end
+    $str = rtrim($str, "\n");
+
+    // remove trailing whitespace on all lines
+    $lines = explode("\n", $str);
+    $lines = array_map(function($line) {
+        return rtrim($line, " \t");
+    }, $lines);
+    return implode("\n", $lines);
+}
diff --git a/lib/nikic/php-parser/test/code/parser/blockComments.test b/lib/nikic/php-parser/test/code/parser/blockComments.test
new file mode 100644
index 000000000..a9854856e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/blockComments.test
@@ -0,0 +1,31 @@
+Comments on blocks
+-----
+<?php
+
+// foo
+{
+    // bar
+    {
+        // baz
+        $a;
+    }
+}
+
+// empty
+{}
+-----
+array(
+    0: Expr_Variable(
+        name: a
+        comments: array(
+            0: // foo
+            1: // bar
+            2: // baz
+        )
+    )
+    1: Stmt_Nop(
+        comments: array(
+            0: // empty
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/comments.test b/lib/nikic/php-parser/test/code/parser/comments.test
new file mode 100644
index 000000000..e15b969dd
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/comments.test
@@ -0,0 +1,100 @@
+Comments
+-----
+<?php
+
+/** doc 1 */
+/* foobar 1 */
+// foo 1
+// bar 1
+$var;
+
+if ($cond) {
+    /** doc 2 */
+    /* foobar 2 */
+    // foo 2
+    // bar 2
+}
+
+/** doc 3 */
+/* foobar 3 */
+// foo 3
+// bar 3
+-----
+array(
+    0: Expr_Variable(
+        name: var
+        comments: array(
+            0: /** doc 1 */
+            1: /* foobar 1 */
+            2: // foo 1
+            3: // bar 1
+        )
+    )
+    1: Stmt_If(
+        cond: Expr_Variable(
+            name: cond
+        )
+        stmts: array(
+            0: Stmt_Nop(
+                comments: array(
+                    0: /** doc 2 */
+                    1: /* foobar 2 */
+                    2: // foo 2
+                    3: // bar 2
+                )
+            )
+        )
+        elseifs: array(
+        )
+        else: null
+    )
+    2: Stmt_Nop(
+        comments: array(
+            0: /** doc 3 */
+            1: /* foobar 3 */
+            2: // foo 3
+            3: // bar 3
+        )
+    )
+)
+-----
+<?php
+
+/** doc */
+/* foobar */
+// foo
+// bar
+
+?>
+-----
+array(
+    0: Stmt_Nop(
+        comments: array(
+            0: /** doc */
+            1: /* foobar */
+            2: // foo
+            3: // bar
+        )
+    )
+)
+-----
+<?php
+
+// comment
+if (42) {}
+-----
+array(
+    0: Stmt_If(
+        cond: Scalar_LNumber(
+            value: 42
+        )
+        stmts: array(
+        )
+        elseifs: array(
+        )
+        else: null
+        comments: array(
+            0: // comment
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/errorHandling/eofError.test b/lib/nikic/php-parser/test/code/parser/errorHandling/eofError.test
new file mode 100644
index 000000000..92951b7f2
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/errorHandling/eofError.test
@@ -0,0 +1,32 @@
+Error positions
+-----
+<?php foo
+-----
+Syntax error, unexpected EOF from 1:10 to 1:10
+array(
+    0: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+    )
+)
+-----
+<?php foo /* bar */
+-----
+Syntax error, unexpected EOF from 1:20 to 1:20
+array(
+    0: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+    )
+    1: Stmt_Nop(
+        comments: array(
+            0: /* bar */
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/errorHandling/lexerErrors.test b/lib/nikic/php-parser/test/code/parser/errorHandling/lexerErrors.test
new file mode 100644
index 000000000..cfb7282ca
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/errorHandling/lexerErrors.test
@@ -0,0 +1,124 @@
+Lexer errors
+-----
+<?php
+
+$a = 42;
+/*
+$b = 24;
+-----
+Unterminated comment from 4:1 to 5:9
+array(
+    0: Expr_Assign(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Scalar_LNumber(
+            value: 42
+        )
+    )
+    1: Stmt_Nop(
+        comments: array(
+            0: /*
+            $b = 24;
+        )
+    )
+)
+-----
+<?php
+
+$a = 42;
+@@{ "\1" }@@
+$b = 24;
+-----
+Unexpected character "@@{ "\1" }@@" (ASCII 1) from 4:1 to 4:1
+array(
+    0: Expr_Assign(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Scalar_LNumber(
+            value: 42
+        )
+    )
+    1: Expr_Assign(
+        var: Expr_Variable(
+            name: b
+        )
+        expr: Scalar_LNumber(
+            value: 24
+        )
+    )
+)
+-----
+<?php
+
+$a = 42;
+@@{ "\0" }@@
+$b = 24;
+-----
+Unexpected null byte from 4:1 to 4:1
+array(
+    0: Expr_Assign(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Scalar_LNumber(
+            value: 42
+        )
+    )
+    1: Expr_Assign(
+        var: Expr_Variable(
+            name: b
+        )
+        expr: Scalar_LNumber(
+            value: 24
+        )
+    )
+)
+-----
+<?php
+
+$a = 1;
+@@{ "\1" }@@
+$b = 2;
+@@{ "\2" }@@
+$c = 3;
+-----
+Unexpected character "@@{ "\1" }@@" (ASCII 1) from 4:1 to 4:1
+Unexpected character "@@{ "\2" }@@" (ASCII 2) from 6:1 to 6:1
+array(
+    0: Expr_Assign(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Scalar_LNumber(
+            value: 1
+        )
+    )
+    1: Expr_Assign(
+        var: Expr_Variable(
+            name: b
+        )
+        expr: Scalar_LNumber(
+            value: 2
+        )
+    )
+    2: Expr_Assign(
+        var: Expr_Variable(
+            name: c
+        )
+        expr: Scalar_LNumber(
+            value: 3
+        )
+    )
+)
+-----
+<?php
+
+if ($b) {
+    $a = 1;
+    /* unterminated
+}
+-----
+Unterminated comment from 5:5 to 6:2
+Syntax error, unexpected EOF from 6:2 to 6:2
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/errorHandling/recovery.test b/lib/nikic/php-parser/test/code/parser/errorHandling/recovery.test
new file mode 100644
index 000000000..172874f55
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/errorHandling/recovery.test
@@ -0,0 +1,866 @@
+Error recovery
+-----
+<?php
+
+foo()
+bar()
+baz()
+-----
+Syntax error, unexpected T_STRING from 4:1 to 4:3
+Syntax error, unexpected T_STRING from 5:1 to 5:3
+Syntax error, unexpected EOF from 5:6 to 5:6
+array(
+    0: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+        args: array(
+        )
+    )
+    1: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: bar
+            )
+        )
+        args: array(
+        )
+    )
+    2: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: baz
+            )
+        )
+        args: array(
+        )
+    )
+)
+-----
+<?php
+
+foo()
+bar();
+baz();
+-----
+Syntax error, unexpected T_STRING from 4:1 to 4:3
+array(
+    0: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+        args: array(
+        )
+    )
+    1: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: bar
+            )
+        )
+        args: array(
+        )
+    )
+    2: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: baz
+            )
+        )
+        args: array(
+        )
+    )
+)
+-----
+<?php
+
+foo();
+bar()
+baz();
+-----
+Syntax error, unexpected T_STRING from 5:1 to 5:3
+array(
+    0: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+        args: array(
+        )
+    )
+    1: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: bar
+            )
+        )
+        args: array(
+        )
+    )
+    2: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: baz
+            )
+        )
+        args: array(
+        )
+    )
+)
+-----
+<?php
+abc;
+1 + ;
+-----
+Syntax error, unexpected ';' from 3:5 to 3:5
+array(
+    0: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: abc
+            )
+        )
+    )
+    1: Scalar_LNumber(
+        value: 1
+    )
+)
+-----
+<?php
+function test() {
+    1 +
+}
+-----
+Syntax error, unexpected '}' from 4:1 to 4:1
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: test
+        params: array(
+        )
+        returnType: null
+        stmts: array(
+            0: Scalar_LNumber(
+                value: 1
+            )
+        )
+    )
+)
+-----
+<?php
+
+$i = 0;
+while
+
+$j = 1;
+$k = 2;
+-----
+Syntax error, unexpected T_VARIABLE, expecting '(' from 6:1 to 6:2
+array(
+    0: Expr_Assign(
+        var: Expr_Variable(
+            name: i
+        )
+        expr: Scalar_LNumber(
+            value: 0
+        )
+    )
+    1: Expr_Assign(
+        var: Expr_Variable(
+            name: j
+        )
+        expr: Scalar_LNumber(
+            value: 1
+        )
+    )
+    2: Expr_Assign(
+        var: Expr_Variable(
+            name: k
+        )
+        expr: Scalar_LNumber(
+            value: 2
+        )
+    )
+)
+-----
+<?php
+
+$i = 0;
+while () {
+    $j = 1;
+}
+$k = 2;
+// The output here drops the loop - would require Error node to handle this
+-----
+Syntax error, unexpected ')' from 4:8 to 4:8
+array(
+    0: Expr_Assign(
+        var: Expr_Variable(
+            name: i
+        )
+        expr: Scalar_LNumber(
+            value: 0
+        )
+    )
+    1: Expr_Assign(
+        var: Expr_Variable(
+            name: j
+        )
+        expr: Scalar_LNumber(
+            value: 1
+        )
+    )
+    2: Expr_Assign(
+        var: Expr_Variable(
+            name: k
+        )
+        expr: Scalar_LNumber(
+            value: 2
+        )
+    )
+    3: Stmt_Nop(
+        comments: array(
+            0: // The output here drops the loop - would require Error node to handle this
+        )
+    )
+)
+-----
+<?php
+// Can't recover this yet, as the '}' for the inner_statement_list
+// is always required.
+
+$i = 0;
+while (true) {
+    $i = 1;
+    $i = 2;
+-----
+Syntax error, unexpected EOF from 8:12 to 8:12
+-----
+<?php
+$foo->
+;
+-----
+!!positions
+Syntax error, unexpected ';', expecting T_STRING or T_VARIABLE or '{' or '$' from 3:1 to 3:1
+array(
+    0: Expr_PropertyFetch[2:1 - 2:6](
+        var: Expr_Variable[2:1 - 2:4](
+            name: foo
+        )
+        name: Expr_Error[3:1 - 2:6](
+        )
+    )
+)
+-----
+<?php
+function foo() {
+    $bar->
+}
+-----
+!!positions
+Syntax error, unexpected '}', expecting T_STRING or T_VARIABLE or '{' or '$' from 4:1 to 4:1
+array(
+    0: Stmt_Function[2:1 - 4:1](
+        byRef: false
+        name: foo
+        params: array(
+        )
+        returnType: null
+        stmts: array(
+            0: Expr_PropertyFetch[3:5 - 3:10](
+                var: Expr_Variable[3:5 - 3:8](
+                    name: bar
+                )
+                name: Expr_Error[4:1 - 3:10](
+                )
+            )
+        )
+    )
+)
+-----
+<?php
+new T
+-----
+Syntax error, unexpected EOF from 2:6 to 2:6
+array(
+    0: Expr_New(
+        class: Name(
+            parts: array(
+                0: T
+            )
+        )
+        args: array(
+        )
+    )
+)
+-----
+<?php
+new
+-----
+!!php7,positions
+Syntax error, unexpected EOF from 2:4 to 2:4
+array(
+    0: Expr_New[2:1 - 2:3](
+        class: Expr_Error[2:4 - 2:3](
+        )
+        args: array(
+        )
+    )
+)
+-----
+<?php
+$foo instanceof
+-----
+!!php7
+Syntax error, unexpected EOF from 2:16 to 2:16
+array(
+    0: Expr_Instanceof(
+        expr: Expr_Variable(
+            name: foo
+        )
+        class: Expr_Error(
+        )
+    )
+)
+-----
+<?php
+$
+-----
+!!php7
+Syntax error, unexpected EOF, expecting T_VARIABLE or '{' or '$' from 2:2 to 2:2
+array(
+    0: Expr_Variable(
+        name: Expr_Error(
+        )
+    )
+)
+-----
+<?php
+Foo::$
+-----
+!!php7
+Syntax error, unexpected EOF, expecting T_VARIABLE or '{' or '$' from 2:7 to 2:7
+array(
+    0: Expr_StaticPropertyFetch(
+        class: Name(
+            parts: array(
+                0: Foo
+            )
+        )
+        name: Expr_Error(
+        )
+    )
+)
+-----
+<?php
+Foo::
+-----
+!!php7
+Syntax error, unexpected EOF from 2:6 to 2:6
+array(
+    0: Expr_ClassConstFetch(
+        class: Name(
+            parts: array(
+                0: Foo
+            )
+        )
+        name: Expr_Error(
+        )
+    )
+)
+-----
+<?php
+namespace Foo
+use A
+use function a
+use A\{B}
+const A = 1
+break
+break 2
+continue
+continue 2
+return
+return 2
+echo $a
+unset($a)
+throw $x
+goto label
+-----
+!!php7
+Syntax error, unexpected T_USE, expecting ';' or '{' from 3:1 to 3:3
+Syntax error, unexpected T_USE, expecting ';' from 5:1 to 5:3
+Syntax error, unexpected T_CONST, expecting ';' from 6:1 to 6:5
+Syntax error, unexpected T_BREAK, expecting ';' from 7:1 to 7:5
+Syntax error, unexpected T_THROW, expecting ';' from 15:1 to 15:5
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: Foo
+            )
+        )
+        stmts: array(
+            0: Stmt_Use(
+                type: TYPE_NORMAL (1)
+                uses: array(
+                    0: Stmt_UseUse(
+                        type: TYPE_UNKNOWN (0)
+                        name: Name(
+                            parts: array(
+                                0: A
+                            )
+                        )
+                        alias: A
+                    )
+                )
+            )
+            1: Stmt_Use(
+                type: TYPE_FUNCTION (2)
+                uses: array(
+                    0: Stmt_UseUse(
+                        type: TYPE_UNKNOWN (0)
+                        name: Name(
+                            parts: array(
+                                0: a
+                            )
+                        )
+                        alias: a
+                    )
+                )
+            )
+            2: Stmt_GroupUse(
+                type: TYPE_UNKNOWN (0)
+                prefix: Name(
+                    parts: array(
+                        0: A
+                    )
+                )
+                uses: array(
+                    0: Stmt_UseUse(
+                        type: TYPE_NORMAL (1)
+                        name: Name(
+                            parts: array(
+                                0: B
+                            )
+                        )
+                        alias: B
+                    )
+                )
+            )
+            3: Stmt_Const(
+                consts: array(
+                    0: Const(
+                        name: A
+                        value: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                )
+            )
+            4: Stmt_Break(
+                num: null
+            )
+            5: Stmt_Break(
+                num: Scalar_LNumber(
+                    value: 2
+                )
+            )
+            6: Stmt_Continue(
+                num: null
+            )
+            7: Stmt_Continue(
+                num: Scalar_LNumber(
+                    value: 2
+                )
+            )
+            8: Stmt_Return(
+                expr: null
+            )
+            9: Stmt_Return(
+                expr: Scalar_LNumber(
+                    value: 2
+                )
+            )
+            10: Stmt_Echo(
+                exprs: array(
+                    0: Expr_Variable(
+                        name: a
+                    )
+                )
+            )
+            11: Stmt_Unset(
+                vars: array(
+                    0: Expr_Variable(
+                        name: a
+                    )
+                )
+            )
+            12: Stmt_Throw(
+                expr: Expr_Variable(
+                    name: x
+                )
+            )
+            13: Stmt_Goto(
+                name: label
+            )
+        )
+    )
+)
+-----
+<?php
+
+use A\{B, };
+use function A\{b, };
+use A, ;
+const A = 42, ;
+
+class X implements Y, {
+    use A, ;
+    use A, {
+        A::b insteadof C, ;
+    }
+    const A = 42, ;
+    public $x, ;
+}
+interface I extends J, {}
+
+unset($x, );
+isset($x, );
+
+declare(a=42, );
+
+function foo($a, ) {}
+foo($a, );
+global $a, ;
+static $a, ;
+echo $a, ;
+
+for ($a, ; $b, ; $c, );
+function ($a, ) use ($b, ) {};
+-----
+!!php7
+A trailing comma is not allowed here from 5:6 to 5:6
+A trailing comma is not allowed here from 6:13 to 6:13
+A trailing comma is not allowed here from 8:21 to 8:21
+A trailing comma is not allowed here from 9:10 to 9:10
+A trailing comma is not allowed here from 10:10 to 10:10
+A trailing comma is not allowed here from 11:25 to 11:25
+A trailing comma is not allowed here from 13:17 to 13:17
+A trailing comma is not allowed here from 14:14 to 14:14
+A trailing comma is not allowed here from 16:22 to 16:22
+A trailing comma is not allowed here from 18:9 to 18:9
+A trailing comma is not allowed here from 19:9 to 19:9
+A trailing comma is not allowed here from 21:13 to 21:13
+A trailing comma is not allowed here from 23:16 to 23:16
+A trailing comma is not allowed here from 24:7 to 24:7
+A trailing comma is not allowed here from 25:10 to 25:10
+A trailing comma is not allowed here from 26:10 to 26:10
+A trailing comma is not allowed here from 27:8 to 27:8
+A trailing comma is not allowed here from 29:8 to 29:8
+A trailing comma is not allowed here from 29:14 to 29:14
+A trailing comma is not allowed here from 29:20 to 29:20
+A trailing comma is not allowed here from 30:13 to 30:13
+A trailing comma is not allowed here from 30:24 to 30:24
+array(
+    0: Stmt_GroupUse(
+        type: TYPE_UNKNOWN (0)
+        prefix: Name(
+            parts: array(
+                0: A
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: B
+                    )
+                )
+                alias: B
+            )
+        )
+    )
+    1: Stmt_GroupUse(
+        type: TYPE_FUNCTION (2)
+        prefix: Name(
+            parts: array(
+                0: A
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: b
+                    )
+                )
+                alias: b
+            )
+        )
+    )
+    2: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: A
+                    )
+                )
+                alias: A
+            )
+        )
+    )
+    3: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: A
+                value: Scalar_LNumber(
+                    value: 42
+                )
+            )
+        )
+    )
+    4: Stmt_Class(
+        flags: 0
+        name: X
+        extends: null
+        implements: array(
+            0: Name(
+                parts: array(
+                    0: Y
+                )
+            )
+        )
+        stmts: array(
+            0: Stmt_TraitUse(
+                traits: array(
+                    0: Name(
+                        parts: array(
+                            0: A
+                        )
+                    )
+                )
+                adaptations: array(
+                )
+            )
+            1: Stmt_TraitUse(
+                traits: array(
+                    0: Name(
+                        parts: array(
+                            0: A
+                        )
+                    )
+                )
+                adaptations: array(
+                    0: Stmt_TraitUseAdaptation_Precedence(
+                        trait: Name(
+                            parts: array(
+                                0: A
+                            )
+                        )
+                        method: b
+                        insteadof: array(
+                            0: Name(
+                                parts: array(
+                                    0: C
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+            2: Stmt_ClassConst(
+                flags: 0
+                consts: array(
+                    0: Const(
+                        name: A
+                        value: Scalar_LNumber(
+                            value: 42
+                        )
+                    )
+                )
+            )
+            3: Stmt_Property(
+                flags: MODIFIER_PUBLIC (1)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: x
+                        default: null
+                    )
+                )
+            )
+        )
+    )
+    5: Stmt_Interface(
+        name: I
+        extends: array(
+            0: Name(
+                parts: array(
+                    0: J
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+    6: Stmt_Unset(
+        vars: array(
+            0: Expr_Variable(
+                name: x
+            )
+        )
+    )
+    7: Expr_Isset(
+        vars: array(
+            0: Expr_Variable(
+                name: x
+            )
+        )
+    )
+    8: Stmt_Declare(
+        declares: array(
+            0: Stmt_DeclareDeclare(
+                key: a
+                value: Scalar_LNumber(
+                    value: 42
+                )
+            )
+        )
+        stmts: null
+    )
+    9: Stmt_Function(
+        byRef: false
+        name: foo
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    10: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_Variable(
+                    name: a
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    11: Stmt_Global(
+        vars: array(
+            0: Expr_Variable(
+                name: a
+            )
+        )
+    )
+    12: Stmt_Static(
+        vars: array(
+            0: Stmt_StaticVar(
+                name: a
+                default: null
+            )
+        )
+    )
+    13: Stmt_Echo(
+        exprs: array(
+            0: Expr_Variable(
+                name: a
+            )
+        )
+    )
+    14: Stmt_For(
+        init: array(
+            0: Expr_Variable(
+                name: a
+            )
+        )
+        cond: array(
+            0: Expr_Variable(
+                name: b
+            )
+        )
+        loop: array(
+            0: Expr_Variable(
+                name: c
+            )
+        )
+        stmts: array(
+        )
+    )
+    15: Expr_Closure(
+        static: false
+        byRef: false
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+        )
+        uses: array(
+            0: Expr_ClosureUse(
+                var: b
+                byRef: false
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+)
+-----
+<?php
+
+foo(Bar::);
+-----
+!!php7,positions
+Syntax error, unexpected ')' from 3:10 to 3:10
+array(
+    0: Expr_FuncCall[3:1 - 3:10](
+        name: Name[3:1 - 3:3](
+            parts: array(
+                0: foo
+            )
+        )
+        args: array(
+            0: Arg[3:5 - 3:9](
+                value: Expr_ClassConstFetch[3:5 - 3:9](
+                    class: Name[3:5 - 3:7](
+                        parts: array(
+                            0: Bar
+                        )
+                    )
+                    name: Expr_Error[3:10 - 3:9](
+                    )
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/arrayDef.test b/lib/nikic/php-parser/test/code/parser/expr/arrayDef.test
new file mode 100644
index 000000000..28baf2664
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/arrayDef.test
@@ -0,0 +1,142 @@
+Array definitions
+-----
+<?php
+
+array();
+array('a');
+array('a', );
+array('a', 'b');
+array('a', &$b, 'c' => 'd', 'e' => &$f);
+
+// short array syntax
+[];
+[1, 2, 3];
+['a' => 'b'];
+-----
+array(
+    0: Expr_Array(
+        items: array(
+        )
+    )
+    1: Expr_Array(
+        items: array(
+            0: Expr_ArrayItem(
+                key: null
+                value: Scalar_String(
+                    value: a
+                )
+                byRef: false
+            )
+        )
+    )
+    2: Expr_Array(
+        items: array(
+            0: Expr_ArrayItem(
+                key: null
+                value: Scalar_String(
+                    value: a
+                )
+                byRef: false
+            )
+        )
+    )
+    3: Expr_Array(
+        items: array(
+            0: Expr_ArrayItem(
+                key: null
+                value: Scalar_String(
+                    value: a
+                )
+                byRef: false
+            )
+            1: Expr_ArrayItem(
+                key: null
+                value: Scalar_String(
+                    value: b
+                )
+                byRef: false
+            )
+        )
+    )
+    4: Expr_Array(
+        items: array(
+            0: Expr_ArrayItem(
+                key: null
+                value: Scalar_String(
+                    value: a
+                )
+                byRef: false
+            )
+            1: Expr_ArrayItem(
+                key: null
+                value: Expr_Variable(
+                    name: b
+                )
+                byRef: true
+            )
+            2: Expr_ArrayItem(
+                key: Scalar_String(
+                    value: c
+                )
+                value: Scalar_String(
+                    value: d
+                )
+                byRef: false
+            )
+            3: Expr_ArrayItem(
+                key: Scalar_String(
+                    value: e
+                )
+                value: Expr_Variable(
+                    name: f
+                )
+                byRef: true
+            )
+        )
+    )
+    5: Expr_Array(
+        items: array(
+        )
+        comments: array(
+            0: // short array syntax
+        )
+    )
+    6: Expr_Array(
+        items: array(
+            0: Expr_ArrayItem(
+                key: null
+                value: Scalar_LNumber(
+                    value: 1
+                )
+                byRef: false
+            )
+            1: Expr_ArrayItem(
+                key: null
+                value: Scalar_LNumber(
+                    value: 2
+                )
+                byRef: false
+            )
+            2: Expr_ArrayItem(
+                key: null
+                value: Scalar_LNumber(
+                    value: 3
+                )
+                byRef: false
+            )
+        )
+    )
+    7: Expr_Array(
+        items: array(
+            0: Expr_ArrayItem(
+                key: Scalar_String(
+                    value: a
+                )
+                value: Scalar_String(
+                    value: b
+                )
+                byRef: false
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/arrayDestructuring.test b/lib/nikic/php-parser/test/code/parser/expr/arrayDestructuring.test
new file mode 100644
index 000000000..4ca76b216
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/arrayDestructuring.test
@@ -0,0 +1,144 @@
+Array destructuring
+-----
+<?php
+
+[$a, $b] = [$c, $d];
+[, $a, , , $b, ,] = $foo;
+[, [[$a]], $b] = $bar;
+['a' => $b, 'b' => $a] = $baz;
+-----
+!!php7
+array(
+    0: Expr_Assign(
+        var: Expr_Array(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: a
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: b
+                    )
+                    byRef: false
+                )
+            )
+        )
+        expr: Expr_Array(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: c
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: d
+                    )
+                    byRef: false
+                )
+            )
+        )
+    )
+    1: Expr_Assign(
+        var: Expr_Array(
+            items: array(
+                0: null
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: a
+                    )
+                    byRef: false
+                )
+                2: null
+                3: null
+                4: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: b
+                    )
+                    byRef: false
+                )
+                5: null
+            )
+        )
+        expr: Expr_Variable(
+            name: foo
+        )
+    )
+    2: Expr_Assign(
+        var: Expr_Array(
+            items: array(
+                0: null
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Array(
+                        items: array(
+                            0: Expr_ArrayItem(
+                                key: null
+                                value: Expr_Array(
+                                    items: array(
+                                        0: Expr_ArrayItem(
+                                            key: null
+                                            value: Expr_Variable(
+                                                name: a
+                                            )
+                                            byRef: false
+                                        )
+                                    )
+                                )
+                                byRef: false
+                            )
+                        )
+                    )
+                    byRef: false
+                )
+                2: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: b
+                    )
+                    byRef: false
+                )
+            )
+        )
+        expr: Expr_Variable(
+            name: bar
+        )
+    )
+    3: Expr_Assign(
+        var: Expr_Array(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: Scalar_String(
+                        value: a
+                    )
+                    value: Expr_Variable(
+                        name: b
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: Scalar_String(
+                        value: b
+                    )
+                    value: Expr_Variable(
+                        name: a
+                    )
+                    byRef: false
+                )
+            )
+        )
+        expr: Expr_Variable(
+            name: baz
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/assign.test b/lib/nikic/php-parser/test/code/parser/expr/assign.test
new file mode 100644
index 000000000..1d6b187ad
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/assign.test
@@ -0,0 +1,301 @@
+Assignments
+-----
+<?php
+// simple assign
+$a = $b;
+
+// combined assign
+$a &= $b;
+$a |= $b;
+$a ^= $b;
+$a .= $b;
+$a /= $b;
+$a -= $b;
+$a %= $b;
+$a *= $b;
+$a += $b;
+$a <<= $b;
+$a >>= $b;
+$a **= $b;
+
+// chained assign
+$a = $b *= $c **= $d;
+
+// by ref assign
+$a =& $b;
+
+// list() assign
+list($a) = $b;
+list($a, , $b) = $c;
+list($a, list(, $c), $d) = $e;
+
+// inc/dec
+++$a;
+$a++;
+--$a;
+$a--;
+-----
+array(
+    0: Expr_Assign(
+        var: Expr_Variable(
+            name: a
+            comments: array(
+                0: // simple assign
+            )
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+        comments: array(
+            0: // simple assign
+        )
+    )
+    1: Expr_AssignOp_BitwiseAnd(
+        var: Expr_Variable(
+            name: a
+            comments: array(
+                0: // combined assign
+            )
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+        comments: array(
+            0: // combined assign
+        )
+    )
+    2: Expr_AssignOp_BitwiseOr(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    3: Expr_AssignOp_BitwiseXor(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    4: Expr_AssignOp_Concat(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    5: Expr_AssignOp_Div(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    6: Expr_AssignOp_Minus(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    7: Expr_AssignOp_Mod(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    8: Expr_AssignOp_Mul(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    9: Expr_AssignOp_Plus(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    10: Expr_AssignOp_ShiftLeft(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    11: Expr_AssignOp_ShiftRight(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    12: Expr_AssignOp_Pow(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    13: Expr_Assign(
+        var: Expr_Variable(
+            name: a
+            comments: array(
+                0: // chained assign
+            )
+        )
+        expr: Expr_AssignOp_Mul(
+            var: Expr_Variable(
+                name: b
+            )
+            expr: Expr_AssignOp_Pow(
+                var: Expr_Variable(
+                    name: c
+                )
+                expr: Expr_Variable(
+                    name: d
+                )
+            )
+        )
+        comments: array(
+            0: // chained assign
+        )
+    )
+    14: Expr_AssignRef(
+        var: Expr_Variable(
+            name: a
+            comments: array(
+                0: // by ref assign
+            )
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+        comments: array(
+            0: // by ref assign
+        )
+    )
+    15: Expr_Assign(
+        var: Expr_List(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: a
+                    )
+                    byRef: false
+                )
+            )
+            comments: array(
+                0: // list() assign
+            )
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+        comments: array(
+            0: // list() assign
+        )
+    )
+    16: Expr_Assign(
+        var: Expr_List(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: a
+                    )
+                    byRef: false
+                )
+                1: null
+                2: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: b
+                    )
+                    byRef: false
+                )
+            )
+        )
+        expr: Expr_Variable(
+            name: c
+        )
+    )
+    17: Expr_Assign(
+        var: Expr_List(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: a
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Expr_List(
+                        items: array(
+                            0: null
+                            1: Expr_ArrayItem(
+                                key: null
+                                value: Expr_Variable(
+                                    name: c
+                                )
+                                byRef: false
+                            )
+                        )
+                    )
+                    byRef: false
+                )
+                2: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: d
+                    )
+                    byRef: false
+                )
+            )
+        )
+        expr: Expr_Variable(
+            name: e
+        )
+    )
+    18: Expr_PreInc(
+        var: Expr_Variable(
+            name: a
+        )
+        comments: array(
+            0: // inc/dec
+        )
+    )
+    19: Expr_PostInc(
+        var: Expr_Variable(
+            name: a
+        )
+    )
+    20: Expr_PreDec(
+        var: Expr_Variable(
+            name: a
+        )
+    )
+    21: Expr_PostDec(
+        var: Expr_Variable(
+            name: a
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/assignNewByRef.test b/lib/nikic/php-parser/test/code/parser/expr/assignNewByRef.test
new file mode 100644
index 000000000..10e1317f0
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/assignNewByRef.test
@@ -0,0 +1,39 @@
+Assigning new by reference (PHP 5 only)
+-----
+<?php
+$a =& new B;
+-----
+!!php5
+array(
+    0: Expr_AssignRef(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_New(
+            class: Name(
+                parts: array(
+                    0: B
+                )
+            )
+            args: array(
+            )
+        )
+    )
+)
+-----
+<?php
+$a =& new B;
+-----
+!!php7
+Syntax error, unexpected T_NEW from 2:7 to 2:9
+array(
+    0: Expr_New(
+        class: Name(
+            parts: array(
+                0: B
+            )
+        )
+        args: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/cast.test b/lib/nikic/php-parser/test/code/parser/expr/cast.test
new file mode 100644
index 000000000..3c54ba72d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/cast.test
@@ -0,0 +1,72 @@
+Casts
+-----
+<?php
+(array)   $a;
+(bool)    $a;
+(boolean) $a;
+(real)    $a;
+(double)  $a;
+(float)   $a;
+(int)     $a;
+(integer) $a;
+(object)  $a;
+(string)  $a;
+(unset)   $a;
+-----
+array(
+    0: Expr_Cast_Array(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    1: Expr_Cast_Bool(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    2: Expr_Cast_Bool(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    3: Expr_Cast_Double(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    4: Expr_Cast_Double(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    5: Expr_Cast_Double(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    6: Expr_Cast_Int(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    7: Expr_Cast_Int(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    8: Expr_Cast_Object(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    9: Expr_Cast_String(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    10: Expr_Cast_Unset(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/clone.test b/lib/nikic/php-parser/test/code/parser/expr/clone.test
new file mode 100644
index 000000000..640156606
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/clone.test
@@ -0,0 +1,13 @@
+Clone
+-----
+<?php
+
+clone $a;
+-----
+array(
+    0: Expr_Clone(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/closure.test b/lib/nikic/php-parser/test/code/parser/expr/closure.test
new file mode 100644
index 000000000..f459b602d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/closure.test
@@ -0,0 +1,142 @@
+Closures
+-----
+<?php
+function($a) { $a; };
+function($a) use($b) {};
+function() use($a, &$b) {};
+function &($a) {};
+static function() {};
+function($a) : array {};
+function() use($a) : \Foo\Bar {};
+-----
+array(
+    0: Expr_Closure(
+        static: false
+        byRef: false
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+        )
+        uses: array(
+        )
+        returnType: null
+        stmts: array(
+            0: Expr_Variable(
+                name: a
+            )
+        )
+    )
+    1: Expr_Closure(
+        static: false
+        byRef: false
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+        )
+        uses: array(
+            0: Expr_ClosureUse(
+                var: b
+                byRef: false
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    2: Expr_Closure(
+        static: false
+        byRef: false
+        params: array(
+        )
+        uses: array(
+            0: Expr_ClosureUse(
+                var: a
+                byRef: false
+            )
+            1: Expr_ClosureUse(
+                var: b
+                byRef: true
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    3: Expr_Closure(
+        static: false
+        byRef: true
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+        )
+        uses: array(
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    4: Expr_Closure(
+        static: true
+        byRef: false
+        params: array(
+        )
+        uses: array(
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    5: Expr_Closure(
+        static: false
+        byRef: false
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+        )
+        uses: array(
+        )
+        returnType: array
+        stmts: array(
+        )
+    )
+    6: Expr_Closure(
+        static: false
+        byRef: false
+        params: array(
+        )
+        uses: array(
+            0: Expr_ClosureUse(
+                var: a
+                byRef: false
+            )
+        )
+        returnType: Name_FullyQualified(
+            parts: array(
+                0: Foo
+                1: Bar
+            )
+        )
+        stmts: array(
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/expr/comparison.test b/lib/nikic/php-parser/test/code/parser/expr/comparison.test
new file mode 100644
index 000000000..d5b1e3540
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/comparison.test
@@ -0,0 +1,107 @@
+Comparison operators
+-----
+<?php
+$a < $b;
+$a <= $b;
+$a > $b;
+$a >= $b;
+$a == $b;
+$a === $b;
+$a != $b;
+$a !== $b;
+$a <=> $b;
+$a instanceof B;
+$a instanceof $b;
+-----
+array(
+    0: Expr_BinaryOp_Smaller(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    1: Expr_BinaryOp_SmallerOrEqual(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    2: Expr_BinaryOp_Greater(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    3: Expr_BinaryOp_GreaterOrEqual(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    4: Expr_BinaryOp_Equal(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    5: Expr_BinaryOp_Identical(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    6: Expr_BinaryOp_NotEqual(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    7: Expr_BinaryOp_NotIdentical(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    8: Expr_BinaryOp_Spaceship(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    9: Expr_Instanceof(
+        expr: Expr_Variable(
+            name: a
+        )
+        class: Name(
+            parts: array(
+                0: B
+            )
+        )
+    )
+    10: Expr_Instanceof(
+        expr: Expr_Variable(
+            name: a
+        )
+        class: Expr_Variable(
+            name: b
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/expr/constant_expr.test b/lib/nikic/php-parser/test/code/parser/expr/constant_expr.test
new file mode 100644
index 000000000..3e7a23ef0
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/constant_expr.test
@@ -0,0 +1,621 @@
+Expressions in static scalar context
+-----
+<?php
+
+const T_1 = 1 << 1;
+const T_2 = 1 / 2;
+const T_3 = 1.5 + 1.5;
+const T_4 = "foo" . "bar";
+const T_5 = (1.5 + 1.5) * 2;
+const T_6 = "foo" . 2 . 3 . 4.0;
+const T_7 = __LINE__;
+const T_8 = <<<ENDOFSTRING
+This is a test string
+ENDOFSTRING;
+const T_9 = ~-1;
+const T_10 = (-1?:1) + (0?2:3);
+const T_11 = 1 && 0;
+const T_12 = 1 and 1;
+const T_13 = 0 || 0;
+const T_14 = 1 or 0;
+const T_15 = 1 xor 1;
+const T_16 = 1 xor 0;
+const T_17 = 1 < 0;
+const T_18 = 0 <= 0;
+const T_19 = 1 > 0;
+const T_20 = 1 >= 0;
+const T_21 = 1 === 1;
+const T_22 = 1 !== 1;
+const T_23 = 0 != "0";
+const T_24 = 1 == "1";
+const T_25 = 1 + 2 * 3;
+const T_26 = "1" + 2 + "3";
+const T_27 = 2 ** 3;
+const T_28 = [1, 2, 3][1];
+const T_29 = 12 - 13;
+const T_30 = 12 ^ 13;
+const T_31 = 12 & 13;
+const T_32 = 12 | 13;
+const T_33 = 12 % 3;
+const T_34 = 100 >> 4;
+const T_35 = !false;
+-----
+array(
+    0: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_1
+                value: Expr_BinaryOp_ShiftLeft(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    1: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_2
+                value: Expr_BinaryOp_Div(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 2
+                    )
+                )
+            )
+        )
+    )
+    2: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_3
+                value: Expr_BinaryOp_Plus(
+                    left: Scalar_DNumber(
+                        value: 1.5
+                    )
+                    right: Scalar_DNumber(
+                        value: 1.5
+                    )
+                )
+            )
+        )
+    )
+    3: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_4
+                value: Expr_BinaryOp_Concat(
+                    left: Scalar_String(
+                        value: foo
+                    )
+                    right: Scalar_String(
+                        value: bar
+                    )
+                )
+            )
+        )
+    )
+    4: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_5
+                value: Expr_BinaryOp_Mul(
+                    left: Expr_BinaryOp_Plus(
+                        left: Scalar_DNumber(
+                            value: 1.5
+                        )
+                        right: Scalar_DNumber(
+                            value: 1.5
+                        )
+                    )
+                    right: Scalar_LNumber(
+                        value: 2
+                    )
+                )
+            )
+        )
+    )
+    5: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_6
+                value: Expr_BinaryOp_Concat(
+                    left: Expr_BinaryOp_Concat(
+                        left: Expr_BinaryOp_Concat(
+                            left: Scalar_String(
+                                value: foo
+                            )
+                            right: Scalar_LNumber(
+                                value: 2
+                            )
+                        )
+                        right: Scalar_LNumber(
+                            value: 3
+                        )
+                    )
+                    right: Scalar_DNumber(
+                        value: 4
+                    )
+                )
+            )
+        )
+    )
+    6: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_7
+                value: Scalar_MagicConst_Line(
+                )
+            )
+        )
+    )
+    7: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_8
+                value: Scalar_String(
+                    value: This is a test string
+                )
+            )
+        )
+    )
+    8: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_9
+                value: Expr_BitwiseNot(
+                    expr: Expr_UnaryMinus(
+                        expr: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                )
+            )
+        )
+    )
+    9: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_10
+                value: Expr_BinaryOp_Plus(
+                    left: Expr_Ternary(
+                        cond: Expr_UnaryMinus(
+                            expr: Scalar_LNumber(
+                                value: 1
+                            )
+                        )
+                        if: null
+                        else: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                    right: Expr_Ternary(
+                        cond: Scalar_LNumber(
+                            value: 0
+                        )
+                        if: Scalar_LNumber(
+                            value: 2
+                        )
+                        else: Scalar_LNumber(
+                            value: 3
+                        )
+                    )
+                )
+            )
+        )
+    )
+    10: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_11
+                value: Expr_BinaryOp_BooleanAnd(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    11: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_12
+                value: Expr_BinaryOp_LogicalAnd(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    12: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_13
+                value: Expr_BinaryOp_BooleanOr(
+                    left: Scalar_LNumber(
+                        value: 0
+                    )
+                    right: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    13: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_14
+                value: Expr_BinaryOp_LogicalOr(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    14: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_15
+                value: Expr_BinaryOp_LogicalXor(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    15: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_16
+                value: Expr_BinaryOp_LogicalXor(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    16: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_17
+                value: Expr_BinaryOp_Smaller(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    17: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_18
+                value: Expr_BinaryOp_SmallerOrEqual(
+                    left: Scalar_LNumber(
+                        value: 0
+                    )
+                    right: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    18: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_19
+                value: Expr_BinaryOp_Greater(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    19: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_20
+                value: Expr_BinaryOp_GreaterOrEqual(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    20: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_21
+                value: Expr_BinaryOp_Identical(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    21: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_22
+                value: Expr_BinaryOp_NotIdentical(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    22: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_23
+                value: Expr_BinaryOp_NotEqual(
+                    left: Scalar_LNumber(
+                        value: 0
+                    )
+                    right: Scalar_String(
+                        value: 0
+                    )
+                )
+            )
+        )
+    )
+    23: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_24
+                value: Expr_BinaryOp_Equal(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Scalar_String(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    24: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_25
+                value: Expr_BinaryOp_Plus(
+                    left: Scalar_LNumber(
+                        value: 1
+                    )
+                    right: Expr_BinaryOp_Mul(
+                        left: Scalar_LNumber(
+                            value: 2
+                        )
+                        right: Scalar_LNumber(
+                            value: 3
+                        )
+                    )
+                )
+            )
+        )
+    )
+    25: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_26
+                value: Expr_BinaryOp_Plus(
+                    left: Expr_BinaryOp_Plus(
+                        left: Scalar_String(
+                            value: 1
+                        )
+                        right: Scalar_LNumber(
+                            value: 2
+                        )
+                    )
+                    right: Scalar_String(
+                        value: 3
+                    )
+                )
+            )
+        )
+    )
+    26: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_27
+                value: Expr_BinaryOp_Pow(
+                    left: Scalar_LNumber(
+                        value: 2
+                    )
+                    right: Scalar_LNumber(
+                        value: 3
+                    )
+                )
+            )
+        )
+    )
+    27: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_28
+                value: Expr_ArrayDimFetch(
+                    var: Expr_Array(
+                        items: array(
+                            0: Expr_ArrayItem(
+                                key: null
+                                value: Scalar_LNumber(
+                                    value: 1
+                                )
+                                byRef: false
+                            )
+                            1: Expr_ArrayItem(
+                                key: null
+                                value: Scalar_LNumber(
+                                    value: 2
+                                )
+                                byRef: false
+                            )
+                            2: Expr_ArrayItem(
+                                key: null
+                                value: Scalar_LNumber(
+                                    value: 3
+                                )
+                                byRef: false
+                            )
+                        )
+                    )
+                    dim: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    28: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_29
+                value: Expr_BinaryOp_Minus(
+                    left: Scalar_LNumber(
+                        value: 12
+                    )
+                    right: Scalar_LNumber(
+                        value: 13
+                    )
+                )
+            )
+        )
+    )
+    29: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_30
+                value: Expr_BinaryOp_BitwiseXor(
+                    left: Scalar_LNumber(
+                        value: 12
+                    )
+                    right: Scalar_LNumber(
+                        value: 13
+                    )
+                )
+            )
+        )
+    )
+    30: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_31
+                value: Expr_BinaryOp_BitwiseAnd(
+                    left: Scalar_LNumber(
+                        value: 12
+                    )
+                    right: Scalar_LNumber(
+                        value: 13
+                    )
+                )
+            )
+        )
+    )
+    31: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_32
+                value: Expr_BinaryOp_BitwiseOr(
+                    left: Scalar_LNumber(
+                        value: 12
+                    )
+                    right: Scalar_LNumber(
+                        value: 13
+                    )
+                )
+            )
+        )
+    )
+    32: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_33
+                value: Expr_BinaryOp_Mod(
+                    left: Scalar_LNumber(
+                        value: 12
+                    )
+                    right: Scalar_LNumber(
+                        value: 3
+                    )
+                )
+            )
+        )
+    )
+    33: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_34
+                value: Expr_BinaryOp_ShiftRight(
+                    left: Scalar_LNumber(
+                        value: 100
+                    )
+                    right: Scalar_LNumber(
+                        value: 4
+                    )
+                )
+            )
+        )
+    )
+    34: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: T_35
+                value: Expr_BooleanNot(
+                    expr: Expr_ConstFetch(
+                        name: Name(
+                            parts: array(
+                                0: false
+                            )
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/errorSuppress.test b/lib/nikic/php-parser/test/code/parser/expr/errorSuppress.test
new file mode 100644
index 000000000..ce3fce96a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/errorSuppress.test
@@ -0,0 +1,12 @@
+Error suppression
+-----
+<?php
+@$a;
+-----
+array(
+    0: Expr_ErrorSuppress(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/exit.test b/lib/nikic/php-parser/test/code/parser/expr/exit.test
new file mode 100644
index 000000000..8f21e5ba9
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/exit.test
@@ -0,0 +1,34 @@
+Exit
+-----
+<?php
+exit;
+exit();
+exit('Die!');
+die;
+die();
+die('Exit!');
+-----
+array(
+    0: Expr_Exit(
+        expr: null
+    )
+    1: Expr_Exit(
+        expr: null
+    )
+    2: Expr_Exit(
+        expr: Scalar_String(
+            value: Die!
+        )
+    )
+    3: Expr_Exit(
+        expr: null
+    )
+    4: Expr_Exit(
+        expr: null
+    )
+    5: Expr_Exit(
+        expr: Scalar_String(
+            value: Exit!
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/args.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/args.test
new file mode 100644
index 000000000..6d7352099
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/args.test
@@ -0,0 +1,99 @@
+Arguments
+-----
+<?php
+
+f();
+f($a);
+f($a, $b);
+f(&$a);
+f($a, ...$b);
+-----
+array(
+    0: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: f
+            )
+        )
+        args: array(
+        )
+    )
+    1: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: f
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_Variable(
+                    name: a
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    2: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: f
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_Variable(
+                    name: a
+                )
+                byRef: false
+                unpack: false
+            )
+            1: Arg(
+                value: Expr_Variable(
+                    name: b
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    3: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: f
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_Variable(
+                    name: a
+                )
+                byRef: true
+                unpack: false
+            )
+        )
+    )
+    4: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: f
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_Variable(
+                    name: a
+                )
+                byRef: false
+                unpack: false
+            )
+            1: Arg(
+                value: Expr_Variable(
+                    name: b
+                )
+                byRef: false
+                unpack: true
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/constFetch.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/constFetch.test
new file mode 100644
index 000000000..7686d2d96
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/constFetch.test
@@ -0,0 +1,33 @@
+Constant fetches
+-----
+<?php
+
+A;
+A::B;
+A::class;
+-----
+array(
+    0: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+    )
+    1: Expr_ClassConstFetch(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: B
+    )
+    2: Expr_ClassConstFetch(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: class
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/constantDeref.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/constantDeref.test
new file mode 100644
index 000000000..682f78082
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/constantDeref.test
@@ -0,0 +1,231 @@
+Array/string dereferencing
+-----
+<?php
+
+"abc"[2];
+"abc"[2][0][0];
+
+[1, 2, 3][2];
+[1, 2, 3][2][0][0];
+
+array(1, 2, 3)[2];
+array(1, 2, 3)[2][0][0];
+
+FOO[0];
+Foo::BAR[1];
+$foo::BAR[2][1][0];
+-----
+array(
+    0: Expr_ArrayDimFetch(
+        var: Scalar_String(
+            value: abc
+        )
+        dim: Scalar_LNumber(
+            value: 2
+        )
+    )
+    1: Expr_ArrayDimFetch(
+        var: Expr_ArrayDimFetch(
+            var: Expr_ArrayDimFetch(
+                var: Scalar_String(
+                    value: abc
+                )
+                dim: Scalar_LNumber(
+                    value: 2
+                )
+            )
+            dim: Scalar_LNumber(
+                value: 0
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 0
+        )
+    )
+    2: Expr_ArrayDimFetch(
+        var: Expr_Array(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 1
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 2
+                    )
+                    byRef: false
+                )
+                2: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 3
+                    )
+                    byRef: false
+                )
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 2
+        )
+    )
+    3: Expr_ArrayDimFetch(
+        var: Expr_ArrayDimFetch(
+            var: Expr_ArrayDimFetch(
+                var: Expr_Array(
+                    items: array(
+                        0: Expr_ArrayItem(
+                            key: null
+                            value: Scalar_LNumber(
+                                value: 1
+                            )
+                            byRef: false
+                        )
+                        1: Expr_ArrayItem(
+                            key: null
+                            value: Scalar_LNumber(
+                                value: 2
+                            )
+                            byRef: false
+                        )
+                        2: Expr_ArrayItem(
+                            key: null
+                            value: Scalar_LNumber(
+                                value: 3
+                            )
+                            byRef: false
+                        )
+                    )
+                )
+                dim: Scalar_LNumber(
+                    value: 2
+                )
+            )
+            dim: Scalar_LNumber(
+                value: 0
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 0
+        )
+    )
+    4: Expr_ArrayDimFetch(
+        var: Expr_Array(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 1
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 2
+                    )
+                    byRef: false
+                )
+                2: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 3
+                    )
+                    byRef: false
+                )
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 2
+        )
+    )
+    5: Expr_ArrayDimFetch(
+        var: Expr_ArrayDimFetch(
+            var: Expr_ArrayDimFetch(
+                var: Expr_Array(
+                    items: array(
+                        0: Expr_ArrayItem(
+                            key: null
+                            value: Scalar_LNumber(
+                                value: 1
+                            )
+                            byRef: false
+                        )
+                        1: Expr_ArrayItem(
+                            key: null
+                            value: Scalar_LNumber(
+                                value: 2
+                            )
+                            byRef: false
+                        )
+                        2: Expr_ArrayItem(
+                            key: null
+                            value: Scalar_LNumber(
+                                value: 3
+                            )
+                            byRef: false
+                        )
+                    )
+                )
+                dim: Scalar_LNumber(
+                    value: 2
+                )
+            )
+            dim: Scalar_LNumber(
+                value: 0
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 0
+        )
+    )
+    6: Expr_ArrayDimFetch(
+        var: Expr_ConstFetch(
+            name: Name(
+                parts: array(
+                    0: FOO
+                )
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 0
+        )
+    )
+    7: Expr_ArrayDimFetch(
+        var: Expr_ClassConstFetch(
+            class: Name(
+                parts: array(
+                    0: Foo
+                )
+            )
+            name: BAR
+        )
+        dim: Scalar_LNumber(
+            value: 1
+        )
+    )
+    8: Expr_ArrayDimFetch(
+        var: Expr_ArrayDimFetch(
+            var: Expr_ArrayDimFetch(
+                var: Expr_ClassConstFetch(
+                    class: Expr_Variable(
+                        name: foo
+                    )
+                    name: BAR
+                )
+                dim: Scalar_LNumber(
+                    value: 2
+                )
+            )
+            dim: Scalar_LNumber(
+                value: 1
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 0
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/funcCall.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/funcCall.test
new file mode 100644
index 000000000..62f69e347
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/funcCall.test
@@ -0,0 +1,132 @@
+Function calls
+-----
+<?php
+
+// function name variations
+a();
+$a();
+${'a'}();
+$$a();
+$$$a();
+$a['b']();
+$a{'b'}();
+$a->b['c']();
+
+// array dereferencing
+a()['b'];
+-----
+array(
+    0: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: a
+            )
+            comments: array(
+                0: // function name variations
+            )
+        )
+        args: array(
+        )
+        comments: array(
+            0: // function name variations
+        )
+    )
+    1: Expr_FuncCall(
+        name: Expr_Variable(
+            name: a
+        )
+        args: array(
+        )
+    )
+    2: Expr_FuncCall(
+        name: Expr_Variable(
+            name: Scalar_String(
+                value: a
+            )
+        )
+        args: array(
+        )
+    )
+    3: Expr_FuncCall(
+        name: Expr_Variable(
+            name: Expr_Variable(
+                name: a
+            )
+        )
+        args: array(
+        )
+    )
+    4: Expr_FuncCall(
+        name: Expr_Variable(
+            name: Expr_Variable(
+                name: Expr_Variable(
+                    name: a
+                )
+            )
+        )
+        args: array(
+        )
+    )
+    5: Expr_FuncCall(
+        name: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            dim: Scalar_String(
+                value: b
+            )
+        )
+        args: array(
+        )
+    )
+    6: Expr_FuncCall(
+        name: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            dim: Scalar_String(
+                value: b
+            )
+        )
+        args: array(
+        )
+    )
+    7: Expr_FuncCall(
+        name: Expr_ArrayDimFetch(
+            var: Expr_PropertyFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                name: b
+            )
+            dim: Scalar_String(
+                value: c
+            )
+        )
+        args: array(
+        )
+    )
+    8: Expr_ArrayDimFetch(
+        var: Expr_FuncCall(
+            name: Name(
+                parts: array(
+                    0: a
+                )
+                comments: array(
+                    0: // array dereferencing
+                )
+            )
+            args: array(
+            )
+            comments: array(
+                0: // array dereferencing
+            )
+        )
+        dim: Scalar_String(
+            value: b
+        )
+        comments: array(
+            0: // array dereferencing
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/newDeref.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/newDeref.test
new file mode 100644
index 000000000..5e36ff810
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/newDeref.test
@@ -0,0 +1,70 @@
+New expression dereferencing
+-----
+<?php
+
+(new A)->b;
+(new A)->b();
+(new A)['b'];
+(new A)['b']['c'];
+-----
+array(
+    0: Expr_PropertyFetch(
+        var: Expr_New(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            args: array(
+            )
+        )
+        name: b
+    )
+    1: Expr_MethodCall(
+        var: Expr_New(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            args: array(
+            )
+        )
+        name: b
+        args: array(
+        )
+    )
+    2: Expr_ArrayDimFetch(
+        var: Expr_New(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            args: array(
+            )
+        )
+        dim: Scalar_String(
+            value: b
+        )
+    )
+    3: Expr_ArrayDimFetch(
+        var: Expr_ArrayDimFetch(
+            var: Expr_New(
+                class: Name(
+                    parts: array(
+                        0: A
+                    )
+                )
+                args: array(
+                )
+            )
+            dim: Scalar_String(
+                value: b
+            )
+        )
+        dim: Scalar_String(
+            value: c
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/objectAccess.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/objectAccess.test
new file mode 100644
index 000000000..584461bde
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/objectAccess.test
@@ -0,0 +1,145 @@
+Object access
+-----
+<?php
+
+// property fetch variations
+$a->b;
+$a->b['c'];
+$a->b{'c'};
+
+// method call variations
+$a->b();
+$a->{'b'}();
+$a->$b();
+$a->$b['c']();
+
+// array dereferencing
+$a->b()['c'];
+$a->b(){'c'}; // invalid PHP: drop Support?
+-----
+!!php5
+array(
+    0: Expr_PropertyFetch(
+        var: Expr_Variable(
+            name: a
+            comments: array(
+                0: // property fetch variations
+            )
+        )
+        name: b
+        comments: array(
+            0: // property fetch variations
+        )
+    )
+    1: Expr_ArrayDimFetch(
+        var: Expr_PropertyFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            name: b
+        )
+        dim: Scalar_String(
+            value: c
+        )
+    )
+    2: Expr_ArrayDimFetch(
+        var: Expr_PropertyFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            name: b
+        )
+        dim: Scalar_String(
+            value: c
+        )
+    )
+    3: Expr_MethodCall(
+        var: Expr_Variable(
+            name: a
+            comments: array(
+                0: // method call variations
+            )
+        )
+        name: b
+        args: array(
+        )
+        comments: array(
+            0: // method call variations
+        )
+    )
+    4: Expr_MethodCall(
+        var: Expr_Variable(
+            name: a
+        )
+        name: Scalar_String(
+            value: b
+        )
+        args: array(
+        )
+    )
+    5: Expr_MethodCall(
+        var: Expr_Variable(
+            name: a
+        )
+        name: Expr_Variable(
+            name: b
+        )
+        args: array(
+        )
+    )
+    6: Expr_MethodCall(
+        var: Expr_Variable(
+            name: a
+        )
+        name: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: b
+            )
+            dim: Scalar_String(
+                value: c
+            )
+        )
+        args: array(
+        )
+    )
+    7: Expr_ArrayDimFetch(
+        var: Expr_MethodCall(
+            var: Expr_Variable(
+                name: a
+                comments: array(
+                    0: // array dereferencing
+                )
+            )
+            name: b
+            args: array(
+            )
+            comments: array(
+                0: // array dereferencing
+            )
+        )
+        dim: Scalar_String(
+            value: c
+        )
+        comments: array(
+            0: // array dereferencing
+        )
+    )
+    8: Expr_ArrayDimFetch(
+        var: Expr_MethodCall(
+            var: Expr_Variable(
+                name: a
+            )
+            name: b
+            args: array(
+            )
+        )
+        dim: Scalar_String(
+            value: c
+        )
+    )
+    9: Stmt_Nop(
+        comments: array(
+            0: // invalid PHP: drop Support?
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/simpleArrayAccess.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/simpleArrayAccess.test
new file mode 100644
index 000000000..ea3f9ef43
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/simpleArrayAccess.test
@@ -0,0 +1,62 @@
+Simple array access
+-----
+<?php
+
+$a['b'];
+$a['b']['c'];
+$a[] = $b;
+$a{'b'};
+${$a}['b'];
+-----
+array(
+    0: Expr_ArrayDimFetch(
+        var: Expr_Variable(
+            name: a
+        )
+        dim: Scalar_String(
+            value: b
+        )
+    )
+    1: Expr_ArrayDimFetch(
+        var: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            dim: Scalar_String(
+                value: b
+            )
+        )
+        dim: Scalar_String(
+            value: c
+        )
+    )
+    2: Expr_Assign(
+        var: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            dim: null
+        )
+        expr: Expr_Variable(
+            name: b
+        )
+    )
+    3: Expr_ArrayDimFetch(
+        var: Expr_Variable(
+            name: a
+        )
+        dim: Scalar_String(
+            value: b
+        )
+    )
+    4: Expr_ArrayDimFetch(
+        var: Expr_Variable(
+            name: Expr_Variable(
+                name: a
+            )
+        )
+        dim: Scalar_String(
+            value: b
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticCall.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticCall.test
new file mode 100644
index 000000000..b806f7de4
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticCall.test
@@ -0,0 +1,173 @@
+Static calls
+-----
+<?php
+
+// method name variations
+A::b();
+A::{'b'}();
+A::$b();
+A::$b['c']();
+A::$b['c']['d']();
+
+// array dereferencing
+A::b()['c'];
+
+// class name variations
+static::b();
+$a::b();
+${'a'}::b();
+$a['b']::c();
+-----
+!!php5
+array(
+    0: Expr_StaticCall(
+        class: Name(
+            parts: array(
+                0: A
+            )
+            comments: array(
+                0: // method name variations
+            )
+        )
+        name: b
+        args: array(
+        )
+        comments: array(
+            0: // method name variations
+        )
+    )
+    1: Expr_StaticCall(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: Scalar_String(
+            value: b
+        )
+        args: array(
+        )
+    )
+    2: Expr_StaticCall(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: Expr_Variable(
+            name: b
+        )
+        args: array(
+        )
+    )
+    3: Expr_StaticCall(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: b
+            )
+            dim: Scalar_String(
+                value: c
+            )
+        )
+        args: array(
+        )
+    )
+    4: Expr_StaticCall(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: Expr_ArrayDimFetch(
+            var: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: b
+                )
+                dim: Scalar_String(
+                    value: c
+                )
+            )
+            dim: Scalar_String(
+                value: d
+            )
+        )
+        args: array(
+        )
+    )
+    5: Expr_ArrayDimFetch(
+        var: Expr_StaticCall(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+                comments: array(
+                    0: // array dereferencing
+                )
+            )
+            name: b
+            args: array(
+            )
+            comments: array(
+                0: // array dereferencing
+            )
+        )
+        dim: Scalar_String(
+            value: c
+        )
+        comments: array(
+            0: // array dereferencing
+        )
+    )
+    6: Expr_StaticCall(
+        class: Name(
+            parts: array(
+                0: static
+            )
+            comments: array(
+                0: // class name variations
+            )
+        )
+        name: b
+        args: array(
+        )
+        comments: array(
+            0: // class name variations
+        )
+    )
+    7: Expr_StaticCall(
+        class: Expr_Variable(
+            name: a
+        )
+        name: b
+        args: array(
+        )
+    )
+    8: Expr_StaticCall(
+        class: Expr_Variable(
+            name: Scalar_String(
+                value: a
+            )
+        )
+        name: b
+        args: array(
+        )
+    )
+    9: Expr_StaticCall(
+        class: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            dim: Scalar_String(
+                value: b
+            )
+        )
+        name: c
+        args: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticPropertyFetch.test b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticPropertyFetch.test
new file mode 100644
index 000000000..3d3cde510
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/fetchAndCall/staticPropertyFetch.test
@@ -0,0 +1,91 @@
+Static property fetches
+-----
+<?php
+
+// property name variations
+A::$b;
+A::$$b;
+A::${'b'};
+
+// array access
+A::$b['c'];
+A::$b{'c'};
+
+// class name variations can be found in staticCall.test
+-----
+array(
+    0: Expr_StaticPropertyFetch(
+        class: Name(
+            parts: array(
+                0: A
+            )
+            comments: array(
+                0: // property name variations
+            )
+        )
+        name: b
+        comments: array(
+            0: // property name variations
+        )
+    )
+    1: Expr_StaticPropertyFetch(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: Expr_Variable(
+            name: b
+        )
+    )
+    2: Expr_StaticPropertyFetch(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: Scalar_String(
+            value: b
+        )
+    )
+    3: Expr_ArrayDimFetch(
+        var: Expr_StaticPropertyFetch(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+                comments: array(
+                    0: // array access
+                )
+            )
+            name: b
+            comments: array(
+                0: // array access
+            )
+        )
+        dim: Scalar_String(
+            value: c
+        )
+        comments: array(
+            0: // array access
+        )
+    )
+    4: Expr_ArrayDimFetch(
+        var: Expr_StaticPropertyFetch(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            name: b
+        )
+        dim: Scalar_String(
+            value: c
+        )
+    )
+    5: Stmt_Nop(
+        comments: array(
+            0: // class name variations can be found in staticCall.test
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/includeAndEval.test b/lib/nikic/php-parser/test/code/parser/expr/includeAndEval.test
new file mode 100644
index 000000000..8870ea5e7
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/includeAndEval.test
@@ -0,0 +1,40 @@
+Include and eval
+-----
+<?php
+include 'A.php';
+include_once 'A.php';
+require 'A.php';
+require_once 'A.php';
+eval('A');
+-----
+array(
+    0: Expr_Include(
+        expr: Scalar_String(
+            value: A.php
+        )
+        type: TYPE_INCLUDE (1)
+    )
+    1: Expr_Include(
+        expr: Scalar_String(
+            value: A.php
+        )
+        type: TYPE_INCLUDE_ONCE (2)
+    )
+    2: Expr_Include(
+        expr: Scalar_String(
+            value: A.php
+        )
+        type: TYPE_REQUIRE (3)
+    )
+    3: Expr_Include(
+        expr: Scalar_String(
+            value: A.php
+        )
+        type: TYPE_REQURE_ONCE (4)
+    )
+    4: Expr_Eval(
+        expr: Scalar_String(
+            value: A
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/issetAndEmpty.test b/lib/nikic/php-parser/test/code/parser/expr/issetAndEmpty.test
new file mode 100644
index 000000000..3a43d0d42
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/issetAndEmpty.test
@@ -0,0 +1,75 @@
+isset() and empty()
+-----
+<?php
+isset($a);
+isset($a, $b, $c);
+
+empty($a);
+empty(foo());
+empty(array(1, 2, 3));
+-----
+array(
+    0: Expr_Isset(
+        vars: array(
+            0: Expr_Variable(
+                name: a
+            )
+        )
+    )
+    1: Expr_Isset(
+        vars: array(
+            0: Expr_Variable(
+                name: a
+            )
+            1: Expr_Variable(
+                name: b
+            )
+            2: Expr_Variable(
+                name: c
+            )
+        )
+    )
+    2: Expr_Empty(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    3: Expr_Empty(
+        expr: Expr_FuncCall(
+            name: Name(
+                parts: array(
+                    0: foo
+                )
+            )
+            args: array(
+            )
+        )
+    )
+    4: Expr_Empty(
+        expr: Expr_Array(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 1
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 2
+                    )
+                    byRef: false
+                )
+                2: Expr_ArrayItem(
+                    key: null
+                    value: Scalar_LNumber(
+                        value: 3
+                    )
+                    byRef: false
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/listWithKeys.test b/lib/nikic/php-parser/test/code/parser/expr/listWithKeys.test
new file mode 100644
index 000000000..48e9637a6
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/listWithKeys.test
@@ -0,0 +1,75 @@
+List destructing with keys
+-----
+<?php
+
+list('a' => $b) = ['a' => 'b'];
+list('a' => list($b => $c), 'd' => $e) = $x;
+-----
+!!php7
+array(
+    0: Expr_Assign(
+        var: Expr_List(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: Scalar_String(
+                        value: a
+                    )
+                    value: Expr_Variable(
+                        name: b
+                    )
+                    byRef: false
+                )
+            )
+        )
+        expr: Expr_Array(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: Scalar_String(
+                        value: a
+                    )
+                    value: Scalar_String(
+                        value: b
+                    )
+                    byRef: false
+                )
+            )
+        )
+    )
+    1: Expr_Assign(
+        var: Expr_List(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: Scalar_String(
+                        value: a
+                    )
+                    value: Expr_List(
+                        items: array(
+                            0: Expr_ArrayItem(
+                                key: Expr_Variable(
+                                    name: b
+                                )
+                                value: Expr_Variable(
+                                    name: c
+                                )
+                                byRef: false
+                            )
+                        )
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: Scalar_String(
+                        value: d
+                    )
+                    value: Expr_Variable(
+                        name: e
+                    )
+                    byRef: false
+                )
+            )
+        )
+        expr: Expr_Variable(
+            name: x
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/logic.test b/lib/nikic/php-parser/test/code/parser/expr/logic.test
new file mode 100644
index 000000000..b3634e91a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/logic.test
@@ -0,0 +1,159 @@
+Logical operators
+-----
+<?php
+
+// boolean ops
+$a && $b;
+$a || $b;
+!$a;
+!!$a;
+
+// logical ops
+$a and $b;
+$a or $b;
+$a xor $b;
+
+// precedence
+$a && $b || $c && $d;
+$a && ($b || $c) && $d;
+
+$a = $b || $c;
+$a = $b or $c;
+-----
+array(
+    0: Expr_BinaryOp_BooleanAnd(
+        left: Expr_Variable(
+            name: a
+            comments: array(
+                0: // boolean ops
+            )
+        )
+        right: Expr_Variable(
+            name: b
+        )
+        comments: array(
+            0: // boolean ops
+        )
+    )
+    1: Expr_BinaryOp_BooleanOr(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    2: Expr_BooleanNot(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    3: Expr_BooleanNot(
+        expr: Expr_BooleanNot(
+            expr: Expr_Variable(
+                name: a
+            )
+        )
+    )
+    4: Expr_BinaryOp_LogicalAnd(
+        left: Expr_Variable(
+            name: a
+            comments: array(
+                0: // logical ops
+            )
+        )
+        right: Expr_Variable(
+            name: b
+        )
+        comments: array(
+            0: // logical ops
+        )
+    )
+    5: Expr_BinaryOp_LogicalOr(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    6: Expr_BinaryOp_LogicalXor(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    7: Expr_BinaryOp_BooleanOr(
+        left: Expr_BinaryOp_BooleanAnd(
+            left: Expr_Variable(
+                name: a
+                comments: array(
+                    0: // precedence
+                )
+            )
+            right: Expr_Variable(
+                name: b
+            )
+            comments: array(
+                0: // precedence
+            )
+        )
+        right: Expr_BinaryOp_BooleanAnd(
+            left: Expr_Variable(
+                name: c
+            )
+            right: Expr_Variable(
+                name: d
+            )
+        )
+        comments: array(
+            0: // precedence
+        )
+    )
+    8: Expr_BinaryOp_BooleanAnd(
+        left: Expr_BinaryOp_BooleanAnd(
+            left: Expr_Variable(
+                name: a
+            )
+            right: Expr_BinaryOp_BooleanOr(
+                left: Expr_Variable(
+                    name: b
+                )
+                right: Expr_Variable(
+                    name: c
+                )
+            )
+        )
+        right: Expr_Variable(
+            name: d
+        )
+    )
+    9: Expr_Assign(
+        var: Expr_Variable(
+            name: a
+        )
+        expr: Expr_BinaryOp_BooleanOr(
+            left: Expr_Variable(
+                name: b
+            )
+            right: Expr_Variable(
+                name: c
+            )
+        )
+    )
+    10: Expr_BinaryOp_LogicalOr(
+        left: Expr_Assign(
+            var: Expr_Variable(
+                name: a
+            )
+            expr: Expr_Variable(
+                name: b
+            )
+        )
+        right: Expr_Variable(
+            name: c
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/math.test b/lib/nikic/php-parser/test/code/parser/expr/math.test
new file mode 100644
index 000000000..3c00ebc70
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/math.test
@@ -0,0 +1,256 @@
+Mathematical operators
+-----
+<?php
+
+// unary ops
+~$a;
++$a;
+-$a;
+
+// binary ops
+$a & $b;
+$a | $b;
+$a ^ $b;
+$a . $b;
+$a / $b;
+$a - $b;
+$a % $b;
+$a * $b;
+$a + $b;
+$a << $b;
+$a >> $b;
+$a ** $b;
+
+// associativity
+$a * $b * $c;
+$a * ($b * $c);
+
+// precedence
+$a + $b * $c;
+($a + $b) * $c;
+
+// pow is special
+$a ** $b ** $c;
+($a ** $b) ** $c;
+-----
+array(
+    0: Expr_BitwiseNot(
+        expr: Expr_Variable(
+            name: a
+        )
+        comments: array(
+            0: // unary ops
+        )
+    )
+    1: Expr_UnaryPlus(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    2: Expr_UnaryMinus(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    3: Expr_BinaryOp_BitwiseAnd(
+        left: Expr_Variable(
+            name: a
+            comments: array(
+                0: // binary ops
+            )
+        )
+        right: Expr_Variable(
+            name: b
+        )
+        comments: array(
+            0: // binary ops
+        )
+    )
+    4: Expr_BinaryOp_BitwiseOr(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    5: Expr_BinaryOp_BitwiseXor(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    6: Expr_BinaryOp_Concat(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    7: Expr_BinaryOp_Div(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    8: Expr_BinaryOp_Minus(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    9: Expr_BinaryOp_Mod(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    10: Expr_BinaryOp_Mul(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    11: Expr_BinaryOp_Plus(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    12: Expr_BinaryOp_ShiftLeft(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    13: Expr_BinaryOp_ShiftRight(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    14: Expr_BinaryOp_Pow(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_Variable(
+            name: b
+        )
+    )
+    15: Expr_BinaryOp_Mul(
+        left: Expr_BinaryOp_Mul(
+            left: Expr_Variable(
+                name: a
+                comments: array(
+                    0: // associativity
+                )
+            )
+            right: Expr_Variable(
+                name: b
+            )
+            comments: array(
+                0: // associativity
+            )
+        )
+        right: Expr_Variable(
+            name: c
+        )
+        comments: array(
+            0: // associativity
+        )
+    )
+    16: Expr_BinaryOp_Mul(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_BinaryOp_Mul(
+            left: Expr_Variable(
+                name: b
+            )
+            right: Expr_Variable(
+                name: c
+            )
+        )
+    )
+    17: Expr_BinaryOp_Plus(
+        left: Expr_Variable(
+            name: a
+            comments: array(
+                0: // precedence
+            )
+        )
+        right: Expr_BinaryOp_Mul(
+            left: Expr_Variable(
+                name: b
+            )
+            right: Expr_Variable(
+                name: c
+            )
+        )
+        comments: array(
+            0: // precedence
+        )
+    )
+    18: Expr_BinaryOp_Mul(
+        left: Expr_BinaryOp_Plus(
+            left: Expr_Variable(
+                name: a
+            )
+            right: Expr_Variable(
+                name: b
+            )
+        )
+        right: Expr_Variable(
+            name: c
+        )
+    )
+    19: Expr_BinaryOp_Pow(
+        left: Expr_Variable(
+            name: a
+            comments: array(
+                0: // pow is special
+            )
+        )
+        right: Expr_BinaryOp_Pow(
+            left: Expr_Variable(
+                name: b
+            )
+            right: Expr_Variable(
+                name: c
+            )
+        )
+        comments: array(
+            0: // pow is special
+        )
+    )
+    20: Expr_BinaryOp_Pow(
+        left: Expr_BinaryOp_Pow(
+            left: Expr_Variable(
+                name: a
+            )
+            right: Expr_Variable(
+                name: b
+            )
+        )
+        right: Expr_Variable(
+            name: c
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/new.test b/lib/nikic/php-parser/test/code/parser/expr/new.test
new file mode 100644
index 000000000..a132bbb45
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/new.test
@@ -0,0 +1,146 @@
+New
+-----
+<?php
+
+new A;
+new A($b);
+
+// class name variations
+new $a();
+new $a['b']();
+new A::$b();
+// DNCR object access
+new $a->b();
+new $a->b->c();
+new $a->b['c']();
+new $a->b{'c'}();
+
+// test regression introduces by new dereferencing syntax
+(new A);
+-----
+array(
+    0: Expr_New(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        args: array(
+        )
+    )
+    1: Expr_New(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_Variable(
+                    name: b
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    2: Expr_New(
+        class: Expr_Variable(
+            name: a
+        )
+        args: array(
+        )
+        comments: array(
+            0: // class name variations
+        )
+    )
+    3: Expr_New(
+        class: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            dim: Scalar_String(
+                value: b
+            )
+        )
+        args: array(
+        )
+    )
+    4: Expr_New(
+        class: Expr_StaticPropertyFetch(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            name: b
+        )
+        args: array(
+        )
+    )
+    5: Expr_New(
+        class: Expr_PropertyFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            name: b
+        )
+        args: array(
+        )
+        comments: array(
+            0: // DNCR object access
+        )
+    )
+    6: Expr_New(
+        class: Expr_PropertyFetch(
+            var: Expr_PropertyFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                name: b
+            )
+            name: c
+        )
+        args: array(
+        )
+    )
+    7: Expr_New(
+        class: Expr_ArrayDimFetch(
+            var: Expr_PropertyFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                name: b
+            )
+            dim: Scalar_String(
+                value: c
+            )
+        )
+        args: array(
+        )
+    )
+    8: Expr_New(
+        class: Expr_ArrayDimFetch(
+            var: Expr_PropertyFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                name: b
+            )
+            dim: Scalar_String(
+                value: c
+            )
+        )
+        args: array(
+        )
+    )
+    9: Expr_New(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        args: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/newWithoutClass.test b/lib/nikic/php-parser/test/code/parser/expr/newWithoutClass.test
new file mode 100644
index 000000000..ca7f4981e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/newWithoutClass.test
@@ -0,0 +1,23 @@
+New without a class
+-----
+<?php
+new;
+-----
+!!php5
+Syntax error, unexpected ';' from 2:4 to 2:4
+array(
+)
+-----
+<?php
+new;
+-----
+!!php7
+Syntax error, unexpected ';' from 2:4 to 2:4
+array(
+    0: Expr_New(
+        class: Expr_Error(
+        )
+        args: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/print.test b/lib/nikic/php-parser/test/code/parser/expr/print.test
new file mode 100644
index 000000000..d07afda09
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/print.test
@@ -0,0 +1,12 @@
+Print
+-----
+<?php
+print $a;
+-----
+array(
+    0: Expr_Print(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/shellExec.test b/lib/nikic/php-parser/test/code/parser/expr/shellExec.test
new file mode 100644
index 000000000..2304fd985
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/shellExec.test
@@ -0,0 +1,46 @@
+Shell execution
+-----
+<?php
+``;
+`test`;
+`test $A`;
+`test \``;
+`test \"`;
+-----
+array(
+    0: Expr_ShellExec(
+        parts: array(
+        )
+    )
+    1: Expr_ShellExec(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: test
+            )
+        )
+    )
+    2: Expr_ShellExec(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: test
+            )
+            1: Expr_Variable(
+                name: A
+            )
+        )
+    )
+    3: Expr_ShellExec(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: test `
+            )
+        )
+    )
+    4: Expr_ShellExec(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: test \"
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/ternaryAndCoalesce.test b/lib/nikic/php-parser/test/code/parser/expr/ternaryAndCoalesce.test
new file mode 100644
index 000000000..268935dbd
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/ternaryAndCoalesce.test
@@ -0,0 +1,149 @@
+Ternary operator
+-----
+<?php
+
+// ternary
+$a ? $b : $c;
+$a ?: $c;
+
+// precedence
+$a ? $b : $c ? $d : $e;
+$a ? $b : ($c ? $d : $e);
+
+// null coalesce
+$a ?? $b;
+$a ?? $b ?? $c;
+$a ?? $b ? $c : $d;
+$a && $b ?? $c;
+-----
+array(
+    0: Expr_Ternary(
+        cond: Expr_Variable(
+            name: a
+            comments: array(
+                0: // ternary
+            )
+        )
+        if: Expr_Variable(
+            name: b
+        )
+        else: Expr_Variable(
+            name: c
+        )
+        comments: array(
+            0: // ternary
+        )
+    )
+    1: Expr_Ternary(
+        cond: Expr_Variable(
+            name: a
+        )
+        if: null
+        else: Expr_Variable(
+            name: c
+        )
+    )
+    2: Expr_Ternary(
+        cond: Expr_Ternary(
+            cond: Expr_Variable(
+                name: a
+                comments: array(
+                    0: // precedence
+                )
+            )
+            if: Expr_Variable(
+                name: b
+            )
+            else: Expr_Variable(
+                name: c
+            )
+            comments: array(
+                0: // precedence
+            )
+        )
+        if: Expr_Variable(
+            name: d
+        )
+        else: Expr_Variable(
+            name: e
+        )
+        comments: array(
+            0: // precedence
+        )
+    )
+    3: Expr_Ternary(
+        cond: Expr_Variable(
+            name: a
+        )
+        if: Expr_Variable(
+            name: b
+        )
+        else: Expr_Ternary(
+            cond: Expr_Variable(
+                name: c
+            )
+            if: Expr_Variable(
+                name: d
+            )
+            else: Expr_Variable(
+                name: e
+            )
+        )
+    )
+    4: Expr_BinaryOp_Coalesce(
+        left: Expr_Variable(
+            name: a
+            comments: array(
+                0: // null coalesce
+            )
+        )
+        right: Expr_Variable(
+            name: b
+        )
+        comments: array(
+            0: // null coalesce
+        )
+    )
+    5: Expr_BinaryOp_Coalesce(
+        left: Expr_Variable(
+            name: a
+        )
+        right: Expr_BinaryOp_Coalesce(
+            left: Expr_Variable(
+                name: b
+            )
+            right: Expr_Variable(
+                name: c
+            )
+        )
+    )
+    6: Expr_Ternary(
+        cond: Expr_BinaryOp_Coalesce(
+            left: Expr_Variable(
+                name: a
+            )
+            right: Expr_Variable(
+                name: b
+            )
+        )
+        if: Expr_Variable(
+            name: c
+        )
+        else: Expr_Variable(
+            name: d
+        )
+    )
+    7: Expr_BinaryOp_Coalesce(
+        left: Expr_BinaryOp_BooleanAnd(
+            left: Expr_Variable(
+                name: a
+            )
+            right: Expr_Variable(
+                name: b
+            )
+        )
+        right: Expr_Variable(
+            name: c
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/uvs/globalNonSimpleVarError.test b/lib/nikic/php-parser/test/code/parser/expr/uvs/globalNonSimpleVarError.test
new file mode 100644
index 000000000..4cd2e680f
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/uvs/globalNonSimpleVarError.test
@@ -0,0 +1,25 @@
+Non-simple variables are forbidden in PHP 7
+-----
+<?php
+global $$foo->bar;
+-----
+!!php7
+Syntax error, unexpected T_OBJECT_OPERATOR, expecting ';' from 2:13 to 2:14
+array(
+    0: Stmt_Global(
+        vars: array(
+            0: Expr_Variable(
+                name: Expr_Variable(
+                    name: foo
+                )
+            )
+        )
+    )
+    1: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: bar
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/expr/uvs/indirectCall.test b/lib/nikic/php-parser/test/code/parser/expr/uvs/indirectCall.test
new file mode 100644
index 000000000..bb3e7fbea
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/uvs/indirectCall.test
@@ -0,0 +1,481 @@
+UVS indirect calls
+-----
+<?php
+
+id('var_dump')(1);
+id('id')('var_dump')(2);
+id()()('var_dump')(4);
+id(['udef', 'id'])[1]()('var_dump')(5);
+(function($x) { return $x; })('id')('var_dump')(8);
+($f = function($x = null) use (&$f) {
+    return $x ?: $f;
+})()()()('var_dump')(9);
+[$obj, 'id']()('id')($id)('var_dump')(10);
+'id'()('id')('var_dump')(12);
+('i' . 'd')()('var_dump')(13);
+'\id'('var_dump')(14);
+-----
+!!php7
+array(
+    0: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Name(
+                parts: array(
+                    0: id
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 1
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    1: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Expr_FuncCall(
+                name: Name(
+                    parts: array(
+                        0: id
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Scalar_String(
+                            value: id
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 2
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    2: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Expr_FuncCall(
+                name: Expr_FuncCall(
+                    name: Name(
+                        parts: array(
+                            0: id
+                        )
+                    )
+                    args: array(
+                    )
+                )
+                args: array(
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 4
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    3: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Expr_FuncCall(
+                name: Expr_ArrayDimFetch(
+                    var: Expr_FuncCall(
+                        name: Name(
+                            parts: array(
+                                0: id
+                            )
+                        )
+                        args: array(
+                            0: Arg(
+                                value: Expr_Array(
+                                    items: array(
+                                        0: Expr_ArrayItem(
+                                            key: null
+                                            value: Scalar_String(
+                                                value: udef
+                                            )
+                                            byRef: false
+                                        )
+                                        1: Expr_ArrayItem(
+                                            key: null
+                                            value: Scalar_String(
+                                                value: id
+                                            )
+                                            byRef: false
+                                        )
+                                    )
+                                )
+                                byRef: false
+                                unpack: false
+                            )
+                        )
+                    )
+                    dim: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+                args: array(
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 5
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    4: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Expr_FuncCall(
+                name: Expr_Closure(
+                    static: false
+                    byRef: false
+                    params: array(
+                        0: Param(
+                            type: null
+                            byRef: false
+                            variadic: false
+                            name: x
+                            default: null
+                        )
+                    )
+                    uses: array(
+                    )
+                    returnType: null
+                    stmts: array(
+                        0: Stmt_Return(
+                            expr: Expr_Variable(
+                                name: x
+                            )
+                        )
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Scalar_String(
+                            value: id
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 8
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    5: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Expr_FuncCall(
+                name: Expr_FuncCall(
+                    name: Expr_FuncCall(
+                        name: Expr_Assign(
+                            var: Expr_Variable(
+                                name: f
+                            )
+                            expr: Expr_Closure(
+                                static: false
+                                byRef: false
+                                params: array(
+                                    0: Param(
+                                        type: null
+                                        byRef: false
+                                        variadic: false
+                                        name: x
+                                        default: Expr_ConstFetch(
+                                            name: Name(
+                                                parts: array(
+                                                    0: null
+                                                )
+                                            )
+                                        )
+                                    )
+                                )
+                                uses: array(
+                                    0: Expr_ClosureUse(
+                                        var: f
+                                        byRef: true
+                                    )
+                                )
+                                returnType: null
+                                stmts: array(
+                                    0: Stmt_Return(
+                                        expr: Expr_Ternary(
+                                            cond: Expr_Variable(
+                                                name: x
+                                            )
+                                            if: null
+                                            else: Expr_Variable(
+                                                name: f
+                                            )
+                                        )
+                                    )
+                                )
+                            )
+                        )
+                        args: array(
+                        )
+                    )
+                    args: array(
+                    )
+                )
+                args: array(
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 9
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    6: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Expr_FuncCall(
+                name: Expr_FuncCall(
+                    name: Expr_FuncCall(
+                        name: Expr_Array(
+                            items: array(
+                                0: Expr_ArrayItem(
+                                    key: null
+                                    value: Expr_Variable(
+                                        name: obj
+                                    )
+                                    byRef: false
+                                )
+                                1: Expr_ArrayItem(
+                                    key: null
+                                    value: Scalar_String(
+                                        value: id
+                                    )
+                                    byRef: false
+                                )
+                            )
+                        )
+                        args: array(
+                        )
+                    )
+                    args: array(
+                        0: Arg(
+                            value: Scalar_String(
+                                value: id
+                            )
+                            byRef: false
+                            unpack: false
+                        )
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Expr_Variable(
+                            name: id
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 10
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    7: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Expr_FuncCall(
+                name: Expr_FuncCall(
+                    name: Scalar_String(
+                        value: id
+                    )
+                    args: array(
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Scalar_String(
+                            value: id
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 12
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    8: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Expr_FuncCall(
+                name: Expr_BinaryOp_Concat(
+                    left: Scalar_String(
+                        value: i
+                    )
+                    right: Scalar_String(
+                        value: d
+                    )
+                )
+                args: array(
+                )
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 13
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    9: Expr_FuncCall(
+        name: Expr_FuncCall(
+            name: Scalar_String(
+                value: \id
+            )
+            args: array(
+                0: Arg(
+                    value: Scalar_String(
+                        value: var_dump
+                    )
+                    byRef: false
+                    unpack: false
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 14
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/expr/uvs/isset.test b/lib/nikic/php-parser/test/code/parser/expr/uvs/isset.test
new file mode 100644
index 000000000..35bc8ed19
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/uvs/isset.test
@@ -0,0 +1,74 @@
+UVS isset() on temporaries
+-----
+<?php
+
+isset(([0, 1] + [])[0]);
+isset(['a' => 'b']->a);
+isset("str"->a);
+-----
+!!php7
+array(
+    0: Expr_Isset(
+        vars: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_BinaryOp_Plus(
+                    left: Expr_Array(
+                        items: array(
+                            0: Expr_ArrayItem(
+                                key: null
+                                value: Scalar_LNumber(
+                                    value: 0
+                                )
+                                byRef: false
+                            )
+                            1: Expr_ArrayItem(
+                                key: null
+                                value: Scalar_LNumber(
+                                    value: 1
+                                )
+                                byRef: false
+                            )
+                        )
+                    )
+                    right: Expr_Array(
+                        items: array(
+                        )
+                    )
+                )
+                dim: Scalar_LNumber(
+                    value: 0
+                )
+            )
+        )
+    )
+    1: Expr_Isset(
+        vars: array(
+            0: Expr_PropertyFetch(
+                var: Expr_Array(
+                    items: array(
+                        0: Expr_ArrayItem(
+                            key: Scalar_String(
+                                value: a
+                            )
+                            value: Scalar_String(
+                                value: b
+                            )
+                            byRef: false
+                        )
+                    )
+                )
+                name: a
+            )
+        )
+    )
+    2: Expr_Isset(
+        vars: array(
+            0: Expr_PropertyFetch(
+                var: Scalar_String(
+                    value: str
+                )
+                name: a
+            )
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/expr/uvs/misc.test b/lib/nikic/php-parser/test/code/parser/expr/uvs/misc.test
new file mode 100644
index 000000000..2c5ba900e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/uvs/misc.test
@@ -0,0 +1,109 @@
+Uniform variable syntax in PHP 7 (misc)
+-----
+<?php
+
+A::A[0];
+A::A[0][1][2];
+"string"->length();
+(clone $obj)->b[0](1);
+[0, 1][0] = 1;
+-----
+!!php7
+array(
+    0: Expr_ArrayDimFetch(
+        var: Expr_ClassConstFetch(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            name: A
+        )
+        dim: Scalar_LNumber(
+            value: 0
+        )
+    )
+    1: Expr_ArrayDimFetch(
+        var: Expr_ArrayDimFetch(
+            var: Expr_ArrayDimFetch(
+                var: Expr_ClassConstFetch(
+                    class: Name(
+                        parts: array(
+                            0: A
+                        )
+                    )
+                    name: A
+                )
+                dim: Scalar_LNumber(
+                    value: 0
+                )
+            )
+            dim: Scalar_LNumber(
+                value: 1
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 2
+        )
+    )
+    2: Expr_MethodCall(
+        var: Scalar_String(
+            value: string
+        )
+        name: length
+        args: array(
+        )
+    )
+    3: Expr_FuncCall(
+        name: Expr_ArrayDimFetch(
+            var: Expr_PropertyFetch(
+                var: Expr_Clone(
+                    expr: Expr_Variable(
+                        name: obj
+                    )
+                )
+                name: b
+            )
+            dim: Scalar_LNumber(
+                value: 0
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Scalar_LNumber(
+                    value: 1
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    4: Expr_Assign(
+        var: Expr_ArrayDimFetch(
+            var: Expr_Array(
+                items: array(
+                    0: Expr_ArrayItem(
+                        key: null
+                        value: Scalar_LNumber(
+                            value: 0
+                        )
+                        byRef: false
+                    )
+                    1: Expr_ArrayItem(
+                        key: null
+                        value: Scalar_LNumber(
+                            value: 1
+                        )
+                        byRef: false
+                    )
+                )
+            )
+            dim: Scalar_LNumber(
+                value: 0
+            )
+        )
+        expr: Scalar_LNumber(
+            value: 1
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/expr/uvs/new.test b/lib/nikic/php-parser/test/code/parser/expr/uvs/new.test
new file mode 100644
index 000000000..e5f92f97a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/uvs/new.test
@@ -0,0 +1,95 @@
+UVS new expressions
+-----
+<?php
+new $className;
+new $array['className'];
+new $array{'className'};
+new $obj->className;
+new Test::$className;
+new $test::$className;
+new $weird[0]->foo::$className;
+-----
+!!php7
+array(
+    0: Expr_New(
+        class: Expr_Variable(
+            name: className
+        )
+        args: array(
+        )
+    )
+    1: Expr_New(
+        class: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: array
+            )
+            dim: Scalar_String(
+                value: className
+            )
+        )
+        args: array(
+        )
+    )
+    2: Expr_New(
+        class: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: array
+            )
+            dim: Scalar_String(
+                value: className
+            )
+        )
+        args: array(
+        )
+    )
+    3: Expr_New(
+        class: Expr_PropertyFetch(
+            var: Expr_Variable(
+                name: obj
+            )
+            name: className
+        )
+        args: array(
+        )
+    )
+    4: Expr_New(
+        class: Expr_StaticPropertyFetch(
+            class: Name(
+                parts: array(
+                    0: Test
+                )
+            )
+            name: className
+        )
+        args: array(
+        )
+    )
+    5: Expr_New(
+        class: Expr_StaticPropertyFetch(
+            class: Expr_Variable(
+                name: test
+            )
+            name: className
+        )
+        args: array(
+        )
+    )
+    6: Expr_New(
+        class: Expr_StaticPropertyFetch(
+            class: Expr_PropertyFetch(
+                var: Expr_ArrayDimFetch(
+                    var: Expr_Variable(
+                        name: weird
+                    )
+                    dim: Scalar_LNumber(
+                        value: 0
+                    )
+                )
+                name: foo
+            )
+            name: className
+        )
+        args: array(
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/expr/uvs/staticProperty.test b/lib/nikic/php-parser/test/code/parser/expr/uvs/staticProperty.test
new file mode 100644
index 000000000..5fadfc483
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/uvs/staticProperty.test
@@ -0,0 +1,93 @@
+UVS static access
+-----
+<?php
+A::$b;
+$A::$b;
+'A'::$b;
+('A' . '')::$b;
+'A'[0]::$b;
+A::$$b;
+A::$$c[1];
+A::$A::$b;
+-----
+!!php7
+array(
+    0: Expr_StaticPropertyFetch(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: b
+    )
+    1: Expr_StaticPropertyFetch(
+        class: Expr_Variable(
+            name: A
+        )
+        name: b
+    )
+    2: Expr_StaticPropertyFetch(
+        class: Scalar_String(
+            value: A
+        )
+        name: b
+    )
+    3: Expr_StaticPropertyFetch(
+        class: Expr_BinaryOp_Concat(
+            left: Scalar_String(
+                value: A
+            )
+            right: Scalar_String(
+                value:
+            )
+        )
+        name: b
+    )
+    4: Expr_StaticPropertyFetch(
+        class: Expr_ArrayDimFetch(
+            var: Scalar_String(
+                value: A
+            )
+            dim: Scalar_LNumber(
+                value: 0
+            )
+        )
+        name: b
+    )
+    5: Expr_StaticPropertyFetch(
+        class: Name(
+            parts: array(
+                0: A
+            )
+        )
+        name: Expr_Variable(
+            name: b
+        )
+    )
+    6: Expr_ArrayDimFetch(
+        var: Expr_StaticPropertyFetch(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            name: Expr_Variable(
+                name: c
+            )
+        )
+        dim: Scalar_LNumber(
+            value: 1
+        )
+    )
+    7: Expr_StaticPropertyFetch(
+        class: Expr_StaticPropertyFetch(
+            class: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            name: A
+        )
+        name: b
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/expr/variable.test b/lib/nikic/php-parser/test/code/parser/expr/variable.test
new file mode 100644
index 000000000..3a709f990
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/expr/variable.test
@@ -0,0 +1,55 @@
+Variable syntaxes
+-----
+<?php
+
+$a;
+${'a'};
+${foo()};
+$$a;
+$$$a;
+$$a['b'];
+-----
+!!php5
+array(
+    0: Expr_Variable(
+        name: a
+    )
+    1: Expr_Variable(
+        name: Scalar_String(
+            value: a
+        )
+    )
+    2: Expr_Variable(
+        name: Expr_FuncCall(
+            name: Name(
+                parts: array(
+                    0: foo
+                )
+            )
+            args: array(
+            )
+        )
+    )
+    3: Expr_Variable(
+        name: Expr_Variable(
+            name: a
+        )
+    )
+    4: Expr_Variable(
+        name: Expr_Variable(
+            name: Expr_Variable(
+                name: a
+            )
+        )
+    )
+    5: Expr_Variable(
+        name: Expr_ArrayDimFetch(
+            var: Expr_Variable(
+                name: a
+            )
+            dim: Scalar_String(
+                value: b
+            )
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/constantString.test b/lib/nikic/php-parser/test/code/parser/scalar/constantString.test
new file mode 100644
index 000000000..3f80df4c5
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/constantString.test
@@ -0,0 +1,60 @@
+Constant string syntaxes
+-----
+<?php
+
+'';
+"";
+b'';
+b"";
+'Hi';
+b'Hi';
+B'Hi';
+"Hi";
+b"Hi";
+B"Hi";
+'!\'!\\!\a!';
+"!\"!\\!\$!\n!\r!\t!\f!\v!\e!\a";
+"!\xFF!\377!\400!\0!";
+-----
+array(
+    0: Scalar_String(
+        value:
+    )
+    1: Scalar_String(
+        value:
+    )
+    2: Scalar_String(
+        value:
+    )
+    3: Scalar_String(
+        value:
+    )
+    4: Scalar_String(
+        value: Hi
+    )
+    5: Scalar_String(
+        value: Hi
+    )
+    6: Scalar_String(
+        value: Hi
+    )
+    7: Scalar_String(
+        value: Hi
+    )
+    8: Scalar_String(
+        value: Hi
+    )
+    9: Scalar_String(
+        value: Hi
+    )
+    10: Scalar_String(
+        value: !'!\!\a!
+    )
+    11: Scalar_String(
+        value: !"!\!$!
+    !@@{ "\r" }@@!@@{ "\t" }@@!@@{ "\f" }@@!@@{ "\v" }@@!@@{ chr(27) /* "\e" */ }@@!\a
+    )
+    12: Scalar_String(
+        value: !@@{ chr(255) }@@!@@{ chr(255) }@@!@@{ chr(0) }@@!@@{ chr(0) }@@!
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/docString.test b/lib/nikic/php-parser/test/code/parser/scalar/docString.test
new file mode 100644
index 000000000..e1b14208e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/docString.test
@@ -0,0 +1,90 @@
+Nowdoc and heredoc strings
+-----
+<?php
+
+// empty strings
+<<<'EOS'
+EOS;
+<<<EOS
+EOS;
+
+// constant encapsed strings
+<<<'EOS'
+Test '" $a \n
+EOS;
+<<<EOS
+Test '" \$a \n
+EOS;
+
+// encapsed strings
+<<<EOS
+Test $a
+EOS;
+<<<EOS
+Test $a and $b->c test
+EOS;
+
+b<<<EOS
+Binary
+EOS;
+
+-----
+array(
+    0: Scalar_String(
+        value:
+        comments: array(
+            0: // empty strings
+        )
+    )
+    1: Scalar_String(
+        value:
+    )
+    2: Scalar_String(
+        value: Test '" $a \n
+        comments: array(
+            0: // constant encapsed strings
+        )
+    )
+    3: Scalar_String(
+        value: Test '" $a
+
+    )
+    4: Scalar_Encapsed(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: Test
+            )
+            1: Expr_Variable(
+                name: a
+            )
+        )
+        comments: array(
+            0: // encapsed strings
+        )
+    )
+    5: Scalar_Encapsed(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: Test
+            )
+            1: Expr_Variable(
+                name: a
+            )
+            2: Scalar_EncapsedStringPart(
+                value:  and
+            )
+            3: Expr_PropertyFetch(
+                var: Expr_Variable(
+                    name: b
+                )
+                name: c
+            )
+            4: Scalar_EncapsedStringPart(
+                value:  test
+            )
+        )
+    )
+    6: Scalar_String(
+        value: Binary
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/docStringNewlines.test b/lib/nikic/php-parser/test/code/parser/scalar/docStringNewlines.test
new file mode 100644
index 000000000..28b920f16
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/docStringNewlines.test
@@ -0,0 +1,61 @@
+Trailing newlines in doc strings
+-----
+<?php
+
+<<<'EOF'@@{ "\n\n" }@@EOF;
+<<<'EOF'@@{ "\n\n\n" }@@EOF;
+<<<'EOF'@@{ "\nFoo\n\n" }@@EOF;
+<<<EOF@@{ "\n\$var\n\n" }@@EOF;
+
+<<<'EOF'@@{ "\r\n\r\n" }@@EOF;
+<<<'EOF'@@{ "\r\n\r\n\r\n" }@@EOF;
+<<<'EOF'@@{ "\r\nFoo\r\n\r\n" }@@EOF;
+<<<EOF@@{ "\r\n\$var\r\n\r\n" }@@EOF;
+
+-----
+array(
+    0: Scalar_String(
+        value:
+    )
+    1: Scalar_String(
+        value:
+
+    )
+    2: Scalar_String(
+        value: Foo
+
+    )
+    3: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: var
+            )
+            1: Scalar_EncapsedStringPart(
+                value:
+
+            )
+        )
+    )
+    4: Scalar_String(
+        value:
+    )
+    5: Scalar_String(
+        value:
+
+    )
+    6: Scalar_String(
+        value: Foo
+
+    )
+    7: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: var
+            )
+            1: Scalar_EncapsedStringPart(
+                value:
+
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/encapsedNegVarOffset.test b/lib/nikic/php-parser/test/code/parser/scalar/encapsedNegVarOffset.test
new file mode 100644
index 000000000..976b6af6e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/encapsedNegVarOffset.test
@@ -0,0 +1,72 @@
+Encapsed string negative var offsets
+-----
+<?php
+"$a[-0]";
+"$a[-1]";
+"$a[-0x0]";
+"$a[-00]";
+"$a[@@{ -PHP_INT_MAX - 1 }@@]";
+-----
+!!php7
+array(
+    0: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                dim: Scalar_String(
+                    value: -0
+                )
+            )
+        )
+    )
+    1: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                dim: Scalar_LNumber(
+                    value: -1
+                )
+            )
+        )
+    )
+    2: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                dim: Scalar_String(
+                    value: -0x0
+                )
+            )
+        )
+    )
+    3: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                dim: Scalar_String(
+                    value: -00
+                )
+            )
+        )
+    )
+    4: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: a
+                )
+                dim: Scalar_LNumber(
+                    value: @@{ -PHP_INT_MAX - 1 }@@
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/encapsedString.test b/lib/nikic/php-parser/test/code/parser/scalar/encapsedString.test
new file mode 100644
index 000000000..1090eff01
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/encapsedString.test
@@ -0,0 +1,294 @@
+Encapsed strings
+-----
+<?php
+
+"$A";
+"$A->B";
+"$A[B]";
+"$A[0]";
+"$A[1234]";
+"$A[9223372036854775808]";
+"$A[000]";
+"$A[0x0]";
+"$A[0b0]";
+"$A[$B]";
+"{$A}";
+"{$A['B']}";
+"${A}";
+"${A['B']}";
+"${$A}";
+"\{$A}";
+"\{ $A }";
+"\\{$A}";
+"\\{ $A }";
+"{$$A}[B]";
+"$$A[B]";
+"A $B C";
+b"$A";
+B"$A";
+-----
+array(
+    0: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: A
+            )
+        )
+    )
+    1: Scalar_Encapsed(
+        parts: array(
+            0: Expr_PropertyFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                name: B
+            )
+        )
+    )
+    2: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_String(
+                    value: B
+                )
+            )
+        )
+    )
+    3: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_LNumber(
+                    value: 0
+                )
+            )
+        )
+    )
+    4: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_LNumber(
+                    value: 1234
+                )
+            )
+        )
+    )
+    5: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_String(
+                    value: 9223372036854775808
+                )
+            )
+        )
+    )
+    6: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_String(
+                    value: 000
+                )
+            )
+        )
+    )
+    7: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_String(
+                    value: 0x0
+                )
+            )
+        )
+    )
+    8: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_String(
+                    value: 0b0
+                )
+            )
+        )
+    )
+    9: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Expr_Variable(
+                    name: B
+                )
+            )
+        )
+    )
+    10: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: A
+            )
+        )
+    )
+    11: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_String(
+                    value: B
+                )
+            )
+        )
+    )
+    12: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: A
+            )
+        )
+    )
+    13: Scalar_Encapsed(
+        parts: array(
+            0: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_String(
+                    value: B
+                )
+            )
+        )
+    )
+    14: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: Expr_Variable(
+                    name: A
+                )
+            )
+        )
+    )
+    15: Scalar_Encapsed(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: \{
+            )
+            1: Expr_Variable(
+                name: A
+            )
+            2: Scalar_EncapsedStringPart(
+                value: }
+            )
+        )
+    )
+    16: Scalar_Encapsed(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: \{
+            )
+            1: Expr_Variable(
+                name: A
+            )
+            2: Scalar_EncapsedStringPart(
+                value:  }
+            )
+        )
+    )
+    17: Scalar_Encapsed(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: \
+            )
+            1: Expr_Variable(
+                name: A
+            )
+        )
+    )
+    18: Scalar_Encapsed(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: \{
+            )
+            1: Expr_Variable(
+                name: A
+            )
+            2: Scalar_EncapsedStringPart(
+                value:  }
+            )
+        )
+    )
+    19: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: Expr_Variable(
+                    name: A
+                )
+            )
+            1: Scalar_EncapsedStringPart(
+                value: [B]
+            )
+        )
+    )
+    20: Scalar_Encapsed(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: $
+            )
+            1: Expr_ArrayDimFetch(
+                var: Expr_Variable(
+                    name: A
+                )
+                dim: Scalar_String(
+                    value: B
+                )
+            )
+        )
+    )
+    21: Scalar_Encapsed(
+        parts: array(
+            0: Scalar_EncapsedStringPart(
+                value: A
+            )
+            1: Expr_Variable(
+                name: B
+            )
+            2: Scalar_EncapsedStringPart(
+                value:  C
+            )
+        )
+    )
+    22: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: A
+            )
+        )
+    )
+    23: Scalar_Encapsed(
+        parts: array(
+            0: Expr_Variable(
+                name: A
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/float.test b/lib/nikic/php-parser/test/code/parser/scalar/float.test
new file mode 100644
index 000000000..a16028e2a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/float.test
@@ -0,0 +1,74 @@
+Different float syntaxes
+-----
+<?php
+
+0.0;
+0.;
+.0;
+0e0;
+0E0;
+0e+0;
+0e-0;
+30.20e10;
+300.200e100;
+1e10000;
+
+// various integer -> float overflows
+// (all are actually the same number, just in different representations)
+18446744073709551615;
+0xFFFFFFFFFFFFFFFF;
+01777777777777777777777;
+0177777777777777777777787;
+0b1111111111111111111111111111111111111111111111111111111111111111;
+-----
+array(
+    0: Scalar_DNumber(
+        value: 0
+    )
+    1: Scalar_DNumber(
+        value: 0
+    )
+    2: Scalar_DNumber(
+        value: 0
+    )
+    3: Scalar_DNumber(
+        value: 0
+    )
+    4: Scalar_DNumber(
+        value: 0
+    )
+    5: Scalar_DNumber(
+        value: 0
+    )
+    6: Scalar_DNumber(
+        value: 0
+    )
+    7: Scalar_DNumber(
+        value: 302000000000
+    )
+    8: Scalar_DNumber(
+        value: 3.002E+102
+    )
+    9: Scalar_DNumber(
+        value: INF
+    )
+    10: Scalar_DNumber(
+        value: 1.844674407371E+19
+        comments: array(
+            0: // various integer -> float overflows
+            1: // (all are actually the same number, just in different representations)
+        )
+    )
+    11: Scalar_DNumber(
+        value: 1.844674407371E+19
+    )
+    12: Scalar_DNumber(
+        value: 1.844674407371E+19
+    )
+    13: Scalar_DNumber(
+        value: 1.844674407371E+19
+    )
+    14: Scalar_DNumber(
+        value: 1.844674407371E+19
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/int.test b/lib/nikic/php-parser/test/code/parser/scalar/int.test
new file mode 100644
index 000000000..5a212677c
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/int.test
@@ -0,0 +1,43 @@
+Different integer syntaxes
+-----
+<?php
+
+0;
+1;
+@@{ PHP_INT_MAX     }@@;
+@@{ PHP_INT_MAX + 1 }@@;
+0xFFF;
+0xfff;
+0XfFf;
+0777;
+0b111000111000;
+-----
+array(
+    0: Scalar_LNumber(
+        value: 0
+    )
+    1: Scalar_LNumber(
+        value: 1
+    )
+    2: Scalar_LNumber(
+        value: @@{ PHP_INT_MAX }@@
+    )
+    3: Scalar_DNumber(
+        value: @@{ PHP_INT_MAX + 1 }@@
+    )
+    4: Scalar_LNumber(
+        value: 4095
+    )
+    5: Scalar_LNumber(
+        value: 4095
+    )
+    6: Scalar_LNumber(
+        value: 4095
+    )
+    7: Scalar_LNumber(
+        value: 511
+    )
+    8: Scalar_LNumber(
+        value: 3640
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/invalidOctal.test b/lib/nikic/php-parser/test/code/parser/scalar/invalidOctal.test
new file mode 100644
index 000000000..bef3061c8
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/invalidOctal.test
@@ -0,0 +1,22 @@
+Invalid octal literals
+-----
+<?php
+0787;
+-----
+!!php7
+Invalid numeric literal from 2:1 to 2:4
+array(
+    0: Scalar_LNumber(
+        value: 0
+    )
+)
+-----
+<?php
+0787;
+-----
+!!php5
+array(
+    0: Scalar_LNumber(
+        value: 7
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/magicConst.test b/lib/nikic/php-parser/test/code/parser/scalar/magicConst.test
new file mode 100644
index 000000000..9b981eb62
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/magicConst.test
@@ -0,0 +1,31 @@
+Magic constants
+-----
+<?php
+
+__CLASS__;
+__DIR__;
+__FILE__;
+__FUNCTION__;
+__LINE__;
+__METHOD__;
+__NAMESPACE__;
+__TRAIT__;
+-----
+array(
+    0: Scalar_MagicConst_Class(
+    )
+    1: Scalar_MagicConst_Dir(
+    )
+    2: Scalar_MagicConst_File(
+    )
+    3: Scalar_MagicConst_Function(
+    )
+    4: Scalar_MagicConst_Line(
+    )
+    5: Scalar_MagicConst_Method(
+    )
+    6: Scalar_MagicConst_Namespace(
+    )
+    7: Scalar_MagicConst_Trait(
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/scalar/unicodeEscape.test b/lib/nikic/php-parser/test/code/parser/scalar/unicodeEscape.test
new file mode 100644
index 000000000..33a96119a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/scalar/unicodeEscape.test
@@ -0,0 +1,20 @@
+Unicode escape sequence
+-----
+<?php
+
+"\u{0}";
+"\u{114}";
+"\u{1F602}";
+-----
+!!php7
+array(
+    0: Scalar_String(
+        value: @@{"\0"}@@
+    )
+    1: Scalar_String(
+        value: Ĕ
+    )
+    2: Scalar_String(
+        value: @@{"\xF0\x9F\x98\x82"}@@
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/semiReserved.test b/lib/nikic/php-parser/test/code/parser/semiReserved.test
new file mode 100644
index 000000000..34105300b
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/semiReserved.test
@@ -0,0 +1,382 @@
+Valid usages of reserved keywords as identifiers
+-----
+<?php
+
+class Test {
+    function array() {}
+    function public() {}
+
+    static function list() {}
+    static function protected() {}
+
+    public $class;
+    public $private;
+
+    const TRAIT = 3, FINAL = 4;
+
+    const __CLASS__ = 1, __TRAIT__ = 2, __FUNCTION__ = 3, __METHOD__ = 4, __LINE__ = 5,
+          __FILE__ = 6, __DIR__ = 7, __NAMESPACE__ = 8;
+    // __halt_compiler does not work
+}
+
+$t = new Test;
+$t->array();
+$t->public();
+
+Test::list();
+Test::protected();
+
+$t->class;
+$t->private;
+
+Test::TRAIT;
+Test::FINAL;
+
+class Foo {
+    use TraitA, TraitB {
+        TraitA::catch insteadof namespace\TraitB;
+        TraitA::list as foreach;
+        TraitB::throw as protected public;
+        TraitB::self as protected;
+        exit as die;
+        \TraitC::exit as bye;
+        namespace\TraitC::exit as byebye;
+        TraitA::
+            //
+            /** doc comment */
+            #
+        catch /* comment */
+            // comment
+            # comment
+        insteadof TraitB;
+    }
+}
+-----
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: Test
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: 0
+                byRef: false
+                name: array
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            1: Stmt_ClassMethod(
+                flags: 0
+                byRef: false
+                name: public
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            2: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: list
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            3: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: protected
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            4: Stmt_Property(
+                flags: MODIFIER_PUBLIC (1)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: class
+                        default: null
+                    )
+                )
+            )
+            5: Stmt_Property(
+                flags: MODIFIER_PUBLIC (1)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: private
+                        default: null
+                    )
+                )
+            )
+            6: Stmt_ClassConst(
+                flags: 0
+                consts: array(
+                    0: Const(
+                        name: TRAIT
+                        value: Scalar_LNumber(
+                            value: 3
+                        )
+                    )
+                    1: Const(
+                        name: FINAL
+                        value: Scalar_LNumber(
+                            value: 4
+                        )
+                    )
+                )
+            )
+            7: Stmt_ClassConst(
+                flags: 0
+                consts: array(
+                    0: Const(
+                        name: __CLASS__
+                        value: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                    1: Const(
+                        name: __TRAIT__
+                        value: Scalar_LNumber(
+                            value: 2
+                        )
+                    )
+                    2: Const(
+                        name: __FUNCTION__
+                        value: Scalar_LNumber(
+                            value: 3
+                        )
+                    )
+                    3: Const(
+                        name: __METHOD__
+                        value: Scalar_LNumber(
+                            value: 4
+                        )
+                    )
+                    4: Const(
+                        name: __LINE__
+                        value: Scalar_LNumber(
+                            value: 5
+                        )
+                    )
+                    5: Const(
+                        name: __FILE__
+                        value: Scalar_LNumber(
+                            value: 6
+                        )
+                    )
+                    6: Const(
+                        name: __DIR__
+                        value: Scalar_LNumber(
+                            value: 7
+                        )
+                    )
+                    7: Const(
+                        name: __NAMESPACE__
+                        value: Scalar_LNumber(
+                            value: 8
+                        )
+                    )
+                )
+            )
+        )
+    )
+    1: Expr_Assign(
+        var: Expr_Variable(
+            name: t
+        )
+        expr: Expr_New(
+            class: Name(
+                parts: array(
+                    0: Test
+                )
+            )
+            args: array(
+            )
+        )
+    )
+    2: Expr_MethodCall(
+        var: Expr_Variable(
+            name: t
+        )
+        name: array
+        args: array(
+        )
+    )
+    3: Expr_MethodCall(
+        var: Expr_Variable(
+            name: t
+        )
+        name: public
+        args: array(
+        )
+    )
+    4: Expr_StaticCall(
+        class: Name(
+            parts: array(
+                0: Test
+            )
+        )
+        name: list
+        args: array(
+        )
+    )
+    5: Expr_StaticCall(
+        class: Name(
+            parts: array(
+                0: Test
+            )
+        )
+        name: protected
+        args: array(
+        )
+    )
+    6: Expr_PropertyFetch(
+        var: Expr_Variable(
+            name: t
+        )
+        name: class
+    )
+    7: Expr_PropertyFetch(
+        var: Expr_Variable(
+            name: t
+        )
+        name: private
+    )
+    8: Expr_ClassConstFetch(
+        class: Name(
+            parts: array(
+                0: Test
+            )
+        )
+        name: TRAIT
+    )
+    9: Expr_ClassConstFetch(
+        class: Name(
+            parts: array(
+                0: Test
+            )
+        )
+        name: FINAL
+    )
+    10: Stmt_Class(
+        flags: 0
+        name: Foo
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_TraitUse(
+                traits: array(
+                    0: Name(
+                        parts: array(
+                            0: TraitA
+                        )
+                    )
+                    1: Name(
+                        parts: array(
+                            0: TraitB
+                        )
+                    )
+                )
+                adaptations: array(
+                    0: Stmt_TraitUseAdaptation_Precedence(
+                        trait: Name(
+                            parts: array(
+                                0: TraitA
+                            )
+                        )
+                        method: catch
+                        insteadof: array(
+                            0: Name_Relative(
+                                parts: array(
+                                    0: TraitB
+                                )
+                            )
+                        )
+                    )
+                    1: Stmt_TraitUseAdaptation_Alias(
+                        trait: Name(
+                            parts: array(
+                                0: TraitA
+                            )
+                        )
+                        method: list
+                        newModifier: null
+                        newName: foreach
+                    )
+                    2: Stmt_TraitUseAdaptation_Alias(
+                        trait: Name(
+                            parts: array(
+                                0: TraitB
+                            )
+                        )
+                        method: throw
+                        newModifier: MODIFIER_PROTECTED (2)
+                        newName: public
+                    )
+                    3: Stmt_TraitUseAdaptation_Alias(
+                        trait: Name(
+                            parts: array(
+                                0: TraitB
+                            )
+                        )
+                        method: self
+                        newModifier: MODIFIER_PROTECTED (2)
+                        newName: null
+                    )
+                    4: Stmt_TraitUseAdaptation_Alias(
+                        trait: null
+                        method: exit
+                        newModifier: null
+                        newName: die
+                    )
+                    5: Stmt_TraitUseAdaptation_Alias(
+                        trait: Name_FullyQualified(
+                            parts: array(
+                                0: TraitC
+                            )
+                        )
+                        method: exit
+                        newModifier: null
+                        newName: bye
+                    )
+                    6: Stmt_TraitUseAdaptation_Alias(
+                        trait: Name_Relative(
+                            parts: array(
+                                0: TraitC
+                            )
+                        )
+                        method: exit
+                        newModifier: null
+                        newName: byebye
+                    )
+                    7: Stmt_TraitUseAdaptation_Precedence(
+                        trait: Name(
+                            parts: array(
+                                0: TraitA
+                            )
+                        )
+                        method: catch
+                        insteadof: array(
+                            0: Name(
+                                parts: array(
+                                    0: TraitB
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/blocklessStatement.test b/lib/nikic/php-parser/test/code/parser/stmt/blocklessStatement.test
new file mode 100644
index 000000000..ae83dabb9
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/blocklessStatement.test
@@ -0,0 +1,112 @@
+Blockless statements for if/for/etc
+-----
+<?php
+
+if ($a) $A;
+elseif ($b) $B;
+else $C;
+
+for (;;) $foo;
+
+foreach ($a as $b) $AB;
+
+while ($a) $A;
+
+do $A; while ($a);
+
+declare (a='b') $C;
+-----
+array(
+    0: Stmt_If(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+            0: Expr_Variable(
+                name: A
+            )
+        )
+        elseifs: array(
+            0: Stmt_ElseIf(
+                cond: Expr_Variable(
+                    name: b
+                )
+                stmts: array(
+                    0: Expr_Variable(
+                        name: B
+                    )
+                )
+            )
+        )
+        else: Stmt_Else(
+            stmts: array(
+                0: Expr_Variable(
+                    name: C
+                )
+            )
+        )
+    )
+    1: Stmt_For(
+        init: array(
+        )
+        cond: array(
+        )
+        loop: array(
+        )
+        stmts: array(
+            0: Expr_Variable(
+                name: foo
+            )
+        )
+    )
+    2: Stmt_Foreach(
+        expr: Expr_Variable(
+            name: a
+        )
+        keyVar: null
+        byRef: false
+        valueVar: Expr_Variable(
+            name: b
+        )
+        stmts: array(
+            0: Expr_Variable(
+                name: AB
+            )
+        )
+    )
+    3: Stmt_While(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+            0: Expr_Variable(
+                name: A
+            )
+        )
+    )
+    4: Stmt_Do(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+            0: Expr_Variable(
+                name: A
+            )
+        )
+    )
+    5: Stmt_Declare(
+        declares: array(
+            0: Stmt_DeclareDeclare(
+                key: a
+                value: Scalar_String(
+                    value: b
+                )
+            )
+        )
+        stmts: array(
+            0: Expr_Variable(
+                name: C
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/abstract.test b/lib/nikic/php-parser/test/code/parser/stmt/class/abstract.test
new file mode 100644
index 000000000..8c9a99c7a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/abstract.test
@@ -0,0 +1,39 @@
+Abstract class
+-----
+<?php
+
+abstract class A {
+    public function a() {}
+    abstract public function b();
+}
+-----
+array(
+    0: Stmt_Class(
+        flags: MODIFIER_ABSTRACT (16)
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_PUBLIC (1)
+                byRef: false
+                name: a
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            1: Stmt_ClassMethod(
+                flags: MODIFIER_PUBLIC | MODIFIER_ABSTRACT (17)
+                byRef: false
+                name: b
+                params: array(
+                )
+                returnType: null
+                stmts: null
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/anonymous.test b/lib/nikic/php-parser/test/code/parser/stmt/class/anonymous.test
new file mode 100644
index 000000000..266d94354
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/anonymous.test
@@ -0,0 +1,195 @@
+Anonymous classes
+-----
+<?php
+
+new class {
+    public function test() {}
+};
+new class extends A implements B, C {};
+new class() {
+    public $foo;
+};
+new class($a, $b) extends A {
+    use T;
+};
+
+class A {
+    public function test() {
+        return new class($this) extends A {
+            const A = 'B';
+        };
+    }
+}
+-----
+array(
+    0: Expr_New(
+        class: Stmt_Class(
+            flags: 0
+            name: null
+            extends: null
+            implements: array(
+            )
+            stmts: array(
+                0: Stmt_ClassMethod(
+                    flags: MODIFIER_PUBLIC (1)
+                    byRef: false
+                    name: test
+                    params: array(
+                    )
+                    returnType: null
+                    stmts: array(
+                    )
+                )
+            )
+        )
+        args: array(
+        )
+    )
+    1: Expr_New(
+        class: Stmt_Class(
+            flags: 0
+            name: null
+            extends: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            implements: array(
+                0: Name(
+                    parts: array(
+                        0: B
+                    )
+                )
+                1: Name(
+                    parts: array(
+                        0: C
+                    )
+                )
+            )
+            stmts: array(
+            )
+        )
+        args: array(
+        )
+    )
+    2: Expr_New(
+        class: Stmt_Class(
+            flags: 0
+            name: null
+            extends: null
+            implements: array(
+            )
+            stmts: array(
+                0: Stmt_Property(
+                    flags: MODIFIER_PUBLIC (1)
+                    props: array(
+                        0: Stmt_PropertyProperty(
+                            name: foo
+                            default: null
+                        )
+                    )
+                )
+            )
+        )
+        args: array(
+        )
+    )
+    3: Expr_New(
+        class: Stmt_Class(
+            flags: 0
+            name: null
+            extends: Name(
+                parts: array(
+                    0: A
+                )
+            )
+            implements: array(
+            )
+            stmts: array(
+                0: Stmt_TraitUse(
+                    traits: array(
+                        0: Name(
+                            parts: array(
+                                0: T
+                            )
+                        )
+                    )
+                    adaptations: array(
+                    )
+                )
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_Variable(
+                    name: a
+                )
+                byRef: false
+                unpack: false
+            )
+            1: Arg(
+                value: Expr_Variable(
+                    name: b
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    4: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_PUBLIC (1)
+                byRef: false
+                name: test
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                    0: Stmt_Return(
+                        expr: Expr_New(
+                            class: Stmt_Class(
+                                flags: 0
+                                name: null
+                                extends: Name(
+                                    parts: array(
+                                        0: A
+                                    )
+                                )
+                                implements: array(
+                                )
+                                stmts: array(
+                                    0: Stmt_ClassConst(
+                                        flags: 0
+                                        consts: array(
+                                            0: Const(
+                                                name: A
+                                                value: Scalar_String(
+                                                    value: B
+                                                )
+                                            )
+                                        )
+                                    )
+                                )
+                            )
+                            args: array(
+                                0: Arg(
+                                    value: Expr_Variable(
+                                        name: this
+                                    )
+                                    byRef: false
+                                    unpack: false
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/conditional.test b/lib/nikic/php-parser/test/code/parser/stmt/class/conditional.test
new file mode 100644
index 000000000..e18090c79
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/conditional.test
@@ -0,0 +1,33 @@
+Conditional class definition
+-----
+<?php
+
+if (true) {
+    class A {}
+}
+-----
+array(
+    0: Stmt_If(
+        cond: Expr_ConstFetch(
+            name: Name(
+                parts: array(
+                    0: true
+                )
+            )
+        )
+        stmts: array(
+            0: Stmt_Class(
+                flags: 0
+                name: A
+                extends: null
+                implements: array(
+                )
+                stmts: array(
+                )
+            )
+        )
+        elseifs: array(
+        )
+        else: null
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/constModifierErrors.test b/lib/nikic/php-parser/test/code/parser/stmt/class/constModifierErrors.test
new file mode 100644
index 000000000..b3604ed6d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/constModifierErrors.test
@@ -0,0 +1,121 @@
+Invalid class constant modifiers
+-----
+<?php
+class A {
+    static const X = 1;
+}
+-----
+!!php7
+Cannot use 'static' as constant modifier from 3:5 to 3:10
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassConst(
+                flags: MODIFIER_STATIC (8)
+                consts: array(
+                    0: Const(
+                        name: X
+                        value: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
+-----
+<?php
+class A {
+    abstract const X = 1;
+}
+-----
+!!php7
+Cannot use 'abstract' as constant modifier from 3:5 to 3:12
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassConst(
+                flags: MODIFIER_ABSTRACT (16)
+                consts: array(
+                    0: Const(
+                        name: X
+                        value: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
+-----
+<?php
+class A {
+    final const X = 1;
+}
+-----
+!!php7
+Cannot use 'final' as constant modifier from 3:5 to 3:9
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassConst(
+                flags: MODIFIER_FINAL (32)
+                consts: array(
+                    0: Const(
+                        name: X
+                        value: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
+-----
+<?php
+class A {
+    public public const X = 1;
+}
+-----
+!!php7
+Multiple access type modifiers are not allowed from 3:12 to 3:17
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassConst(
+                flags: MODIFIER_PUBLIC (1)
+                consts: array(
+                    0: Const(
+                        name: X
+                        value: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/constModifiers.test b/lib/nikic/php-parser/test/code/parser/stmt/class/constModifiers.test
new file mode 100644
index 000000000..7129d2846
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/constModifiers.test
@@ -0,0 +1,67 @@
+Class constant modifiers
+-----
+<?php
+
+class Foo {
+    const A = 1;
+    public const B = 2;
+    protected const C = 3;
+    private const D = 4;
+}
+-----
+!!php7
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: Foo
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassConst(
+                flags: 0
+                consts: array(
+                    0: Const(
+                        name: A
+                        value: Scalar_LNumber(
+                            value: 1
+                        )
+                    )
+                )
+            )
+            1: Stmt_ClassConst(
+                flags: MODIFIER_PUBLIC (1)
+                consts: array(
+                    0: Const(
+                        name: B
+                        value: Scalar_LNumber(
+                            value: 2
+                        )
+                    )
+                )
+            )
+            2: Stmt_ClassConst(
+                flags: MODIFIER_PROTECTED (2)
+                consts: array(
+                    0: Const(
+                        name: C
+                        value: Scalar_LNumber(
+                            value: 3
+                        )
+                    )
+                )
+            )
+            3: Stmt_ClassConst(
+                flags: MODIFIER_PRIVATE (4)
+                consts: array(
+                    0: Const(
+                        name: D
+                        value: Scalar_LNumber(
+                            value: 4
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/final.test b/lib/nikic/php-parser/test/code/parser/stmt/class/final.test
new file mode 100644
index 000000000..86cc45868
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/final.test
@@ -0,0 +1,17 @@
+Final class
+-----
+<?php
+
+final class A {}
+-----
+array(
+    0: Stmt_Class(
+        flags: MODIFIER_FINAL (32)
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/implicitPublic.test b/lib/nikic/php-parser/test/code/parser/stmt/class/implicitPublic.test
new file mode 100644
index 000000000..08452c156
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/implicitPublic.test
@@ -0,0 +1,92 @@
+Implicitly public properties and methods
+-----
+<?php
+
+abstract class A {
+    var $a;
+    static $b;
+    abstract function c();
+    final function d() {}
+    static function e() {}
+    final static function f() {}
+    function g() {}
+}
+-----
+array(
+    0: Stmt_Class(
+        flags: MODIFIER_ABSTRACT (16)
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_Property(
+                flags: 0
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: a
+                        default: null
+                    )
+                )
+            )
+            1: Stmt_Property(
+                flags: MODIFIER_STATIC (8)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: b
+                        default: null
+                    )
+                )
+            )
+            2: Stmt_ClassMethod(
+                flags: MODIFIER_ABSTRACT (16)
+                byRef: false
+                name: c
+                params: array(
+                )
+                returnType: null
+                stmts: null
+            )
+            3: Stmt_ClassMethod(
+                flags: MODIFIER_FINAL (32)
+                byRef: false
+                name: d
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            4: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: e
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            5: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC | MODIFIER_FINAL (40)
+                byRef: false
+                name: f
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            6: Stmt_ClassMethod(
+                flags: 0
+                byRef: false
+                name: g
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/interface.test b/lib/nikic/php-parser/test/code/parser/stmt/class/interface.test
new file mode 100644
index 000000000..d00bdbdc8
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/interface.test
@@ -0,0 +1,36 @@
+Interface
+-----
+<?php
+
+interface A extends C, D {
+    public function a();
+}
+-----
+array(
+    0: Stmt_Interface(
+        name: A
+        extends: array(
+            0: Name(
+                parts: array(
+                    0: C
+                )
+            )
+            1: Name(
+                parts: array(
+                    0: D
+                )
+            )
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_PUBLIC (1)
+                byRef: false
+                name: a
+                params: array(
+                )
+                returnType: null
+                stmts: null
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/modifier.test b/lib/nikic/php-parser/test/code/parser/stmt/class/modifier.test
new file mode 100644
index 000000000..5a1fd3fc5
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/modifier.test
@@ -0,0 +1,215 @@
+Invalid modifier combination
+-----
+<?php class A { public public $a; }
+-----
+Multiple access type modifiers are not allowed from 1:24 to 1:29
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_Property(
+                flags: MODIFIER_PUBLIC (1)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: a
+                        default: null
+                    )
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { public protected $a; }
+-----
+Multiple access type modifiers are not allowed from 1:24 to 1:32
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_Property(
+                flags: MODIFIER_PUBLIC | MODIFIER_PROTECTED (3)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: a
+                        default: null
+                    )
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { abstract abstract function a(); }
+-----
+Multiple abstract modifiers are not allowed from 1:26 to 1:33
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_ABSTRACT (16)
+                byRef: false
+                name: a
+                params: array(
+                )
+                returnType: null
+                stmts: null
+            )
+        )
+    )
+)
+-----
+<?php class A { static static $a; }
+-----
+Multiple static modifiers are not allowed from 1:24 to 1:29
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_Property(
+                flags: MODIFIER_STATIC (8)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: a
+                        default: null
+                    )
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { final final function a() {} }
+-----
+Multiple final modifiers are not allowed from 1:23 to 1:27
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_FINAL (32)
+                byRef: false
+                name: a
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { abstract final function a(); }
+-----
+Cannot use the final modifier on an abstract class member from 1:26 to 1:30
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_ABSTRACT | MODIFIER_FINAL (48)
+                byRef: false
+                name: a
+                params: array(
+                )
+                returnType: null
+                stmts: null
+            )
+        )
+    )
+)
+-----
+<?php abstract final class A { }
+// Type in the partial parse could conceivably be any of 0, 16 or 32
+-----
+Syntax error, unexpected T_FINAL, expecting T_CLASS from 1:16 to 1:20
+array(
+    0: Stmt_Class(
+        flags: MODIFIER_FINAL (32)
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+        )
+    )
+    1: Stmt_Nop(
+        comments: array(
+            0: // Type in the partial parse could conceivably be any of 0, 16 or 32
+        )
+    )
+)
+-----
+<?php class A { abstract $a; }
+-----
+Properties cannot be declared abstract from 1:17 to 1:24
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_Property(
+                flags: MODIFIER_ABSTRACT (16)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: a
+                        default: null
+                    )
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { final $a; }
+-----
+Properties cannot be declared final from 1:17 to 1:21
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_Property(
+                flags: MODIFIER_FINAL (32)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: a
+                        default: null
+                    )
+                )
+            )
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/name.test b/lib/nikic/php-parser/test/code/parser/stmt/class/name.test
new file mode 100644
index 000000000..d53330521
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/name.test
@@ -0,0 +1,240 @@
+Invalid class name
+-----
+<?php class self {}
+-----
+Cannot use 'self' as class name as it is reserved from 1:13 to 1:16
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: self
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php class PARENT {}
+-----
+Cannot use 'PARENT' as class name as it is reserved from 1:13 to 1:18
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: PARENT
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php class static {}
+-----
+Syntax error, unexpected T_STATIC, expecting T_STRING from 1:13 to 1:18
+array(
+)
+-----
+<?php class A extends self {}
+-----
+Cannot use 'self' as class name as it is reserved from 1:23 to 1:26
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: Name(
+            parts: array(
+                0: self
+            )
+        )
+        implements: array(
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php class A extends PARENT {}
+-----
+Cannot use 'PARENT' as class name as it is reserved from 1:23 to 1:28
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: Name(
+            parts: array(
+                0: PARENT
+            )
+        )
+        implements: array(
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php class A extends static {}
+-----
+Cannot use 'static' as class name as it is reserved from 1:23 to 1:28
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: Name(
+            parts: array(
+                0: static
+            )
+        )
+        implements: array(
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php class A implements self {}
+-----
+Cannot use 'self' as interface name as it is reserved from 1:26 to 1:29
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+            0: Name(
+                parts: array(
+                    0: self
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php class A implements PARENT {}
+-----
+Cannot use 'PARENT' as interface name as it is reserved from 1:26 to 1:31
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+            0: Name(
+                parts: array(
+                    0: PARENT
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php class A implements static {}
+-----
+Cannot use 'static' as interface name as it is reserved from 1:26 to 1:31
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+            0: Name(
+                parts: array(
+                    0: static
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php interface self {}
+-----
+Cannot use 'self' as class name as it is reserved from 1:17 to 1:20
+array(
+    0: Stmt_Interface(
+        name: self
+        extends: array(
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php interface PARENT {}
+-----
+Cannot use 'PARENT' as class name as it is reserved from 1:17 to 1:22
+array(
+    0: Stmt_Interface(
+        name: PARENT
+        extends: array(
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php interface static {}
+-----
+Syntax error, unexpected T_STATIC, expecting T_STRING from 1:17 to 1:22
+array(
+)
+-----
+<?php interface A extends self {}
+-----
+Cannot use 'self' as interface name as it is reserved from 1:27 to 1:30
+array(
+    0: Stmt_Interface(
+        name: A
+        extends: array(
+            0: Name(
+                parts: array(
+                    0: self
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php interface A extends PARENT {}
+-----
+Cannot use 'PARENT' as interface name as it is reserved from 1:27 to 1:32
+array(
+    0: Stmt_Interface(
+        name: A
+        extends: array(
+            0: Name(
+                parts: array(
+                    0: PARENT
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php interface A extends static {}
+-----
+Cannot use 'static' as interface name as it is reserved from 1:27 to 1:32
+array(
+    0: Stmt_Interface(
+        name: A
+        extends: array(
+            0: Name(
+                parts: array(
+                    0: static
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/php4Style.test b/lib/nikic/php-parser/test/code/parser/stmt/class/php4Style.test
new file mode 100644
index 000000000..e459e1752
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/php4Style.test
@@ -0,0 +1,50 @@
+PHP 4 style declarations
+-----
+<?php
+
+class A {
+    var $foo;
+    function bar() {}
+    static abstract function baz() {}
+}
+-----
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_Property(
+                flags: 0
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: foo
+                        default: null
+                    )
+                )
+            )
+            1: Stmt_ClassMethod(
+                flags: 0
+                byRef: false
+                name: bar
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            2: Stmt_ClassMethod(
+                flags: MODIFIER_ABSTRACT | MODIFIER_STATIC (24)
+                byRef: false
+                name: baz
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/simple.test b/lib/nikic/php-parser/test/code/parser/stmt/class/simple.test
new file mode 100644
index 000000000..b2f899449
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/simple.test
@@ -0,0 +1,156 @@
+Class declaration
+-----
+<?php
+
+class A extends B implements C, D {
+    const A = 'B', C = 'D';
+
+    public $a = 'b', $c = 'd';
+    protected $e;
+    private $f;
+
+    public function a() {}
+    public static function b($a) {}
+    public final function c() : B {}
+    protected function d() {}
+    private function e() {}
+}
+-----
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: Name(
+            parts: array(
+                0: B
+            )
+        )
+        implements: array(
+            0: Name(
+                parts: array(
+                    0: C
+                )
+            )
+            1: Name(
+                parts: array(
+                    0: D
+                )
+            )
+        )
+        stmts: array(
+            0: Stmt_ClassConst(
+                flags: 0
+                consts: array(
+                    0: Const(
+                        name: A
+                        value: Scalar_String(
+                            value: B
+                        )
+                    )
+                    1: Const(
+                        name: C
+                        value: Scalar_String(
+                            value: D
+                        )
+                    )
+                )
+            )
+            1: Stmt_Property(
+                flags: MODIFIER_PUBLIC (1)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: a
+                        default: Scalar_String(
+                            value: b
+                        )
+                    )
+                    1: Stmt_PropertyProperty(
+                        name: c
+                        default: Scalar_String(
+                            value: d
+                        )
+                    )
+                )
+            )
+            2: Stmt_Property(
+                flags: MODIFIER_PROTECTED (2)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: e
+                        default: null
+                    )
+                )
+            )
+            3: Stmt_Property(
+                flags: MODIFIER_PRIVATE (4)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: f
+                        default: null
+                    )
+                )
+            )
+            4: Stmt_ClassMethod(
+                flags: MODIFIER_PUBLIC (1)
+                byRef: false
+                name: a
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            5: Stmt_ClassMethod(
+                flags: MODIFIER_PUBLIC | MODIFIER_STATIC (9)
+                byRef: false
+                name: b
+                params: array(
+                    0: Param(
+                        type: null
+                        byRef: false
+                        variadic: false
+                        name: a
+                        default: null
+                    )
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            6: Stmt_ClassMethod(
+                flags: MODIFIER_PUBLIC | MODIFIER_FINAL (33)
+                byRef: false
+                name: c
+                params: array(
+                )
+                returnType: Name(
+                    parts: array(
+                        0: B
+                    )
+                )
+                stmts: array(
+                )
+            )
+            7: Stmt_ClassMethod(
+                flags: MODIFIER_PROTECTED (2)
+                byRef: false
+                name: d
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+            8: Stmt_ClassMethod(
+                flags: MODIFIER_PRIVATE (4)
+                byRef: false
+                name: e
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/staticMethod.test b/lib/nikic/php-parser/test/code/parser/stmt/class/staticMethod.test
new file mode 100644
index 000000000..225596acb
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/staticMethod.test
@@ -0,0 +1,151 @@
+Some special methods cannot be static
+-----
+<?php class A { static function __construct() {} }
+-----
+Constructor __construct() cannot be static from 1:17 to 1:22
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: __construct
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { static function __destruct() {} }
+-----
+Destructor __destruct() cannot be static from 1:17 to 1:22
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: __destruct
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { static function __clone() {} }
+-----
+Clone method __clone() cannot be static from 1:17 to 1:22
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: __clone
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { static function __CONSTRUCT() {} }
+-----
+Constructor __CONSTRUCT() cannot be static from 1:17 to 1:22
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: __CONSTRUCT
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { static function __Destruct() {} }
+-----
+Destructor __Destruct() cannot be static from 1:17 to 1:22
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: __Destruct
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
+-----
+<?php class A { static function __cLoNe() {} }
+-----
+Clone method __cLoNe() cannot be static from 1:17 to 1:22
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: A
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_STATIC (8)
+                byRef: false
+                name: __cLoNe
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/class/trait.test b/lib/nikic/php-parser/test/code/parser/stmt/class/trait.test
new file mode 100644
index 000000000..75c6ec66f
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/class/trait.test
@@ -0,0 +1,160 @@
+Traits
+-----
+<?php
+
+trait A {
+    public function a() {}
+}
+
+class B {
+    use C;
+    use D {
+        a as protected b;
+        c as d;
+        e as private;
+    }
+    use E, F, G {
+        E::a insteadof F, G;
+        E::b as protected c;
+        E::d as e;
+        E::f as private;
+    }
+}
+-----
+array(
+    0: Stmt_Trait(
+        name: A
+        stmts: array(
+            0: Stmt_ClassMethod(
+                flags: MODIFIER_PUBLIC (1)
+                byRef: false
+                name: a
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+    )
+    1: Stmt_Class(
+        flags: 0
+        name: B
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_TraitUse(
+                traits: array(
+                    0: Name(
+                        parts: array(
+                            0: C
+                        )
+                    )
+                )
+                adaptations: array(
+                )
+            )
+            1: Stmt_TraitUse(
+                traits: array(
+                    0: Name(
+                        parts: array(
+                            0: D
+                        )
+                    )
+                )
+                adaptations: array(
+                    0: Stmt_TraitUseAdaptation_Alias(
+                        trait: null
+                        method: a
+                        newModifier: MODIFIER_PROTECTED (2)
+                        newName: b
+                    )
+                    1: Stmt_TraitUseAdaptation_Alias(
+                        trait: null
+                        method: c
+                        newModifier: null
+                        newName: d
+                    )
+                    2: Stmt_TraitUseAdaptation_Alias(
+                        trait: null
+                        method: e
+                        newModifier: MODIFIER_PRIVATE (4)
+                        newName: null
+                    )
+                )
+            )
+            2: Stmt_TraitUse(
+                traits: array(
+                    0: Name(
+                        parts: array(
+                            0: E
+                        )
+                    )
+                    1: Name(
+                        parts: array(
+                            0: F
+                        )
+                    )
+                    2: Name(
+                        parts: array(
+                            0: G
+                        )
+                    )
+                )
+                adaptations: array(
+                    0: Stmt_TraitUseAdaptation_Precedence(
+                        trait: Name(
+                            parts: array(
+                                0: E
+                            )
+                        )
+                        method: a
+                        insteadof: array(
+                            0: Name(
+                                parts: array(
+                                    0: F
+                                )
+                            )
+                            1: Name(
+                                parts: array(
+                                    0: G
+                                )
+                            )
+                        )
+                    )
+                    1: Stmt_TraitUseAdaptation_Alias(
+                        trait: Name(
+                            parts: array(
+                                0: E
+                            )
+                        )
+                        method: b
+                        newModifier: MODIFIER_PROTECTED (2)
+                        newName: c
+                    )
+                    2: Stmt_TraitUseAdaptation_Alias(
+                        trait: Name(
+                            parts: array(
+                                0: E
+                            )
+                        )
+                        method: d
+                        newModifier: null
+                        newName: e
+                    )
+                    3: Stmt_TraitUseAdaptation_Alias(
+                        trait: Name(
+                            parts: array(
+                                0: E
+                            )
+                        )
+                        method: f
+                        newModifier: MODIFIER_PRIVATE (4)
+                        newName: null
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/const.test b/lib/nikic/php-parser/test/code/parser/stmt/const.test
new file mode 100644
index 000000000..da21f416f
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/const.test
@@ -0,0 +1,40 @@
+Global constants
+-----
+<?php
+
+const A = 0, B = 1.0, C = 'A', D = E;
+-----
+array(
+    0: Stmt_Const(
+        consts: array(
+            0: Const(
+                name: A
+                value: Scalar_LNumber(
+                    value: 0
+                )
+            )
+            1: Const(
+                name: B
+                value: Scalar_DNumber(
+                    value: 1
+                )
+            )
+            2: Const(
+                name: C
+                value: Scalar_String(
+                    value: A
+                )
+            )
+            3: Const(
+                name: D
+                value: Expr_ConstFetch(
+                    name: Name(
+                        parts: array(
+                            0: E
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/controlFlow.test b/lib/nikic/php-parser/test/code/parser/stmt/controlFlow.test
new file mode 100644
index 000000000..2de1c4f25
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/controlFlow.test
@@ -0,0 +1,55 @@
+Control flow statements
+-----
+<?php
+
+break;
+break 2;
+
+continue;
+continue 2;
+
+return;
+return $a;
+
+throw $e;
+
+label:
+goto label;
+-----
+array(
+    0: Stmt_Break(
+        num: null
+    )
+    1: Stmt_Break(
+        num: Scalar_LNumber(
+            value: 2
+        )
+    )
+    2: Stmt_Continue(
+        num: null
+    )
+    3: Stmt_Continue(
+        num: Scalar_LNumber(
+            value: 2
+        )
+    )
+    4: Stmt_Return(
+        expr: null
+    )
+    5: Stmt_Return(
+        expr: Expr_Variable(
+            name: a
+        )
+    )
+    6: Stmt_Throw(
+        expr: Expr_Variable(
+            name: e
+        )
+    )
+    7: Stmt_Label(
+        name: label
+    )
+    8: Stmt_Goto(
+        name: label
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/declare.test b/lib/nikic/php-parser/test/code/parser/stmt/declare.test
new file mode 100644
index 000000000..93afe67b9
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/declare.test
@@ -0,0 +1,60 @@
+Declare
+-----
+<?php
+
+declare (X='Y');
+
+declare (A='B', C='D') {}
+
+declare (A='B', C='D'):
+enddeclare;
+-----
+array(
+    0: Stmt_Declare(
+        declares: array(
+            0: Stmt_DeclareDeclare(
+                key: X
+                value: Scalar_String(
+                    value: Y
+                )
+            )
+        )
+        stmts: null
+    )
+    1: Stmt_Declare(
+        declares: array(
+            0: Stmt_DeclareDeclare(
+                key: A
+                value: Scalar_String(
+                    value: B
+                )
+            )
+            1: Stmt_DeclareDeclare(
+                key: C
+                value: Scalar_String(
+                    value: D
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+    2: Stmt_Declare(
+        declares: array(
+            0: Stmt_DeclareDeclare(
+                key: A
+                value: Scalar_String(
+                    value: B
+                )
+            )
+            1: Stmt_DeclareDeclare(
+                key: C
+                value: Scalar_String(
+                    value: D
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/echo.test b/lib/nikic/php-parser/test/code/parser/stmt/echo.test
new file mode 100644
index 000000000..1d03eae5d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/echo.test
@@ -0,0 +1,32 @@
+Echo
+-----
+<?php
+
+echo 'Hallo World!';
+echo 'Hallo', ' ', 'World', '!';
+-----
+array(
+    0: Stmt_Echo(
+        exprs: array(
+            0: Scalar_String(
+                value: Hallo World!
+            )
+        )
+    )
+    1: Stmt_Echo(
+        exprs: array(
+            0: Scalar_String(
+                value: Hallo
+            )
+            1: Scalar_String(
+                value:
+            )
+            2: Scalar_String(
+                value: World
+            )
+            3: Scalar_String(
+                value: !
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/builtinTypeDeclarations.test b/lib/nikic/php-parser/test/code/parser/stmt/function/builtinTypeDeclarations.test
new file mode 100644
index 000000000..aecced5d6
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/builtinTypeDeclarations.test
@@ -0,0 +1,59 @@
+Scalar type declarations
+-----
+<?php
+function test(bool $a, Int $b, FLOAT $c, StRiNg $d, iterable $e, object $f) : void {}
+-----
+!!php7
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: test
+        params: array(
+            0: Param(
+                type: bool
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+            1: Param(
+                type: int
+                byRef: false
+                variadic: false
+                name: b
+                default: null
+            )
+            2: Param(
+                type: float
+                byRef: false
+                variadic: false
+                name: c
+                default: null
+            )
+            3: Param(
+                type: string
+                byRef: false
+                variadic: false
+                name: d
+                default: null
+            )
+            4: Param(
+                type: iterable
+                byRef: false
+                variadic: false
+                name: e
+                default: null
+            )
+            5: Param(
+                type: object
+                byRef: false
+                variadic: false
+                name: f
+                default: null
+            )
+        )
+        returnType: void
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/byRef.test b/lib/nikic/php-parser/test/code/parser/stmt/function/byRef.test
new file mode 100644
index 000000000..1c1669c10
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/byRef.test
@@ -0,0 +1,41 @@
+Return and pass by ref
+-----
+<?php
+
+function a(&$b) {}
+function &a($b) {}
+-----
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: a
+        params: array(
+            0: Param(
+                type: null
+                byRef: true
+                variadic: false
+                name: b
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    1: Stmt_Function(
+        byRef: true
+        name: a
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: b
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/conditional.test b/lib/nikic/php-parser/test/code/parser/stmt/function/conditional.test
new file mode 100644
index 000000000..d9c886ed8
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/conditional.test
@@ -0,0 +1,33 @@
+Conditional function definition
+-----
+<?php
+
+if (true) {
+    function A() {}
+}
+-----
+array(
+    0: Stmt_If(
+        cond: Expr_ConstFetch(
+            name: Name(
+                parts: array(
+                    0: true
+                )
+            )
+        )
+        stmts: array(
+            0: Stmt_Function(
+                byRef: false
+                name: A
+                params: array(
+                )
+                returnType: null
+                stmts: array(
+                )
+            )
+        )
+        elseifs: array(
+        )
+        else: null
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/defaultValues.test b/lib/nikic/php-parser/test/code/parser/stmt/function/defaultValues.test
new file mode 100644
index 000000000..d77d4f354
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/defaultValues.test
@@ -0,0 +1,148 @@
+Default values (static scalar tests)
+-----
+<?php
+
+function a(
+    $b = null,
+    $c = 'foo',
+    $d = A::B,
+    $f = +1,
+    $g = -1.0,
+    $h = array(),
+    $i = [],
+    $j = ['foo'],
+    $k = ['foo', 'bar' => 'baz']
+) {}
+-----
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: a
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: b
+                default: Expr_ConstFetch(
+                    name: Name(
+                        parts: array(
+                            0: null
+                        )
+                    )
+                )
+            )
+            1: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: c
+                default: Scalar_String(
+                    value: foo
+                )
+            )
+            2: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: d
+                default: Expr_ClassConstFetch(
+                    class: Name(
+                        parts: array(
+                            0: A
+                        )
+                    )
+                    name: B
+                )
+            )
+            3: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: f
+                default: Expr_UnaryPlus(
+                    expr: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+            4: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: g
+                default: Expr_UnaryMinus(
+                    expr: Scalar_DNumber(
+                        value: 1
+                    )
+                )
+            )
+            5: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: h
+                default: Expr_Array(
+                    items: array(
+                    )
+                )
+            )
+            6: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: i
+                default: Expr_Array(
+                    items: array(
+                    )
+                )
+            )
+            7: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: j
+                default: Expr_Array(
+                    items: array(
+                        0: Expr_ArrayItem(
+                            key: null
+                            value: Scalar_String(
+                                value: foo
+                            )
+                            byRef: false
+                        )
+                    )
+                )
+            )
+            8: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: k
+                default: Expr_Array(
+                    items: array(
+                        0: Expr_ArrayItem(
+                            key: null
+                            value: Scalar_String(
+                                value: foo
+                            )
+                            byRef: false
+                        )
+                        1: Expr_ArrayItem(
+                            key: Scalar_String(
+                                value: bar
+                            )
+                            value: Scalar_String(
+                                value: baz
+                            )
+                            byRef: false
+                        )
+                    )
+                )
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/nullableTypes.test b/lib/nikic/php-parser/test/code/parser/stmt/function/nullableTypes.test
new file mode 100644
index 000000000..d96df4fae
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/nullableTypes.test
@@ -0,0 +1,47 @@
+Nullable types
+-----
+<?php
+
+function test(?Foo $bar, ?string $foo) : ?Baz {
+}
+-----
+!!php7
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: test
+        params: array(
+            0: Param(
+                type: NullableType(
+                    type: Name(
+                        parts: array(
+                            0: Foo
+                        )
+                    )
+                )
+                byRef: false
+                variadic: false
+                name: bar
+                default: null
+            )
+            1: Param(
+                type: NullableType(
+                    type: string
+                )
+                byRef: false
+                variadic: false
+                name: foo
+                default: null
+            )
+        )
+        returnType: NullableType(
+            type: Name(
+                parts: array(
+                    0: Baz
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/returnTypes.test b/lib/nikic/php-parser/test/code/parser/stmt/function/returnTypes.test
new file mode 100644
index 000000000..ca6c3106e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/returnTypes.test
@@ -0,0 +1,52 @@
+Return type declarations
+-----
+<?php
+
+function test1() {}
+function test2() : array {}
+function test3() : callable {}
+function test4() : Foo\Bar {}
+-----
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: test1
+        params: array(
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    1: Stmt_Function(
+        byRef: false
+        name: test2
+        params: array(
+        )
+        returnType: array
+        stmts: array(
+        )
+    )
+    2: Stmt_Function(
+        byRef: false
+        name: test3
+        params: array(
+        )
+        returnType: callable
+        stmts: array(
+        )
+    )
+    3: Stmt_Function(
+        byRef: false
+        name: test4
+        params: array(
+        )
+        returnType: Name(
+            parts: array(
+                0: Foo
+                1: Bar
+            )
+        )
+        stmts: array(
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/specialVars.test b/lib/nikic/php-parser/test/code/parser/stmt/function/specialVars.test
new file mode 100644
index 000000000..f2f35acf4
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/specialVars.test
@@ -0,0 +1,51 @@
+Special function variables
+-----
+<?php
+
+function a() {
+    global $a, ${'b'}, $$c;
+    static $c, $d = 'e';
+}
+-----
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: a
+        params: array(
+        )
+        returnType: null
+        stmts: array(
+            0: Stmt_Global(
+                vars: array(
+                    0: Expr_Variable(
+                        name: a
+                    )
+                    1: Expr_Variable(
+                        name: Scalar_String(
+                            value: b
+                        )
+                    )
+                    2: Expr_Variable(
+                        name: Expr_Variable(
+                            name: c
+                        )
+                    )
+                )
+            )
+            1: Stmt_Static(
+                vars: array(
+                    0: Stmt_StaticVar(
+                        name: c
+                        default: null
+                    )
+                    1: Stmt_StaticVar(
+                        name: d
+                        default: Scalar_String(
+                            value: e
+                        )
+                    )
+                )
+            )
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/typeDeclarations.test b/lib/nikic/php-parser/test/code/parser/stmt/function/typeDeclarations.test
new file mode 100644
index 000000000..53c462c5a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/typeDeclarations.test
@@ -0,0 +1,49 @@
+Type hints
+-----
+<?php
+
+function a($b, array $c, callable $d, E $f) {}
+-----
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: a
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: b
+                default: null
+            )
+            1: Param(
+                type: array
+                byRef: false
+                variadic: false
+                name: c
+                default: null
+            )
+            2: Param(
+                type: callable
+                byRef: false
+                variadic: false
+                name: d
+                default: null
+            )
+            3: Param(
+                type: Name(
+                    parts: array(
+                        0: E
+                    )
+                )
+                byRef: false
+                variadic: false
+                name: f
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/variadic.test b/lib/nikic/php-parser/test/code/parser/stmt/function/variadic.test
new file mode 100644
index 000000000..f9d848c7d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/variadic.test
@@ -0,0 +1,110 @@
+Variadic functions
+-----
+<?php
+function test($a, ... $b) {}
+function test($a, &... $b) {}
+function test($a, Type ... $b) {}
+function test($a, Type &... $b) {}
+-----
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: test
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+            1: Param(
+                type: null
+                byRef: false
+                variadic: true
+                name: b
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    1: Stmt_Function(
+        byRef: false
+        name: test
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+            1: Param(
+                type: null
+                byRef: true
+                variadic: true
+                name: b
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    2: Stmt_Function(
+        byRef: false
+        name: test
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+            1: Param(
+                type: Name(
+                    parts: array(
+                        0: Type
+                    )
+                )
+                byRef: false
+                variadic: true
+                name: b
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+    3: Stmt_Function(
+        byRef: false
+        name: test
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                name: a
+                default: null
+            )
+            1: Param(
+                type: Name(
+                    parts: array(
+                        0: Type
+                    )
+                )
+                byRef: true
+                variadic: true
+                name: b
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/function/variadicDefaultValue.test b/lib/nikic/php-parser/test/code/parser/stmt/function/variadicDefaultValue.test
new file mode 100644
index 000000000..0c3714f21
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/function/variadicDefaultValue.test
@@ -0,0 +1,27 @@
+Invalid variadic function
+-----
+<?php
+function foo(...$foo = []) {}
+-----
+Variadic parameter cannot have a default value from 2:24 to 2:25
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: foo
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: true
+                name: foo
+                default: Expr_Array(
+                    items: array(
+                    )
+                )
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/generator/basic.test b/lib/nikic/php-parser/test/code/parser/stmt/generator/basic.test
new file mode 100644
index 000000000..8a184aaf6
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/generator/basic.test
@@ -0,0 +1,280 @@
+Generators (yield expression)
+-----
+<?php
+
+function gen() {
+    // statements
+    yield;
+    yield $value;
+    yield $key => $value;
+
+    // expressions
+    $data = yield;
+    $data = (yield $value);
+    $data = (yield $key => $value);
+
+    // yield in language constructs with their own parentheses
+    if (yield $foo); elseif (yield $foo);
+    if (yield $foo): elseif (yield $foo): endif;
+    while (yield $foo);
+    do {} while (yield $foo);
+    switch (yield $foo) {}
+    die(yield $foo);
+
+    // yield in function calls
+    func(yield $foo);
+    $foo->func(yield $foo);
+    new Foo(yield $foo);
+
+    yield from $foo;
+    yield from $foo and yield from $bar;
+    yield from $foo + $bar;
+}
+-----
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: gen
+        params: array(
+        )
+        returnType: null
+        stmts: array(
+            0: Expr_Yield(
+                key: null
+                value: null
+                comments: array(
+                    0: // statements
+                )
+            )
+            1: Expr_Yield(
+                key: null
+                value: Expr_Variable(
+                    name: value
+                )
+            )
+            2: Expr_Yield(
+                key: Expr_Variable(
+                    name: key
+                )
+                value: Expr_Variable(
+                    name: value
+                )
+            )
+            3: Expr_Assign(
+                var: Expr_Variable(
+                    name: data
+                    comments: array(
+                        0: // expressions
+                    )
+                )
+                expr: Expr_Yield(
+                    key: null
+                    value: null
+                )
+                comments: array(
+                    0: // expressions
+                )
+            )
+            4: Expr_Assign(
+                var: Expr_Variable(
+                    name: data
+                )
+                expr: Expr_Yield(
+                    key: null
+                    value: Expr_Variable(
+                        name: value
+                    )
+                )
+            )
+            5: Expr_Assign(
+                var: Expr_Variable(
+                    name: data
+                )
+                expr: Expr_Yield(
+                    key: Expr_Variable(
+                        name: key
+                    )
+                    value: Expr_Variable(
+                        name: value
+                    )
+                )
+            )
+            6: Stmt_If(
+                cond: Expr_Yield(
+                    key: null
+                    value: Expr_Variable(
+                        name: foo
+                    )
+                )
+                stmts: array(
+                )
+                elseifs: array(
+                    0: Stmt_ElseIf(
+                        cond: Expr_Yield(
+                            key: null
+                            value: Expr_Variable(
+                                name: foo
+                            )
+                        )
+                        stmts: array(
+                        )
+                    )
+                )
+                else: null
+                comments: array(
+                    0: // yield in language constructs with their own parentheses
+                )
+            )
+            7: Stmt_If(
+                cond: Expr_Yield(
+                    key: null
+                    value: Expr_Variable(
+                        name: foo
+                    )
+                )
+                stmts: array(
+                )
+                elseifs: array(
+                    0: Stmt_ElseIf(
+                        cond: Expr_Yield(
+                            key: null
+                            value: Expr_Variable(
+                                name: foo
+                            )
+                        )
+                        stmts: array(
+                        )
+                    )
+                )
+                else: null
+            )
+            8: Stmt_While(
+                cond: Expr_Yield(
+                    key: null
+                    value: Expr_Variable(
+                        name: foo
+                    )
+                )
+                stmts: array(
+                )
+            )
+            9: Stmt_Do(
+                cond: Expr_Yield(
+                    key: null
+                    value: Expr_Variable(
+                        name: foo
+                    )
+                )
+                stmts: array(
+                )
+            )
+            10: Stmt_Switch(
+                cond: Expr_Yield(
+                    key: null
+                    value: Expr_Variable(
+                        name: foo
+                    )
+                )
+                cases: array(
+                )
+            )
+            11: Expr_Exit(
+                expr: Expr_Yield(
+                    key: null
+                    value: Expr_Variable(
+                        name: foo
+                    )
+                )
+            )
+            12: Expr_FuncCall(
+                name: Name(
+                    parts: array(
+                        0: func
+                    )
+                    comments: array(
+                        0: // yield in function calls
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Expr_Yield(
+                            key: null
+                            value: Expr_Variable(
+                                name: foo
+                            )
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+                comments: array(
+                    0: // yield in function calls
+                )
+            )
+            13: Expr_MethodCall(
+                var: Expr_Variable(
+                    name: foo
+                )
+                name: func
+                args: array(
+                    0: Arg(
+                        value: Expr_Yield(
+                            key: null
+                            value: Expr_Variable(
+                                name: foo
+                            )
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+            14: Expr_New(
+                class: Name(
+                    parts: array(
+                        0: Foo
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Expr_Yield(
+                            key: null
+                            value: Expr_Variable(
+                                name: foo
+                            )
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+            15: Expr_YieldFrom(
+                expr: Expr_Variable(
+                    name: foo
+                )
+            )
+            16: Expr_BinaryOp_LogicalAnd(
+                left: Expr_YieldFrom(
+                    expr: Expr_Variable(
+                        name: foo
+                    )
+                )
+                right: Expr_YieldFrom(
+                    expr: Expr_Variable(
+                        name: bar
+                    )
+                )
+            )
+            17: Expr_YieldFrom(
+                expr: Expr_BinaryOp_Plus(
+                    left: Expr_Variable(
+                        name: foo
+                    )
+                    right: Expr_Variable(
+                        name: bar
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/generator/yieldPrecedence.test b/lib/nikic/php-parser/test/code/parser/stmt/generator/yieldPrecedence.test
new file mode 100644
index 000000000..ff0d4df08
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/generator/yieldPrecedence.test
@@ -0,0 +1,230 @@
+Yield operator precedence
+-----
+<?php
+
+function gen() {
+    yield "a" . "b";
+    yield "a" or die;
+    yield "k" => "a" . "b";
+    yield "k" => "a" or die;
+    var_dump([yield "k" => "a" . "b"]);
+    yield yield "k1" => yield "k2" => "a" . "b";
+    yield yield "k1" => (yield "k2") => "a" . "b";
+    var_dump([yield "k1" => yield "k2" => "a" . "b"]);
+    var_dump([yield "k1" => (yield "k2") => "a" . "b"]);
+}
+-----
+!!php7
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: gen
+        params: array(
+        )
+        returnType: null
+        stmts: array(
+            0: Expr_Yield(
+                key: null
+                value: Expr_BinaryOp_Concat(
+                    left: Scalar_String(
+                        value: a
+                    )
+                    right: Scalar_String(
+                        value: b
+                    )
+                )
+            )
+            1: Expr_BinaryOp_LogicalOr(
+                left: Expr_Yield(
+                    key: null
+                    value: Scalar_String(
+                        value: a
+                    )
+                )
+                right: Expr_Exit(
+                    expr: null
+                )
+            )
+            2: Expr_Yield(
+                key: Scalar_String(
+                    value: k
+                )
+                value: Expr_BinaryOp_Concat(
+                    left: Scalar_String(
+                        value: a
+                    )
+                    right: Scalar_String(
+                        value: b
+                    )
+                )
+            )
+            3: Expr_BinaryOp_LogicalOr(
+                left: Expr_Yield(
+                    key: Scalar_String(
+                        value: k
+                    )
+                    value: Scalar_String(
+                        value: a
+                    )
+                )
+                right: Expr_Exit(
+                    expr: null
+                )
+            )
+            4: Expr_FuncCall(
+                name: Name(
+                    parts: array(
+                        0: var_dump
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Expr_Array(
+                            items: array(
+                                0: Expr_ArrayItem(
+                                    key: null
+                                    value: Expr_Yield(
+                                        key: Scalar_String(
+                                            value: k
+                                        )
+                                        value: Expr_BinaryOp_Concat(
+                                            left: Scalar_String(
+                                                value: a
+                                            )
+                                            right: Scalar_String(
+                                                value: b
+                                            )
+                                        )
+                                    )
+                                    byRef: false
+                                )
+                            )
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+            5: Expr_Yield(
+                key: null
+                value: Expr_Yield(
+                    key: Scalar_String(
+                        value: k1
+                    )
+                    value: Expr_Yield(
+                        key: Scalar_String(
+                            value: k2
+                        )
+                        value: Expr_BinaryOp_Concat(
+                            left: Scalar_String(
+                                value: a
+                            )
+                            right: Scalar_String(
+                                value: b
+                            )
+                        )
+                    )
+                )
+            )
+            6: Expr_Yield(
+                key: Expr_Yield(
+                    key: Scalar_String(
+                        value: k1
+                    )
+                    value: Expr_Yield(
+                        key: null
+                        value: Scalar_String(
+                            value: k2
+                        )
+                    )
+                )
+                value: Expr_BinaryOp_Concat(
+                    left: Scalar_String(
+                        value: a
+                    )
+                    right: Scalar_String(
+                        value: b
+                    )
+                )
+            )
+            7: Expr_FuncCall(
+                name: Name(
+                    parts: array(
+                        0: var_dump
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Expr_Array(
+                            items: array(
+                                0: Expr_ArrayItem(
+                                    key: null
+                                    value: Expr_Yield(
+                                        key: Scalar_String(
+                                            value: k1
+                                        )
+                                        value: Expr_Yield(
+                                            key: Scalar_String(
+                                                value: k2
+                                            )
+                                            value: Expr_BinaryOp_Concat(
+                                                left: Scalar_String(
+                                                    value: a
+                                                )
+                                                right: Scalar_String(
+                                                    value: b
+                                                )
+                                            )
+                                        )
+                                    )
+                                    byRef: false
+                                )
+                            )
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+            8: Expr_FuncCall(
+                name: Name(
+                    parts: array(
+                        0: var_dump
+                    )
+                )
+                args: array(
+                    0: Arg(
+                        value: Expr_Array(
+                            items: array(
+                                0: Expr_ArrayItem(
+                                    key: Expr_Yield(
+                                        key: Scalar_String(
+                                            value: k1
+                                        )
+                                        value: Expr_Yield(
+                                            key: null
+                                            value: Scalar_String(
+                                                value: k2
+                                            )
+                                        )
+                                    )
+                                    value: Expr_BinaryOp_Concat(
+                                        left: Scalar_String(
+                                            value: a
+                                        )
+                                        right: Scalar_String(
+                                            value: b
+                                        )
+                                    )
+                                    byRef: false
+                                )
+                            )
+                        )
+                        byRef: false
+                        unpack: false
+                    )
+                )
+            )
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/generator/yieldUnaryPrecedence.test b/lib/nikic/php-parser/test/code/parser/stmt/generator/yieldUnaryPrecedence.test
new file mode 100644
index 000000000..13f96602c
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/generator/yieldUnaryPrecedence.test
@@ -0,0 +1,48 @@
+Yield with unary operator argument
+-----
+<?php
+
+function gen() {
+    yield +1;
+    yield -1;
+    yield * -1;
+}
+-----
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: gen
+        params: array(
+        )
+        returnType: null
+        stmts: array(
+            0: Expr_Yield(
+                key: null
+                value: Expr_UnaryPlus(
+                    expr: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+            1: Expr_Yield(
+                key: null
+                value: Expr_UnaryMinus(
+                    expr: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+            2: Expr_BinaryOp_Mul(
+                left: Expr_Yield(
+                    key: null
+                    value: null
+                )
+                right: Expr_UnaryMinus(
+                    expr: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/haltCompiler.test b/lib/nikic/php-parser/test/code/parser/stmt/haltCompiler.test
new file mode 100644
index 000000000..67133ba74
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/haltCompiler.test
@@ -0,0 +1,55 @@
+__halt_compiler
+-----
+<?php
+
+$a;
+__halt_compiler()
+?>
+Hallo World!
+-----
+array(
+    0: Expr_Variable(
+        name: a
+    )
+    1: Stmt_HaltCompiler(
+        remaining: Hallo World!
+    )
+)
+-----
+<?php
+
+$a;
+__halt_compiler();Hallo World!
+-----
+array(
+    0: Expr_Variable(
+        name: a
+    )
+    1: Stmt_HaltCompiler(
+        remaining: Hallo World!
+    )
+)
+-----
+<?php
+
+namespace A;
+$a;
+__halt_compiler();
+-----
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+        stmts: array(
+            0: Expr_Variable(
+                name: a
+            )
+        )
+    )
+    1: Stmt_HaltCompiler(
+        remaining:
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerInvalidSyntax.test b/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerInvalidSyntax.test
new file mode 100644
index 000000000..597710f2d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerInvalidSyntax.test
@@ -0,0 +1,6 @@
+Invalid __halt_compiler() syntax
+-----
+<?php
+__halt_compiler()
+-----
+__HALT_COMPILER must be followed by "();" on line 2
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerOffset.test b/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerOffset.test
new file mode 100644
index 000000000..6b4754856
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerOffset.test
@@ -0,0 +1,34 @@
+Use of __HALT_COMPILER_OFFSET__ constant
+-----
+<?php
+
+var_dump(__HALT_COMPILER_OFFSET__);
+__halt_compiler();
+Foo
+-----
+array(
+    0: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: var_dump
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_ConstFetch(
+                    name: Name(
+                        parts: array(
+                            0: __HALT_COMPILER_OFFSET__
+                        )
+                    )
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    1: Stmt_HaltCompiler(
+        remaining:
+    Foo
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerOutermostScope.test b/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerOutermostScope.test
new file mode 100644
index 000000000..2f8a3f19a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/haltCompilerOutermostScope.test
@@ -0,0 +1,8 @@
+__halt_compiler can only be used from outermost scope
+-----
+<?php
+if (true) {
+    __halt_compiler();
+}
+-----
+__HALT_COMPILER() can only be used from the outermost scope from 3:5 to 3:19
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/hashbang.test b/lib/nikic/php-parser/test/code/parser/stmt/hashbang.test
new file mode 100644
index 000000000..11c45da60
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/hashbang.test
@@ -0,0 +1,26 @@
+Hashbang line
+-----
+#!/usr/bin/env php
+<?php
+
+echo "foobar";
+
+?>
+#!/usr/bin/env php
+-----
+array(
+    0: Stmt_InlineHTML(
+        value: #!/usr/bin/env php
+
+    )
+    1: Stmt_Echo(
+        exprs: array(
+            0: Scalar_String(
+                value: foobar
+            )
+        )
+    )
+    2: Stmt_InlineHTML(
+        value: #!/usr/bin/env php
+    )
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/if.test b/lib/nikic/php-parser/test/code/parser/stmt/if.test
new file mode 100644
index 000000000..e054c8976
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/if.test
@@ -0,0 +1,103 @@
+If/Elseif/Else
+-----
+<?php
+
+if      ($a) {}
+elseif  ($b) {}
+elseif  ($c) {}
+else         {}
+
+if ($a) {} // without else
+
+if      ($a):
+elseif  ($b):
+elseif  ($c):
+else        :
+endif;
+
+if ($a): endif; // without else
+-----
+array(
+    0: Stmt_If(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+        )
+        elseifs: array(
+            0: Stmt_ElseIf(
+                cond: Expr_Variable(
+                    name: b
+                )
+                stmts: array(
+                )
+            )
+            1: Stmt_ElseIf(
+                cond: Expr_Variable(
+                    name: c
+                )
+                stmts: array(
+                )
+            )
+        )
+        else: Stmt_Else(
+            stmts: array(
+            )
+        )
+    )
+    1: Stmt_If(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+        )
+        elseifs: array(
+        )
+        else: null
+    )
+    2: Stmt_If(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+        )
+        elseifs: array(
+            0: Stmt_ElseIf(
+                cond: Expr_Variable(
+                    name: b
+                )
+                stmts: array(
+                )
+            )
+            1: Stmt_ElseIf(
+                cond: Expr_Variable(
+                    name: c
+                )
+                stmts: array(
+                )
+            )
+        )
+        else: Stmt_Else(
+            stmts: array(
+            )
+        )
+        comments: array(
+            0: // without else
+        )
+    )
+    3: Stmt_If(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+        )
+        elseifs: array(
+        )
+        else: null
+    )
+    4: Stmt_Nop(
+        comments: array(
+            0: // without else
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/inlineHTML.test b/lib/nikic/php-parser/test/code/parser/stmt/inlineHTML.test
new file mode 100644
index 000000000..9b1b71d81
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/inlineHTML.test
@@ -0,0 +1,27 @@
+Inline HTML
+-----
+<?php
+$a;
+?>
+B
+<?php
+$c;
+?>
+<?php
+$d;
+-----
+array(
+    0: Expr_Variable(
+        name: a
+    )
+    1: Stmt_InlineHTML(
+        value: B
+
+    )
+    2: Expr_Variable(
+        name: c
+    )
+    3: Expr_Variable(
+        name: d
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/loop/do.test b/lib/nikic/php-parser/test/code/parser/stmt/loop/do.test
new file mode 100644
index 000000000..2799e26ff
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/loop/do.test
@@ -0,0 +1,17 @@
+Do loop
+-----
+<?php
+
+do {
+
+} while ($a);
+-----
+array(
+    0: Stmt_Do(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/loop/for.test b/lib/nikic/php-parser/test/code/parser/stmt/loop/for.test
new file mode 100644
index 000000000..c942d311e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/loop/for.test
@@ -0,0 +1,110 @@
+For loop
+-----
+<?php
+
+// "classical" loop
+for ($i = 0; $i < $c; ++$i) {}
+
+// multiple expressions
+for ($a, $b; $c, $d; $e, $f) {}
+
+// infinite loop
+for (;;) {}
+
+// alternative syntax
+for (;;):
+endfor;
+-----
+array(
+    0: Stmt_For(
+        init: array(
+            0: Expr_Assign(
+                var: Expr_Variable(
+                    name: i
+                )
+                expr: Scalar_LNumber(
+                    value: 0
+                )
+            )
+        )
+        cond: array(
+            0: Expr_BinaryOp_Smaller(
+                left: Expr_Variable(
+                    name: i
+                )
+                right: Expr_Variable(
+                    name: c
+                )
+            )
+        )
+        loop: array(
+            0: Expr_PreInc(
+                var: Expr_Variable(
+                    name: i
+                )
+            )
+        )
+        stmts: array(
+        )
+        comments: array(
+            0: // "classical" loop
+        )
+    )
+    1: Stmt_For(
+        init: array(
+            0: Expr_Variable(
+                name: a
+            )
+            1: Expr_Variable(
+                name: b
+            )
+        )
+        cond: array(
+            0: Expr_Variable(
+                name: c
+            )
+            1: Expr_Variable(
+                name: d
+            )
+        )
+        loop: array(
+            0: Expr_Variable(
+                name: e
+            )
+            1: Expr_Variable(
+                name: f
+            )
+        )
+        stmts: array(
+        )
+        comments: array(
+            0: // multiple expressions
+        )
+    )
+    2: Stmt_For(
+        init: array(
+        )
+        cond: array(
+        )
+        loop: array(
+        )
+        stmts: array(
+        )
+        comments: array(
+            0: // infinite loop
+        )
+    )
+    3: Stmt_For(
+        init: array(
+        )
+        cond: array(
+        )
+        loop: array(
+        )
+        stmts: array(
+        )
+        comments: array(
+            0: // alternative syntax
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/loop/foreach.test b/lib/nikic/php-parser/test/code/parser/stmt/loop/foreach.test
new file mode 100644
index 000000000..464c85955
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/loop/foreach.test
@@ -0,0 +1,164 @@
+Foreach loop
+-----
+<?php
+
+// foreach on variable
+foreach ($a as $b)  {}
+foreach ($a as &$b) {}
+foreach ($a as $b => $c) {}
+foreach ($a as $b => &$c) {}
+foreach ($a as list($a, $b)) {}
+foreach ($a as $a => list($b, , $c)) {}
+
+// foreach on expression
+foreach (array() as $b) {}
+
+// alternative syntax
+foreach ($a as $b):
+endforeach;
+-----
+array(
+    0: Stmt_Foreach(
+        expr: Expr_Variable(
+            name: a
+        )
+        keyVar: null
+        byRef: false
+        valueVar: Expr_Variable(
+            name: b
+        )
+        stmts: array(
+        )
+        comments: array(
+            0: // foreach on variable
+        )
+    )
+    1: Stmt_Foreach(
+        expr: Expr_Variable(
+            name: a
+        )
+        keyVar: null
+        byRef: true
+        valueVar: Expr_Variable(
+            name: b
+        )
+        stmts: array(
+        )
+    )
+    2: Stmt_Foreach(
+        expr: Expr_Variable(
+            name: a
+        )
+        keyVar: Expr_Variable(
+            name: b
+        )
+        byRef: false
+        valueVar: Expr_Variable(
+            name: c
+        )
+        stmts: array(
+        )
+    )
+    3: Stmt_Foreach(
+        expr: Expr_Variable(
+            name: a
+        )
+        keyVar: Expr_Variable(
+            name: b
+        )
+        byRef: true
+        valueVar: Expr_Variable(
+            name: c
+        )
+        stmts: array(
+        )
+    )
+    4: Stmt_Foreach(
+        expr: Expr_Variable(
+            name: a
+        )
+        keyVar: null
+        byRef: false
+        valueVar: Expr_List(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: a
+                    )
+                    byRef: false
+                )
+                1: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: b
+                    )
+                    byRef: false
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+    5: Stmt_Foreach(
+        expr: Expr_Variable(
+            name: a
+        )
+        keyVar: Expr_Variable(
+            name: a
+        )
+        byRef: false
+        valueVar: Expr_List(
+            items: array(
+                0: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: b
+                    )
+                    byRef: false
+                )
+                1: null
+                2: Expr_ArrayItem(
+                    key: null
+                    value: Expr_Variable(
+                        name: c
+                    )
+                    byRef: false
+                )
+            )
+        )
+        stmts: array(
+        )
+    )
+    6: Stmt_Foreach(
+        expr: Expr_Array(
+            items: array(
+            )
+        )
+        keyVar: null
+        byRef: false
+        valueVar: Expr_Variable(
+            name: b
+        )
+        stmts: array(
+        )
+        comments: array(
+            0: // foreach on expression
+        )
+    )
+    7: Stmt_Foreach(
+        expr: Expr_Variable(
+            name: a
+        )
+        keyVar: null
+        byRef: false
+        valueVar: Expr_Variable(
+            name: b
+        )
+        stmts: array(
+        )
+        comments: array(
+            0: // alternative syntax
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/loop/while.test b/lib/nikic/php-parser/test/code/parser/stmt/loop/while.test
new file mode 100644
index 000000000..65f6b2336
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/loop/while.test
@@ -0,0 +1,25 @@
+While loop
+-----
+<?php
+
+while ($a) {}
+
+while ($a):
+endwhile;
+-----
+array(
+    0: Stmt_While(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+        )
+    )
+    1: Stmt_While(
+        cond: Expr_Variable(
+            name: a
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/multiCatch.test b/lib/nikic/php-parser/test/code/parser/stmt/multiCatch.test
new file mode 100644
index 000000000..bed73ad91
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/multiCatch.test
@@ -0,0 +1,65 @@
+Try/catch with multiple classes
+-----
+<?php
+try {
+    $x;
+} catch (X|Y $e1) {
+    $y;
+} catch (\A|B\C $e2) {
+    $z;
+}
+-----
+!!php7
+array(
+    0: Stmt_TryCatch(
+        stmts: array(
+            0: Expr_Variable(
+                name: x
+            )
+        )
+        catches: array(
+            0: Stmt_Catch(
+                types: array(
+                    0: Name(
+                        parts: array(
+                            0: X
+                        )
+                    )
+                    1: Name(
+                        parts: array(
+                            0: Y
+                        )
+                    )
+                )
+                var: e1
+                stmts: array(
+                    0: Expr_Variable(
+                        name: y
+                    )
+                )
+            )
+            1: Stmt_Catch(
+                types: array(
+                    0: Name_FullyQualified(
+                        parts: array(
+                            0: A
+                        )
+                    )
+                    1: Name(
+                        parts: array(
+                            0: B
+                            1: C
+                        )
+                    )
+                )
+                var: e2
+                stmts: array(
+                    0: Expr_Variable(
+                        name: z
+                    )
+                )
+            )
+        )
+        finally: null
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/alias.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/alias.test
new file mode 100644
index 000000000..9bb53bd04
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/alias.test
@@ -0,0 +1,168 @@
+Aliases (use)
+-----
+<?php
+
+use A\B;
+use C\D as E;
+use F\G as H, J;
+
+// evil alias notation - Do Not Use!
+use \A;
+use \A as B;
+
+// function and constant aliases
+use function foo\bar;
+use function foo\bar as baz;
+use const foo\BAR;
+use const foo\BAR as BAZ;
+-----
+array(
+    0: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: A
+                        1: B
+                    )
+                )
+                alias: B
+            )
+        )
+    )
+    1: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: C
+                        1: D
+                    )
+                )
+                alias: E
+            )
+        )
+    )
+    2: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: F
+                        1: G
+                    )
+                )
+                alias: H
+            )
+            1: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: J
+                    )
+                )
+                alias: J
+            )
+        )
+    )
+    3: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: A
+                    )
+                )
+                alias: A
+            )
+        )
+        comments: array(
+            0: // evil alias notation - Do Not Use!
+        )
+    )
+    4: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: A
+                    )
+                )
+                alias: B
+            )
+        )
+    )
+    5: Stmt_Use(
+        type: TYPE_FUNCTION (2)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: foo
+                        1: bar
+                    )
+                )
+                alias: bar
+            )
+        )
+        comments: array(
+            0: // function and constant aliases
+        )
+    )
+    6: Stmt_Use(
+        type: TYPE_FUNCTION (2)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: foo
+                        1: bar
+                    )
+                )
+                alias: baz
+            )
+        )
+    )
+    7: Stmt_Use(
+        type: TYPE_CONSTANT (3)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: foo
+                        1: BAR
+                    )
+                )
+                alias: BAR
+            )
+        )
+    )
+    8: Stmt_Use(
+        type: TYPE_CONSTANT (3)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: foo
+                        1: BAR
+                    )
+                )
+                alias: BAZ
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/braced.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/braced.test
new file mode 100644
index 000000000..1fefc1d3f
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/braced.test
@@ -0,0 +1,42 @@
+Braced namespaces
+-----
+<?php
+
+namespace Foo\Bar {
+    foo;
+}
+namespace {
+    bar;
+}
+-----
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: Foo
+                1: Bar
+            )
+        )
+        stmts: array(
+            0: Expr_ConstFetch(
+                name: Name(
+                    parts: array(
+                        0: foo
+                    )
+                )
+            )
+        )
+    )
+    1: Stmt_Namespace(
+        name: null
+        stmts: array(
+            0: Expr_ConstFetch(
+                name: Name(
+                    parts: array(
+                        0: bar
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/commentAfterNamespace.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/commentAfterNamespace.test
new file mode 100644
index 000000000..3f379b734
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/commentAfterNamespace.test
@@ -0,0 +1,22 @@
+Trailing comment after braced namespace declaration
+-----
+<?php
+namespace Foo {}
+// Comment
+-----
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: Foo
+            )
+        )
+        stmts: array(
+        )
+    )
+    1: Stmt_Nop(
+        comments: array(
+            0: // Comment
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUse.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUse.test
new file mode 100644
index 000000000..6597076a6
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUse.test
@@ -0,0 +1,188 @@
+Group use declarations
+-----
+<?php
+use A\{B};
+use A\{B\C, D};
+use \A\B\{C\D, E};
+use function A\{b\c, d};
+use const \A\{B\C, D};
+use A\B\{C\D, function b\c, const D};
+-----
+array(
+    0: Stmt_GroupUse(
+        type: TYPE_UNKNOWN (0)
+        prefix: Name(
+            parts: array(
+                0: A
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: B
+                    )
+                )
+                alias: B
+            )
+        )
+    )
+    1: Stmt_GroupUse(
+        type: TYPE_UNKNOWN (0)
+        prefix: Name(
+            parts: array(
+                0: A
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: B
+                        1: C
+                    )
+                )
+                alias: C
+            )
+            1: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: D
+                    )
+                )
+                alias: D
+            )
+        )
+    )
+    2: Stmt_GroupUse(
+        type: TYPE_UNKNOWN (0)
+        prefix: Name(
+            parts: array(
+                0: A
+                1: B
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: C
+                        1: D
+                    )
+                )
+                alias: D
+            )
+            1: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: E
+                    )
+                )
+                alias: E
+            )
+        )
+    )
+    3: Stmt_GroupUse(
+        type: TYPE_FUNCTION (2)
+        prefix: Name(
+            parts: array(
+                0: A
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: b
+                        1: c
+                    )
+                )
+                alias: c
+            )
+            1: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: d
+                    )
+                )
+                alias: d
+            )
+        )
+    )
+    4: Stmt_GroupUse(
+        type: TYPE_CONSTANT (3)
+        prefix: Name(
+            parts: array(
+                0: A
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: B
+                        1: C
+                    )
+                )
+                alias: C
+            )
+            1: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: D
+                    )
+                )
+                alias: D
+            )
+        )
+    )
+    5: Stmt_GroupUse(
+        type: TYPE_UNKNOWN (0)
+        prefix: Name(
+            parts: array(
+                0: A
+                1: B
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: C
+                        1: D
+                    )
+                )
+                alias: D
+            )
+            1: Stmt_UseUse(
+                type: TYPE_FUNCTION (2)
+                name: Name(
+                    parts: array(
+                        0: b
+                        1: c
+                    )
+                )
+                alias: c
+            )
+            2: Stmt_UseUse(
+                type: TYPE_CONSTANT (3)
+                name: Name(
+                    parts: array(
+                        0: D
+                    )
+                )
+                alias: D
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUseErrors.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUseErrors.test
new file mode 100644
index 000000000..64ebcf2e3
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUseErrors.test
@@ -0,0 +1,107 @@
+Invalid group use syntax
+-----
+<?php
+// Missing semicolon
+use Foo\{Bar}
+use Bar\{Foo};
+-----
+!!php7
+Syntax error, unexpected T_USE, expecting ';' from 4:1 to 4:3
+array(
+    0: Stmt_GroupUse(
+        type: TYPE_UNKNOWN (0)
+        prefix: Name(
+            parts: array(
+                0: Foo
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: Bar
+                    )
+                )
+                alias: Bar
+            )
+        )
+        comments: array(
+            0: // Missing semicolon
+        )
+    )
+    1: Stmt_GroupUse(
+        type: TYPE_UNKNOWN (0)
+        prefix: Name(
+            parts: array(
+                0: Bar
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: Foo
+                    )
+                )
+                alias: Foo
+            )
+        )
+    )
+)
+-----
+<?php
+// Missing NS separator
+use Foo {Bar, Baz};
+-----
+!!php7
+Syntax error, unexpected '{', expecting ';' from 3:9 to 3:9
+array(
+    0: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: Foo
+                    )
+                )
+                alias: Foo
+            )
+        )
+        comments: array(
+            0: // Missing NS separator
+        )
+    )
+    1: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: Bar
+            )
+        )
+    )
+    2: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: Baz
+            )
+        )
+    )
+)
+-----
+<?php
+// Extra NS separator
+use Foo\{\Bar};
+-----
+Syntax error, unexpected T_NS_SEPARATOR, expecting T_STRING or T_FUNCTION or T_CONST from 3:10 to 3:10
+array(
+    0: Expr_ConstFetch(
+        name: Name_FullyQualified(
+            parts: array(
+                0: Bar
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUsePositions.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUsePositions.test
new file mode 100644
index 000000000..fd40e6772
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUsePositions.test
@@ -0,0 +1,28 @@
+Ensure correct file position attributes for group use prefix
+-----
+<?php
+use Foo\Bar\{Baz};
+-----
+!!positions
+array(
+    0: Stmt_GroupUse[2:1 - 2:17](
+        type: TYPE_UNKNOWN (0)
+        prefix: Name[2:5 - 2:11](
+            parts: array(
+                0: Foo
+                1: Bar
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse[2:14 - 2:16](
+                type: TYPE_NORMAL (1)
+                name: Name[2:14 - 2:16](
+                    parts: array(
+                        0: Baz
+                    )
+                )
+                alias: Baz
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUseTrailingComma.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUseTrailingComma.test
new file mode 100644
index 000000000..e7767bc39
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/groupUseTrailingComma.test
@@ -0,0 +1,47 @@
+Group use can have trailing comma
+-----
+<?php
+use A\{B,};
+use function A\{b,};
+-----
+!!php7
+array(
+    0: Stmt_GroupUse(
+        type: TYPE_UNKNOWN (0)
+        prefix: Name(
+            parts: array(
+                0: A
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_NORMAL (1)
+                name: Name(
+                    parts: array(
+                        0: B
+                    )
+                )
+                alias: B
+            )
+        )
+    )
+    1: Stmt_GroupUse(
+        type: TYPE_FUNCTION (2)
+        prefix: Name(
+            parts: array(
+                0: A
+            )
+        )
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: b
+                    )
+                )
+                alias: b
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/invalidName.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/invalidName.test
new file mode 100644
index 000000000..5047c4b27
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/invalidName.test
@@ -0,0 +1,83 @@
+Invalid namespace names
+-----
+<?php namespace self;
+-----
+Cannot use 'self' as namespace name from 1:17 to 1:20
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: self
+            )
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php namespace PARENT;
+-----
+Cannot use 'PARENT' as namespace name from 1:17 to 1:22
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: PARENT
+            )
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php namespace static;
+-----
+Syntax error, unexpected T_STATIC, expecting T_STRING or T_NS_SEPARATOR or '{' from 1:17 to 1:22
+array(
+)
+-----
+<?php use A as self;
+-----
+Cannot use A as self because 'self' is a special class name from 1:16 to 1:19
+array(
+    0: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: A
+                    )
+                )
+                alias: self
+            )
+        )
+    )
+)
+-----
+<?php use B as PARENT;
+-----
+Cannot use B as PARENT because 'PARENT' is a special class name from 1:16 to 1:21
+array(
+    0: Stmt_Use(
+        type: TYPE_NORMAL (1)
+        uses: array(
+            0: Stmt_UseUse(
+                type: TYPE_UNKNOWN (0)
+                name: Name(
+                    parts: array(
+                        0: B
+                    )
+                )
+                alias: PARENT
+            )
+        )
+    )
+)
+-----
+<?php use C as static;
+-----
+Syntax error, unexpected T_STATIC, expecting T_STRING from 1:16 to 1:21
+array(
+)
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/mix.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/mix.test
new file mode 100644
index 000000000..0fbfbf424
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/mix.test
@@ -0,0 +1,103 @@
+Namespace types cannot be mixed
+-----
+<?php
+namespace A;
+echo 1;
+namespace B {
+    echo 2;
+}
+echo 3;
+-----
+Cannot mix bracketed namespace declarations with unbracketed namespace declarations on line 4
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+        stmts: array(
+            0: Stmt_Echo(
+                exprs: array(
+                    0: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    1: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: B
+            )
+        )
+        stmts: array(
+            0: Stmt_Echo(
+                exprs: array(
+                    0: Scalar_LNumber(
+                        value: 2
+                    )
+                )
+            )
+        )
+    )
+    2: Stmt_Echo(
+        exprs: array(
+            0: Scalar_LNumber(
+                value: 3
+            )
+        )
+    )
+)
+-----
+<?php
+namespace A {
+    echo 1;
+}
+echo 2;
+namespace B;
+echo 3;
+-----
+Cannot mix bracketed namespace declarations with unbracketed namespace declarations on line 6
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+        stmts: array(
+            0: Stmt_Echo(
+                exprs: array(
+                    0: Scalar_LNumber(
+                        value: 1
+                    )
+                )
+            )
+        )
+    )
+    1: Stmt_Echo(
+        exprs: array(
+            0: Scalar_LNumber(
+                value: 2
+            )
+        )
+    )
+    2: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: B
+            )
+        )
+        stmts: array(
+            0: Stmt_Echo(
+                exprs: array(
+                    0: Scalar_LNumber(
+                        value: 3
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/name.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/name.test
new file mode 100644
index 000000000..922d26cb1
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/name.test
@@ -0,0 +1,42 @@
+Different name types
+-----
+<?php
+
+A;
+A\B;
+\A\B;
+namespace\A\B;
+-----
+array(
+    0: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+    )
+    1: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: A
+                1: B
+            )
+        )
+    )
+    2: Expr_ConstFetch(
+        name: Name_FullyQualified(
+            parts: array(
+                0: A
+                1: B
+            )
+        )
+    )
+    3: Expr_ConstFetch(
+        name: Name_Relative(
+            parts: array(
+                0: A
+                1: B
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/nested.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/nested.test
new file mode 100644
index 000000000..840daffe9
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/nested.test
@@ -0,0 +1,30 @@
+Nested namespaces are not allowed
+-----
+<?php
+namespace A {
+    namespace B {
+
+    }
+}
+-----
+Namespace declarations cannot be nested from 3:5 to 5:5
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+        stmts: array(
+            0: Stmt_Namespace(
+                name: Name(
+                    parts: array(
+                        0: B
+                    )
+                )
+                stmts: array(
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/notBraced.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/notBraced.test
new file mode 100644
index 000000000..d4d1017b3
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/notBraced.test
@@ -0,0 +1,45 @@
+Semicolon style namespaces
+-----
+<?php
+
+namespace Foo\Bar;
+foo;
+
+namespace Bar;
+bar;
+-----
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: Foo
+                1: Bar
+            )
+        )
+        stmts: array(
+            0: Expr_ConstFetch(
+                name: Name(
+                    parts: array(
+                        0: foo
+                    )
+                )
+            )
+        )
+    )
+    1: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: Bar
+            )
+        )
+        stmts: array(
+            0: Expr_ConstFetch(
+                name: Name(
+                    parts: array(
+                        0: bar
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/nsAfterHashbang.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/nsAfterHashbang.test
new file mode 100644
index 000000000..6d452538d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/nsAfterHashbang.test
@@ -0,0 +1,22 @@
+Hashbang followed by namespace declaration
+-----
+#!/usr/bin/env php
+<?php
+
+namespace A;
+-----
+array(
+    0: Stmt_InlineHTML(
+        value: #!/usr/bin/env php
+
+    )
+    1: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/outsideStmt.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/outsideStmt.test
new file mode 100644
index 000000000..198daa487
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/outsideStmt.test
@@ -0,0 +1,58 @@
+Some statements may occur outside of namespaces
+-----
+<?php
+declare(A='B');
+namespace B {
+
+}
+__halt_compiler()
+?>
+Hi!
+-----
+array(
+    0: Stmt_Declare(
+        declares: array(
+            0: Stmt_DeclareDeclare(
+                key: A
+                value: Scalar_String(
+                    value: B
+                )
+            )
+        )
+        stmts: null
+    )
+    1: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: B
+            )
+        )
+        stmts: array(
+        )
+    )
+    2: Stmt_HaltCompiler(
+        remaining: Hi!
+    )
+)
+-----
+<?php
+/* Comment */
+;
+namespace Foo;
+-----
+array(
+    0: Stmt_Nop(
+        comments: array(
+            0: /* Comment */
+        )
+    )
+    1: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: Foo
+            )
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/namespace/outsideStmtInvalid.test b/lib/nikic/php-parser/test/code/parser/stmt/namespace/outsideStmtInvalid.test
new file mode 100644
index 000000000..737112d73
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/namespace/outsideStmtInvalid.test
@@ -0,0 +1,105 @@
+There (mostly) can't be statements outside of namespaces
+-----
+<?php
+echo 1;
+echo 2;
+namespace A;
+-----
+Namespace declaration statement has to be the very first statement in the script on line 4
+array(
+    0: Stmt_Echo(
+        exprs: array(
+            0: Scalar_LNumber(
+                value: 1
+            )
+        )
+    )
+    1: Stmt_Echo(
+        exprs: array(
+            0: Scalar_LNumber(
+                value: 2
+            )
+        )
+    )
+    2: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+        stmts: array(
+        )
+    )
+)
+-----
+<?php
+namespace A {}
+echo 1;
+-----
+No code may exist outside of namespace {} from 3:1 to 3:7
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+        stmts: array(
+        )
+    )
+    1: Stmt_Echo(
+        exprs: array(
+            0: Scalar_LNumber(
+                value: 1
+            )
+        )
+    )
+)
+-----
+<?php
+namespace A {}
+declare(ticks=1);
+foo();
+namespace B {}
+-----
+No code may exist outside of namespace {} from 3:1 to 3:17
+array(
+    0: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: A
+            )
+        )
+        stmts: array(
+        )
+    )
+    1: Stmt_Declare(
+        declares: array(
+            0: Stmt_DeclareDeclare(
+                key: ticks
+                value: Scalar_LNumber(
+                    value: 1
+                )
+            )
+        )
+        stmts: null
+    )
+    2: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+        args: array(
+        )
+    )
+    3: Stmt_Namespace(
+        name: Name(
+            parts: array(
+                0: B
+            )
+        )
+        stmts: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/switch.test b/lib/nikic/php-parser/test/code/parser/stmt/switch.test
new file mode 100644
index 000000000..fc24508e1
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/switch.test
@@ -0,0 +1,81 @@
+Switch
+-----
+<?php
+
+switch ($a) {
+    case 0:
+        break;
+    // Comment
+    case 1;
+    default:
+}
+
+// alternative syntax
+switch ($a):
+endswitch;
+
+// leading semicolon
+switch ($a) { ; }
+switch ($a): ; endswitch;
+-----
+array(
+    0: Stmt_Switch(
+        cond: Expr_Variable(
+            name: a
+        )
+        cases: array(
+            0: Stmt_Case(
+                cond: Scalar_LNumber(
+                    value: 0
+                )
+                stmts: array(
+                    0: Stmt_Break(
+                        num: null
+                    )
+                )
+            )
+            1: Stmt_Case(
+                cond: Scalar_LNumber(
+                    value: 1
+                )
+                stmts: array(
+                )
+                comments: array(
+                    0: // Comment
+                )
+            )
+            2: Stmt_Case(
+                cond: null
+                stmts: array(
+                )
+            )
+        )
+    )
+    1: Stmt_Switch(
+        cond: Expr_Variable(
+            name: a
+        )
+        cases: array(
+        )
+        comments: array(
+            0: // alternative syntax
+        )
+    )
+    2: Stmt_Switch(
+        cond: Expr_Variable(
+            name: a
+        )
+        cases: array(
+        )
+        comments: array(
+            0: // leading semicolon
+        )
+    )
+    3: Stmt_Switch(
+        cond: Expr_Variable(
+            name: a
+        )
+        cases: array(
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/tryCatch.test b/lib/nikic/php-parser/test/code/parser/stmt/tryCatch.test
new file mode 100644
index 000000000..8f7c5ec69
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/tryCatch.test
@@ -0,0 +1,130 @@
+Try/catch
+-----
+<?php
+
+try {
+    doTry();
+} catch (A $b) {
+    doCatchA();
+} catch (B $c) {
+    doCatchB();
+} finally {
+    doFinally();
+}
+
+// no finally
+try { }
+catch (A $b) { }
+
+// no catch
+try { }
+finally { }
+
+-----
+array(
+    0: Stmt_TryCatch(
+        stmts: array(
+            0: Expr_FuncCall(
+                name: Name(
+                    parts: array(
+                        0: doTry
+                    )
+                )
+                args: array(
+                )
+            )
+        )
+        catches: array(
+            0: Stmt_Catch(
+                types: array(
+                    0: Name(
+                        parts: array(
+                            0: A
+                        )
+                    )
+                )
+                var: b
+                stmts: array(
+                    0: Expr_FuncCall(
+                        name: Name(
+                            parts: array(
+                                0: doCatchA
+                            )
+                        )
+                        args: array(
+                        )
+                    )
+                )
+            )
+            1: Stmt_Catch(
+                types: array(
+                    0: Name(
+                        parts: array(
+                            0: B
+                        )
+                    )
+                )
+                var: c
+                stmts: array(
+                    0: Expr_FuncCall(
+                        name: Name(
+                            parts: array(
+                                0: doCatchB
+                            )
+                        )
+                        args: array(
+                        )
+                    )
+                )
+            )
+        )
+        finally: Stmt_Finally(
+            stmts: array(
+                0: Expr_FuncCall(
+                    name: Name(
+                        parts: array(
+                            0: doFinally
+                        )
+                    )
+                    args: array(
+                    )
+                )
+            )
+        )
+    )
+    1: Stmt_TryCatch(
+        stmts: array(
+        )
+        catches: array(
+            0: Stmt_Catch(
+                types: array(
+                    0: Name(
+                        parts: array(
+                            0: A
+                        )
+                    )
+                )
+                var: b
+                stmts: array(
+                )
+            )
+        )
+        finally: null
+        comments: array(
+            0: // no finally
+        )
+    )
+    2: Stmt_TryCatch(
+        stmts: array(
+        )
+        catches: array(
+        )
+        finally: Stmt_Finally(
+            stmts: array(
+            )
+        )
+        comments: array(
+            0: // no catch
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/tryWithoutCatch.test b/lib/nikic/php-parser/test/code/parser/stmt/tryWithoutCatch.test
new file mode 100644
index 000000000..ad113d94e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/tryWithoutCatch.test
@@ -0,0 +1,27 @@
+Cannot use try without catch or finally
+-----
+<?php
+
+try {
+    foo();
+}
+-----
+Cannot use try without catch or finally from 3:1 to 5:1
+array(
+    0: Stmt_TryCatch(
+        stmts: array(
+            0: Expr_FuncCall(
+                name: Name(
+                    parts: array(
+                        0: foo
+                    )
+                )
+                args: array(
+                )
+            )
+        )
+        catches: array(
+        )
+        finally: null
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/parser/stmt/unset.test b/lib/nikic/php-parser/test/code/parser/stmt/unset.test
new file mode 100644
index 000000000..c69679ef5
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/parser/stmt/unset.test
@@ -0,0 +1,26 @@
+Unset
+-----
+<?php
+
+unset($a);
+unset($b, $c);
+-----
+array(
+    0: Stmt_Unset(
+        vars: array(
+            0: Expr_Variable(
+                name: a
+            )
+        )
+    )
+    1: Stmt_Unset(
+        vars: array(
+            0: Expr_Variable(
+                name: b
+            )
+            1: Expr_Variable(
+                name: c
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/comments.test b/lib/nikic/php-parser/test/code/prettyPrinter/comments.test
new file mode 100644
index 000000000..34a9f93d8
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/comments.test
@@ -0,0 +1,67 @@
+Comments
+-----
+<?php
+
+function justForIndentation()
+{
+    // Some text
+    # Some text
+    /* Some text */
+    /** Some text */
+    /**
+     * Some text.
+     * Some more text.
+     */
+    /*
+     * Some text.
+     * Some more text.
+     */
+    /*
+        Some text.
+        Some more text.
+    */
+    /* Some text.
+       More text. */
+    /* Some text.
+       More text.
+       Even more text. */
+    $foo;
+}
+-----
+function justForIndentation()
+{
+    // Some text
+    # Some text
+    /* Some text */
+    /** Some text */
+    /**
+     * Some text.
+     * Some more text.
+     */
+    /*
+     * Some text.
+     * Some more text.
+     */
+    /*
+        Some text.
+        Some more text.
+    */
+    /* Some text.
+       More text. */
+    /* Some text.
+       More text.
+       Even more text. */
+    $foo;
+}
+-----
+<?php
+
+function test()
+{
+    // empty
+}
+-----
+function test()
+{
+    // empty
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/commentsInCommaList.test b/lib/nikic/php-parser/test/code/prettyPrinter/commentsInCommaList.test
new file mode 100644
index 000000000..d0e42ef68
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/commentsInCommaList.test
@@ -0,0 +1,53 @@
+Comments in arrays and function calls
+-----
+<?php
+
+$arr = [
+    // Foo
+    $foo,
+    // Bar
+    $bar,
+    // Discarded
+];
+[
+    // Foo
+    $foo,
+    ,
+    // Bar
+    $bar,
+] = $arr;
+foo(
+    // Foo
+    $foo,
+    // Bar
+    $bar
+);
+new Foo(
+    // Foo
+    $foo
+);
+-----
+!!php7
+$arr = [
+    // Foo
+    $foo,
+    // Bar
+    $bar,
+];
+[
+    // Foo
+    $foo,
+    ,
+    // Bar
+    $bar,
+] = $arr;
+foo(
+    // Foo
+    $foo,
+    // Bar
+    $bar
+);
+new Foo(
+    // Foo
+    $foo
+);
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/anonymousClass.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/anonymousClass.test
new file mode 100644
index 000000000..1f2451712
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/anonymousClass.test
@@ -0,0 +1,27 @@
+Anonymous classes
+-----
+<?php
+
+new class {};
+new class extends A implements B, C {};
+new class($a) extends A {
+    private $a;
+    public function __construct($a) {
+        $this->a = $a;
+    }
+};
+-----
+new class
+{
+};
+new class extends A implements B, C
+{
+};
+new class($a) extends A
+{
+    private $a;
+    public function __construct($a)
+    {
+        $this->a = $a;
+    }
+};
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/arrayDestructuring.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/arrayDestructuring.test
new file mode 100644
index 000000000..bff1999e4
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/arrayDestructuring.test
@@ -0,0 +1,14 @@
+Array destructuring
+-----
+<?php
+
+[$a, $b] = [$c, $d];
+[, $a, , , $b, ,] = $foo;
+[, [[$a]], $b] = $bar;
+['a' => $b, 'b' => $a] = $baz;
+-----
+!!php7
+[$a, $b] = [$c, $d];
+[, $a, , , $b, ] = $foo;
+[, [[$a]], $b] = $bar;
+['a' => $b, 'b' => $a] = $baz;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/call.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/call.test
new file mode 100644
index 000000000..0ec8925cf
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/call.test
@@ -0,0 +1,13 @@
+Calls
+-----
+<?php
+
+f($a);
+f(&$a);
+f(...$a);
+f($a, &$b, ...$c);
+-----
+f($a);
+f(&$a);
+f(...$a);
+f($a, &$b, ...$c);
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/closure.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/closure.test
new file mode 100644
index 000000000..7e4fcfd05
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/closure.test
@@ -0,0 +1,18 @@
+Closures
+-----
+<?php
+
+$closureWithArgs = function ($arg1, $arg2) {
+    $comment = 'closure body';
+};
+
+$closureWithArgsAndVars = function ($arg1, $arg2) use($var1, $var2) {
+    $comment = 'closure body';
+};
+-----
+$closureWithArgs = function ($arg1, $arg2) {
+    $comment = 'closure body';
+};
+$closureWithArgsAndVars = function ($arg1, $arg2) use($var1, $var2) {
+    $comment = 'closure body';
+};
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/constant_deref.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/constant_deref.test
new file mode 100644
index 000000000..1371d4225
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/constant_deref.test
@@ -0,0 +1,13 @@
+Constant/literal dereferencing
+-----
+<?php
+
+FOO[0];
+FOO::BAR[0];
+'FOO'[0];
+array(FOO)[0];
+-----
+FOO[0];
+FOO::BAR[0];
+'FOO'[0];
+array(FOO)[0];
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/docStrings.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/docStrings.test
new file mode 100644
index 000000000..a4a60acea
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/docStrings.test
@@ -0,0 +1,86 @@
+Literals
+-----
+<?php
+
+<<<'STR'
+STR;
+<<<STR
+STR;
+
+<<<'STR'
+A
+B
+STR;
+<<<STR
+A
+B
+STR;
+
+<<<'STR'
+a\nb$c
+STR;
+<<<STR
+a\\nb\$c
+STR;
+
+<<<STR
+a$b
+{$c->d}
+STR;
+
+call(
+    <<<STR
+A
+STR
+    , <<<STR
+B
+STR
+);
+
+function test() {
+    <<<STR
+Foo
+STR;
+    <<<STR
+    Bar
+STR;
+}
+-----
+<<<'STR'
+STR;
+<<<STR
+STR;
+<<<'STR'
+A
+B
+STR;
+<<<STR
+A
+B
+STR;
+<<<'STR'
+a\nb$c
+STR;
+<<<STR
+a\\nb\$c
+STR;
+<<<STR
+a{$b}
+{$c->d}
+STR;
+call(<<<STR
+A
+STR
+, <<<STR
+B
+STR
+);
+function test()
+{
+    <<<STR
+Foo
+STR;
+    <<<STR
+    Bar
+STR;
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/include.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/include.test
new file mode 100644
index 000000000..3c4077987
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/include.test
@@ -0,0 +1,7 @@
+Include
+-----
+<?php
+
+(include $foo) && (include $bar);
+-----
+(include $foo) && (include $bar);
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/intrinsics.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/intrinsics.test
new file mode 100644
index 000000000..f1a1adcd5
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/intrinsics.test
@@ -0,0 +1,29 @@
+isset, empty, unset, exit, die, clone, eval
+-----
+<?php
+
+isset($a, $a[$b]);
+empty($a);
+empty('foo');
+unset($a, $a[$b]);
+exit;
+exit();
+exit(1);
+die;
+die();
+die('foo');
+clone $foo;
+eval('str');
+-----
+isset($a, $a[$b]);
+empty($a);
+empty('foo');
+unset($a, $a[$b]);
+exit;
+exit;
+exit(1);
+die;
+die;
+die('foo');
+clone $foo;
+eval('str');
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/list.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/list.test
new file mode 100644
index 000000000..608ced6a6
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/list.test
@@ -0,0 +1,19 @@
+list()
+-----
+<?php
+
+list() = $a;
+list($a) = $b;
+list($a, $b, $c) = $d;
+list(, $a) = $b;
+list(, , $a, , $b) = $c;
+list(list($a)) = $b;
+list(, list(, list(, $a), $b)) = $c;
+-----
+list() = $a;
+list($a) = $b;
+list($a, $b, $c) = $d;
+list(, $a) = $b;
+list(, , $a, , $b) = $c;
+list(list($a)) = $b;
+list(, list(, list(, $a), $b)) = $c;
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/literals.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/literals.test
new file mode 100644
index 000000000..166718cf7
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/literals.test
@@ -0,0 +1,154 @@
+Literals
+-----
+<?php
+
+// magic constants
+__LINE__;
+__FILE__;
+__DIR__;
+__FUNCTION__;
+__CLASS__;
+__TRAIT__;
+__METHOD__;
+__NAMESPACE__;
+
+// not actually literals, but close
+null;
+true;
+false;
+NULL;
+TRUE;
+FALSE;
+
+// integers (normalized to decimal)
+0;
+11;
+011;
+0x11;
+0b11;
+
+// floats (normalized to ... something)
+0.;
+.0;
+0.0;
+0e1000;
+1.0;
+1e100;
+1e1000;
+1E-100;
+1000000000000000000000000000000000000000000000000000000000000000000000000000000000000;
+378282246310005.0;
+10000000000000002.0;
+
+// strings (single quoted)
+'a';
+'a
+b';
+"a";
+"a\nb";
+'a\'b';
+
+// strings (double quoted)
+"a'b";
+"a\b";
+"$a";
+"a$b";
+"$a$b";
+"$a $b";
+"a${b}c";
+"a{$b}c";
+"a$a[b]c";
+"\{$A}";
+"\{ $A }";
+"\\{$A}";
+"\\{ $A }";
+"{$$A}[B]";
+"$$A[B]";
+
+// make sure indentation doesn't mess anything up
+function foo()
+{
+    "a\nb";
+    'a
+b';
+    'a
+    b';
+}
+
+// shell exec (similar to double quoted string)
+`foo`;
+`foo$a`;
+`foo{$a}bar`;
+`\`\'\"`;
+-----
+// magic constants
+__LINE__;
+__FILE__;
+__DIR__;
+__FUNCTION__;
+__CLASS__;
+__TRAIT__;
+__METHOD__;
+__NAMESPACE__;
+// not actually literals, but close
+null;
+true;
+false;
+NULL;
+TRUE;
+FALSE;
+// integers (normalized to decimal)
+0;
+11;
+011;
+0x11;
+0b11;
+// floats (normalized to ... something)
+0.0;
+0.0;
+0.0;
+0.0;
+1.0;
+1.0E+100;
+\INF;
+1.0E-100;
+1.0E+84;
+378282246310005.0;
+10000000000000002.0;
+// strings (single quoted)
+'a';
+'a
+b';
+"a";
+"a\nb";
+'a\'b';
+// strings (double quoted)
+"a'b";
+"a\\b";
+"{$a}";
+"a{$b}";
+"{$a}{$b}";
+"{$a} {$b}";
+"a{$b}c";
+"a{$b}c";
+"a{$a['b']}c";
+"\\{{$A}}";
+"\\{ {$A} }";
+"\\{$A}";
+"\\{ {$A} }";
+"{${$A}}[B]";
+"\${$A['B']}";
+// make sure indentation doesn't mess anything up
+function foo()
+{
+    "a\nb";
+    'a
+b';
+    'a
+    b';
+}
+// shell exec (similar to double quoted string)
+`foo`;
+`foo{$a}`;
+`foo{$a}bar`;
+`\`\\'\\"`;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/numbers.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/numbers.test
new file mode 100644
index 000000000..c85f36bd8
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/numbers.test
@@ -0,0 +1,35 @@
+Number literals
+-----
+<?php
+
+0;
++0;
+-0;
+0.0;
+-0.0;
+42;
+-42;
+42.0;
+-42.0;
+42.5;
+-42.5;
+1e42;
+-1e42;
+1e1000;
+-1e1000;
+-----
+0;
++0;
+-0;
+0.0;
+-0.0;
+42;
+-42;
+42.0;
+-42.0;
+42.5;
+-42.5;
+1.0E+42;
+-1.0E+42;
+\INF;
+-\INF;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/operators.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/operators.test
new file mode 100644
index 000000000..72b68418f
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/operators.test
@@ -0,0 +1,144 @@
+Basic operators
+-----
+<?php
+
+$a ** $b;
+
+++$a;
+--$a;
+$a++;
+$a--;
+
+@$a;
+~$a;
+-$a;
++$a;
+
+(int) $a;
+(integer) $a;
+(float) $a;
+(double) $a;
+(real) $a;
+(string) $a;
+(binary) $a;
+(array) $a;
+(object) $a;
+(bool) $a;
+(boolean) $a;
+(unset) $a;
+
+$a * $b;
+$a / $b;
+$a % $b;
+$a + $b;
+$a - $b;
+$a . $b;
+$a << $b;
+$a >> $b;
+$a < $b;
+$a <= $b;
+$a > $b;
+$a >= $b;
+$a == $b;
+$a != $b;
+$a <> $b;
+$a === $b;
+$a !== $b;
+$a <=> $b;
+$a & $b;
+$a ^ $b;
+$a | $b;
+$a && $b;
+$a || $b;
+$a ? $b : $c;
+$a ?: $c;
+$a ?? $c;
+
+$a = $b;
+$a **= $b;
+$a *= $b;
+$a /= $b;
+$a %= $b;
+$a += $b;
+$a -= $b;
+$a .= $b;
+$a <<= $b;
+$a >>= $b;
+$a &= $b;
+$a ^= $b;
+$a |= $b;
+$a =& $b;
+
+$a and $b;
+$a xor $b;
+$a or $b;
+
+$a instanceof Foo;
+$a instanceof $b;
+-----
+$a ** $b;
+++$a;
+--$a;
+$a++;
+$a--;
+@$a;
+~$a;
+-$a;
++$a;
+(int) $a;
+(int) $a;
+(double) $a;
+(double) $a;
+(double) $a;
+(string) $a;
+(string) $a;
+(array) $a;
+(object) $a;
+(bool) $a;
+(bool) $a;
+(unset) $a;
+$a * $b;
+$a / $b;
+$a % $b;
+$a + $b;
+$a - $b;
+$a . $b;
+$a << $b;
+$a >> $b;
+$a < $b;
+$a <= $b;
+$a > $b;
+$a >= $b;
+$a == $b;
+$a != $b;
+$a != $b;
+$a === $b;
+$a !== $b;
+$a <=> $b;
+$a & $b;
+$a ^ $b;
+$a | $b;
+$a && $b;
+$a || $b;
+$a ? $b : $c;
+$a ?: $c;
+$a ?? $c;
+$a = $b;
+$a **= $b;
+$a *= $b;
+$a /= $b;
+$a %= $b;
+$a += $b;
+$a -= $b;
+$a .= $b;
+$a <<= $b;
+$a >>= $b;
+$a &= $b;
+$a ^= $b;
+$a |= $b;
+$a =& $b;
+$a and $b;
+$a xor $b;
+$a or $b;
+$a instanceof Foo;
+$a instanceof $b;
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/parentheses.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/parentheses.test
new file mode 100644
index 000000000..a49c1108d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/parentheses.test
@@ -0,0 +1,86 @@
+Pretty printer generates least-parentheses output
+-----
+<?php
+
+echo 'abc' . 'cde' . 'fgh';
+echo 'abc' . ('cde' . 'fgh');
+
+echo 'abc' . 1 + 2 . 'fgh';
+echo 'abc' . (1 + 2) . 'fgh';
+
+echo 1 * 2 + 3 / 4 % 5 . 6;
+echo 1 * (2 + 3) / (4 % (5 . 6));
+
+$a = $b = $c = $d = $f && true;
+($a = $b = $c = $d = $f) && true;
+$a = $b = $c = $d = $f and true;
+$a = $b = $c = $d = ($f and true);
+
+$a ? $b : $c ? $d : $e ? $f : $g;
+$a ? $b : ($c ? $d : ($e ? $f : $g));
+$a ? $b ? $c : $d : $f;
+
+$a ?? $b ?? $c;
+($a ?? $b) ?? $c;
+$a ?? ($b ? $c : $d);
+$a || ($b ?? $c);
+
+(1 > 0) > (1 < 0);
+++$a + $b;
+$a + $b++;
+
+$a ** $b ** $c;
+($a ** $b) ** $c;
+-1 ** 2;
+
+yield from $a and yield from $b;
+yield from ($a and yield from $b);
+
+print ($a and print $b);
+
+-(-$a);
++(+$a);
+-(--$a);
++(++$a);
+
+// The following will currently add unnecessary parentheses, because the pretty printer is not aware that assignment
+// and incdec only work on variables.
+!$a = $b;
+++$a ** $b;
+$a ** $b++;
+-----
+echo 'abc' . 'cde' . 'fgh';
+echo 'abc' . ('cde' . 'fgh');
+echo 'abc' . 1 + 2 . 'fgh';
+echo 'abc' . (1 + 2) . 'fgh';
+echo 1 * 2 + 3 / 4 % 5 . 6;
+echo 1 * (2 + 3) / (4 % (5 . 6));
+$a = $b = $c = $d = $f && true;
+($a = $b = $c = $d = $f) && true;
+$a = $b = $c = $d = $f and true;
+$a = $b = $c = $d = ($f and true);
+$a ? $b : $c ? $d : $e ? $f : $g;
+$a ? $b : ($c ? $d : ($e ? $f : $g));
+$a ? $b ? $c : $d : $f;
+$a ?? $b ?? $c;
+($a ?? $b) ?? $c;
+$a ?? ($b ? $c : $d);
+$a || ($b ?? $c);
+(1 > 0) > (1 < 0);
+++$a + $b;
+$a + $b++;
+$a ** $b ** $c;
+($a ** $b) ** $c;
+-1 ** 2;
+yield from $a and yield from $b;
+yield from ($a and yield from $b);
+print ($a and print $b);
+-(-$a);
++(+$a);
+-(--$a);
++(++$a);
+// The following will currently add unnecessary parentheses, because the pretty printer is not aware that assignment
+// and incdec only work on variables.
+!($a = $b);
+(++$a) ** $b;
+$a ** ($b++);
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/shortArraySyntax.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/shortArraySyntax.test
new file mode 100644
index 000000000..082c2e047
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/shortArraySyntax.test
@@ -0,0 +1,11 @@
+Short array syntax
+-----
+<?php
+
+[];
+array(1, 2, 3);
+['a' => 'b', 'c' => 'd'];
+-----
+[];
+array(1, 2, 3);
+['a' => 'b', 'c' => 'd'];
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/stringEscaping.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/stringEscaping.test
new file mode 100644
index 000000000..02877ad32
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/stringEscaping.test
@@ -0,0 +1,23 @@
+Escape sequences in double-quoted strings
+-----
+<?php
+"\n\r\t\f\v\$\"\\";
+"@@{ implode(range("\0", "\37")) }@@";
+"\0000\0001";
+
+<<<DOC
+\n\r\t\f\v\$\"\\
+@@{ implode(range("\0", "\37")) }@@
+\0000\0001
+DOC;
+
+-----
+"\n\r\t\f\v\$\"\\";
+"\0\1\2\3\4\5\6\7\10\t\n\v\f\r\16\17\20\21\22\23\24\25\26\27\30\31\32\33\34\35\36\37";
+"\0000\0001";
+<<<DOC
+@@{ "\n\r" }@@\t\f\v\$\\"\\
+\0\1\2\3\4\5\6\7\10\t@@{ "\n" }@@\v\f@@{ "\r" }@@\16\17\20\21\22\23\24\25\26\27\30\31\32\33\34\35\36\37
+\0000\0001
+DOC
+;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/uvs.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/uvs.test
new file mode 100644
index 000000000..e336fb578
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/uvs.test
@@ -0,0 +1,23 @@
+Uniform variable syntax
+-----
+<?php
+
+(function() {})();
+array('a', 'b')()();
+A::$b::$c;
+$A::$b[$c]();
+$A::{$b[$c]}();
+A::$$b[$c]();
+($a->b)();
+(A::$b)();
+-----
+!!php7
+(function () {
+})();
+array('a', 'b')()();
+A::$b::$c;
+$A::$b[$c]();
+$A::{$b[$c]}();
+A::${$b}[$c]();
+($a->b)();
+(A::$b)();
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/variables.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/variables.test
new file mode 100644
index 000000000..4e0fa2e12
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/variables.test
@@ -0,0 +1,73 @@
+Variables
+-----
+<?php
+
+$a;
+$$a;
+${$a};
+$a->b;
+$a->b();
+$a->b($c);
+$a->$b();
+$a->{$b}();
+$a->$b[$c]();
+$$a->b;
+$a[$b];
+$a[$b]();
+$$a[$b];
+$a::B;
+$a::$b;
+$a::b();
+$a::b($c);
+$a::$b();
+$a::$b[$c];
+$a::$b[$c]($d);
+$a::{$b[$c]}($d);
+$a::{$b->c}();
+A::$$b[$c]();
+a();
+$a();
+$a()[$b];
+$a->b()[$c];
+$a::$b()[$c];
+(new A)->b;
+(new A())->b();
+(new $$a)[$b];
+(new $a->b)->c;
+
+global $a, $$a, $$a[$b], $$a->b;
+-----
+!!php5
+$a;
+${$a};
+${$a};
+$a->b;
+$a->b();
+$a->b($c);
+$a->{$b}();
+$a->{$b}();
+$a->{$b[$c]}();
+${$a}->b;
+$a[$b];
+$a[$b]();
+${$a[$b]};
+$a::B;
+$a::$b;
+$a::b();
+$a::b($c);
+$a::$b();
+$a::$b[$c];
+$a::{$b[$c]}($d);
+$a::{$b[$c]}($d);
+$a::{$b->c}();
+A::${$b[$c]}();
+a();
+$a();
+$a()[$b];
+$a->b()[$c];
+$a::$b()[$c];
+(new A())->b;
+(new A())->b();
+(new ${$a}())[$b];
+(new $a->b())->c;
+global $a, ${$a}, ${$a[$b]}, ${$a->b};
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/expr/yield.test b/lib/nikic/php-parser/test/code/prettyPrinter/expr/yield.test
new file mode 100644
index 000000000..12ab7dec1
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/expr/yield.test
@@ -0,0 +1,46 @@
+Yield
+-----
+<?php
+
+function gen()
+{
+    yield;
+    yield $a;
+    yield $a => $b;
+    $a = yield;
+    $a = (yield $b);
+    $a = (yield $b => $c);
+}
+// TODO Get rid of parens for cases 2 and 3
+-----
+function gen()
+{
+    yield;
+    (yield $a);
+    (yield $a => $b);
+    $a = yield;
+    $a = (yield $b);
+    $a = (yield $b => $c);
+}
+// TODO Get rid of parens for cases 2 and 3
+-----
+<?php
+
+function gen()
+{
+    $a = yield $b;
+    $a = yield $b => $c;
+    yield from $a;
+    $a = yield from $b;
+}
+// TODO Get rid of parens for last case
+-----
+!!php7
+function gen()
+{
+    $a = (yield $b);
+    $a = (yield $b => $c);
+    yield from $a;
+    $a = (yield from $b);
+}
+// TODO Get rid of parens for last case
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/inlineHTMLandPHPtest.file-test b/lib/nikic/php-parser/test/code/prettyPrinter/inlineHTMLandPHPtest.file-test
new file mode 100644
index 000000000..b33eb527d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/inlineHTMLandPHPtest.file-test
@@ -0,0 +1,58 @@
+File containing both inline HTML and PHP
+-----
+HTML
+<?php
+echo 'PHP';
+-----
+HTML
+<?php
+echo 'PHP';
+-----
+<?php
+echo 'PHP';
+?>
+HTML
+-----
+<?php
+
+echo 'PHP';
+?>
+HTML
+-----
+HTML
+<?php
+echo 'PHP';
+?>
+HTML
+-----
+HTML
+<?php
+echo 'PHP';
+?>
+HTML
+-----
+HTML
+<?php
+echo 'PHP';
+?>
+HTML
+<?php
+echo 'PHP';
+?>
+HTML
+-----
+HTML
+<?php
+echo 'PHP';
+?>
+HTML
+<?php
+echo 'PHP';
+?>
+HTML
+-----
+HTML<?php echo 'PHP'; ?>HTML
+-----
+HTML<?php
+echo 'PHP';
+?>HTML
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/onlyInlineHTML.file-test b/lib/nikic/php-parser/test/code/prettyPrinter/onlyInlineHTML.file-test
new file mode 100644
index 000000000..e98071914
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/onlyInlineHTML.file-test
@@ -0,0 +1,19 @@
+File containing only inline HTML
+-----
+Hallo World
+Foo Bar
+Bar Foo
+World Hallo
+-----
+Hallo World
+Foo Bar
+Bar Foo
+World Hallo
+-----
+
+
+Test
+-----
+
+
+Test
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/onlyPHP.file-test b/lib/nikic/php-parser/test/code/prettyPrinter/onlyPHP.file-test
new file mode 100644
index 000000000..9550b107e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/onlyPHP.file-test
@@ -0,0 +1,16 @@
+File containing only PHP
+-----
+<?php
+
+echo 'Foo Bar';
+echo 'Bar Foo';
+-----
+<?php
+
+echo 'Foo Bar';
+echo 'Bar Foo';
+-----
+<?php
+
+-----
+<?php
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/alias.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/alias.test
new file mode 100644
index 000000000..ef5695d8e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/alias.test
@@ -0,0 +1,20 @@
+Aliases (namespacing)
+-----
+<?php
+
+use A\B;
+use C\D as E;
+use F\G as H, J;
+
+use function foo\bar;
+use function foo\bar as baz;
+use const foo\BAR;
+use const foo\BAR as BAZ;
+-----
+use A\B;
+use C\D as E;
+use F\G as H, J;
+use function foo\bar;
+use function foo\bar as baz;
+use const foo\BAR;
+use const foo\BAR as BAZ;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/break_continue.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/break_continue.test
new file mode 100644
index 000000000..4773df1d3
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/break_continue.test
@@ -0,0 +1,13 @@
+break/continue
+-----
+<?php
+
+continue;
+continue 2;
+break;
+break 2;
+-----
+continue;
+continue 2;
+break;
+break 2;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/class.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/class.test
new file mode 100644
index 000000000..5225d2a6e
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/class.test
@@ -0,0 +1,53 @@
+Class
+-----
+<?php
+
+class Foo extends Bar implements ABC, \DEF, namespace\GHI
+{
+    var $a = 'foo';
+    private $b = 'bar';
+    static $c = 'baz';
+    function test()
+    {
+        $this->a = 'bar';
+        echo 'test';
+    }
+
+    protected function baz() {}
+    public function foo() {}
+    abstract static function bar() {}
+}
+
+trait Bar
+{
+    function test()
+    {
+    }
+}
+-----
+class Foo extends Bar implements ABC, \DEF, namespace\GHI
+{
+    var $a = 'foo';
+    private $b = 'bar';
+    static $c = 'baz';
+    function test()
+    {
+        $this->a = 'bar';
+        echo 'test';
+    }
+    protected function baz()
+    {
+    }
+    public function foo()
+    {
+    }
+    static abstract function bar()
+    {
+    }
+}
+trait Bar
+{
+    function test()
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/class_const.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/class_const.test
new file mode 100644
index 000000000..e73ad4304
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/class_const.test
@@ -0,0 +1,20 @@
+Class constants
+-----
+<?php
+
+class Foo
+{
+    const A = 1, B = 2;
+    public const C = 3, D = 4;
+    protected const E = 5, F = 6;
+    private const G = 7, H = 8;
+}
+-----
+!!php7
+class Foo
+{
+    const A = 1, B = 2;
+    public const C = 3, D = 4;
+    protected const E = 5, F = 6;
+    private const G = 7, H = 8;
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/const.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/const.test
new file mode 100644
index 000000000..6b1764206
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/const.test
@@ -0,0 +1,11 @@
+Constant declarations
+-----
+<?php
+
+const FOO = 'BAR';
+const FOO = 1 + 1;
+const FOO = BAR, BAR = FOO;
+-----
+const FOO = 'BAR';
+const FOO = 1 + 1;
+const FOO = BAR, BAR = FOO;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/declare.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/declare.test
new file mode 100644
index 000000000..fd48e6953
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/declare.test
@@ -0,0 +1,17 @@
+declare
+-----
+<?php
+
+declare (strict_types=1);
+declare (ticks=1) {
+    foo();
+}
+declare (ticks=2) {
+}
+-----
+declare (strict_types=1);
+declare (ticks=1) {
+    foo();
+}
+declare (ticks=2) {
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/do_while.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/do_while.test
new file mode 100644
index 000000000..532d475a0
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/do_while.test
@@ -0,0 +1,10 @@
+doWhile
+-----
+<?php
+
+do {
+
+} while (true);
+-----
+do {
+} while (true);
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/for.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/for.test
new file mode 100644
index 000000000..ef7ac4a93
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/for.test
@@ -0,0 +1,28 @@
+for
+-----
+<?php
+
+for ($i = 0; $i < 10; $i++) {
+
+}
+
+for ($i = 0,$j = 0; $i < 10; $i++) {
+
+}
+
+for ($i = 0; $i < 10;) {
+
+}
+
+for (;;) {
+
+}
+-----
+for ($i = 0; $i < 10; $i++) {
+}
+for ($i = 0, $j = 0; $i < 10; $i++) {
+}
+for ($i = 0; $i < 10;) {
+}
+for (;;) {
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/foreach.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/foreach.test
new file mode 100644
index 000000000..44c3a1acf
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/foreach.test
@@ -0,0 +1,28 @@
+foreach
+-----
+<?php
+
+foreach ($arr as $val) {
+
+}
+
+foreach ($arr as &$val) {
+
+}
+
+foreach ($arr as $key => $val) {
+
+}
+
+foreach ($arr as $key => &$val) {
+
+}
+-----
+foreach ($arr as $val) {
+}
+foreach ($arr as &$val) {
+}
+foreach ($arr as $key => $val) {
+}
+foreach ($arr as $key => &$val) {
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/function_signatures.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/function_signatures.test
new file mode 100644
index 000000000..af1088a05
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/function_signatures.test
@@ -0,0 +1,43 @@
+Function signatures
+-----
+<?php
+
+interface A
+{
+    function f1();
+    function f2($a, $b);
+    function f3(&$a);
+    function f4(A\B $a);
+    function f4(array $a);
+    function f5(callable $a);
+    function f6(&$a);
+    function f7(...$a);
+    function f8(&...$a);
+    function f9(A &$a);
+    function f10(A ...$a);
+    function f11(A &$a);
+    function f12(A &...$a);
+    function f13($a) : array;
+    function f14($a) : callable;
+    function f15($a) : B\C;
+}
+-----
+interface A
+{
+    function f1();
+    function f2($a, $b);
+    function f3(&$a);
+    function f4(A\B $a);
+    function f4(array $a);
+    function f5(callable $a);
+    function f6(&$a);
+    function f7(...$a);
+    function f8(&...$a);
+    function f9(A &$a);
+    function f10(A ...$a);
+    function f11(A &$a);
+    function f12(A &...$a);
+    function f13($a) : array;
+    function f14($a) : callable;
+    function f15($a) : B\C;
+}
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/global_static_variables.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/global_static_variables.test
new file mode 100644
index 000000000..eea776a5a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/global_static_variables.test
@@ -0,0 +1,11 @@
+Global and static variables
+-----
+<?php
+
+global $a, $$a, ${$a[$a]};
+static $a, $b;
+static $a = 'foo', $b = 'bar';
+-----
+global $a, ${$a}, ${$a[$a]};
+static $a, $b;
+static $a = 'foo', $b = 'bar';
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/goto.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/goto.test
new file mode 100644
index 000000000..61c781200
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/goto.test
@@ -0,0 +1,9 @@
+goto
+-----
+<?php
+
+marker:
+goto marker;
+-----
+marker:
+goto marker;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/groupUse.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/groupUse.test
new file mode 100644
index 000000000..de086c877
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/groupUse.test
@@ -0,0 +1,16 @@
+Group use declaration
+-----
+<?php
+use A\{B};
+use A\{B\C, D};
+use A\B\{C\D, E};
+use function A\{b\c, d};
+use const A\{B\C, D};
+use A\B\{C\D, function b\c, const D};
+-----
+use A\{B};
+use A\{B\C, D};
+use A\B\{C\D, E};
+use function A\{b\c, d};
+use const A\{B\C, D};
+use A\B\{C\D, function b\c, const D};
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/haltCompiler.file-test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/haltCompiler.file-test
new file mode 100644
index 000000000..a427a64c8
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/haltCompiler.file-test
@@ -0,0 +1,27 @@
+__halt_compiler
+-----
+<?php
+
+echo 'foo';
+__halt_compiler();
+!!!
+???
+-----
+<?php
+
+echo 'foo';
+__halt_compiler();
+!!!
+???
+-----
+<?php
+
+echo 'foo';
+__halt_compiler();
+<?php
+-----
+<?php
+
+echo 'foo';
+__halt_compiler();
+<?php
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/if.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/if.test
new file mode 100644
index 000000000..8debb2ec3
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/if.test
@@ -0,0 +1,16 @@
+if/elseif/else
+-----
+<?php
+
+if ($expr) {
+
+} elseif ($expr2) {
+
+} else {
+
+}
+-----
+if ($expr) {
+} elseif ($expr2) {
+} else {
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/multiCatch.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/multiCatch.test
new file mode 100644
index 000000000..8e3f12b4d
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/multiCatch.test
@@ -0,0 +1,19 @@
+Multi catch
+-----
+<?php
+try {
+    $x;
+} catch (X|Y $e1) {
+    $y;
+} catch (\A|B\C $e2) {
+    $z;
+}
+-----
+!!php7
+try {
+    $x;
+} catch (X|Y $e1) {
+    $y;
+} catch (\A|B\C $e2) {
+    $z;
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/namespaces.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/namespaces.test
new file mode 100644
index 000000000..939470b5b
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/namespaces.test
@@ -0,0 +1,50 @@
+Namespaces
+-----
+<?php
+
+namespace Foo;
+
+function foo()
+{
+}
+
+namespace Bar;
+
+function bar()
+{
+}
+-----
+namespace Foo;
+
+function foo()
+{
+}
+namespace Bar;
+
+function bar()
+{
+}
+-----
+<?php
+
+namespace Foo {
+    function foo()
+    {
+    }
+}
+
+namespace {
+    function glob() {
+    }
+}
+-----
+namespace Foo {
+    function foo()
+    {
+    }
+}
+namespace {
+    function glob()
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/nullable_types.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/nullable_types.test
new file mode 100644
index 000000000..6a40e2019
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/nullable_types.test
@@ -0,0 +1,11 @@
+Nullable types
+-----
+<?php
+function test(?Foo $bar, ?string $foo, ?\Xyz $zyx) : ?Baz
+{
+}
+-----
+!!php7
+function test(?Foo $bar, ?string $foo, ?\Xyz $zyx) : ?Baz
+{
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/switch.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/switch.test
new file mode 100644
index 000000000..871ff54ba
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/switch.test
@@ -0,0 +1,37 @@
+switch/case/default
+-----
+<?php
+
+switch ($expr) {
+    case 0:
+        echo 'First case, with a break';
+        break;
+    case 1:
+        echo 'Second case, which falls through';
+    case 2:
+    case 3:
+    case 4:
+        echo 'Third case, return instead of break';
+        return;
+    // Comment
+    default:
+        echo 'Default case';
+        break;
+}
+-----
+switch ($expr) {
+    case 0:
+        echo 'First case, with a break';
+        break;
+    case 1:
+        echo 'Second case, which falls through';
+    case 2:
+    case 3:
+    case 4:
+        echo 'Third case, return instead of break';
+        return;
+    // Comment
+    default:
+        echo 'Default case';
+        break;
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/throw.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/throw.test
new file mode 100644
index 000000000..23408936a
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/throw.test
@@ -0,0 +1,7 @@
+throw
+-----
+<?php
+
+throw $e;
+-----
+throw $e;
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/traitUse.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/traitUse.test
new file mode 100644
index 000000000..7455ea008
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/traitUse.test
@@ -0,0 +1,25 @@
+Trait uses and adaptations
+-----
+<?php
+
+class A
+{
+    use B, C, D {
+        f as g;
+        f as private;
+        f as private g;
+        B::f as g;
+        B::f insteadof C, D;
+    }
+}
+-----
+class A
+{
+    use B, C, D {
+        f as g;
+        f as private;
+        f as private g;
+        B::f as g;
+        B::f insteadof C, D;
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/tryCatch.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/tryCatch.test
new file mode 100644
index 000000000..044934de9
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/tryCatch.test
@@ -0,0 +1,24 @@
+tryCatch
+-----
+<?php
+
+try {
+
+} catch (Exception $e) {
+
+}
+
+try {
+} catch (Exception $e) {
+
+} finally {
+
+}
+-----
+try {
+} catch (Exception $e) {
+}
+try {
+} catch (Exception $e) {
+} finally {
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/test/code/prettyPrinter/stmt/while.test b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/while.test
new file mode 100644
index 000000000..4e6dadaeb
--- /dev/null
+++ b/lib/nikic/php-parser/test/code/prettyPrinter/stmt/while.test
@@ -0,0 +1,10 @@
+while
+-----
+<?php
+
+while (true) {
+
+}
+-----
+while (true) {
+}
\ No newline at end of file
diff --git a/lib/pear/pear_exception/tests/PEAR/ExceptionTest.php b/lib/pear/pear_exception/tests/PEAR/ExceptionTest.php
new file mode 100644
index 000000000..61d2df4f1
--- /dev/null
+++ b/lib/pear/pear_exception/tests/PEAR/ExceptionTest.php
@@ -0,0 +1,78 @@
+<?php
+$localFile = __DIR__ . '/../../PEAR/Exception.php';
+if (file_exists($localFile)) {
+    require_once $localFile;
+} else {
+    require_once 'PEAR/Exception.php';
+}
+
+class PEAR_ExceptionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @expectedException PEAR_Exception
+     * @expectedExceptionMessage foo
+     */
+    public function testThrow()
+    {
+        throw new PEAR_Exception('foo');
+    }
+
+    public function testGetCauseNone()
+    {
+        $e = new PEAR_Exception('foo bar');
+        $this->assertNull($e->getCause());
+    }
+
+    public function testGetCauseException()
+    {
+        $cause = new Exception('foo bar');
+        $e = new PEAR_Exception('I caught an exception', $cause);
+        $this->assertNotNull($e->getCause());
+        $this->assertInstanceOf('Exception', $e->getCause());
+        $this->assertEquals($cause, $e->getCause());
+    }
+
+    public function testGetCauseMessage()
+    {
+        $cause = new Exception('foo bar');
+        $e = new PEAR_Exception('I caught an exception', $cause);
+
+        $e->getCauseMessage($causes);
+        $this->assertEquals('I caught an exception', $causes[0]['message']);
+        $this->assertEquals('foo bar', $causes[1]['message']);
+    }
+
+    public function testGetTraceSafe()
+    {
+        $e = new PEAR_Exception('oops');
+        $this->assertInternalType('array', $e->getTraceSafe());
+    }
+
+    public function testGetErrorClass()
+    {
+        $e = new PEAR_Exception('oops');
+        $this->assertEquals('PEAR_ExceptionTest', $e->getErrorClass());
+    }
+
+    public function testGetErrorMethod()
+    {
+        $e = new PEAR_Exception('oops');
+        $this->assertEquals('testGetErrorMethod', $e->getErrorMethod());
+    }
+
+    public function test__toString()
+    {
+        $e = new PEAR_Exception('oops');
+        $this->assertInternalType('string', (string) $e);
+        $this->assertContains('oops', (string) $e);
+    }
+
+    public function testToHtml()
+    {
+        $e = new PEAR_Exception('oops');
+        $html = $e->toHtml();
+        $this->assertInternalType('string', $html);
+        $this->assertContains('oops', $html);
+    }
+}
+?>
diff --git a/lib/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/lib/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
new file mode 100644
index 000000000..9ecb6c4b0
--- /dev/null
+++ b/lib/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace Psr\Log\Test;
+
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * 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 TestCase
+{
+    /**
+     * @return LoggerInterface
+     */
+    abstract public function getLogger();
+
+    /**
+     * This must return the log messages in order.
+     *
+     * The simple formatting of the messages is: "<LOG LEVEL> <MESSAGE>".
+     *
+     * Example ->error('Foo') would yield "error Foo".
+     *
+     * @return string[]
+     */
+    abstract public 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()
+    {
+        if (method_exists($this, 'createPartialMock')) {
+            $dummy = $this->createPartialMock('Psr\Log\Test\DummyTest', array('__toString'));
+        } else {
+            $dummy = $this->getMock('Psr\Log\Test\DummyTest', array('__toString'));
+        }
+        $dummy->expects($this->once())
+            ->method('__toString')
+            ->will($this->returnValue('DUMMY'));
+
+        $this->getLogger()->warning($dummy);
+
+        $expected = array('warning DUMMY');
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testContextCanContainAnything()
+    {
+        $closed = fopen('php://memory', 'r');
+        fclose($closed);
+
+        $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'),
+            'closed' => $closed,
+        );
+
+        $this->getLogger()->warning('Crazy context data', $context);
+
+        $expected = array('warning Crazy context data');
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
+    {
+        $logger = $this->getLogger();
+        $logger->warning('Random message', array('exception' => 'oops'));
+        $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+
+        $expected = array(
+            'warning Random message',
+            'critical Uncaught Exception!'
+        );
+        $this->assertEquals($expected, $this->getLogs());
+    }
+}
+
+class DummyTest
+{
+    public function __toString()
+    {
+        return 'DummyTest';
+    }
+}
diff --git a/lib/psr/log/Psr/Log/Test/TestLogger.php b/lib/psr/log/Psr/Log/Test/TestLogger.php
new file mode 100644
index 000000000..1be323049
--- /dev/null
+++ b/lib/psr/log/Psr/Log/Test/TestLogger.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace Psr\Log\Test;
+
+use Psr\Log\AbstractLogger;
+
+/**
+ * Used for testing purposes.
+ *
+ * It records all records and gives you access to them for verification.
+ *
+ * @method bool hasEmergency($record)
+ * @method bool hasAlert($record)
+ * @method bool hasCritical($record)
+ * @method bool hasError($record)
+ * @method bool hasWarning($record)
+ * @method bool hasNotice($record)
+ * @method bool hasInfo($record)
+ * @method bool hasDebug($record)
+ *
+ * @method bool hasEmergencyRecords()
+ * @method bool hasAlertRecords()
+ * @method bool hasCriticalRecords()
+ * @method bool hasErrorRecords()
+ * @method bool hasWarningRecords()
+ * @method bool hasNoticeRecords()
+ * @method bool hasInfoRecords()
+ * @method bool hasDebugRecords()
+ *
+ * @method bool hasEmergencyThatContains($message)
+ * @method bool hasAlertThatContains($message)
+ * @method bool hasCriticalThatContains($message)
+ * @method bool hasErrorThatContains($message)
+ * @method bool hasWarningThatContains($message)
+ * @method bool hasNoticeThatContains($message)
+ * @method bool hasInfoThatContains($message)
+ * @method bool hasDebugThatContains($message)
+ *
+ * @method bool hasEmergencyThatMatches($message)
+ * @method bool hasAlertThatMatches($message)
+ * @method bool hasCriticalThatMatches($message)
+ * @method bool hasErrorThatMatches($message)
+ * @method bool hasWarningThatMatches($message)
+ * @method bool hasNoticeThatMatches($message)
+ * @method bool hasInfoThatMatches($message)
+ * @method bool hasDebugThatMatches($message)
+ *
+ * @method bool hasEmergencyThatPasses($message)
+ * @method bool hasAlertThatPasses($message)
+ * @method bool hasCriticalThatPasses($message)
+ * @method bool hasErrorThatPasses($message)
+ * @method bool hasWarningThatPasses($message)
+ * @method bool hasNoticeThatPasses($message)
+ * @method bool hasInfoThatPasses($message)
+ * @method bool hasDebugThatPasses($message)
+ */
+class TestLogger extends AbstractLogger
+{
+    /**
+     * @var array
+     */
+    public $records = [];
+
+    public $recordsByLevel = [];
+
+    /**
+     * @inheritdoc
+     */
+    public function log($level, $message, array $context = [])
+    {
+        $record = [
+            'level' => $level,
+            'message' => $message,
+            'context' => $context,
+        ];
+
+        $this->recordsByLevel[$record['level']][] = $record;
+        $this->records[] = $record;
+    }
+
+    public function hasRecords($level)
+    {
+        return isset($this->recordsByLevel[$level]);
+    }
+
+    public function hasRecord($record, $level)
+    {
+        if (is_string($record)) {
+            $record = ['message' => $record];
+        }
+        return $this->hasRecordThatPasses(function ($rec) use ($record) {
+            if ($rec['message'] !== $record['message']) {
+                return false;
+            }
+            if (isset($record['context']) && $rec['context'] !== $record['context']) {
+                return false;
+            }
+            return true;
+        }, $level);
+    }
+
+    public function hasRecordThatContains($message, $level)
+    {
+        return $this->hasRecordThatPasses(function ($rec) use ($message) {
+            return strpos($rec['message'], $message) !== false;
+        }, $level);
+    }
+
+    public function hasRecordThatMatches($regex, $level)
+    {
+        return $this->hasRecordThatPasses(function ($rec) use ($regex) {
+            return preg_match($regex, $rec['message']) > 0;
+        }, $level);
+    }
+
+    public function hasRecordThatPasses(callable $predicate, $level)
+    {
+        if (!isset($this->recordsByLevel[$level])) {
+            return false;
+        }
+        foreach ($this->recordsByLevel[$level] as $i => $rec) {
+            if (call_user_func($predicate, $rec, $i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function __call($method, $args)
+    {
+        if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
+            $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
+            $level = strtolower($matches[2]);
+            if (method_exists($this, $genericMethod)) {
+                $args[] = $level;
+                return call_user_func_array([$this, $genericMethod], $args);
+            }
+        }
+        throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
+    }
+
+    public function reset()
+    {
+        $this->records = [];
+        $this->recordsByLevel = [];
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php b/lib/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
new file mode 100644
index 000000000..d1fa9535c
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+
+abstract class AbstractRedisAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testExpiration' => 'Testing expiration slows down the test suite',
+        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
+    ];
+
+    protected static $redis;
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
+    }
+
+    public static function setUpBeforeClass()
+    {
+        if (!\extension_loaded('redis')) {
+            self::markTestSkipped('Extension redis required.');
+        }
+        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
+            $e = error_get_last();
+            self::markTestSkipped($e['message']);
+        }
+    }
+
+    public static function tearDownAfterClass()
+    {
+        self::$redis = null;
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/AdapterTestCase.php b/lib/symfony/cache/Tests/Adapter/AdapterTestCase.php
new file mode 100644
index 000000000..5758a2861
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/AdapterTestCase.php
@@ -0,0 +1,175 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Cache\IntegrationTests\CachePoolTest;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\PruneableInterface;
+
+abstract class AdapterTestCase extends CachePoolTest
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (!\array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && \defined('HHVM_VERSION')) {
+            $this->skippedTests['testDeferredSaveWithoutCommit'] = 'Destructors are called late on HHVM.';
+        }
+
+        if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createCachePool() instanceof PruneableInterface) {
+            $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
+        }
+    }
+
+    public function testDefaultLifeTime()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = $this->createCachePool(2);
+
+        $item = $cache->getItem('key.dlt');
+        $item->set('value');
+        $cache->save($item);
+        sleep(1);
+
+        $item = $cache->getItem('key.dlt');
+        $this->assertTrue($item->isHit());
+
+        sleep(2);
+        $item = $cache->getItem('key.dlt');
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testExpiration()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = $this->createCachePool();
+        $cache->save($cache->getItem('k1')->set('v1')->expiresAfter(2));
+        $cache->save($cache->getItem('k2')->set('v2')->expiresAfter(366 * 86400));
+
+        sleep(3);
+        $item = $cache->getItem('k1');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get(), "Item's value must be null when isHit() is false.");
+
+        $item = $cache->getItem('k2');
+        $this->assertTrue($item->isHit());
+        $this->assertSame('v2', $item->get());
+    }
+
+    public function testNotUnserializable()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = $this->createCachePool();
+
+        $item = $cache->getItem('foo');
+        $cache->save($item->set(new NotUnserializable()));
+
+        $item = $cache->getItem('foo');
+        $this->assertFalse($item->isHit());
+
+        foreach ($cache->getItems(['foo']) as $item) {
+        }
+        $cache->save($item->set(new NotUnserializable()));
+
+        foreach ($cache->getItems(['foo']) as $item) {
+        }
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testPrune()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        if (!method_exists($this, 'isPruned')) {
+            $this->fail('Test classes for pruneable caches must implement `isPruned($cache, $name)` method.');
+        }
+
+        /** @var PruneableInterface|CacheItemPoolInterface $cache */
+        $cache = $this->createCachePool();
+
+        $doSet = function ($name, $value, \DateInterval $expiresAfter = null) use ($cache) {
+            $item = $cache->getItem($name);
+            $item->set($value);
+
+            if ($expiresAfter) {
+                $item->expiresAfter($expiresAfter);
+            }
+
+            $cache->save($item);
+        };
+
+        $doSet('foo', 'foo-val', new \DateInterval('PT05S'));
+        $doSet('bar', 'bar-val', new \DateInterval('PT10S'));
+        $doSet('baz', 'baz-val', new \DateInterval('PT15S'));
+        $doSet('qux', 'qux-val', new \DateInterval('PT20S'));
+
+        sleep(30);
+        $cache->prune();
+        $this->assertTrue($this->isPruned($cache, 'foo'));
+        $this->assertTrue($this->isPruned($cache, 'bar'));
+        $this->assertTrue($this->isPruned($cache, 'baz'));
+        $this->assertTrue($this->isPruned($cache, 'qux'));
+
+        $doSet('foo', 'foo-val');
+        $doSet('bar', 'bar-val', new \DateInterval('PT20S'));
+        $doSet('baz', 'baz-val', new \DateInterval('PT40S'));
+        $doSet('qux', 'qux-val', new \DateInterval('PT80S'));
+
+        $cache->prune();
+        $this->assertFalse($this->isPruned($cache, 'foo'));
+        $this->assertFalse($this->isPruned($cache, 'bar'));
+        $this->assertFalse($this->isPruned($cache, 'baz'));
+        $this->assertFalse($this->isPruned($cache, 'qux'));
+
+        sleep(30);
+        $cache->prune();
+        $this->assertFalse($this->isPruned($cache, 'foo'));
+        $this->assertTrue($this->isPruned($cache, 'bar'));
+        $this->assertFalse($this->isPruned($cache, 'baz'));
+        $this->assertFalse($this->isPruned($cache, 'qux'));
+
+        sleep(30);
+        $cache->prune();
+        $this->assertFalse($this->isPruned($cache, 'foo'));
+        $this->assertTrue($this->isPruned($cache, 'baz'));
+        $this->assertFalse($this->isPruned($cache, 'qux'));
+
+        sleep(30);
+        $cache->prune();
+        $this->assertFalse($this->isPruned($cache, 'foo'));
+        $this->assertTrue($this->isPruned($cache, 'qux'));
+    }
+}
+
+class NotUnserializable implements \Serializable
+{
+    public function serialize()
+    {
+        return serialize(123);
+    }
+
+    public function unserialize($ser)
+    {
+        throw new \Exception(__CLASS__);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/ApcuAdapterTest.php b/lib/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
new file mode 100644
index 000000000..5cca73f56
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Psr\Log\NullLogger;
+use Symfony\Component\Cache\Adapter\ApcuAdapter;
+
+class ApcuAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testExpiration' => 'Testing expiration slows down the test suite',
+        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
+    ];
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)) {
+            $this->markTestSkipped('APCu extension is required.');
+        }
+        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {
+            if ('testWithCliSapi' !== $this->getName()) {
+                $this->markTestSkipped('apc.enable_cli=1 is required.');
+            }
+        }
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Fails transiently on Windows.');
+        }
+
+        return new ApcuAdapter(str_replace('\\', '.', __CLASS__), $defaultLifetime);
+    }
+
+    public function testUnserializable()
+    {
+        $pool = $this->createCachePool();
+
+        $item = $pool->getItem('foo');
+        $item->set(function () {});
+
+        $this->assertFalse($pool->save($item));
+
+        $item = $pool->getItem('foo');
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testVersion()
+    {
+        $namespace = str_replace('\\', '.', \get_class($this));
+
+        $pool1 = new ApcuAdapter($namespace, 0, 'p1');
+
+        $item = $pool1->getItem('foo');
+        $this->assertFalse($item->isHit());
+        $this->assertTrue($pool1->save($item->set('bar')));
+
+        $item = $pool1->getItem('foo');
+        $this->assertTrue($item->isHit());
+        $this->assertSame('bar', $item->get());
+
+        $pool2 = new ApcuAdapter($namespace, 0, 'p2');
+
+        $item = $pool2->getItem('foo');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get());
+
+        $item = $pool1->getItem('foo');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get());
+    }
+
+    public function testNamespace()
+    {
+        $namespace = str_replace('\\', '.', \get_class($this));
+
+        $pool1 = new ApcuAdapter($namespace.'_1', 0, 'p1');
+
+        $item = $pool1->getItem('foo');
+        $this->assertFalse($item->isHit());
+        $this->assertTrue($pool1->save($item->set('bar')));
+
+        $item = $pool1->getItem('foo');
+        $this->assertTrue($item->isHit());
+        $this->assertSame('bar', $item->get());
+
+        $pool2 = new ApcuAdapter($namespace.'_2', 0, 'p1');
+
+        $item = $pool2->getItem('foo');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get());
+
+        $item = $pool1->getItem('foo');
+        $this->assertTrue($item->isHit());
+        $this->assertSame('bar', $item->get());
+    }
+
+    public function testWithCliSapi()
+    {
+        try {
+            // disable PHPUnit error handler to mimic a production environment
+            $isCalled = false;
+            set_error_handler(function () use (&$isCalled) {
+                $isCalled = true;
+            });
+            $pool = new ApcuAdapter(str_replace('\\', '.', __CLASS__));
+            $pool->setLogger(new NullLogger());
+
+            $item = $pool->getItem('foo');
+            $item->isHit();
+            $pool->save($item->set('bar'));
+            $this->assertFalse($isCalled);
+        } finally {
+            restore_error_handler();
+        }
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/ArrayAdapterTest.php b/lib/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
new file mode 100644
index 000000000..e6adc9d01
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class ArrayAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
+        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
+    ];
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new ArrayAdapter($defaultLifetime);
+    }
+
+    public function testGetValuesHitAndMiss()
+    {
+        /** @var ArrayAdapter $cache */
+        $cache = $this->createCachePool();
+
+        // Hit
+        $item = $cache->getItem('foo');
+        $item->set('4711');
+        $cache->save($item);
+
+        $fooItem = $cache->getItem('foo');
+        $this->assertTrue($fooItem->isHit());
+        $this->assertEquals('4711', $fooItem->get());
+
+        // Miss (should be present as NULL in $values)
+        $cache->getItem('bar');
+
+        $values = $cache->getValues();
+
+        $this->assertCount(2, $values);
+        $this->assertArrayHasKey('foo', $values);
+        $this->assertSame(serialize('4711'), $values['foo']);
+        $this->assertArrayHasKey('bar', $values);
+        $this->assertNull($values['bar']);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/ChainAdapterTest.php b/lib/symfony/cache/Tests/Adapter/ChainAdapterTest.php
new file mode 100644
index 000000000..5e48930dd
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/ChainAdapterTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\ChainAdapter;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @group time-sensitive
+ */
+class ChainAdapterTest extends AdapterTestCase
+{
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter(), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
+    }
+
+    public function testEmptyAdaptersException()
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('At least one adapter must be specified.');
+        new ChainAdapter([]);
+    }
+
+    public function testInvalidAdapterException()
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The class "stdClass" does not implement');
+        new ChainAdapter([new \stdClass()]);
+    }
+
+    public function testPrune()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = new ChainAdapter([
+            $this->getPruneableMock(),
+            $this->getNonPruneableMock(),
+            $this->getPruneableMock(),
+        ]);
+        $this->assertTrue($cache->prune());
+
+        $cache = new ChainAdapter([
+            $this->getPruneableMock(),
+            $this->getFailingPruneableMock(),
+            $this->getPruneableMock(),
+        ]);
+        $this->assertFalse($cache->prune());
+    }
+
+    /**
+     * @return MockObject|PruneableCacheInterface
+     */
+    private function getPruneableMock()
+    {
+        $pruneable = $this
+            ->getMockBuilder(PruneableCacheInterface::class)
+            ->getMock();
+
+        $pruneable
+            ->expects($this->atLeastOnce())
+            ->method('prune')
+            ->willReturn(true);
+
+        return $pruneable;
+    }
+
+    /**
+     * @return MockObject|PruneableCacheInterface
+     */
+    private function getFailingPruneableMock()
+    {
+        $pruneable = $this
+            ->getMockBuilder(PruneableCacheInterface::class)
+            ->getMock();
+
+        $pruneable
+            ->expects($this->atLeastOnce())
+            ->method('prune')
+            ->willReturn(false);
+
+        return $pruneable;
+    }
+
+    /**
+     * @return MockObject|AdapterInterface
+     */
+    private function getNonPruneableMock()
+    {
+        return $this
+            ->getMockBuilder(AdapterInterface::class)
+            ->getMock();
+    }
+}
+
+interface PruneableCacheInterface extends PruneableInterface, AdapterInterface
+{
+}
diff --git a/lib/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php b/lib/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
new file mode 100644
index 000000000..8f520cb59
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\DoctrineAdapter;
+use Symfony\Component\Cache\Tests\Fixtures\ArrayCache;
+
+/**
+ * @group time-sensitive
+ */
+class DoctrineAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayCache is not.',
+        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayCache is not.',
+        'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
+    ];
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new DoctrineAdapter(new ArrayCache($defaultLifetime), '', $defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php b/lib/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
new file mode 100644
index 000000000..fa8306826
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class FilesystemAdapterTest extends AdapterTestCase
+{
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new FilesystemAdapter('', $defaultLifetime);
+    }
+
+    public static function tearDownAfterClass()
+    {
+        self::rmdir(sys_get_temp_dir().'/symfony-cache');
+    }
+
+    public static function rmdir($dir)
+    {
+        if (!file_exists($dir)) {
+            return;
+        }
+        if (!$dir || 0 !== strpos(\dirname($dir), sys_get_temp_dir())) {
+            throw new \Exception(__METHOD__."() operates only on subdirs of system's temp dir");
+        }
+        $children = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+        foreach ($children as $child) {
+            if ($child->isDir()) {
+                rmdir($child);
+            } else {
+                unlink($child);
+            }
+        }
+        rmdir($dir);
+    }
+
+    protected function isPruned(CacheItemPoolInterface $cache, $name)
+    {
+        $getFileMethod = (new \ReflectionObject($cache))->getMethod('getFile');
+        $getFileMethod->setAccessible(true);
+
+        return !file_exists($getFileMethod->invoke($cache, $name));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php b/lib/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
new file mode 100644
index 000000000..536e2c2d4
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+
+class MaxIdLengthAdapterTest extends TestCase
+{
+    public function testLongKey()
+    {
+        $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
+            ->setConstructorArgs([str_repeat('-', 10)])
+            ->setMethods(['doHave', 'doFetch', 'doDelete', 'doSave', 'doClear'])
+            ->getMock();
+
+        $cache->expects($this->exactly(2))
+            ->method('doHave')
+            ->withConsecutive(
+                [$this->equalTo('----------:0GTYWa9n4ed8vqNlOT2iEr:')],
+                [$this->equalTo('----------:---------------------------------------')]
+            );
+
+        $cache->hasItem(str_repeat('-', 40));
+        $cache->hasItem(str_repeat('-', 39));
+    }
+
+    public function testLongKeyVersioning()
+    {
+        $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
+            ->setConstructorArgs([str_repeat('-', 26)])
+            ->getMock();
+
+        $cache
+            ->method('doFetch')
+            ->willReturn(['2:']);
+
+        $reflectionClass = new \ReflectionClass(AbstractAdapter::class);
+
+        $reflectionMethod = $reflectionClass->getMethod('getId');
+        $reflectionMethod->setAccessible(true);
+
+        // No versioning enabled
+        $this->assertEquals('--------------------------:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));
+
+        $reflectionProperty = $reflectionClass->getProperty('versioningIsEnabled');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($cache, true);
+
+        // Versioning enabled
+        $this->assertEquals('--------------------------:2:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));
+    }
+
+    public function testTooLongNamespace()
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Namespace must be 26 chars max, 40 given ("----------------------------------------")');
+        $this->getMockBuilder(MaxIdLengthAdapter::class)
+            ->setConstructorArgs([str_repeat('-', 40)])
+            ->getMock();
+    }
+}
+
+abstract class MaxIdLengthAdapter extends AbstractAdapter
+{
+    protected $maxIdLength = 50;
+
+    public function __construct($ns)
+    {
+        parent::__construct($ns);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php b/lib/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
new file mode 100644
index 000000000..3a996079a
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -0,0 +1,198 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Adapter\MemcachedAdapter;
+
+class MemcachedAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
+    ];
+
+    protected static $client;
+
+    public static function setUpBeforeClass()
+    {
+        if (!MemcachedAdapter::isSupported()) {
+            self::markTestSkipped('Extension memcached >=2.2.0 required.');
+        }
+        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
+        self::$client->get('foo');
+        $code = self::$client->getResultCode();
+
+        if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) {
+            self::markTestSkipped('Memcached error: '.strtolower(self::$client->getResultMessage()));
+        }
+    }
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')) : self::$client;
+
+        return new MemcachedAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
+    }
+
+    public function testOptions()
+    {
+        $client = MemcachedAdapter::createConnection([], [
+            'libketama_compatible' => false,
+            'distribution' => 'modula',
+            'compression' => true,
+            'serializer' => 'php',
+            'hash' => 'md5',
+        ]);
+
+        $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
+        $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
+        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
+        $this->assertSame(0, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
+        $this->assertSame(\Memcached::DISTRIBUTION_MODULA, $client->getOption(\Memcached::OPT_DISTRIBUTION));
+    }
+
+    /**
+     * @dataProvider provideBadOptions
+     */
+    public function testBadOptions($name, $value)
+    {
+        $this->expectException('ErrorException');
+        $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
+        MemcachedAdapter::createConnection([], [$name => $value]);
+    }
+
+    public function provideBadOptions()
+    {
+        return [
+            ['foo', 'bar'],
+            ['hash', 'zyx'],
+            ['serializer', 'zyx'],
+            ['distribution', 'zyx'],
+        ];
+    }
+
+    public function testDefaultOptions()
+    {
+        $this->assertTrue(MemcachedAdapter::isSupported());
+
+        $client = MemcachedAdapter::createConnection([]);
+
+        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_TCP_NODELAY));
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
+    }
+
+    public function testOptionSerializer()
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\CacheException');
+        $this->expectExceptionMessage('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
+        if (!\Memcached::HAVE_JSON) {
+            $this->markTestSkipped('Memcached::HAVE_JSON required');
+        }
+
+        new MemcachedAdapter(MemcachedAdapter::createConnection([], ['serializer' => 'json']));
+    }
+
+    /**
+     * @dataProvider provideServersSetting
+     */
+    public function testServersSetting($dsn, $host, $port)
+    {
+        $client1 = MemcachedAdapter::createConnection($dsn);
+        $client2 = MemcachedAdapter::createConnection([$dsn]);
+        $client3 = MemcachedAdapter::createConnection([[$host, $port]]);
+        $expect = [
+            'host' => $host,
+            'port' => $port,
+        ];
+
+        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
+        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
+    }
+
+    public function provideServersSetting()
+    {
+        yield [
+            'memcached://127.0.0.1/50',
+            '127.0.0.1',
+            11211,
+        ];
+        yield [
+            'memcached://localhost:11222?weight=25',
+            'localhost',
+            11222,
+        ];
+        if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
+            yield [
+                'memcached://user:password@127.0.0.1?weight=50',
+                '127.0.0.1',
+                11211,
+            ];
+        }
+        yield [
+            'memcached:///var/run/memcached.sock?weight=25',
+            '/var/run/memcached.sock',
+            0,
+        ];
+        yield [
+            'memcached:///var/local/run/memcached.socket?weight=25',
+            '/var/local/run/memcached.socket',
+            0,
+        ];
+        if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
+            yield [
+                'memcached://user:password@/var/local/run/memcached.socket?weight=25',
+                '/var/local/run/memcached.socket',
+                0,
+            ];
+        }
+    }
+
+    /**
+     * @dataProvider provideDsnWithOptions
+     */
+    public function testDsnWithOptions($dsn, array $options, array $expectedOptions)
+    {
+        $client = MemcachedAdapter::createConnection($dsn, $options);
+
+        foreach ($expectedOptions as $option => $expect) {
+            $this->assertSame($expect, $client->getOption($option));
+        }
+    }
+
+    public function provideDsnWithOptions()
+    {
+        if (!class_exists('\Memcached')) {
+            self::markTestSkipped('Extension memcached required.');
+        }
+
+        yield [
+            'memcached://localhost:11222?retry_timeout=10',
+            [\Memcached::OPT_RETRY_TIMEOUT => 8],
+            [\Memcached::OPT_RETRY_TIMEOUT => 10],
+        ];
+        yield [
+            'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
+            [\Memcached::OPT_RETRY_TIMEOUT => 8],
+            [\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8],
+        ];
+    }
+
+    public function testClear()
+    {
+        $this->assertTrue($this->createCachePool()->clear());
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php b/lib/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php
new file mode 100644
index 000000000..c27140333
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\ProxyAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class NamespacedProxyAdapterTest extends ProxyAdapterTest
+{
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new ProxyAdapter(new ArrayAdapter($defaultLifetime), 'foo', $defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/NullAdapterTest.php b/lib/symfony/cache/Tests/Adapter/NullAdapterTest.php
new file mode 100644
index 000000000..b771fa0ed
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/NullAdapterTest.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Cache\CacheItemInterface;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class NullAdapterTest extends TestCase
+{
+    public function createCachePool()
+    {
+        return new NullAdapter();
+    }
+
+    public function testGetItem()
+    {
+        $adapter = $this->createCachePool();
+
+        $item = $adapter->getItem('key');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
+    }
+
+    public function testHasItem()
+    {
+        $this->assertFalse($this->createCachePool()->hasItem('key'));
+    }
+
+    public function testGetItems()
+    {
+        $adapter = $this->createCachePool();
+
+        $keys = ['foo', 'bar', 'baz', 'biz'];
+
+        /** @var CacheItemInterface[] $items */
+        $items = $adapter->getItems($keys);
+        $count = 0;
+
+        foreach ($items as $key => $item) {
+            $itemKey = $item->getKey();
+
+            $this->assertEquals($itemKey, $key, 'Keys must be preserved when fetching multiple items');
+            $this->assertContains($key, $keys, 'Cache key can not change.');
+            $this->assertFalse($item->isHit());
+
+            // Remove $key for $keys
+            foreach ($keys as $k => $v) {
+                if ($v === $key) {
+                    unset($keys[$k]);
+                }
+            }
+
+            ++$count;
+        }
+
+        $this->assertSame(4, $count);
+    }
+
+    public function testIsHit()
+    {
+        $adapter = $this->createCachePool();
+
+        $item = $adapter->getItem('key');
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testClear()
+    {
+        $this->assertTrue($this->createCachePool()->clear());
+    }
+
+    public function testDeleteItem()
+    {
+        $this->assertTrue($this->createCachePool()->deleteItem('key'));
+    }
+
+    public function testDeleteItems()
+    {
+        $this->assertTrue($this->createCachePool()->deleteItems(['key', 'foo', 'bar']));
+    }
+
+    public function testSave()
+    {
+        $adapter = $this->createCachePool();
+
+        $item = $adapter->getItem('key');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
+
+        $this->assertFalse($adapter->save($item));
+    }
+
+    public function testDeferredSave()
+    {
+        $adapter = $this->createCachePool();
+
+        $item = $adapter->getItem('key');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
+
+        $this->assertFalse($adapter->saveDeferred($item));
+    }
+
+    public function testCommit()
+    {
+        $adapter = $this->createCachePool();
+
+        $item = $adapter->getItem('key');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
+
+        $this->assertFalse($adapter->saveDeferred($item));
+        $this->assertFalse($this->createCachePool()->commit());
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/PdoAdapterTest.php b/lib/symfony/cache/Tests/Adapter/PdoAdapterTest.php
new file mode 100644
index 000000000..dd2a91185
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/PdoAdapterTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\PdoAdapter;
+use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
+
+/**
+ * @group time-sensitive
+ */
+class PdoAdapterTest extends AdapterTestCase
+{
+    use PdoPruneableTrait;
+
+    protected static $dbFile;
+
+    public static function setUpBeforeClass()
+    {
+        if (!\extension_loaded('pdo_sqlite')) {
+            self::markTestSkipped('Extension pdo_sqlite required.');
+        }
+
+        self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
+
+        $pool = new PdoAdapter('sqlite:'.self::$dbFile);
+        $pool->createTable();
+    }
+
+    public static function tearDownAfterClass()
+    {
+        @unlink(self::$dbFile);
+    }
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new PdoAdapter('sqlite:'.self::$dbFile, 'ns', $defaultLifetime);
+    }
+
+    public function testCleanupExpiredItems()
+    {
+        $pdo = new \PDO('sqlite:'.self::$dbFile);
+
+        $getCacheItemCount = function () use ($pdo) {
+            return (int) $pdo->query('SELECT COUNT(*) FROM cache_items')->fetch(\PDO::FETCH_COLUMN);
+        };
+
+        $this->assertSame(0, $getCacheItemCount());
+
+        $cache = $this->createCachePool();
+
+        $item = $cache->getItem('some_nice_key');
+        $item->expiresAfter(1);
+        $item->set(1);
+
+        $cache->save($item);
+        $this->assertSame(1, $getCacheItemCount());
+
+        sleep(2);
+
+        $newItem = $cache->getItem($item->getKey());
+        $this->assertFalse($newItem->isHit());
+        $this->assertSame(0, $getCacheItemCount(), 'PDOAdapter must clean up expired items');
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php b/lib/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
new file mode 100644
index 000000000..aa53958cf
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Doctrine\DBAL\DriverManager;
+use Symfony\Component\Cache\Adapter\PdoAdapter;
+use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
+
+/**
+ * @group time-sensitive
+ */
+class PdoDbalAdapterTest extends AdapterTestCase
+{
+    use PdoPruneableTrait;
+
+    protected static $dbFile;
+
+    public static function setUpBeforeClass()
+    {
+        if (!\extension_loaded('pdo_sqlite')) {
+            self::markTestSkipped('Extension pdo_sqlite required.');
+        }
+
+        self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
+
+        $pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
+        $pool->createTable();
+    }
+
+    public static function tearDownAfterClass()
+    {
+        @unlink(self::$dbFile);
+    }
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php b/lib/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
new file mode 100644
index 000000000..751f758cc
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Psr\Cache\CacheItemInterface;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class PhpArrayAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testBasicUsage' => 'PhpArrayAdapter is read-only.',
+        'testBasicUsageWithLongKey' => 'PhpArrayAdapter is read-only.',
+        'testClear' => 'PhpArrayAdapter is read-only.',
+        'testClearWithDeferredItems' => 'PhpArrayAdapter is read-only.',
+        'testDeleteItem' => 'PhpArrayAdapter is read-only.',
+        'testSaveExpired' => 'PhpArrayAdapter is read-only.',
+        'testSaveWithoutExpire' => 'PhpArrayAdapter is read-only.',
+        'testDeferredSave' => 'PhpArrayAdapter is read-only.',
+        'testDeferredSaveWithoutCommit' => 'PhpArrayAdapter is read-only.',
+        'testDeleteItems' => 'PhpArrayAdapter is read-only.',
+        'testDeleteDeferredItem' => 'PhpArrayAdapter is read-only.',
+        'testCommit' => 'PhpArrayAdapter is read-only.',
+        'testSaveDeferredWhenChangingValues' => 'PhpArrayAdapter is read-only.',
+        'testSaveDeferredOverwrite' => 'PhpArrayAdapter is read-only.',
+        'testIsHitDeferred' => 'PhpArrayAdapter is read-only.',
+
+        'testExpiresAt' => 'PhpArrayAdapter does not support expiration.',
+        'testExpiresAtWithNull' => 'PhpArrayAdapter does not support expiration.',
+        'testExpiresAfterWithNull' => 'PhpArrayAdapter does not support expiration.',
+        'testDeferredExpired' => 'PhpArrayAdapter does not support expiration.',
+        'testExpiration' => 'PhpArrayAdapter does not support expiration.',
+
+        'testGetItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testGetItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+
+        'testDefaultLifeTime' => 'PhpArrayAdapter does not allow configuring a default lifetime.',
+        'testPrune' => 'PhpArrayAdapter just proxies',
+    ];
+
+    protected static $file;
+
+    public static function setUpBeforeClass()
+    {
+        self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
+    }
+
+    protected function tearDown()
+    {
+        if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
+            FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
+        }
+    }
+
+    public function createCachePool()
+    {
+        return new PhpArrayAdapterWrapper(self::$file, new NullAdapter());
+    }
+
+    public function testStore()
+    {
+        $arrayWithRefs = [];
+        $arrayWithRefs[0] = 123;
+        $arrayWithRefs[1] = &$arrayWithRefs[0];
+
+        $object = (object) [
+            'foo' => 'bar',
+            'foo2' => 'bar2',
+        ];
+
+        $expected = [
+            'null' => null,
+            'serializedString' => serialize($object),
+            'arrayWithRefs' => $arrayWithRefs,
+            'object' => $object,
+            'arrayWithObject' => ['bar' => $object],
+        ];
+
+        $adapter = $this->createCachePool();
+        $adapter->warmUp($expected);
+
+        foreach ($expected as $key => $value) {
+            $this->assertSame(serialize($value), serialize($adapter->getItem($key)->get()), 'Warm up should create a PHP file that OPCache can load in memory');
+        }
+    }
+
+    public function testStoredFile()
+    {
+        $expected = [
+            'integer' => 42,
+            'float' => 42.42,
+            'boolean' => true,
+            'array_simple' => ['foo', 'bar'],
+            'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
+        ];
+
+        $adapter = $this->createCachePool();
+        $adapter->warmUp($expected);
+
+        $values = eval(substr(file_get_contents(self::$file), 6));
+
+        $this->assertSame($expected, $values, 'Warm up should create a PHP file that OPCache can load in memory');
+    }
+}
+
+class PhpArrayAdapterWrapper extends PhpArrayAdapter
+{
+    public function save(CacheItemInterface $item)
+    {
+        \call_user_func(\Closure::bind(function () use ($item) {
+            $this->values[$item->getKey()] = $item->get();
+            $this->warmUp($this->values);
+            $this->values = eval(substr(file_get_contents($this->file), 6));
+        }, $this, PhpArrayAdapter::class));
+
+        return true;
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php b/lib/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
new file mode 100644
index 000000000..4bdd7580f
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class PhpArrayAdapterWithFallbackTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testGetItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testGetItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
+        'testPrune' => 'PhpArrayAdapter just proxies',
+    ];
+
+    protected static $file;
+
+    public static function setUpBeforeClass()
+    {
+        self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
+    }
+
+    protected function tearDown()
+    {
+        if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
+            FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
+        }
+    }
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new PhpArrayAdapter(self::$file, new FilesystemAdapter('php-array-fallback', $defaultLifetime));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php b/lib/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
new file mode 100644
index 000000000..247160d53
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class PhpFilesAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testDefaultLifeTime' => 'PhpFilesAdapter does not allow configuring a default lifetime.',
+    ];
+
+    public function createCachePool()
+    {
+        if (!PhpFilesAdapter::isSupported()) {
+            $this->markTestSkipped('OPcache extension is not enabled.');
+        }
+
+        return new PhpFilesAdapter('sf-cache');
+    }
+
+    public static function tearDownAfterClass()
+    {
+        FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
+    }
+
+    protected function isPruned(CacheItemPoolInterface $cache, $name)
+    {
+        $getFileMethod = (new \ReflectionObject($cache))->getMethod('getFile');
+        $getFileMethod->setAccessible(true);
+
+        return !file_exists($getFileMethod->invoke($cache, $name));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/PredisAdapterTest.php b/lib/symfony/cache/Tests/Adapter/PredisAdapterTest.php
new file mode 100644
index 000000000..6aadbf266
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/PredisAdapterTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Predis\Connection\StreamConnection;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+
+class PredisAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        self::$redis = new \Predis\Client(['host' => getenv('REDIS_HOST')]);
+    }
+
+    public function testCreateConnection()
+    {
+        $redisHost = getenv('REDIS_HOST');
+
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/1', ['class' => \Predis\Client::class, 'timeout' => 3]);
+        $this->assertInstanceOf(\Predis\Client::class, $redis);
+
+        $connection = $redis->getConnection();
+        $this->assertInstanceOf(StreamConnection::class, $connection);
+
+        $params = [
+            'scheme' => 'tcp',
+            'host' => $redisHost,
+            'path' => '',
+            'dbindex' => '1',
+            'port' => 6379,
+            'class' => 'Predis\Client',
+            'timeout' => 3,
+            'persistent' => 0,
+            'persistent_id' => null,
+            'read_timeout' => 0,
+            'retry_interval' => 0,
+            'lazy' => false,
+            'database' => '1',
+            'password' => null,
+        ];
+        $this->assertSame($params, $connection->getParameters()->toArray());
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php b/lib/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
new file mode 100644
index 000000000..1afabaf1d
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+class PredisClusterAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        self::$redis = new \Predis\Client([['host' => getenv('REDIS_HOST')]]);
+    }
+
+    public static function tearDownAfterClass()
+    {
+        self::$redis = null;
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/lib/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
new file mode 100644
index 000000000..5b09919e2
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+        }
+        self::$redis = new \Predis\Client(explode(' ', $hosts), ['cluster' => 'redis']);
+    }
+
+    public static function tearDownAfterClass()
+    {
+        self::$redis = null;
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/ProxyAdapterTest.php b/lib/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
new file mode 100644
index 000000000..810cb31a2
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Psr\Cache\CacheItemInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\ProxyAdapter;
+use Symfony\Component\Cache\CacheItem;
+
+/**
+ * @group time-sensitive
+ */
+class ProxyAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
+        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
+        'testPrune' => 'ProxyAdapter just proxies',
+    ];
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new ProxyAdapter(new ArrayAdapter(), '', $defaultLifetime);
+    }
+
+    public function testProxyfiedItem()
+    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('OK bar');
+        $item = new CacheItem();
+        $pool = new ProxyAdapter(new TestingArrayAdapter($item));
+
+        $proxyItem = $pool->getItem('foo');
+
+        $this->assertNotSame($item, $proxyItem);
+        $pool->save($proxyItem->set('bar'));
+    }
+}
+
+class TestingArrayAdapter extends ArrayAdapter
+{
+    private $item;
+
+    public function __construct(CacheItemInterface $item)
+    {
+        $this->item = $item;
+    }
+
+    public function getItem($key)
+    {
+        return $this->item;
+    }
+
+    public function save(CacheItemInterface $item)
+    {
+        if ($item === $this->item) {
+            throw new \Exception('OK '.$item->get());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/RedisAdapterTest.php b/lib/symfony/cache/Tests/Adapter/RedisAdapterTest.php
new file mode 100644
index 000000000..edc6a9934
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/RedisAdapterTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Cache\Traits\RedisProxy;
+
+class RedisAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true]);
+    }
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        $adapter = parent::createCachePool($defaultLifetime);
+        $this->assertInstanceOf(RedisProxy::class, self::$redis);
+
+        return $adapter;
+    }
+
+    public function testCreateConnection()
+    {
+        $redisHost = getenv('REDIS_HOST');
+
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost);
+        $this->assertInstanceOf(\Redis::class, $redis);
+        $this->assertTrue($redis->isConnected());
+        $this->assertSame(0, $redis->getDbNum());
+
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
+        $this->assertSame(2, $redis->getDbNum());
+
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
+        $this->assertEquals(3, $redis->getTimeout());
+
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
+        $this->assertEquals(4, $redis->getTimeout());
+
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
+        $this->assertEquals(5, $redis->getReadTimeout());
+    }
+
+    /**
+     * @dataProvider provideFailedCreateConnection
+     */
+    public function testFailedCreateConnection($dsn)
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Redis connection failed');
+        RedisAdapter::createConnection($dsn);
+    }
+
+    public function provideFailedCreateConnection()
+    {
+        return [
+            ['redis://localhost:1234'],
+            ['redis://foo@localhost'],
+            ['redis://localhost/123'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideInvalidCreateConnection
+     */
+    public function testInvalidCreateConnection($dsn)
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid Redis DSN');
+        RedisAdapter::createConnection($dsn);
+    }
+
+    public function provideInvalidCreateConnection()
+    {
+        return [
+            ['foo://localhost'],
+            ['redis://'],
+        ];
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php b/lib/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
new file mode 100644
index 000000000..bd9def326
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+class RedisArrayAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass()
+    {
+        parent::setupBeforeClass();
+        if (!class_exists('RedisArray')) {
+            self::markTestSkipped('The RedisArray class is required.');
+        }
+        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php b/lib/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
new file mode 100644
index 000000000..9c339d2dd
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+class RedisClusterAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (!class_exists('RedisCluster')) {
+            self::markTestSkipped('The RedisCluster class is required.');
+        }
+        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+        }
+
+        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php b/lib/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
new file mode 100644
index 000000000..d8470a2e7
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\SimpleCacheAdapter;
+use Symfony\Component\Cache\Simple\ArrayCache;
+use Symfony\Component\Cache\Simple\FilesystemCache;
+
+/**
+ * @group time-sensitive
+ */
+class SimpleCacheAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testPrune' => 'SimpleCache just proxies',
+    ];
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new SimpleCacheAdapter(new FilesystemCache(), '', $defaultLifetime);
+    }
+
+    public function testValidCacheKeyWithNamespace()
+    {
+        $cache = new SimpleCacheAdapter(new ArrayCache(), 'some_namespace', 0);
+        $item = $cache->getItem('my_key');
+        $item->set('someValue');
+        $cache->save($item);
+
+        $this->assertTrue($cache->getItem('my_key')->isHit(), 'Stored item is successfully retrieved.');
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php b/lib/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
new file mode 100644
index 000000000..0108b9250
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -0,0 +1,318 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Cache\CacheItemInterface;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class TagAwareAdapterTest extends AdapterTestCase
+{
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new TagAwareAdapter(new FilesystemAdapter('', $defaultLifetime));
+    }
+
+    public static function tearDownAfterClass()
+    {
+        FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
+    }
+
+    public function testInvalidTag()
+    {
+        $this->expectException('Psr\Cache\InvalidArgumentException');
+        $pool = $this->createCachePool();
+        $item = $pool->getItem('foo');
+        $item->tag(':');
+    }
+
+    public function testInvalidateTags()
+    {
+        $pool = $this->createCachePool();
+
+        $i0 = $pool->getItem('i0');
+        $i1 = $pool->getItem('i1');
+        $i2 = $pool->getItem('i2');
+        $i3 = $pool->getItem('i3');
+        $foo = $pool->getItem('foo');
+
+        $pool->save($i0->tag('bar'));
+        $pool->save($i1->tag('foo'));
+        $pool->save($i2->tag('foo')->tag('bar'));
+        $pool->save($i3->tag('foo')->tag('baz'));
+        $pool->save($foo);
+
+        $pool->invalidateTags(['bar']);
+
+        $this->assertFalse($pool->getItem('i0')->isHit());
+        $this->assertTrue($pool->getItem('i1')->isHit());
+        $this->assertFalse($pool->getItem('i2')->isHit());
+        $this->assertTrue($pool->getItem('i3')->isHit());
+        $this->assertTrue($pool->getItem('foo')->isHit());
+
+        $pool->invalidateTags(['foo']);
+
+        $this->assertFalse($pool->getItem('i1')->isHit());
+        $this->assertFalse($pool->getItem('i3')->isHit());
+        $this->assertTrue($pool->getItem('foo')->isHit());
+
+        $anotherPoolInstance = $this->createCachePool();
+
+        $this->assertFalse($anotherPoolInstance->getItem('i1')->isHit());
+        $this->assertFalse($anotherPoolInstance->getItem('i3')->isHit());
+        $this->assertTrue($anotherPoolInstance->getItem('foo')->isHit());
+    }
+
+    public function testInvalidateCommits()
+    {
+        $pool1 = $this->createCachePool();
+
+        $foo = $pool1->getItem('foo');
+        $foo->tag('tag');
+
+        $pool1->saveDeferred($foo->set('foo'));
+        $pool1->invalidateTags(['tag']);
+
+        $pool2 = $this->createCachePool();
+        $foo = $pool2->getItem('foo');
+
+        $this->assertTrue($foo->isHit());
+    }
+
+    public function testTagsAreCleanedOnSave()
+    {
+        $pool = $this->createCachePool();
+
+        $i = $pool->getItem('k');
+        $pool->save($i->tag('foo'));
+
+        $i = $pool->getItem('k');
+        $pool->save($i->tag('bar'));
+
+        $pool->invalidateTags(['foo']);
+        $this->assertTrue($pool->getItem('k')->isHit());
+    }
+
+    public function testTagsAreCleanedOnDelete()
+    {
+        $pool = $this->createCachePool();
+
+        $i = $pool->getItem('k');
+        $pool->save($i->tag('foo'));
+        $pool->deleteItem('k');
+
+        $pool->save($pool->getItem('k'));
+        $pool->invalidateTags(['foo']);
+
+        $this->assertTrue($pool->getItem('k')->isHit());
+    }
+
+    public function testTagItemExpiry()
+    {
+        $pool = $this->createCachePool(10);
+
+        $item = $pool->getItem('foo');
+        $item->tag(['baz']);
+        $item->expiresAfter(100);
+
+        $pool->save($item);
+        $pool->invalidateTags(['baz']);
+        $this->assertFalse($pool->getItem('foo')->isHit());
+
+        sleep(20);
+
+        $this->assertFalse($pool->getItem('foo')->isHit());
+    }
+
+    public function testGetPreviousTags()
+    {
+        $pool = $this->createCachePool();
+
+        $i = $pool->getItem('k');
+        $pool->save($i->tag('foo'));
+
+        $i = $pool->getItem('k');
+        $this->assertSame(['foo' => 'foo'], $i->getPreviousTags());
+    }
+
+    public function testPrune()
+    {
+        $cache = new TagAwareAdapter($this->getPruneableMock());
+        $this->assertTrue($cache->prune());
+
+        $cache = new TagAwareAdapter($this->getNonPruneableMock());
+        $this->assertFalse($cache->prune());
+
+        $cache = new TagAwareAdapter($this->getFailingPruneableMock());
+        $this->assertFalse($cache->prune());
+    }
+
+    public function testKnownTagVersionsTtl()
+    {
+        $itemsPool = new FilesystemAdapter('', 10);
+        $tagsPool = $this
+            ->getMockBuilder(AdapterInterface::class)
+            ->getMock();
+
+        $pool = new TagAwareAdapter($itemsPool, $tagsPool, 10);
+
+        $item = $pool->getItem('foo');
+        $item->tag(['baz']);
+        $item->expiresAfter(100);
+
+        $tag = $this->getMockBuilder(CacheItemInterface::class)->getMock();
+        $tag->expects(self::exactly(2))->method('get')->willReturn(10);
+
+        $tagsPool->expects(self::exactly(2))->method('getItems')->willReturn([
+            'baz'.TagAwareAdapter::TAGS_PREFIX => $tag,
+        ]);
+
+        $pool->save($item);
+        $this->assertTrue($pool->getItem('foo')->isHit());
+        $this->assertTrue($pool->getItem('foo')->isHit());
+
+        sleep(20);
+
+        $this->assertTrue($pool->getItem('foo')->isHit());
+
+        sleep(5);
+
+        $this->assertTrue($pool->getItem('foo')->isHit());
+    }
+
+    public function testTagEntryIsCreatedForItemWithoutTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $adapter = new FilesystemAdapter();
+        $this->assertTrue($adapter->hasItem(TagAwareAdapter::TAGS_PREFIX.$itemKey));
+    }
+
+    public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $anotherPool = $this->createCachePool();
+
+        $adapter = new FilesystemAdapter();
+        $adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
+
+        $this->assertFalse($anotherPool->hasItem($itemKey));
+    }
+
+    public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $anotherPool = $this->createCachePool();
+
+        $adapter = new FilesystemAdapter();
+        $adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
+
+        $item = $anotherPool->getItem($itemKey);
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemAndOnlyHasTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $anotherPool = $this->createCachePool();
+
+        $adapter = new FilesystemAdapter();
+        $adapter->deleteItem($itemKey); //simulate losing item but keeping tags
+
+        $this->assertFalse($anotherPool->hasItem($itemKey));
+    }
+
+    public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemAndOnlyHasTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $anotherPool = $this->createCachePool();
+
+        $adapter = new FilesystemAdapter();
+        $adapter->deleteItem($itemKey); //simulate losing item but keeping tags
+
+        $item = $anotherPool->getItem($itemKey);
+        $this->assertFalse($item->isHit());
+    }
+
+    /**
+     * @return MockObject|PruneableCacheInterface
+     */
+    private function getPruneableMock()
+    {
+        $pruneable = $this
+            ->getMockBuilder(PruneableCacheInterface::class)
+            ->getMock();
+
+        $pruneable
+            ->expects($this->atLeastOnce())
+            ->method('prune')
+            ->willReturn(true);
+
+        return $pruneable;
+    }
+
+    /**
+     * @return MockObject|PruneableCacheInterface
+     */
+    private function getFailingPruneableMock()
+    {
+        $pruneable = $this
+            ->getMockBuilder(PruneableCacheInterface::class)
+            ->getMock();
+
+        $pruneable
+            ->expects($this->atLeastOnce())
+            ->method('prune')
+            ->willReturn(false);
+
+        return $pruneable;
+    }
+
+    /**
+     * @return MockObject|AdapterInterface
+     */
+    private function getNonPruneableMock()
+    {
+        return $this
+            ->getMockBuilder(AdapterInterface::class)
+            ->getMock();
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php b/lib/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
new file mode 100644
index 000000000..b11c1f287
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\ProxyAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
+use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
+
+class TagAwareAndProxyAdapterIntegrationTest extends TestCase
+{
+    /**
+     * @dataProvider dataProvider
+     */
+    public function testIntegrationUsingProxiedAdapter(CacheItemPoolInterface $proxiedAdapter)
+    {
+        $cache = new TagAwareAdapter(new ProxyAdapter($proxiedAdapter));
+
+        $item = $cache->getItem('foo');
+        $item->tag(['tag1', 'tag2']);
+        $item->set('bar');
+        $cache->save($item);
+
+        $this->assertSame('bar', $cache->getItem('foo')->get());
+    }
+
+    public function dataProvider()
+    {
+        return [
+            [new ArrayAdapter()],
+            // also testing with a non-AdapterInterface implementation
+            // because the ProxyAdapter behaves slightly different for those
+            [new ExternalAdapter()],
+        ];
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/TraceableAdapterTest.php b/lib/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
new file mode 100644
index 000000000..35eba7d77
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
@@ -0,0 +1,191 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\TraceableAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class TraceableAdapterTest extends AdapterTestCase
+{
+    protected $skippedTests = [
+        'testPrune' => 'TraceableAdapter just proxies',
+    ];
+
+    public function createCachePool($defaultLifetime = 0)
+    {
+        return new TraceableAdapter(new FilesystemAdapter('', $defaultLifetime));
+    }
+
+    public function testGetItemMissTrace()
+    {
+        $pool = $this->createCachePool();
+        $pool->getItem('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('getItem', $call->name);
+        $this->assertSame(['k' => false], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(1, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testGetItemHitTrace()
+    {
+        $pool = $this->createCachePool();
+        $item = $pool->getItem('k')->set('foo');
+        $pool->save($item);
+        $pool->getItem('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(3, $calls);
+
+        $call = $calls[2];
+        $this->assertSame(1, $call->hits);
+        $this->assertSame(0, $call->misses);
+    }
+
+    public function testGetItemsMissTrace()
+    {
+        $pool = $this->createCachePool();
+        $arg = ['k0', 'k1'];
+        $items = $pool->getItems($arg);
+        foreach ($items as $item) {
+        }
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('getItems', $call->name);
+        $this->assertSame(['k0' => false, 'k1' => false], $call->result);
+        $this->assertSame(2, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testHasItemMissTrace()
+    {
+        $pool = $this->createCachePool();
+        $pool->hasItem('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('hasItem', $call->name);
+        $this->assertSame(['k' => false], $call->result);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testHasItemHitTrace()
+    {
+        $pool = $this->createCachePool();
+        $item = $pool->getItem('k')->set('foo');
+        $pool->save($item);
+        $pool->hasItem('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(3, $calls);
+
+        $call = $calls[2];
+        $this->assertSame('hasItem', $call->name);
+        $this->assertSame(['k' => true], $call->result);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testDeleteItemTrace()
+    {
+        $pool = $this->createCachePool();
+        $pool->deleteItem('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('deleteItem', $call->name);
+        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testDeleteItemsTrace()
+    {
+        $pool = $this->createCachePool();
+        $arg = ['k0', 'k1'];
+        $pool->deleteItems($arg);
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('deleteItems', $call->name);
+        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testSaveTrace()
+    {
+        $pool = $this->createCachePool();
+        $item = $pool->getItem('k')->set('foo');
+        $pool->save($item);
+        $calls = $pool->getCalls();
+        $this->assertCount(2, $calls);
+
+        $call = $calls[1];
+        $this->assertSame('save', $call->name);
+        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testSaveDeferredTrace()
+    {
+        $pool = $this->createCachePool();
+        $item = $pool->getItem('k')->set('foo');
+        $pool->saveDeferred($item);
+        $calls = $pool->getCalls();
+        $this->assertCount(2, $calls);
+
+        $call = $calls[1];
+        $this->assertSame('saveDeferred', $call->name);
+        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testCommitTrace()
+    {
+        $pool = $this->createCachePool();
+        $pool->commit();
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('commit', $call->name);
+        $this->assertTrue($call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php b/lib/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
new file mode 100644
index 000000000..5cd4185cb
--- /dev/null
+++ b/lib/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
+use Symfony\Component\Cache\Adapter\TraceableTagAwareAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class TraceableTagAwareAdapterTest extends TraceableAdapterTest
+{
+    public function testInvalidateTags()
+    {
+        $pool = new TraceableTagAwareAdapter(new TagAwareAdapter(new FilesystemAdapter()));
+        $pool->invalidateTags(['foo']);
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('invalidateTags', $call->name);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+}
diff --git a/lib/symfony/cache/Tests/CacheItemTest.php b/lib/symfony/cache/Tests/CacheItemTest.php
new file mode 100644
index 000000000..28c681d15
--- /dev/null
+++ b/lib/symfony/cache/Tests/CacheItemTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\CacheItem;
+
+class CacheItemTest extends TestCase
+{
+    public function testValidKey()
+    {
+        $this->assertSame('foo', CacheItem::validateKey('foo'));
+    }
+
+    /**
+     * @dataProvider provideInvalidKey
+     */
+    public function testInvalidKey($key)
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Cache key');
+        CacheItem::validateKey($key);
+    }
+
+    public function provideInvalidKey()
+    {
+        return [
+            [''],
+            ['{'],
+            ['}'],
+            ['('],
+            [')'],
+            ['/'],
+            ['\\'],
+            ['@'],
+            [':'],
+            [true],
+            [null],
+            [1],
+            [1.1],
+            [[[]]],
+            [new \Exception('foo')],
+        ];
+    }
+
+    public function testTag()
+    {
+        $item = new CacheItem();
+
+        $this->assertSame($item, $item->tag('foo'));
+        $this->assertSame($item, $item->tag(['bar', 'baz']));
+
+        \call_user_func(\Closure::bind(function () use ($item) {
+            $this->assertSame(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'], $item->tags);
+        }, $this, CacheItem::class));
+    }
+
+    /**
+     * @dataProvider provideInvalidKey
+     */
+    public function testInvalidTag($tag)
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Cache tag');
+        $item = new CacheItem();
+        $item->tag($tag);
+    }
+}
diff --git a/lib/symfony/cache/Tests/DoctrineProviderTest.php b/lib/symfony/cache/Tests/DoctrineProviderTest.php
new file mode 100644
index 000000000..91a5516ab
--- /dev/null
+++ b/lib/symfony/cache/Tests/DoctrineProviderTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests;
+
+use Doctrine\Common\Cache\CacheProvider;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\DoctrineProvider;
+
+class DoctrineProviderTest extends TestCase
+{
+    public function testProvider()
+    {
+        $pool = new ArrayAdapter();
+        $cache = new DoctrineProvider($pool);
+
+        $this->assertInstanceOf(CacheProvider::class, $cache);
+
+        $key = '{}()/\@:';
+
+        $this->assertTrue($cache->delete($key));
+        $this->assertFalse($cache->contains($key));
+
+        $this->assertTrue($cache->save($key, 'bar'));
+        $this->assertTrue($cache->contains($key));
+        $this->assertSame('bar', $cache->fetch($key));
+
+        $this->assertTrue($cache->delete($key));
+        $this->assertFalse($cache->fetch($key));
+        $this->assertTrue($cache->save($key, 'bar'));
+
+        $cache->flushAll();
+        $this->assertFalse($cache->fetch($key));
+        $this->assertFalse($cache->contains($key));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Fixtures/ArrayCache.php b/lib/symfony/cache/Tests/Fixtures/ArrayCache.php
new file mode 100644
index 000000000..13b4f3306
--- /dev/null
+++ b/lib/symfony/cache/Tests/Fixtures/ArrayCache.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Symfony\Component\Cache\Tests\Fixtures;
+
+use Doctrine\Common\Cache\CacheProvider;
+
+class ArrayCache extends CacheProvider
+{
+    private $data = [];
+
+    protected function doFetch($id)
+    {
+        return $this->doContains($id) ? $this->data[$id][0] : false;
+    }
+
+    protected function doContains($id)
+    {
+        if (!isset($this->data[$id])) {
+            return false;
+        }
+
+        $expiry = $this->data[$id][1];
+
+        return !$expiry || time() < $expiry || !$this->doDelete($id);
+    }
+
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        $this->data[$id] = [$data, $lifeTime ? time() + $lifeTime : false];
+
+        return true;
+    }
+
+    protected function doDelete($id)
+    {
+        unset($this->data[$id]);
+
+        return true;
+    }
+
+    protected function doFlush()
+    {
+        $this->data = [];
+
+        return true;
+    }
+
+    protected function doGetStats()
+    {
+        return null;
+    }
+}
diff --git a/lib/symfony/cache/Tests/Fixtures/ExternalAdapter.php b/lib/symfony/cache/Tests/Fixtures/ExternalAdapter.php
new file mode 100644
index 000000000..779a374ec
--- /dev/null
+++ b/lib/symfony/cache/Tests/Fixtures/ExternalAdapter.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Fixtures;
+
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+
+/**
+ * Adapter not implementing the {@see \Symfony\Component\Cache\Adapter\AdapterInterface}.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class ExternalAdapter implements CacheItemPoolInterface
+{
+    private $cache;
+
+    public function __construct()
+    {
+        $this->cache = new ArrayAdapter();
+    }
+
+    public function getItem($key)
+    {
+        return $this->cache->getItem($key);
+    }
+
+    public function getItems(array $keys = [])
+    {
+        return $this->cache->getItems($keys);
+    }
+
+    public function hasItem($key)
+    {
+        return $this->cache->hasItem($key);
+    }
+
+    public function clear()
+    {
+        return $this->cache->clear();
+    }
+
+    public function deleteItem($key)
+    {
+        return $this->cache->deleteItem($key);
+    }
+
+    public function deleteItems(array $keys)
+    {
+        return $this->cache->deleteItems($keys);
+    }
+
+    public function save(CacheItemInterface $item)
+    {
+        return $this->cache->save($item);
+    }
+
+    public function saveDeferred(CacheItemInterface $item)
+    {
+        return $this->cache->saveDeferred($item);
+    }
+
+    public function commit()
+    {
+        return $this->cache->commit();
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php b/lib/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
new file mode 100644
index 000000000..e6d10284e
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\RedisCache;
+
+abstract class AbstractRedisCacheTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testSetTtl' => 'Testing expiration slows down the test suite',
+        'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
+    ];
+
+    protected static $redis;
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new RedisCache(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
+    }
+
+    public static function setUpBeforeClass()
+    {
+        if (!\extension_loaded('redis')) {
+            self::markTestSkipped('Extension redis required.');
+        }
+        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
+            $e = error_get_last();
+            self::markTestSkipped($e['message']);
+        }
+    }
+
+    public static function tearDownAfterClass()
+    {
+        self::$redis = null;
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/ApcuCacheTest.php b/lib/symfony/cache/Tests/Simple/ApcuCacheTest.php
new file mode 100644
index 000000000..f37b95a09
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/ApcuCacheTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\ApcuCache;
+
+class ApcuCacheTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testSetTtl' => 'Testing expiration slows down the test suite',
+        'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
+    ];
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) || ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN))) {
+            $this->markTestSkipped('APCu extension is required.');
+        }
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Fails transiently on Windows.');
+        }
+
+        return new ApcuCache(str_replace('\\', '.', __CLASS__), $defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/ArrayCacheTest.php b/lib/symfony/cache/Tests/Simple/ArrayCacheTest.php
new file mode 100644
index 000000000..26c3e14d0
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/ArrayCacheTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\ArrayCache;
+
+/**
+ * @group time-sensitive
+ */
+class ArrayCacheTest extends CacheTestCase
+{
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new ArrayCache($defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/CacheTestCase.php b/lib/symfony/cache/Tests/Simple/CacheTestCase.php
new file mode 100644
index 000000000..ff9944a34
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/CacheTestCase.php
@@ -0,0 +1,150 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Cache\IntegrationTests\SimpleCacheTest;
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\PruneableInterface;
+
+abstract class CacheTestCase extends SimpleCacheTest
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createSimpleCache() instanceof PruneableInterface) {
+            $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
+        }
+    }
+
+    public static function validKeys()
+    {
+        if (\defined('HHVM_VERSION')) {
+            return parent::validKeys();
+        }
+
+        return array_merge(parent::validKeys(), [["a\0b"]]);
+    }
+
+    public function testDefaultLifeTime()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = $this->createSimpleCache(2);
+        $cache->clear();
+
+        $cache->set('key.dlt', 'value');
+        sleep(1);
+
+        $this->assertSame('value', $cache->get('key.dlt'));
+
+        sleep(2);
+        $this->assertNull($cache->get('key.dlt'));
+
+        $cache->clear();
+    }
+
+    public function testNotUnserializable()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = $this->createSimpleCache();
+        $cache->clear();
+
+        $cache->set('foo', new NotUnserializable());
+
+        $this->assertNull($cache->get('foo'));
+
+        $cache->setMultiple(['foo' => new NotUnserializable()]);
+
+        foreach ($cache->getMultiple(['foo']) as $value) {
+        }
+        $this->assertNull($value);
+
+        $cache->clear();
+    }
+
+    public function testPrune()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        if (!method_exists($this, 'isPruned')) {
+            $this->fail('Test classes for pruneable caches must implement `isPruned($cache, $name)` method.');
+        }
+
+        /** @var PruneableInterface|CacheInterface $cache */
+        $cache = $this->createSimpleCache();
+        $cache->clear();
+
+        $cache->set('foo', 'foo-val', new \DateInterval('PT05S'));
+        $cache->set('bar', 'bar-val', new \DateInterval('PT10S'));
+        $cache->set('baz', 'baz-val', new \DateInterval('PT15S'));
+        $cache->set('qux', 'qux-val', new \DateInterval('PT20S'));
+
+        sleep(30);
+        $cache->prune();
+        $this->assertTrue($this->isPruned($cache, 'foo'));
+        $this->assertTrue($this->isPruned($cache, 'bar'));
+        $this->assertTrue($this->isPruned($cache, 'baz'));
+        $this->assertTrue($this->isPruned($cache, 'qux'));
+
+        $cache->set('foo', 'foo-val');
+        $cache->set('bar', 'bar-val', new \DateInterval('PT20S'));
+        $cache->set('baz', 'baz-val', new \DateInterval('PT40S'));
+        $cache->set('qux', 'qux-val', new \DateInterval('PT80S'));
+
+        $cache->prune();
+        $this->assertFalse($this->isPruned($cache, 'foo'));
+        $this->assertFalse($this->isPruned($cache, 'bar'));
+        $this->assertFalse($this->isPruned($cache, 'baz'));
+        $this->assertFalse($this->isPruned($cache, 'qux'));
+
+        sleep(30);
+        $cache->prune();
+        $this->assertFalse($this->isPruned($cache, 'foo'));
+        $this->assertTrue($this->isPruned($cache, 'bar'));
+        $this->assertFalse($this->isPruned($cache, 'baz'));
+        $this->assertFalse($this->isPruned($cache, 'qux'));
+
+        sleep(30);
+        $cache->prune();
+        $this->assertFalse($this->isPruned($cache, 'foo'));
+        $this->assertTrue($this->isPruned($cache, 'baz'));
+        $this->assertFalse($this->isPruned($cache, 'qux'));
+
+        sleep(30);
+        $cache->prune();
+        $this->assertFalse($this->isPruned($cache, 'foo'));
+        $this->assertTrue($this->isPruned($cache, 'qux'));
+
+        $cache->clear();
+    }
+}
+
+class NotUnserializable implements \Serializable
+{
+    public function serialize()
+    {
+        return serialize(123);
+    }
+
+    public function unserialize($ser)
+    {
+        throw new \Exception(__CLASS__);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/ChainCacheTest.php b/lib/symfony/cache/Tests/Simple/ChainCacheTest.php
new file mode 100644
index 000000000..f216bc1f3
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/ChainCacheTest.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\Simple\ArrayCache;
+use Symfony\Component\Cache\Simple\ChainCache;
+use Symfony\Component\Cache\Simple\FilesystemCache;
+
+/**
+ * @group time-sensitive
+ */
+class ChainCacheTest extends CacheTestCase
+{
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new ChainCache([new ArrayCache($defaultLifetime), new FilesystemCache('', $defaultLifetime)], $defaultLifetime);
+    }
+
+    public function testEmptyCachesException()
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('At least one cache must be specified.');
+        new ChainCache([]);
+    }
+
+    public function testInvalidCacheException()
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The class "stdClass" does not implement');
+        new ChainCache([new \stdClass()]);
+    }
+
+    public function testPrune()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = new ChainCache([
+            $this->getPruneableMock(),
+            $this->getNonPruneableMock(),
+            $this->getPruneableMock(),
+        ]);
+        $this->assertTrue($cache->prune());
+
+        $cache = new ChainCache([
+            $this->getPruneableMock(),
+            $this->getFailingPruneableMock(),
+            $this->getPruneableMock(),
+        ]);
+        $this->assertFalse($cache->prune());
+    }
+
+    /**
+     * @return MockObject|PruneableCacheInterface
+     */
+    private function getPruneableMock()
+    {
+        $pruneable = $this
+            ->getMockBuilder(PruneableCacheInterface::class)
+            ->getMock();
+
+        $pruneable
+            ->expects($this->atLeastOnce())
+            ->method('prune')
+            ->willReturn(true);
+
+        return $pruneable;
+    }
+
+    /**
+     * @return MockObject|PruneableCacheInterface
+     */
+    private function getFailingPruneableMock()
+    {
+        $pruneable = $this
+            ->getMockBuilder(PruneableCacheInterface::class)
+            ->getMock();
+
+        $pruneable
+            ->expects($this->atLeastOnce())
+            ->method('prune')
+            ->willReturn(false);
+
+        return $pruneable;
+    }
+
+    /**
+     * @return MockObject|CacheInterface
+     */
+    private function getNonPruneableMock()
+    {
+        return $this
+            ->getMockBuilder(CacheInterface::class)
+            ->getMock();
+    }
+}
+
+interface PruneableCacheInterface extends PruneableInterface, CacheInterface
+{
+}
diff --git a/lib/symfony/cache/Tests/Simple/DoctrineCacheTest.php b/lib/symfony/cache/Tests/Simple/DoctrineCacheTest.php
new file mode 100644
index 000000000..af4331d69
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/DoctrineCacheTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\DoctrineCache;
+use Symfony\Component\Cache\Tests\Fixtures\ArrayCache;
+
+/**
+ * @group time-sensitive
+ */
+class DoctrineCacheTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testObjectDoesNotChangeInCache' => 'ArrayCache does not use serialize/unserialize',
+        'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
+    ];
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new DoctrineCache(new ArrayCache($defaultLifetime), '', $defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/FilesystemCacheTest.php b/lib/symfony/cache/Tests/Simple/FilesystemCacheTest.php
new file mode 100644
index 000000000..620305a58
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/FilesystemCacheTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\Simple\FilesystemCache;
+
+/**
+ * @group time-sensitive
+ */
+class FilesystemCacheTest extends CacheTestCase
+{
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new FilesystemCache('', $defaultLifetime);
+    }
+
+    protected function isPruned(CacheInterface $cache, $name)
+    {
+        $getFileMethod = (new \ReflectionObject($cache))->getMethod('getFile');
+        $getFileMethod->setAccessible(true);
+
+        return !file_exists($getFileMethod->invoke($cache, $name));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/MemcachedCacheTest.php b/lib/symfony/cache/Tests/Simple/MemcachedCacheTest.php
new file mode 100644
index 000000000..21332232b
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/MemcachedCacheTest.php
@@ -0,0 +1,172 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Simple\MemcachedCache;
+
+class MemcachedCacheTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testSetTtl' => 'Testing expiration slows down the test suite',
+        'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
+    ];
+
+    protected static $client;
+
+    public static function setUpBeforeClass()
+    {
+        if (!MemcachedCache::isSupported()) {
+            self::markTestSkipped('Extension memcached >=2.2.0 required.');
+        }
+        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'));
+        self::$client->get('foo');
+        $code = self::$client->getResultCode();
+
+        if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) {
+            self::markTestSkipped('Memcached error: '.strtolower(self::$client->getResultMessage()));
+        }
+    }
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]) : self::$client;
+
+        return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
+    }
+
+    public function testCreatePersistentConnectionShouldNotDupServerList()
+    {
+        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
+        $this->assertCount(1, $instance->getServerList());
+
+        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
+        $this->assertCount(1, $instance->getServerList());
+    }
+
+    public function testOptions()
+    {
+        $client = MemcachedCache::createConnection([], [
+            'libketama_compatible' => false,
+            'distribution' => 'modula',
+            'compression' => true,
+            'serializer' => 'php',
+            'hash' => 'md5',
+        ]);
+
+        $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
+        $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
+        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
+        $this->assertSame(0, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
+        $this->assertSame(\Memcached::DISTRIBUTION_MODULA, $client->getOption(\Memcached::OPT_DISTRIBUTION));
+    }
+
+    /**
+     * @dataProvider provideBadOptions
+     */
+    public function testBadOptions($name, $value)
+    {
+        $this->expectException('ErrorException');
+        $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
+        MemcachedCache::createConnection([], [$name => $value]);
+    }
+
+    public function provideBadOptions()
+    {
+        return [
+            ['foo', 'bar'],
+            ['hash', 'zyx'],
+            ['serializer', 'zyx'],
+            ['distribution', 'zyx'],
+        ];
+    }
+
+    public function testDefaultOptions()
+    {
+        $this->assertTrue(MemcachedCache::isSupported());
+
+        $client = MemcachedCache::createConnection([]);
+
+        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
+    }
+
+    public function testOptionSerializer()
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\CacheException');
+        $this->expectExceptionMessage('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
+        if (!\Memcached::HAVE_JSON) {
+            $this->markTestSkipped('Memcached::HAVE_JSON required');
+        }
+
+        new MemcachedCache(MemcachedCache::createConnection([], ['serializer' => 'json']));
+    }
+
+    /**
+     * @dataProvider provideServersSetting
+     */
+    public function testServersSetting($dsn, $host, $port)
+    {
+        $client1 = MemcachedCache::createConnection($dsn);
+        $client2 = MemcachedCache::createConnection([$dsn]);
+        $client3 = MemcachedCache::createConnection([[$host, $port]]);
+        $expect = [
+            'host' => $host,
+            'port' => $port,
+        ];
+
+        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
+        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
+    }
+
+    public function provideServersSetting()
+    {
+        yield [
+            'memcached://127.0.0.1/50',
+            '127.0.0.1',
+            11211,
+        ];
+        yield [
+            'memcached://localhost:11222?weight=25',
+            'localhost',
+            11222,
+        ];
+        if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
+            yield [
+                'memcached://user:password@127.0.0.1?weight=50',
+                '127.0.0.1',
+                11211,
+            ];
+        }
+        yield [
+            'memcached:///var/run/memcached.sock?weight=25',
+            '/var/run/memcached.sock',
+            0,
+        ];
+        yield [
+            'memcached:///var/local/run/memcached.socket?weight=25',
+            '/var/local/run/memcached.socket',
+            0,
+        ];
+        if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
+            yield [
+                'memcached://user:password@/var/local/run/memcached.socket?weight=25',
+                '/var/local/run/memcached.socket',
+                0,
+            ];
+        }
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php b/lib/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
new file mode 100644
index 000000000..13865a609
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Simple\MemcachedCache;
+
+class MemcachedCacheTextModeTest extends MemcachedCacheTest
+{
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        $client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
+
+        return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/NullCacheTest.php b/lib/symfony/cache/Tests/Simple/NullCacheTest.php
new file mode 100644
index 000000000..31f42c32b
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/NullCacheTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Simple\NullCache;
+
+/**
+ * @group time-sensitive
+ */
+class NullCacheTest extends TestCase
+{
+    public function createCachePool()
+    {
+        return new NullCache();
+    }
+
+    public function testGetItem()
+    {
+        $cache = $this->createCachePool();
+
+        $this->assertNull($cache->get('key'));
+    }
+
+    public function testHas()
+    {
+        $this->assertFalse($this->createCachePool()->has('key'));
+    }
+
+    public function testGetMultiple()
+    {
+        $cache = $this->createCachePool();
+
+        $keys = ['foo', 'bar', 'baz', 'biz'];
+
+        $default = new \stdClass();
+        $items = $cache->getMultiple($keys, $default);
+        $count = 0;
+
+        foreach ($items as $key => $item) {
+            $this->assertContains($key, $keys, 'Cache key can not change.');
+            $this->assertSame($default, $item);
+
+            // Remove $key for $keys
+            foreach ($keys as $k => $v) {
+                if ($v === $key) {
+                    unset($keys[$k]);
+                }
+            }
+
+            ++$count;
+        }
+
+        $this->assertSame(4, $count);
+    }
+
+    public function testClear()
+    {
+        $this->assertTrue($this->createCachePool()->clear());
+    }
+
+    public function testDelete()
+    {
+        $this->assertTrue($this->createCachePool()->delete('key'));
+    }
+
+    public function testDeleteMultiple()
+    {
+        $this->assertTrue($this->createCachePool()->deleteMultiple(['key', 'foo', 'bar']));
+    }
+
+    public function testSet()
+    {
+        $cache = $this->createCachePool();
+
+        $this->assertFalse($cache->set('key', 'val'));
+        $this->assertNull($cache->get('key'));
+    }
+
+    public function testSetMultiple()
+    {
+        $cache = $this->createCachePool();
+
+        $this->assertFalse($cache->setMultiple(['key' => 'val']));
+        $this->assertNull($cache->get('key'));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/PdoCacheTest.php b/lib/symfony/cache/Tests/Simple/PdoCacheTest.php
new file mode 100644
index 000000000..f5a26341f
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/PdoCacheTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\PdoCache;
+use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
+
+/**
+ * @group time-sensitive
+ */
+class PdoCacheTest extends CacheTestCase
+{
+    use PdoPruneableTrait;
+
+    protected static $dbFile;
+
+    public static function setUpBeforeClass()
+    {
+        if (!\extension_loaded('pdo_sqlite')) {
+            self::markTestSkipped('Extension pdo_sqlite required.');
+        }
+
+        self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
+
+        $pool = new PdoCache('sqlite:'.self::$dbFile);
+        $pool->createTable();
+    }
+
+    public static function tearDownAfterClass()
+    {
+        @unlink(self::$dbFile);
+    }
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new PdoCache('sqlite:'.self::$dbFile, 'ns', $defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/PdoDbalCacheTest.php b/lib/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
new file mode 100644
index 000000000..4da2b603c
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Doctrine\DBAL\DriverManager;
+use Symfony\Component\Cache\Simple\PdoCache;
+use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
+
+/**
+ * @group time-sensitive
+ */
+class PdoDbalCacheTest extends CacheTestCase
+{
+    use PdoPruneableTrait;
+
+    protected static $dbFile;
+
+    public static function setUpBeforeClass()
+    {
+        if (!\extension_loaded('pdo_sqlite')) {
+            self::markTestSkipped('Extension pdo_sqlite required.');
+        }
+
+        self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
+
+        $pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
+        $pool->createTable();
+    }
+
+    public static function tearDownAfterClass()
+    {
+        @unlink(self::$dbFile);
+    }
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/PhpArrayCacheTest.php b/lib/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
new file mode 100644
index 000000000..c18f71442
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\NullCache;
+use Symfony\Component\Cache\Simple\PhpArrayCache;
+use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
+
+/**
+ * @group time-sensitive
+ */
+class PhpArrayCacheTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testBasicUsageWithLongKey' => 'PhpArrayCache does no writes',
+
+        'testDelete' => 'PhpArrayCache does no writes',
+        'testDeleteMultiple' => 'PhpArrayCache does no writes',
+        'testDeleteMultipleGenerator' => 'PhpArrayCache does no writes',
+
+        'testSetTtl' => 'PhpArrayCache does no expiration',
+        'testSetMultipleTtl' => 'PhpArrayCache does no expiration',
+        'testSetExpiredTtl' => 'PhpArrayCache does no expiration',
+        'testSetMultipleExpiredTtl' => 'PhpArrayCache does no expiration',
+
+        'testGetInvalidKeys' => 'PhpArrayCache does no validation',
+        'testGetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
+        'testSetInvalidKeys' => 'PhpArrayCache does no validation',
+        'testDeleteInvalidKeys' => 'PhpArrayCache does no validation',
+        'testDeleteMultipleInvalidKeys' => 'PhpArrayCache does no validation',
+        'testSetInvalidTtl' => 'PhpArrayCache does no validation',
+        'testSetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
+        'testSetMultipleInvalidTtl' => 'PhpArrayCache does no validation',
+        'testHasInvalidKeys' => 'PhpArrayCache does no validation',
+        'testSetValidData' => 'PhpArrayCache does no validation',
+
+        'testDefaultLifeTime' => 'PhpArrayCache does not allow configuring a default lifetime.',
+        'testPrune' => 'PhpArrayCache just proxies',
+    ];
+
+    protected static $file;
+
+    public static function setUpBeforeClass()
+    {
+        self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
+    }
+
+    protected function tearDown()
+    {
+        if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
+            FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
+        }
+    }
+
+    public function createSimpleCache()
+    {
+        return new PhpArrayCacheWrapper(self::$file, new NullCache());
+    }
+
+    public function testStore()
+    {
+        $arrayWithRefs = [];
+        $arrayWithRefs[0] = 123;
+        $arrayWithRefs[1] = &$arrayWithRefs[0];
+
+        $object = (object) [
+            'foo' => 'bar',
+            'foo2' => 'bar2',
+        ];
+
+        $expected = [
+            'null' => null,
+            'serializedString' => serialize($object),
+            'arrayWithRefs' => $arrayWithRefs,
+            'object' => $object,
+            'arrayWithObject' => ['bar' => $object],
+        ];
+
+        $cache = new PhpArrayCache(self::$file, new NullCache());
+        $cache->warmUp($expected);
+
+        foreach ($expected as $key => $value) {
+            $this->assertSame(serialize($value), serialize($cache->get($key)), 'Warm up should create a PHP file that OPCache can load in memory');
+        }
+    }
+
+    public function testStoredFile()
+    {
+        $expected = [
+            'integer' => 42,
+            'float' => 42.42,
+            'boolean' => true,
+            'array_simple' => ['foo', 'bar'],
+            'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
+        ];
+
+        $cache = new PhpArrayCache(self::$file, new NullCache());
+        $cache->warmUp($expected);
+
+        $values = eval(substr(file_get_contents(self::$file), 6));
+
+        $this->assertSame($expected, $values, 'Warm up should create a PHP file that OPCache can load in memory');
+    }
+}
+
+class PhpArrayCacheWrapper extends PhpArrayCache
+{
+    public function set($key, $value, $ttl = null)
+    {
+        \call_user_func(\Closure::bind(function () use ($key, $value) {
+            $this->values[$key] = $value;
+            $this->warmUp($this->values);
+            $this->values = eval(substr(file_get_contents($this->file), 6));
+        }, $this, PhpArrayCache::class));
+
+        return true;
+    }
+
+    public function setMultiple($values, $ttl = null)
+    {
+        if (!\is_array($values) && !$values instanceof \Traversable) {
+            return parent::setMultiple($values, $ttl);
+        }
+        \call_user_func(\Closure::bind(function () use ($values) {
+            foreach ($values as $key => $value) {
+                $this->values[$key] = $value;
+            }
+            $this->warmUp($this->values);
+            $this->values = eval(substr(file_get_contents($this->file), 6));
+        }, $this, PhpArrayCache::class));
+
+        return true;
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php b/lib/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
new file mode 100644
index 000000000..eba749cec
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\FilesystemCache;
+use Symfony\Component\Cache\Simple\PhpArrayCache;
+use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
+
+/**
+ * @group time-sensitive
+ */
+class PhpArrayCacheWithFallbackTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testGetInvalidKeys' => 'PhpArrayCache does no validation',
+        'testGetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
+        'testDeleteInvalidKeys' => 'PhpArrayCache does no validation',
+        'testDeleteMultipleInvalidKeys' => 'PhpArrayCache does no validation',
+        //'testSetValidData' => 'PhpArrayCache does no validation',
+        'testSetInvalidKeys' => 'PhpArrayCache does no validation',
+        'testSetInvalidTtl' => 'PhpArrayCache does no validation',
+        'testSetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
+        'testSetMultipleInvalidTtl' => 'PhpArrayCache does no validation',
+        'testHasInvalidKeys' => 'PhpArrayCache does no validation',
+        'testPrune' => 'PhpArrayCache just proxies',
+    ];
+
+    protected static $file;
+
+    public static function setUpBeforeClass()
+    {
+        self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
+    }
+
+    protected function tearDown()
+    {
+        if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
+            FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
+        }
+    }
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new PhpArrayCache(self::$file, new FilesystemCache('php-array-fallback', $defaultLifetime));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/PhpFilesCacheTest.php b/lib/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
new file mode 100644
index 000000000..936f29a43
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\Simple\PhpFilesCache;
+
+/**
+ * @group time-sensitive
+ */
+class PhpFilesCacheTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testDefaultLifeTime' => 'PhpFilesCache does not allow configuring a default lifetime.',
+    ];
+
+    public function createSimpleCache()
+    {
+        if (!PhpFilesCache::isSupported()) {
+            $this->markTestSkipped('OPcache extension is not enabled.');
+        }
+
+        return new PhpFilesCache('sf-cache');
+    }
+
+    protected function isPruned(CacheInterface $cache, $name)
+    {
+        $getFileMethod = (new \ReflectionObject($cache))->getMethod('getFile');
+        $getFileMethod->setAccessible(true);
+
+        return !file_exists($getFileMethod->invoke($cache, $name));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/Psr6CacheTest.php b/lib/symfony/cache/Tests/Simple/Psr6CacheTest.php
new file mode 100644
index 000000000..1bc75c906
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/Psr6CacheTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Simple\Psr6Cache;
+
+/**
+ * @group time-sensitive
+ */
+class Psr6CacheTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testPrune' => 'Psr6Cache just proxies',
+    ];
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new Psr6Cache(new FilesystemAdapter('', $defaultLifetime));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/RedisArrayCacheTest.php b/lib/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
new file mode 100644
index 000000000..ec5e4c06e
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+class RedisArrayCacheTest extends AbstractRedisCacheTest
+{
+    public static function setUpBeforeClass()
+    {
+        parent::setupBeforeClass();
+        if (!class_exists('RedisArray')) {
+            self::markTestSkipped('The RedisArray class is required.');
+        }
+        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/RedisCacheTest.php b/lib/symfony/cache/Tests/Simple/RedisCacheTest.php
new file mode 100644
index 000000000..c2cd31a5b
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/RedisCacheTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\RedisCache;
+
+class RedisCacheTest extends AbstractRedisCacheTest
+{
+    public static function setUpBeforeClass()
+    {
+        parent::setupBeforeClass();
+        self::$redis = RedisCache::createConnection('redis://'.getenv('REDIS_HOST'));
+    }
+
+    public function testCreateConnection()
+    {
+        $redisHost = getenv('REDIS_HOST');
+
+        $redis = RedisCache::createConnection('redis://'.$redisHost);
+        $this->assertInstanceOf(\Redis::class, $redis);
+        $this->assertTrue($redis->isConnected());
+        $this->assertSame(0, $redis->getDbNum());
+
+        $redis = RedisCache::createConnection('redis://'.$redisHost.'/2');
+        $this->assertSame(2, $redis->getDbNum());
+
+        $redis = RedisCache::createConnection('redis://'.$redisHost, ['timeout' => 3]);
+        $this->assertEquals(3, $redis->getTimeout());
+
+        $redis = RedisCache::createConnection('redis://'.$redisHost.'?timeout=4');
+        $this->assertEquals(4, $redis->getTimeout());
+
+        $redis = RedisCache::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
+        $this->assertEquals(5, $redis->getReadTimeout());
+    }
+
+    /**
+     * @dataProvider provideFailedCreateConnection
+     */
+    public function testFailedCreateConnection($dsn)
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Redis connection failed');
+        RedisCache::createConnection($dsn);
+    }
+
+    public function provideFailedCreateConnection()
+    {
+        return [
+            ['redis://localhost:1234'],
+            ['redis://foo@localhost'],
+            ['redis://localhost/123'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideInvalidCreateConnection
+     */
+    public function testInvalidCreateConnection($dsn)
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid Redis DSN');
+        RedisCache::createConnection($dsn);
+    }
+
+    public function provideInvalidCreateConnection()
+    {
+        return [
+            ['foo://localhost'],
+            ['redis://'],
+        ];
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/RedisClusterCacheTest.php b/lib/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
new file mode 100644
index 000000000..6b7f8039d
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+class RedisClusterCacheTest extends AbstractRedisCacheTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (!class_exists('RedisCluster')) {
+            self::markTestSkipped('The RedisCluster class is required.');
+        }
+        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+        }
+
+        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
+    }
+}
diff --git a/lib/symfony/cache/Tests/Simple/TraceableCacheTest.php b/lib/symfony/cache/Tests/Simple/TraceableCacheTest.php
new file mode 100644
index 000000000..e684caf36
--- /dev/null
+++ b/lib/symfony/cache/Tests/Simple/TraceableCacheTest.php
@@ -0,0 +1,171 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Simple\FilesystemCache;
+use Symfony\Component\Cache\Simple\TraceableCache;
+
+/**
+ * @group time-sensitive
+ */
+class TraceableCacheTest extends CacheTestCase
+{
+    protected $skippedTests = [
+        'testPrune' => 'TraceableCache just proxies',
+    ];
+
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        return new TraceableCache(new FilesystemCache('', $defaultLifetime));
+    }
+
+    public function testGetMissTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $pool->get('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('get', $call->name);
+        $this->assertSame(['k' => false], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(1, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testGetHitTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $pool->set('k', 'foo');
+        $pool->get('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(2, $calls);
+
+        $call = $calls[1];
+        $this->assertSame(1, $call->hits);
+        $this->assertSame(0, $call->misses);
+    }
+
+    public function testGetMultipleMissTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $pool->set('k1', 123);
+        $values = $pool->getMultiple(['k0', 'k1']);
+        foreach ($values as $value) {
+        }
+        $calls = $pool->getCalls();
+        $this->assertCount(2, $calls);
+
+        $call = $calls[1];
+        $this->assertSame('getMultiple', $call->name);
+        $this->assertSame(['k1' => true, 'k0' => false], $call->result);
+        $this->assertSame(1, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testHasMissTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $pool->has('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('has', $call->name);
+        $this->assertSame(['k' => false], $call->result);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testHasHitTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $pool->set('k', 'foo');
+        $pool->has('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(2, $calls);
+
+        $call = $calls[1];
+        $this->assertSame('has', $call->name);
+        $this->assertSame(['k' => true], $call->result);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testDeleteTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $pool->delete('k');
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('delete', $call->name);
+        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testDeleteMultipleTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $arg = ['k0', 'k1'];
+        $pool->deleteMultiple($arg);
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('deleteMultiple', $call->name);
+        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testTraceSetTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $pool->set('k', 'foo');
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('set', $call->name);
+        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+
+    public function testSetMultipleTrace()
+    {
+        $pool = $this->createSimpleCache();
+        $pool->setMultiple(['k' => 'foo']);
+        $calls = $pool->getCalls();
+        $this->assertCount(1, $calls);
+
+        $call = $calls[0];
+        $this->assertSame('setMultiple', $call->name);
+        $this->assertSame(['keys' => ['k'], 'result' => true], $call->result);
+        $this->assertSame(0, $call->hits);
+        $this->assertSame(0, $call->misses);
+        $this->assertNotEmpty($call->start);
+        $this->assertNotEmpty($call->end);
+    }
+}
diff --git a/lib/symfony/cache/Tests/Traits/PdoPruneableTrait.php b/lib/symfony/cache/Tests/Traits/PdoPruneableTrait.php
new file mode 100644
index 000000000..3b1e1128b
--- /dev/null
+++ b/lib/symfony/cache/Tests/Traits/PdoPruneableTrait.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Traits;
+
+trait PdoPruneableTrait
+{
+    protected function isPruned($cache, $name)
+    {
+        $o = new \ReflectionObject($cache);
+
+        if (!$o->hasMethod('getConnection')) {
+            self::fail('Cache does not have "getConnection()" method.');
+        }
+
+        $getPdoConn = $o->getMethod('getConnection');
+        $getPdoConn->setAccessible(true);
+
+        /** @var \Doctrine\DBAL\Statement $select */
+        $select = $getPdoConn->invoke($cache)->prepare('SELECT 1 FROM cache_items WHERE item_id LIKE :id');
+        $select->bindValue(':id', sprintf('%%%s', $name));
+        $select->execute();
+
+        return 0 === \count($select->fetchAll(\PDO::FETCH_COLUMN));
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/ApcClassLoaderTest.php b/lib/symfony/class-loader/Tests/ApcClassLoaderTest.php
new file mode 100644
index 000000000..6706acbd3
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/ApcClassLoaderTest.php
@@ -0,0 +1,200 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\ClassLoader\ApcClassLoader;
+use Symfony\Component\ClassLoader\ClassLoader;
+
+/**
+ * @group legacy
+ */
+class ApcClassLoaderTest extends TestCase
+{
+    protected function setUp()
+    {
+        if (!(filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN))) {
+            $this->markTestSkipped('The apc extension is not enabled.');
+        } else {
+            apcu_clear_cache();
+        }
+    }
+
+    protected function tearDown()
+    {
+        if (filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {
+            apcu_clear_cache();
+        }
+    }
+
+    public function testConstructor()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Apc\Namespaced', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+
+        $loader = new ApcClassLoader('test.prefix.', $loader);
+
+        $this->assertEquals($loader->findFile('\Apc\Namespaced\FooBar'), apcu_fetch('test.prefix.\Apc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
+    }
+
+    /**
+     * @dataProvider getLoadClassTests
+     */
+    public function testLoadClass($className, $testClassName, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Apc\Namespaced', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Apc_Pearlike_', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+
+        $loader = new ApcClassLoader('test.prefix.', $loader);
+        $loader->loadClass($testClassName);
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassTests()
+    {
+        return [
+           ['\\Apc\\Namespaced\\Foo', 'Apc\\Namespaced\\Foo',   '->loadClass() loads Apc\Namespaced\Foo class'],
+           ['Apc_Pearlike_Foo',    'Apc_Pearlike_Foo',      '->loadClass() loads Apc_Pearlike_Foo class'],
+        ];
+    }
+
+    /**
+     * @dataProvider getLoadClassFromFallbackTests
+     */
+    public function testLoadClassFromFallback($className, $testClassName, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Apc\Namespaced', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Apc_Pearlike_', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('', [__DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/fallback']);
+
+        $loader = new ApcClassLoader('test.prefix.fallback', $loader);
+        $loader->loadClass($testClassName);
+
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassFromFallbackTests()
+    {
+        return [
+           ['\\Apc\\Namespaced\\Baz',    'Apc\\Namespaced\\Baz',    '->loadClass() loads Apc\Namespaced\Baz class'],
+           ['Apc_Pearlike_Baz',       'Apc_Pearlike_Baz',       '->loadClass() loads Apc_Pearlike_Baz class'],
+           ['\\Apc\\Namespaced\\FooBar', 'Apc\\Namespaced\\FooBar', '->loadClass() loads Apc\Namespaced\Baz class from fallback dir'],
+           ['Apc_Pearlike_FooBar',    'Apc_Pearlike_FooBar',    '->loadClass() loads Apc_Pearlike_Baz class from fallback dir'],
+       ];
+    }
+
+    /**
+     * @dataProvider getLoadClassNamespaceCollisionTests
+     */
+    public function testLoadClassNamespaceCollision($namespaces, $className, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefixes($namespaces);
+
+        $loader = new ApcClassLoader('test.prefix.collision.', $loader);
+        $loader->loadClass($className);
+
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassNamespaceCollisionTests()
+    {
+        return [
+           [
+               [
+                   'Apc\\NamespaceCollision\\A' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
+                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
+               ],
+               'Apc\NamespaceCollision\A\Foo',
+               '->loadClass() loads NamespaceCollision\A\Foo from alpha.',
+           ],
+           [
+               [
+                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
+                   'Apc\\NamespaceCollision\\A' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
+               ],
+               'Apc\NamespaceCollision\A\Bar',
+               '->loadClass() loads NamespaceCollision\A\Bar from alpha.',
+           ],
+           [
+               [
+                   'Apc\\NamespaceCollision\\A' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
+                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
+               ],
+               'Apc\NamespaceCollision\A\B\Foo',
+               '->loadClass() loads NamespaceCollision\A\B\Foo from beta.',
+           ],
+           [
+               [
+                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
+                   'Apc\\NamespaceCollision\\A' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
+               ],
+               'Apc\NamespaceCollision\A\B\Bar',
+               '->loadClass() loads NamespaceCollision\A\B\Bar from beta.',
+           ],
+        ];
+    }
+
+    /**
+     * @dataProvider getLoadClassPrefixCollisionTests
+     */
+    public function testLoadClassPrefixCollision($prefixes, $className, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefixes($prefixes);
+
+        $loader = new ApcClassLoader('test.prefix.collision.', $loader);
+        $loader->loadClass($className);
+
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassPrefixCollisionTests()
+    {
+        return [
+           [
+               [
+                   'ApcPrefixCollision_A_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
+                   'ApcPrefixCollision_A_B_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/beta/Apc',
+               ],
+               'ApcPrefixCollision_A_Foo',
+               '->loadClass() loads ApcPrefixCollision_A_Foo from alpha.',
+           ],
+           [
+               [
+                   'ApcPrefixCollision_A_B_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/beta/Apc',
+                   'ApcPrefixCollision_A_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
+               ],
+               'ApcPrefixCollision_A_Bar',
+               '->loadClass() loads ApcPrefixCollision_A_Bar from alpha.',
+           ],
+           [
+               [
+                   'ApcPrefixCollision_A_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
+                   'ApcPrefixCollision_A_B_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/beta/Apc',
+               ],
+               'ApcPrefixCollision_A_B_Foo',
+               '->loadClass() loads ApcPrefixCollision_A_B_Foo from beta.',
+           ],
+           [
+               [
+                   'ApcPrefixCollision_A_B_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/beta/Apc',
+                   'ApcPrefixCollision_A_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
+               ],
+               'ApcPrefixCollision_A_B_Bar',
+               '->loadClass() loads ApcPrefixCollision_A_B_Bar from beta.',
+           ],
+        ];
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/ClassCollectionLoaderTest.php b/lib/symfony/class-loader/Tests/ClassCollectionLoaderTest.php
new file mode 100644
index 000000000..e1d5f56de
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/ClassCollectionLoaderTest.php
@@ -0,0 +1,317 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\ClassLoader\ClassCollectionLoader;
+use Symfony\Component\ClassLoader\Tests\Fixtures\DeclaredClass;
+use Symfony\Component\ClassLoader\Tests\Fixtures\WarmedClass;
+
+require_once __DIR__.'/Fixtures/ClassesWithParents/GInterface.php';
+require_once __DIR__.'/Fixtures/ClassesWithParents/CInterface.php';
+require_once __DIR__.'/Fixtures/ClassesWithParents/B.php';
+require_once __DIR__.'/Fixtures/ClassesWithParents/A.php';
+
+/**
+ * @group legacy
+ */
+class ClassCollectionLoaderTest extends TestCase
+{
+    public function testTraitDependencies()
+    {
+        require_once __DIR__.'/Fixtures/deps/traits.php';
+
+        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
+        $m = $r->getMethod('getOrderedClasses');
+        $m->setAccessible(true);
+
+        $ordered = $m->invoke(null, ['CTFoo']);
+
+        $this->assertEquals(
+            ['TD', 'TC', 'TB', 'TA', 'TZ', 'CTFoo'],
+            array_map(function ($class) { return $class->getName(); }, $ordered)
+        );
+
+        $ordered = $m->invoke(null, ['CTBar']);
+
+        $this->assertEquals(
+            ['TD', 'TZ', 'TC', 'TB', 'TA', 'CTBar'],
+            array_map(function ($class) { return $class->getName(); }, $ordered)
+        );
+    }
+
+    /**
+     * @dataProvider getDifferentOrders
+     */
+    public function testClassReordering(array $classes)
+    {
+        $expected = [
+            'ClassesWithParents\\GInterface',
+            'ClassesWithParents\\CInterface',
+            'ClassesWithParents\\B',
+            'ClassesWithParents\\A',
+        ];
+
+        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
+        $m = $r->getMethod('getOrderedClasses');
+        $m->setAccessible(true);
+
+        $ordered = $m->invoke(null, $classes);
+
+        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
+    }
+
+    public function getDifferentOrders()
+    {
+        return [
+            [[
+                'ClassesWithParents\\A',
+                'ClassesWithParents\\CInterface',
+                'ClassesWithParents\\GInterface',
+                'ClassesWithParents\\B',
+            ]],
+            [[
+                'ClassesWithParents\\B',
+                'ClassesWithParents\\A',
+                'ClassesWithParents\\CInterface',
+            ]],
+            [[
+                'ClassesWithParents\\CInterface',
+                'ClassesWithParents\\B',
+                'ClassesWithParents\\A',
+            ]],
+            [[
+                'ClassesWithParents\\A',
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider getDifferentOrdersForTraits
+     */
+    public function testClassWithTraitsReordering(array $classes)
+    {
+        require_once __DIR__.'/Fixtures/ClassesWithParents/ATrait.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/BTrait.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/CTrait.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/D.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/E.php';
+
+        $expected = [
+            'ClassesWithParents\\GInterface',
+            'ClassesWithParents\\CInterface',
+            'ClassesWithParents\\ATrait',
+            'ClassesWithParents\\BTrait',
+            'ClassesWithParents\\CTrait',
+            'ClassesWithParents\\B',
+            'ClassesWithParents\\A',
+            'ClassesWithParents\\D',
+            'ClassesWithParents\\E',
+        ];
+
+        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
+        $m = $r->getMethod('getOrderedClasses');
+        $m->setAccessible(true);
+
+        $ordered = $m->invoke(null, $classes);
+
+        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
+    }
+
+    public function getDifferentOrdersForTraits()
+    {
+        return [
+            [[
+                'ClassesWithParents\\E',
+                'ClassesWithParents\\ATrait',
+            ]],
+            [[
+                'ClassesWithParents\\E',
+            ]],
+        ];
+    }
+
+    public function testFixClassWithTraitsOrdering()
+    {
+        require_once __DIR__.'/Fixtures/ClassesWithParents/CTrait.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/F.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/G.php';
+
+        $classes = [
+            'ClassesWithParents\\F',
+            'ClassesWithParents\\G',
+        ];
+
+        $expected = [
+            'ClassesWithParents\\CTrait',
+            'ClassesWithParents\\F',
+            'ClassesWithParents\\G',
+        ];
+
+        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
+        $m = $r->getMethod('getOrderedClasses');
+        $m->setAccessible(true);
+
+        $ordered = $m->invoke(null, $classes);
+
+        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
+    }
+
+    /**
+     * @dataProvider getFixNamespaceDeclarationsData
+     */
+    public function testFixNamespaceDeclarations($source, $expected)
+    {
+        $this->assertEquals('<?php '.$expected, ClassCollectionLoader::fixNamespaceDeclarations('<?php '.$source));
+    }
+
+    public function getFixNamespaceDeclarationsData()
+    {
+        return [
+            ["namespace;\nclass Foo {}\n", "namespace\n{\nclass Foo {}\n}"],
+            ["namespace Foo;\nclass Foo {}\n", "namespace Foo\n{\nclass Foo {}\n}"],
+            ["namespace   Bar ;\nclass Foo {}\n", "namespace Bar\n{\nclass Foo {}\n}"],
+            ["namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}"],
+            ["namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}"],
+            ["namespace\n{\nclass Foo {}\n}\n", "namespace\n{\nclass Foo {}\n}"],
+        ];
+    }
+
+    /**
+     * @dataProvider getFixNamespaceDeclarationsDataWithoutTokenizer
+     */
+    public function testFixNamespaceDeclarationsWithoutTokenizer($source, $expected)
+    {
+        ClassCollectionLoader::enableTokenizer(false);
+        $this->assertEquals('<?php '.$expected, ClassCollectionLoader::fixNamespaceDeclarations('<?php '.$source));
+        ClassCollectionLoader::enableTokenizer(true);
+    }
+
+    public function getFixNamespaceDeclarationsDataWithoutTokenizer()
+    {
+        return [
+            ["namespace;\nclass Foo {}\n", "namespace\n{\nclass Foo {}\n}\n"],
+            ["namespace Foo;\nclass Foo {}\n", "namespace Foo\n{\nclass Foo {}\n}\n"],
+            ["namespace   Bar ;\nclass Foo {}\n", "namespace   Bar\n{\nclass Foo {}\n}\n"],
+            ["namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}\n"],
+            ["namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n"],
+            ["\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n", "\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n"],
+        ];
+    }
+
+    public function testUnableToLoadClassException()
+    {
+        $this->expectException('InvalidArgumentException');
+        if (is_file($file = sys_get_temp_dir().'/foo.php')) {
+            unlink($file);
+        }
+
+        ClassCollectionLoader::load(['SomeNotExistingClass'], sys_get_temp_dir(), 'foo', false);
+    }
+
+    public function testCommentStripping()
+    {
+        if (is_file($file = __DIR__.'/bar.php')) {
+            unlink($file);
+        }
+        spl_autoload_register($r = function ($class) {
+            if (0 === strpos($class, 'Namespaced') || 0 === strpos($class, 'Pearlike_')) {
+                @require_once __DIR__.'/Fixtures/'.str_replace(['\\', '_'], '/', $class).'.php';
+            }
+        });
+
+        $strictTypes = \defined('HHVM_VERSION') ? '' : "\nnamespace {require __DIR__.'/Fixtures/Namespaced/WithStrictTypes.php';}";
+
+        ClassCollectionLoader::load(
+            ['Namespaced\\WithComments', 'Pearlike_WithComments', 'Namespaced\\WithDirMagic', 'Namespaced\\WithFileMagic', 'Namespaced\\WithHaltCompiler', $strictTypes ? 'Namespaced\\WithStrictTypes' : 'Namespaced\\WithComments'],
+            __DIR__,
+            'bar',
+            false
+        );
+
+        spl_autoload_unregister($r);
+
+        $this->assertEquals(<<<'EOF'
+namespace Namespaced
+{
+class WithComments
+{
+public static $loaded = true;
+}
+$string ='string should not be   modified {$string}';
+$heredoc = (<<<HD
+
+
+Heredoc should not be   modified {$string}
+
+
+HD
+);
+$nowdoc =<<<'ND'
+
+
+Nowdoc should not be   modified {$string}
+
+
+ND
+;
+}
+namespace
+{
+class Pearlike_WithComments
+{
+public static $loaded = true;
+}
+}
+namespace {require __DIR__.'/Fixtures/Namespaced/WithDirMagic.php';}
+namespace {require __DIR__.'/Fixtures/Namespaced/WithFileMagic.php';}
+namespace {require __DIR__.'/Fixtures/Namespaced/WithHaltCompiler.php';}
+EOF
+            .$strictTypes,
+            str_replace(["<?php \n", '\\\\'], ['', '/'], file_get_contents($file))
+        );
+
+        unlink($file);
+    }
+
+    public function testInline()
+    {
+        $this->assertTrue(class_exists(WarmedClass::class, true));
+
+        @unlink($cache = sys_get_temp_dir().'/inline.php');
+
+        $classes = [WarmedClass::class];
+        $excluded = [DeclaredClass::class];
+
+        ClassCollectionLoader::inline($classes, $cache, $excluded);
+
+        $this->assertSame(<<<'EOTXT'
+<?php 
+namespace Symfony\Component\ClassLoader\Tests\Fixtures
+{
+interface WarmedInterface
+{
+}
+}
+namespace Symfony\Component\ClassLoader\Tests\Fixtures
+{
+class WarmedClass extends DeclaredClass implements WarmedInterface
+{
+}
+}
+EOTXT
+            , file_get_contents($cache)
+        );
+
+        unlink($cache);
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/ClassLoaderTest.php b/lib/symfony/class-loader/Tests/ClassLoaderTest.php
new file mode 100644
index 000000000..af8a94bdb
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/ClassLoaderTest.php
@@ -0,0 +1,238 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\ClassLoader\ClassLoader;
+
+/**
+ * @group legacy
+ */
+class ClassLoaderTest extends TestCase
+{
+    public function testGetPrefixes()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Foo', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Bar', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Bas', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertArrayNotHasKey('Foo1', $prefixes);
+        $this->assertArrayHasKey('Bar', $prefixes);
+        $this->assertArrayHasKey('Bas', $prefixes);
+    }
+
+    public function testGetFallbackDirs()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix(null, __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix(null, __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $fallback_dirs = $loader->getFallbackDirs();
+        $this->assertCount(2, $fallback_dirs);
+    }
+
+    /**
+     * @dataProvider getLoadClassTests
+     */
+    public function testLoadClass($className, $testClassName, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Namespaced2\\', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Pearlike2_', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->loadClass($testClassName);
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassTests()
+    {
+        return [
+            ['\\Namespaced2\\Foo', 'Namespaced2\\Foo',   '->loadClass() loads Namespaced2\Foo class'],
+            ['\\Pearlike2_Foo',    'Pearlike2_Foo',      '->loadClass() loads Pearlike2_Foo class'],
+        ];
+    }
+
+    /**
+     * @dataProvider getLoadNonexistentClassTests
+     */
+    public function testLoadNonexistentClass($className, $testClassName, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Namespaced2\\', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Pearlike2_', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->loadClass($testClassName);
+        $this->assertFalse(class_exists($className), $message);
+    }
+
+    public function getLoadNonexistentClassTests()
+    {
+        return [
+            ['\\Pearlike3_Bar', '\\Pearlike3_Bar', '->loadClass() loads non existing Pearlike3_Bar class with a leading slash'],
+        ];
+    }
+
+    public function testAddPrefixSingle()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Foo', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Foo', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertCount(1, $prefixes['Foo']);
+    }
+
+    public function testAddPrefixesSingle()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefixes(['Foo' => ['foo', 'foo']]);
+        $loader->addPrefixes(['Foo' => ['foo']]);
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertCount(1, $prefixes['Foo'], print_r($prefixes, true));
+    }
+
+    public function testAddPrefixMulti()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Foo', 'foo');
+        $loader->addPrefix('Foo', 'bar');
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertCount(2, $prefixes['Foo']);
+        $this->assertContains('foo', $prefixes['Foo']);
+        $this->assertContains('bar', $prefixes['Foo']);
+    }
+
+    public function testUseIncludePath()
+    {
+        $loader = new ClassLoader();
+        $this->assertFalse($loader->getUseIncludePath());
+
+        $this->assertNull($loader->findFile('Foo'));
+
+        $includePath = get_include_path();
+
+        $loader->setUseIncludePath(true);
+        $this->assertTrue($loader->getUseIncludePath());
+
+        set_include_path(__DIR__.'/Fixtures/includepath'.PATH_SEPARATOR.$includePath);
+
+        $this->assertEquals(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'includepath'.\DIRECTORY_SEPARATOR.'Foo.php', $loader->findFile('Foo'));
+
+        set_include_path($includePath);
+    }
+
+    /**
+     * @dataProvider getLoadClassFromFallbackTests
+     */
+    public function testLoadClassFromFallback($className, $testClassName, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Namespaced2\\', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Pearlike2_', __DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('', [__DIR__.\DIRECTORY_SEPARATOR.'Fixtures/fallback']);
+        $loader->loadClass($testClassName);
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassFromFallbackTests()
+    {
+        return [
+            ['\\Namespaced2\\Baz',    'Namespaced2\\Baz',    '->loadClass() loads Namespaced2\Baz class'],
+            ['\\Pearlike2_Baz',       'Pearlike2_Baz',       '->loadClass() loads Pearlike2_Baz class'],
+            ['\\Namespaced2\\FooBar', 'Namespaced2\\FooBar', '->loadClass() loads Namespaced2\Baz class from fallback dir'],
+            ['\\Pearlike2_FooBar',    'Pearlike2_FooBar',    '->loadClass() loads Pearlike2_Baz class from fallback dir'],
+        ];
+    }
+
+    /**
+     * @dataProvider getLoadClassNamespaceCollisionTests
+     */
+    public function testLoadClassNamespaceCollision($namespaces, $className, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefixes($namespaces);
+
+        $loader->loadClass($className);
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassNamespaceCollisionTests()
+    {
+        return [
+            [
+                [
+                    'NamespaceCollision\\C' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'NamespaceCollision\\C\\B' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ],
+                'NamespaceCollision\C\Foo',
+                '->loadClass() loads NamespaceCollision\C\Foo from alpha.',
+            ],
+            [
+                [
+                    'NamespaceCollision\\C\\B' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'NamespaceCollision\\C' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ],
+                'NamespaceCollision\C\Bar',
+                '->loadClass() loads NamespaceCollision\C\Bar from alpha.',
+            ],
+            [
+                [
+                    'NamespaceCollision\\C' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'NamespaceCollision\\C\\B' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ],
+                'NamespaceCollision\C\B\Foo',
+                '->loadClass() loads NamespaceCollision\C\B\Foo from beta.',
+            ],
+            [
+                [
+                    'NamespaceCollision\\C\\B' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'NamespaceCollision\\C' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ],
+                'NamespaceCollision\C\B\Bar',
+                '->loadClass() loads NamespaceCollision\C\B\Bar from beta.',
+            ],
+            [
+                [
+                    'PrefixCollision_C_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'PrefixCollision_C_B_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ],
+                'PrefixCollision_C_Foo',
+                '->loadClass() loads PrefixCollision_C_Foo from alpha.',
+            ],
+            [
+                [
+                    'PrefixCollision_C_B_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'PrefixCollision_C_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ],
+                'PrefixCollision_C_Bar',
+                '->loadClass() loads PrefixCollision_C_Bar from alpha.',
+            ],
+            [
+                [
+                    'PrefixCollision_C_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'PrefixCollision_C_B_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ],
+                'PrefixCollision_C_B_Foo',
+                '->loadClass() loads PrefixCollision_C_B_Foo from beta.',
+            ],
+            [
+                [
+                    'PrefixCollision_C_B_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'PrefixCollision_C_' => __DIR__.\DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ],
+                'PrefixCollision_C_B_Bar',
+                '->loadClass() loads PrefixCollision_C_B_Bar from beta.',
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/ClassMapGeneratorTest.php b/lib/symfony/class-loader/Tests/ClassMapGeneratorTest.php
new file mode 100644
index 000000000..911066018
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/ClassMapGeneratorTest.php
@@ -0,0 +1,151 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\ClassLoader\ClassMapGenerator;
+
+/**
+ * @group legacy
+ */
+class ClassMapGeneratorTest extends TestCase
+{
+    /**
+     * @var string|null
+     */
+    private $workspace = null;
+
+    public function prepare_workspace()
+    {
+        $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();
+        mkdir($this->workspace, 0777, true);
+        $this->workspace = realpath($this->workspace);
+    }
+
+    /**
+     * @param string $file
+     */
+    private function clean($file)
+    {
+        if (is_dir($file) && !is_link($file)) {
+            $dir = new \FilesystemIterator($file);
+            foreach ($dir as $childFile) {
+                $this->clean($childFile);
+            }
+
+            rmdir($file);
+        } else {
+            unlink($file);
+        }
+    }
+
+    /**
+     * @dataProvider getTestCreateMapTests
+     */
+    public function testDump($directory)
+    {
+        $this->prepare_workspace();
+
+        $file = $this->workspace.'/file';
+
+        $generator = new ClassMapGenerator();
+        $generator->dump($directory, $file);
+        $this->assertFileExists($file);
+
+        $this->clean($this->workspace);
+    }
+
+    /**
+     * @dataProvider getTestCreateMapTests
+     */
+    public function testCreateMap($directory, $expected)
+    {
+        $this->assertEqualsNormalized($expected, ClassMapGenerator::createMap($directory));
+    }
+
+    public function getTestCreateMapTests()
+    {
+        $data = [
+            [__DIR__.'/Fixtures/Namespaced', [
+                'Namespaced\\Bar' => realpath(__DIR__).'/Fixtures/Namespaced/Bar.php',
+                'Namespaced\\Foo' => realpath(__DIR__).'/Fixtures/Namespaced/Foo.php',
+                'Namespaced\\Baz' => realpath(__DIR__).'/Fixtures/Namespaced/Baz.php',
+                'Namespaced\\WithComments' => realpath(__DIR__).'/Fixtures/Namespaced/WithComments.php',
+                'Namespaced\\WithStrictTypes' => realpath(__DIR__).'/Fixtures/Namespaced/WithStrictTypes.php',
+                'Namespaced\\WithHaltCompiler' => realpath(__DIR__).'/Fixtures/Namespaced/WithHaltCompiler.php',
+                'Namespaced\\WithDirMagic' => realpath(__DIR__).'/Fixtures/Namespaced/WithDirMagic.php',
+                'Namespaced\\WithFileMagic' => realpath(__DIR__).'/Fixtures/Namespaced/WithFileMagic.php',
+            ]],
+            [__DIR__.'/Fixtures/beta/NamespaceCollision', [
+                'NamespaceCollision\\A\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Bar.php',
+                'NamespaceCollision\\A\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Foo.php',
+                'NamespaceCollision\\C\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Bar.php',
+                'NamespaceCollision\\C\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Foo.php',
+            ]],
+            [__DIR__.'/Fixtures/Pearlike', [
+                'Pearlike_Foo' => realpath(__DIR__).'/Fixtures/Pearlike/Foo.php',
+                'Pearlike_Bar' => realpath(__DIR__).'/Fixtures/Pearlike/Bar.php',
+                'Pearlike_Baz' => realpath(__DIR__).'/Fixtures/Pearlike/Baz.php',
+                'Pearlike_WithComments' => realpath(__DIR__).'/Fixtures/Pearlike/WithComments.php',
+            ]],
+            [__DIR__.'/Fixtures/classmap', [
+                'Foo\\Bar\\A' => realpath(__DIR__).'/Fixtures/classmap/sameNsMultipleClasses.php',
+                'Foo\\Bar\\B' => realpath(__DIR__).'/Fixtures/classmap/sameNsMultipleClasses.php',
+                'A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'Alpha\\A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'Alpha\\B' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'Beta\\A' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'Beta\\B' => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'ClassMap\\SomeInterface' => realpath(__DIR__).'/Fixtures/classmap/SomeInterface.php',
+                'ClassMap\\SomeParent' => realpath(__DIR__).'/Fixtures/classmap/SomeParent.php',
+                'ClassMap\\SomeClass' => realpath(__DIR__).'/Fixtures/classmap/SomeClass.php',
+            ]],
+            [__DIR__.'/Fixtures/php5.4', [
+                'TFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'CFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'Foo\\TBar' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'Foo\\IBar' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'Foo\\TFooBar' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'Foo\\CBar' => __DIR__.'/Fixtures/php5.4/traits.php',
+            ]],
+            [__DIR__.'/Fixtures/php5.5', [
+                'ClassCons\\Foo' => __DIR__.'/Fixtures/php5.5/class_cons.php',
+            ]],
+        ];
+
+        return $data;
+    }
+
+    public function testCreateMapFinderSupport()
+    {
+        $finder = new \Symfony\Component\Finder\Finder();
+        $finder->files()->in(__DIR__.'/Fixtures/beta/NamespaceCollision');
+
+        $this->assertEqualsNormalized([
+            'NamespaceCollision\\A\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Bar.php',
+            'NamespaceCollision\\A\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Foo.php',
+            'NamespaceCollision\\C\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Bar.php',
+            'NamespaceCollision\\C\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Foo.php',
+        ], ClassMapGenerator::createMap($finder));
+    }
+
+    protected function assertEqualsNormalized($expected, $actual, $message = '')
+    {
+        foreach ($expected as $ns => $path) {
+            $expected[$ns] = str_replace('\\', '/', $path);
+        }
+        foreach ($actual as $ns => $path) {
+            $actual[$ns] = str_replace('\\', '/', $path);
+        }
+        $this->assertEquals($expected, $actual, $message);
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Bar.php
new file mode 100644
index 000000000..4259f1451
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Baz.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Baz.php
new file mode 100644
index 000000000..3ddb595e2
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Baz.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class Baz
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Foo.php
new file mode 100644
index 000000000..cf0a4b741
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/FooBar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/FooBar.php
new file mode 100644
index 000000000..bbbc81515
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/FooBar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class FooBar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Bar.php
new file mode 100644
index 000000000..e774cb9bf
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Apc_Pearlike_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Baz.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Baz.php
new file mode 100644
index 000000000..b28474431
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Baz.php
@@ -0,0 +1,6 @@
+<?php
+
+class Apc_Pearlike_Baz
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Foo.php
new file mode 100644
index 000000000..3cf8aa809
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class Apc_Pearlike_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php
new file mode 100644
index 000000000..3df50fab5
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class ApcPrefixCollision_A_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php
new file mode 100644
index 000000000..206c9f8e6
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class ApcPrefixCollision_A_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php
new file mode 100644
index 000000000..4a4f73ee0
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\NamespaceCollision\A;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php
new file mode 100644
index 000000000..184a1b1da
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\NamespaceCollision\A;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php
new file mode 100644
index 000000000..3892f7068
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class ApcPrefixCollision_A_B_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php
new file mode 100644
index 000000000..62e749f75
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class ApcPrefixCollision_A_B_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php
new file mode 100644
index 000000000..e406a69e8
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\NamespaceCollision\A\B;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php
new file mode 100644
index 000000000..450eeb50b
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\NamespaceCollision\A\B;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php
new file mode 100644
index 000000000..96f2f76c6
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Apc_Pearlike_FooBar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php b/lib/symfony/class-loader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php
new file mode 100644
index 000000000..bbbc81515
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class FooBar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/A.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/A.php
new file mode 100644
index 000000000..b0f942595
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/A.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+class A extends B
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/ATrait.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/ATrait.php
new file mode 100644
index 000000000..b02d1859b
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/ATrait.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+trait ATrait
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/B.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/B.php
new file mode 100644
index 000000000..22c751a7e
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/B.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+class B implements CInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/BTrait.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/BTrait.php
new file mode 100644
index 000000000..7242a9f1f
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/BTrait.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+trait BTrait
+{
+    use ATrait;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CInterface.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CInterface.php
new file mode 100644
index 000000000..8eec389be
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+interface CInterface extends GInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CTrait.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CTrait.php
new file mode 100644
index 000000000..110c62496
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CTrait.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+trait CTrait
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/D.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/D.php
new file mode 100644
index 000000000..28514d737
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/D.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+class D extends A
+{
+    use BTrait;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/E.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/E.php
new file mode 100644
index 000000000..6dc603589
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/E.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+class E extends D
+{
+    use CTrait;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/F.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/F.php
new file mode 100644
index 000000000..a0a5172d7
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/F.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+class F
+{
+    use CTrait;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/G.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/G.php
new file mode 100644
index 000000000..bab60315a
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/G.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+class G
+{
+    use CTrait;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/GInterface.php b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/GInterface.php
new file mode 100644
index 000000000..208a19d6d
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/ClassesWithParents/GInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+interface GInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/DeclaredClass.php b/lib/symfony/class-loader/Tests/Fixtures/DeclaredClass.php
new file mode 100644
index 000000000..bf975661e
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/DeclaredClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\ClassLoader\Tests\Fixtures;
+
+class DeclaredClass implements DeclaredInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/DeclaredInterface.php b/lib/symfony/class-loader/Tests/Fixtures/DeclaredInterface.php
new file mode 100644
index 000000000..268f2a180
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/DeclaredInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\ClassLoader\Tests\Fixtures;
+
+interface DeclaredInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Bar.php
new file mode 100644
index 000000000..02b589d27
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Baz.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Baz.php
new file mode 100644
index 000000000..0b0bbd057
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Baz.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class Baz
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Foo.php
new file mode 100644
index 000000000..df5e1f4ce
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithComments.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithComments.php
new file mode 100644
index 000000000..361e53de1
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithComments.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class WithComments
+{
+    /** @Boolean */
+    public static $loaded = true;
+}
+
+$string = 'string should not be   modified {$string}';
+
+$heredoc = (<<<HD
+
+
+Heredoc should not be   modified {$string}
+
+
+HD
+);
+
+$nowdoc = <<<'ND'
+
+
+Nowdoc should not be   modified {$string}
+
+
+ND;
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithDirMagic.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithDirMagic.php
new file mode 100644
index 000000000..f997ca7dd
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithDirMagic.php
@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * foo
+ */
+
+namespace Namespaced;
+
+class WithDirMagic
+{
+    public function getDir()
+    {
+        return __DIR__;
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithFileMagic.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithFileMagic.php
new file mode 100644
index 000000000..d4302528f
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithFileMagic.php
@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * foo
+ */
+
+namespace Namespaced;
+
+class WithFileMagic
+{
+    public function getFile()
+    {
+        return __FILE__;
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithHaltCompiler.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithHaltCompiler.php
new file mode 100644
index 000000000..472d37787
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithHaltCompiler.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * foo
+ */
+
+namespace Namespaced;
+
+class WithHaltCompiler
+{
+}
+
+// the end of the script execution
+__halt_compiler(); data
+data
+data
+data
+...
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithStrictTypes.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithStrictTypes.php
new file mode 100644
index 000000000..846611e38
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced/WithStrictTypes.php
@@ -0,0 +1,13 @@
+<?php
+
+/*
+ * foo
+ */
+
+declare(strict_types=1);
+
+namespace Namespaced;
+
+class WithStrictTypes
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Bar.php
new file mode 100644
index 000000000..7bf42ab1b
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Bar.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Namespaced2;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Baz.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Baz.php
new file mode 100644
index 000000000..fed3e01d6
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Baz.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Namespaced2;
+
+class Baz
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Foo.php
new file mode 100644
index 000000000..5d7452a64
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Namespaced2/Foo.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Namespaced2;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Bar.php
new file mode 100644
index 000000000..63661695b
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Baz.php b/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Baz.php
new file mode 100644
index 000000000..3aa836755
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Baz.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike_Baz
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Foo.php
new file mode 100644
index 000000000..c51b1569c
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Pearlike/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Pearlike/WithComments.php b/lib/symfony/class-loader/Tests/Fixtures/Pearlike/WithComments.php
new file mode 100644
index 000000000..d0fd2060d
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Pearlike/WithComments.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class Pearlike_WithComments
+{
+    /** @Boolean */
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Bar.php
new file mode 100644
index 000000000..7f5f79773
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike2_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Baz.php b/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Baz.php
new file mode 100644
index 000000000..8317a0efd
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Baz.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike2_Baz
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Foo.php
new file mode 100644
index 000000000..0f62ca480
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/Pearlike2/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike2_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/WarmedClass.php b/lib/symfony/class-loader/Tests/Fixtures/WarmedClass.php
new file mode 100644
index 000000000..f9db4f0bf
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/WarmedClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\ClassLoader\Tests\Fixtures;
+
+class WarmedClass extends DeclaredClass implements WarmedInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/WarmedInterface.php b/lib/symfony/class-loader/Tests/Fixtures/WarmedInterface.php
new file mode 100644
index 000000000..14e4873e9
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/WarmedInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\ClassLoader\Tests\Fixtures;
+
+interface WarmedInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php
new file mode 100644
index 000000000..b8d1a1399
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NamespaceCollision\A;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php
new file mode 100644
index 000000000..aee6a080d
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NamespaceCollision\A;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php
new file mode 100644
index 000000000..c1b8dd65d
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace NamespaceCollision\C;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php
new file mode 100644
index 000000000..1fffbbacf
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace NamespaceCollision\C;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php
new file mode 100644
index 000000000..676daadd2
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_A_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php
new file mode 100644
index 000000000..44388be7c
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_A_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php
new file mode 100644
index 000000000..0bbc3684a
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_C_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php
new file mode 100644
index 000000000..73f4ac4c3
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_C_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php
new file mode 100644
index 000000000..9f0915571
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NamespaceCollision\A\B;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Foo.php
new file mode 100644
index 000000000..f5f2d727e
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NamespaceCollision\A\B;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/C/B/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/C/B/Bar.php
new file mode 100644
index 000000000..4bb03dc7f
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/C/B/Bar.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace NamespaceCollision\C\B;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/C/B/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/C/B/Foo.php
new file mode 100644
index 000000000..195d88875
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/C/B/Foo.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace NamespaceCollision\C\B;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/A/B/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/A/B/Bar.php
new file mode 100644
index 000000000..f2682e498
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/A/B/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_A_B_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/A/B/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/A/B/Foo.php
new file mode 100644
index 000000000..af7ca7043
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/A/B/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_A_B_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/C/B/Bar.php b/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/C/B/Bar.php
new file mode 100644
index 000000000..f31343849
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/C/B/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_C_B_Bar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/C/B/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/C/B/Foo.php
new file mode 100644
index 000000000..a9bf82051
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/beta/PrefixCollision/C/B/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_C_B_Foo
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeClass.php b/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeClass.php
new file mode 100644
index 000000000..c63cef923
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeClass.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassMap;
+
+class SomeClass extends SomeParent implements SomeInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeInterface.php b/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeInterface.php
new file mode 100644
index 000000000..1fe5e09aa
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassMap;
+
+interface SomeInterface
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeParent.php b/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeParent.php
new file mode 100644
index 000000000..ce2f9fc6c
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/classmap/SomeParent.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassMap;
+
+abstract class SomeParent
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/classmap/multipleNs.php b/lib/symfony/class-loader/Tests/Fixtures/classmap/multipleNs.php
new file mode 100644
index 000000000..c7cec646f
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/classmap/multipleNs.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace {
+    class A
+    {
+    }
+}
+
+namespace Alpha {
+    class A
+    {
+    }
+    class B
+    {
+    }
+}
+
+namespace Beta {
+    class A
+    {
+    }
+    class B
+    {
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/classmap/notAClass.php b/lib/symfony/class-loader/Tests/Fixtures/classmap/notAClass.php
new file mode 100644
index 000000000..49eb3ff05
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/classmap/notAClass.php
@@ -0,0 +1,3 @@
+<?php
+
+$a = new stdClass();
diff --git a/lib/symfony/class-loader/Tests/Fixtures/classmap/notPhpFile.md b/lib/symfony/class-loader/Tests/Fixtures/classmap/notPhpFile.md
new file mode 100644
index 000000000..6e48e5a63
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/classmap/notPhpFile.md
@@ -0,0 +1 @@
+This file should be skipped.
diff --git a/lib/symfony/class-loader/Tests/Fixtures/classmap/sameNsMultipleClasses.php b/lib/symfony/class-loader/Tests/Fixtures/classmap/sameNsMultipleClasses.php
new file mode 100644
index 000000000..b34b9dd28
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/classmap/sameNsMultipleClasses.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Foo\Bar;
+
+class A
+{
+}
+class B
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/deps/traits.php b/lib/symfony/class-loader/Tests/Fixtures/deps/traits.php
new file mode 100644
index 000000000..82b30a6f9
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/deps/traits.php
@@ -0,0 +1,37 @@
+<?php
+
+trait TD
+{
+}
+
+trait TZ
+{
+    use TD;
+}
+
+trait TC
+{
+    use TD;
+}
+
+trait TB
+{
+    use TC;
+}
+
+trait TA
+{
+    use TB;
+}
+
+class CTFoo
+{
+    use TA;
+    use TZ;
+}
+
+class CTBar
+{
+    use TZ;
+    use TA;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/fallback/Namespaced/FooBar.php b/lib/symfony/class-loader/Tests/Fixtures/fallback/Namespaced/FooBar.php
new file mode 100644
index 000000000..0fd29efbb
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/fallback/Namespaced/FooBar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class FooBar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/fallback/Namespaced2/FooBar.php b/lib/symfony/class-loader/Tests/Fixtures/fallback/Namespaced2/FooBar.php
new file mode 100644
index 000000000..1036d4359
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/fallback/Namespaced2/FooBar.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Namespaced2;
+
+class FooBar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/fallback/Pearlike/FooBar.php b/lib/symfony/class-loader/Tests/Fixtures/fallback/Pearlike/FooBar.php
new file mode 100644
index 000000000..3ebe5260b
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/fallback/Pearlike/FooBar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike_FooBar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/fallback/Pearlike2/FooBar.php b/lib/symfony/class-loader/Tests/Fixtures/fallback/Pearlike2/FooBar.php
new file mode 100644
index 000000000..9bf0007aa
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/fallback/Pearlike2/FooBar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike2_FooBar
+{
+    public static $loaded = true;
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/includepath/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/includepath/Foo.php
new file mode 100644
index 000000000..a8f0bc75d
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/includepath/Foo.php
@@ -0,0 +1,5 @@
+<?php
+
+class Foo
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/php5.4/traits.php b/lib/symfony/class-loader/Tests/Fixtures/php5.4/traits.php
new file mode 100644
index 000000000..ccdadaf05
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/php5.4/traits.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace {
+    trait TFoo
+    {
+    }
+
+    class CFoo
+    {
+        use TFoo;
+    }
+}
+
+namespace Foo {
+    trait TBar
+    {
+    }
+
+    interface IBar
+    {
+    }
+
+    trait TFooBar
+    {
+    }
+
+    class CBar implements IBar
+    {
+        use TBar;
+        use TFooBar;
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/php5.5/class_cons.php b/lib/symfony/class-loader/Tests/Fixtures/php5.5/class_cons.php
new file mode 100644
index 000000000..0ed8d77fc
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/php5.5/class_cons.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace ClassCons;
+
+class Foo
+{
+    public function __construct()
+    {
+        \Foo\TBar/* foo */::class;
+    }
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/psr-4/Class_With_Underscores.php b/lib/symfony/class-loader/Tests/Fixtures/psr-4/Class_With_Underscores.php
new file mode 100644
index 000000000..ce9b8ea32
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/psr-4/Class_With_Underscores.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Acme\DemoLib;
+
+class Class_With_Underscores
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/psr-4/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/psr-4/Foo.php
new file mode 100644
index 000000000..8ba6f837e
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/psr-4/Foo.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Acme\DemoLib;
+
+class Foo
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Class_With_Underscores.php b/lib/symfony/class-loader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Class_With_Underscores.php
new file mode 100644
index 000000000..e18bb0f11
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Class_With_Underscores.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Acme\DemoLib\Lets\Go\Deeper;
+
+class Class_With_Underscores
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Foo.php b/lib/symfony/class-loader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Foo.php
new file mode 100644
index 000000000..53ead9f42
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Foo.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Acme\DemoLib\Lets\Go\Deeper;
+
+class Foo
+{
+}
diff --git a/lib/symfony/class-loader/Tests/Psr4ClassLoaderTest.php b/lib/symfony/class-loader/Tests/Psr4ClassLoaderTest.php
new file mode 100644
index 000000000..122200e99
--- /dev/null
+++ b/lib/symfony/class-loader/Tests/Psr4ClassLoaderTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\ClassLoader\Psr4ClassLoader;
+
+/**
+ * @group legacy
+ */
+class Psr4ClassLoaderTest extends TestCase
+{
+    /**
+     * @param string $className
+     * @dataProvider getLoadClassTests
+     */
+    public function testLoadClass($className)
+    {
+        $loader = new Psr4ClassLoader();
+        $loader->addPrefix(
+            'Acme\\DemoLib',
+            __DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'psr-4'
+        );
+        $loader->loadClass($className);
+        $this->assertTrue(class_exists($className), sprintf('loadClass() should load %s', $className));
+    }
+
+    /**
+     * @return array
+     */
+    public function getLoadClassTests()
+    {
+        return [
+            ['Acme\\DemoLib\\Foo'],
+            ['Acme\\DemoLib\\Class_With_Underscores'],
+            ['Acme\\DemoLib\\Lets\\Go\\Deeper\\Foo'],
+            ['Acme\\DemoLib\\Lets\\Go\\Deeper\\Class_With_Underscores'],
+        ];
+    }
+
+    /**
+     * @param string $className
+     * @dataProvider getLoadNonexistentClassTests
+     */
+    public function testLoadNonexistentClass($className)
+    {
+        $loader = new Psr4ClassLoader();
+        $loader->addPrefix(
+            'Acme\\DemoLib',
+            __DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'psr-4'
+        );
+        $loader->loadClass($className);
+        $this->assertFalse(class_exists($className), sprintf('loadClass() should not load %s', $className));
+    }
+
+    /**
+     * @return array
+     */
+    public function getLoadNonexistentClassTests()
+    {
+        return [
+            ['Acme\\DemoLib\\I_Do_Not_Exist'],
+            ['UnknownVendor\\SomeLib\\I_Do_Not_Exist'],
+        ];
+    }
+}
diff --git a/lib/symfony/config/Tests/ConfigCacheFactoryTest.php b/lib/symfony/config/Tests/ConfigCacheFactoryTest.php
new file mode 100644
index 000000000..6190b9b45
--- /dev/null
+++ b/lib/symfony/config/Tests/ConfigCacheFactoryTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\ConfigCacheFactory;
+
+class ConfigCacheFactoryTest extends TestCase
+{
+    public function testCacheWithInvalidCallback()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid type for callback argument. Expected callable, but got "object".');
+        $cacheFactory = new ConfigCacheFactory(true);
+
+        $cacheFactory->cache('file', new \stdClass());
+    }
+}
diff --git a/lib/symfony/config/Tests/ConfigCacheTest.php b/lib/symfony/config/Tests/ConfigCacheTest.php
new file mode 100644
index 000000000..d0b70899b
--- /dev/null
+++ b/lib/symfony/config/Tests/ConfigCacheTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\ConfigCache;
+use Symfony\Component\Config\Tests\Resource\ResourceStub;
+
+class ConfigCacheTest extends TestCase
+{
+    private $cacheFile = null;
+
+    protected function setUp()
+    {
+        $this->cacheFile = tempnam(sys_get_temp_dir(), 'config_');
+    }
+
+    protected function tearDown()
+    {
+        $files = [$this->cacheFile, $this->cacheFile.'.meta'];
+
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                unlink($file);
+            }
+        }
+    }
+
+    /**
+     * @dataProvider debugModes
+     */
+    public function testCacheIsNotValidIfNothingHasBeenCached($debug)
+    {
+        unlink($this->cacheFile); // remove tempnam() side effect
+        $cache = new ConfigCache($this->cacheFile, $debug);
+
+        $this->assertFalse($cache->isFresh());
+    }
+
+    public function testIsAlwaysFreshInProduction()
+    {
+        $staleResource = new ResourceStub();
+        $staleResource->setFresh(false);
+
+        $cache = new ConfigCache($this->cacheFile, false);
+        $cache->write('', [$staleResource]);
+
+        $this->assertTrue($cache->isFresh());
+    }
+
+    /**
+     * @dataProvider debugModes
+     */
+    public function testIsFreshWhenNoResourceProvided($debug)
+    {
+        $cache = new ConfigCache($this->cacheFile, $debug);
+        $cache->write('', []);
+        $this->assertTrue($cache->isFresh());
+    }
+
+    public function testFreshResourceInDebug()
+    {
+        $freshResource = new ResourceStub();
+        $freshResource->setFresh(true);
+
+        $cache = new ConfigCache($this->cacheFile, true);
+        $cache->write('', [$freshResource]);
+
+        $this->assertTrue($cache->isFresh());
+    }
+
+    public function testStaleResourceInDebug()
+    {
+        $staleResource = new ResourceStub();
+        $staleResource->setFresh(false);
+
+        $cache = new ConfigCache($this->cacheFile, true);
+        $cache->write('', [$staleResource]);
+
+        $this->assertFalse($cache->isFresh());
+    }
+
+    public function debugModes()
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/ArrayNodeTest.php b/lib/symfony/config/Tests/Definition/ArrayNodeTest.php
new file mode 100644
index 000000000..25c2cfc69
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/ArrayNodeTest.php
@@ -0,0 +1,237 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\ArrayNode;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\Config\Definition\ScalarNode;
+
+class ArrayNodeTest extends TestCase
+{
+    public function testNormalizeThrowsExceptionWhenFalseIsNotAllowed()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+        $node = new ArrayNode('root');
+        $node->normalize(false);
+    }
+
+    public function testExceptionThrownOnUnrecognizedChild()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('Unrecognized option "foo" under "root"');
+        $node = new ArrayNode('root');
+        $node->normalize(['foo' => 'bar']);
+    }
+
+    public function ignoreAndRemoveMatrixProvider()
+    {
+        $unrecognizedOptionException = new InvalidConfigurationException('Unrecognized option "foo" under "root"');
+
+        return [
+            [true, true, [], 'no exception is thrown for an unrecognized child if the ignoreExtraKeys option is set to true'],
+            [true, false, ['foo' => 'bar'], 'extra keys are not removed when ignoreExtraKeys second option is set to false'],
+            [false, true, $unrecognizedOptionException],
+            [false, false, $unrecognizedOptionException],
+        ];
+    }
+
+    /**
+     * @dataProvider ignoreAndRemoveMatrixProvider
+     */
+    public function testIgnoreAndRemoveBehaviors($ignore, $remove, $expected, $message = '')
+    {
+        if ($expected instanceof \Exception) {
+            $this->expectException(\get_class($expected));
+            $this->expectExceptionMessage($expected->getMessage());
+        }
+        $node = new ArrayNode('root');
+        $node->setIgnoreExtraKeys($ignore, $remove);
+        $result = $node->normalize(['foo' => 'bar']);
+        $this->assertSame($expected, $result, $message);
+    }
+
+    /**
+     * @dataProvider getPreNormalizationTests
+     */
+    public function testPreNormalize($denormalized, $normalized)
+    {
+        $node = new ArrayNode('foo');
+
+        $r = new \ReflectionMethod($node, 'preNormalize');
+        $r->setAccessible(true);
+
+        $this->assertSame($normalized, $r->invoke($node, $denormalized));
+    }
+
+    public function getPreNormalizationTests()
+    {
+        return [
+            [
+                ['foo-bar' => 'foo'],
+                ['foo_bar' => 'foo'],
+            ],
+            [
+                ['foo-bar_moo' => 'foo'],
+                ['foo-bar_moo' => 'foo'],
+            ],
+            [
+                ['anything-with-dash-and-no-underscore' => 'first', 'no_dash' => 'second'],
+                ['anything_with_dash_and_no_underscore' => 'first', 'no_dash' => 'second'],
+            ],
+            [
+                ['foo-bar' => null, 'foo_bar' => 'foo'],
+                ['foo-bar' => null, 'foo_bar' => 'foo'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getZeroNamedNodeExamplesData
+     */
+    public function testNodeNameCanBeZero($denormalized, $normalized)
+    {
+        $zeroNode = new ArrayNode(0);
+        $zeroNode->addChild(new ScalarNode('name'));
+        $fiveNode = new ArrayNode(5);
+        $fiveNode->addChild(new ScalarNode(0));
+        $fiveNode->addChild(new ScalarNode('new_key'));
+        $rootNode = new ArrayNode('root');
+        $rootNode->addChild($zeroNode);
+        $rootNode->addChild($fiveNode);
+        $rootNode->addChild(new ScalarNode('string_key'));
+        $r = new \ReflectionMethod($rootNode, 'normalizeValue');
+        $r->setAccessible(true);
+
+        $this->assertSame($normalized, $r->invoke($rootNode, $denormalized));
+    }
+
+    public function getZeroNamedNodeExamplesData()
+    {
+        return [
+            [
+                [
+                    0 => [
+                        'name' => 'something',
+                    ],
+                    5 => [
+                        0 => 'this won\'t work too',
+                        'new_key' => 'some other value',
+                    ],
+                    'string_key' => 'just value',
+                ],
+                [
+                    0 => [
+                        'name' => 'something',
+                    ],
+                    5 => [
+                        0 => 'this won\'t work too',
+                        'new_key' => 'some other value',
+                    ],
+                    'string_key' => 'just value',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getPreNormalizedNormalizedOrderedData
+     */
+    public function testChildrenOrderIsMaintainedOnNormalizeValue($prenormalized, $normalized)
+    {
+        $scalar1 = new ScalarNode('1');
+        $scalar2 = new ScalarNode('2');
+        $scalar3 = new ScalarNode('3');
+        $node = new ArrayNode('foo');
+        $node->addChild($scalar1);
+        $node->addChild($scalar3);
+        $node->addChild($scalar2);
+
+        $r = new \ReflectionMethod($node, 'normalizeValue');
+        $r->setAccessible(true);
+
+        $this->assertSame($normalized, $r->invoke($node, $prenormalized));
+    }
+
+    public function getPreNormalizedNormalizedOrderedData()
+    {
+        return [
+            [
+                ['2' => 'two', '1' => 'one', '3' => 'three'],
+                ['2' => 'two', '1' => 'one', '3' => 'three'],
+            ],
+        ];
+    }
+
+    public function testAddChildEmptyName()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Child nodes must be named.');
+        $node = new ArrayNode('root');
+
+        $childNode = new ArrayNode('');
+        $node->addChild($childNode);
+    }
+
+    public function testAddChildNameAlreadyExists()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('A child node named "foo" already exists.');
+        $node = new ArrayNode('root');
+
+        $childNode = new ArrayNode('foo');
+        $node->addChild($childNode);
+
+        $childNodeWithSameName = new ArrayNode('foo');
+        $node->addChild($childNodeWithSameName);
+    }
+
+    public function testGetDefaultValueWithoutDefaultValue()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('The node at path "foo" has no default value.');
+        $node = new ArrayNode('foo');
+        $node->getDefaultValue();
+    }
+
+    public function testSetDeprecated()
+    {
+        $childNode = new ArrayNode('foo');
+        $childNode->setDeprecated('"%node%" is deprecated');
+
+        $this->assertTrue($childNode->isDeprecated());
+        $this->assertSame('"foo" is deprecated', $childNode->getDeprecationMessage($childNode->getName(), $childNode->getPath()));
+
+        $node = new ArrayNode('root');
+        $node->addChild($childNode);
+
+        $deprecationTriggered = false;
+        $deprecationHandler = function ($level, $message, $file, $line) use (&$prevErrorHandler, &$deprecationTriggered) {
+            if (E_USER_DEPRECATED === $level) {
+                return $deprecationTriggered = true;
+            }
+
+            return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;
+        };
+
+        $prevErrorHandler = set_error_handler($deprecationHandler);
+        $node->finalize([]);
+        restore_error_handler();
+
+        $this->assertFalse($deprecationTriggered, '->finalize() should not trigger if the deprecated node is not set');
+
+        $prevErrorHandler = set_error_handler($deprecationHandler);
+        $node->finalize(['foo' => []]);
+        restore_error_handler();
+        $this->assertTrue($deprecationTriggered, '->finalize() should trigger if the deprecated node is set');
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/BooleanNodeTest.php b/lib/symfony/config/Tests/Definition/BooleanNodeTest.php
new file mode 100644
index 000000000..8552eeba3
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/BooleanNodeTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\BooleanNode;
+
+class BooleanNodeTest extends TestCase
+{
+    /**
+     * @dataProvider getValidValues
+     */
+    public function testNormalize($value)
+    {
+        $node = new BooleanNode('test');
+        $this->assertSame($value, $node->normalize($value));
+    }
+
+    /**
+     * @dataProvider getValidValues
+     *
+     * @param bool $value
+     */
+    public function testValidNonEmptyValues($value)
+    {
+        $node = new BooleanNode('test');
+        $node->setAllowEmptyValue(false);
+
+        $this->assertSame($value, $node->finalize($value));
+    }
+
+    public function getValidValues()
+    {
+        return [
+            [false],
+            [true],
+        ];
+    }
+
+    /**
+     * @dataProvider getInvalidValues
+     */
+    public function testNormalizeThrowsExceptionOnInvalidValues($value)
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+        $node = new BooleanNode('test');
+        $node->normalize($value);
+    }
+
+    public function getInvalidValues()
+    {
+        return [
+            [null],
+            [''],
+            ['foo'],
+            [0],
+            [1],
+            [0.0],
+            [0.1],
+            [[]],
+            [['foo' => 'bar']],
+            [new \stdClass()],
+        ];
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/lib/symfony/config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
new file mode 100644
index 000000000..1123b4159
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
@@ -0,0 +1,362 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Builder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;
+use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException;
+use Symfony\Component\Config\Definition\Processor;
+
+class ArrayNodeDefinitionTest extends TestCase
+{
+    public function testAppendingSomeNode()
+    {
+        $parent = new ArrayNodeDefinition('root');
+        $child = new ScalarNodeDefinition('child');
+
+        $parent
+            ->children()
+                ->scalarNode('foo')->end()
+                ->scalarNode('bar')->end()
+            ->end()
+            ->append($child);
+
+        $this->assertCount(3, $this->getField($parent, 'children'));
+        $this->assertContains($child, $this->getField($parent, 'children'));
+    }
+
+    /**
+     * @dataProvider providePrototypeNodeSpecificCalls
+     */
+    public function testPrototypeNodeSpecificOption($method, $args)
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidDefinitionException');
+        $node = new ArrayNodeDefinition('root');
+
+        \call_user_func_array([$node, $method], $args);
+
+        $node->getNode();
+    }
+
+    public function providePrototypeNodeSpecificCalls()
+    {
+        return [
+            ['defaultValue', [[]]],
+            ['addDefaultChildrenIfNoneSet', []],
+            ['requiresAtLeastOneElement', []],
+            ['useAttributeAsKey', ['foo']],
+        ];
+    }
+
+    public function testConcreteNodeSpecificOption()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidDefinitionException');
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->addDefaultsIfNotSet()
+            ->prototype('array')
+        ;
+        $node->getNode();
+    }
+
+    public function testPrototypeNodesCantHaveADefaultValueWhenUsingDefaultChildren()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidDefinitionException');
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->defaultValue([])
+            ->addDefaultChildrenIfNoneSet('foo')
+            ->prototype('array')
+        ;
+        $node->getNode();
+    }
+
+    public function testPrototypedArrayNodeDefaultWhenUsingDefaultChildren()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->addDefaultChildrenIfNoneSet()
+            ->prototype('array')
+        ;
+        $tree = $node->getNode();
+        $this->assertEquals([[]], $tree->getDefaultValue());
+    }
+
+    /**
+     * @dataProvider providePrototypedArrayNodeDefaults
+     */
+    public function testPrototypedArrayNodeDefault($args, $shouldThrowWhenUsingAttrAsKey, $shouldThrowWhenNotUsingAttrAsKey, $defaults)
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->addDefaultChildrenIfNoneSet($args)
+            ->prototype('array')
+        ;
+
+        try {
+            $tree = $node->getNode();
+            $this->assertFalse($shouldThrowWhenNotUsingAttrAsKey);
+            $this->assertEquals($defaults, $tree->getDefaultValue());
+        } catch (InvalidDefinitionException $e) {
+            $this->assertTrue($shouldThrowWhenNotUsingAttrAsKey);
+        }
+
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->useAttributeAsKey('attr')
+            ->addDefaultChildrenIfNoneSet($args)
+            ->prototype('array')
+        ;
+
+        try {
+            $tree = $node->getNode();
+            $this->assertFalse($shouldThrowWhenUsingAttrAsKey);
+            $this->assertEquals($defaults, $tree->getDefaultValue());
+        } catch (InvalidDefinitionException $e) {
+            $this->assertTrue($shouldThrowWhenUsingAttrAsKey);
+        }
+    }
+
+    public function providePrototypedArrayNodeDefaults()
+    {
+        return [
+            [null, true, false, [[]]],
+            [2, true, false, [[], []]],
+            ['2', false, true, ['2' => []]],
+            ['foo', false, true, ['foo' => []]],
+            [['foo'], false, true, ['foo' => []]],
+            [['foo', 'bar'], false, true, ['foo' => [], 'bar' => []]],
+        ];
+    }
+
+    public function testNestedPrototypedArrayNodes()
+    {
+        $nodeDefinition = new ArrayNodeDefinition('root');
+        $nodeDefinition
+            ->addDefaultChildrenIfNoneSet()
+            ->prototype('array')
+                  ->prototype('array')
+        ;
+        $node = $nodeDefinition->getNode();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\PrototypedArrayNode', $node);
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\PrototypedArrayNode', $node->getPrototype());
+    }
+
+    public function testEnabledNodeDefaults()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->canBeEnabled()
+            ->children()
+                ->scalarNode('foo')->defaultValue('bar')->end()
+        ;
+
+        $this->assertEquals(['enabled' => false, 'foo' => 'bar'], $node->getNode()->getDefaultValue());
+    }
+
+    /**
+     * @dataProvider getEnableableNodeFixtures
+     */
+    public function testTrueEnableEnabledNode($expected, $config, $message)
+    {
+        $processor = new Processor();
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->canBeEnabled()
+            ->children()
+                ->scalarNode('foo')->defaultValue('bar')->end()
+        ;
+
+        $this->assertEquals(
+            $expected,
+            $processor->process($node->getNode(), $config),
+            $message
+        );
+    }
+
+    public function testCanBeDisabled()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node->canBeDisabled();
+
+        $this->assertTrue($this->getField($node, 'addDefaults'));
+        $this->assertEquals(['enabled' => false], $this->getField($node, 'falseEquivalent'));
+        $this->assertEquals(['enabled' => true], $this->getField($node, 'trueEquivalent'));
+        $this->assertEquals(['enabled' => true], $this->getField($node, 'nullEquivalent'));
+
+        $nodeChildren = $this->getField($node, 'children');
+        $this->assertArrayHasKey('enabled', $nodeChildren);
+
+        $enabledNode = $nodeChildren['enabled'];
+        $this->assertTrue($this->getField($enabledNode, 'default'));
+        $this->assertTrue($this->getField($enabledNode, 'defaultValue'));
+    }
+
+    public function testIgnoreExtraKeys()
+    {
+        $node = new ArrayNodeDefinition('root');
+
+        $this->assertFalse($this->getField($node, 'ignoreExtraKeys'));
+
+        $result = $node->ignoreExtraKeys();
+
+        $this->assertEquals($node, $result);
+        $this->assertTrue($this->getField($node, 'ignoreExtraKeys'));
+    }
+
+    public function testNormalizeKeys()
+    {
+        $node = new ArrayNodeDefinition('root');
+
+        $this->assertTrue($this->getField($node, 'normalizeKeys'));
+
+        $result = $node->normalizeKeys(false);
+
+        $this->assertEquals($node, $result);
+        $this->assertFalse($this->getField($node, 'normalizeKeys'));
+    }
+
+    public function testUnsetChild()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->children()
+                ->scalarNode('value')
+                    ->beforeNormalization()
+                        ->ifTrue(function ($value) {
+                            return empty($value);
+                        })
+                        ->thenUnset()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+
+        $this->assertSame([], $node->getNode()->normalize(['value' => null]));
+    }
+
+    public function testPrototypeVariable()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $this->assertEquals($node->prototype('variable'), $node->variablePrototype());
+    }
+
+    public function testPrototypeScalar()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $this->assertEquals($node->prototype('scalar'), $node->scalarPrototype());
+    }
+
+    public function testPrototypeBoolean()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $this->assertEquals($node->prototype('boolean'), $node->booleanPrototype());
+    }
+
+    public function testPrototypeInteger()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $this->assertEquals($node->prototype('integer'), $node->integerPrototype());
+    }
+
+    public function testPrototypeFloat()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $this->assertEquals($node->prototype('float'), $node->floatPrototype());
+    }
+
+    public function testPrototypeArray()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $this->assertEquals($node->prototype('array'), $node->arrayPrototype());
+    }
+
+    public function testPrototypeEnum()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $this->assertEquals($node->prototype('enum'), $node->enumPrototype());
+    }
+
+    public function getEnableableNodeFixtures()
+    {
+        return [
+            [['enabled' => true, 'foo' => 'bar'], [true], 'true enables an enableable node'],
+            [['enabled' => true, 'foo' => 'bar'], [null], 'null enables an enableable node'],
+            [['enabled' => true, 'foo' => 'bar'], [['enabled' => true]], 'An enableable node can be enabled'],
+            [['enabled' => true, 'foo' => 'baz'], [['foo' => 'baz']], 'any configuration enables an enableable node'],
+            [['enabled' => false, 'foo' => 'baz'], [['foo' => 'baz', 'enabled' => false]], 'An enableable node can be disabled'],
+            [['enabled' => false, 'foo' => 'bar'], [false], 'false disables an enableable node'],
+        ];
+    }
+
+    public function testRequiresAtLeastOneElement()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->requiresAtLeastOneElement()
+            ->integerPrototype();
+
+        $node->getNode()->finalize([1]);
+
+        $this->addToAssertionCount(1);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Using Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition::cannotBeEmpty() at path "root" has no effect, consider requiresAtLeastOneElement() instead. In 4.0 both methods will behave the same.
+     */
+    public function testCannotBeEmpty()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->cannotBeEmpty()
+            ->integerPrototype();
+
+        $node->getNode()->finalize([]);
+    }
+
+    public function testSetDeprecated()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->children()
+                ->arrayNode('foo')->setDeprecated('The "%path%" node is deprecated.')->end()
+            ->end()
+        ;
+        $deprecatedNode = $node->getNode()->getChildren()['foo'];
+
+        $this->assertTrue($deprecatedNode->isDeprecated());
+        $this->assertSame('The "root.foo" node is deprecated.', $deprecatedNode->getDeprecationMessage($deprecatedNode->getName(), $deprecatedNode->getPath()));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation ->cannotBeEmpty() is not applicable to concrete nodes at path "root". In 4.0 it will throw an exception.
+     */
+    public function testCannotBeEmptyOnConcreteNode()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node->cannotBeEmpty();
+
+        $node->getNode()->finalize([]);
+    }
+
+    protected function getField($object, $field)
+    {
+        $reflection = new \ReflectionProperty($object, $field);
+        $reflection->setAccessible(true);
+
+        return $reflection->getValue($object);
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php b/lib/symfony/config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php
new file mode 100644
index 000000000..6f568a2df
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Builder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition;
+
+class BooleanNodeDefinitionTest extends TestCase
+{
+    public function testCannotBeEmptyThrowsAnException()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidDefinitionException');
+        $this->expectExceptionMessage('->cannotBeEmpty() is not applicable to BooleanNodeDefinition.');
+        $def = new BooleanNodeDefinition('foo');
+        $def->cannotBeEmpty();
+    }
+
+    public function testSetDeprecated()
+    {
+        $def = new BooleanNodeDefinition('foo');
+        $def->setDeprecated('The "%path%" node is deprecated.');
+
+        $node = $def->getNode();
+
+        $this->assertTrue($node->isDeprecated());
+        $this->assertSame('The "foo" node is deprecated.', $node->getDeprecationMessage($node->getName(), $node->getPath()));
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/Builder/EnumNodeDefinitionTest.php b/lib/symfony/config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
new file mode 100644
index 000000000..2e43a1354
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Builder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\EnumNodeDefinition;
+
+class EnumNodeDefinitionTest extends TestCase
+{
+    public function testWithOneValue()
+    {
+        $def = new EnumNodeDefinition('foo');
+        $def->values(['foo']);
+
+        $node = $def->getNode();
+        $this->assertEquals(['foo'], $node->getValues());
+    }
+
+    public function testWithOneDistinctValue()
+    {
+        $def = new EnumNodeDefinition('foo');
+        $def->values(['foo', 'foo']);
+
+        $node = $def->getNode();
+        $this->assertEquals(['foo'], $node->getValues());
+    }
+
+    public function testNoValuesPassed()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('You must call ->values() on enum nodes.');
+        $def = new EnumNodeDefinition('foo');
+        $def->getNode();
+    }
+
+    public function testWithNoValues()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('->values() must be called with at least one value.');
+        $def = new EnumNodeDefinition('foo');
+        $def->values([]);
+    }
+
+    public function testGetNode()
+    {
+        $def = new EnumNodeDefinition('foo');
+        $def->values(['foo', 'bar']);
+
+        $node = $def->getNode();
+        $this->assertEquals(['foo', 'bar'], $node->getValues());
+    }
+
+    public function testSetDeprecated()
+    {
+        $def = new EnumNodeDefinition('foo');
+        $def->values(['foo', 'bar']);
+        $def->setDeprecated('The "%path%" node is deprecated.');
+
+        $node = $def->getNode();
+
+        $this->assertTrue($node->isDeprecated());
+        $this->assertSame('The "foo" node is deprecated.', $def->getNode()->getDeprecationMessage($node->getName(), $node->getPath()));
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/Builder/ExprBuilderTest.php b/lib/symfony/config/Tests/Definition/Builder/ExprBuilderTest.php
new file mode 100644
index 000000000..85d0d3631
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Builder/ExprBuilderTest.php
@@ -0,0 +1,264 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Builder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+
+class ExprBuilderTest extends TestCase
+{
+    public function testAlwaysExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->always($this->returnClosure('new_value'))
+        ->end();
+
+        $this->assertFinalizedValueIs('new_value', $test);
+    }
+
+    public function testIfTrueExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifTrue()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test, ['key' => true]);
+
+        $test = $this->getTestBuilder()
+            ->ifTrue(function ($v) { return true; })
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test);
+
+        $test = $this->getTestBuilder()
+            ->ifTrue(function ($v) { return false; })
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('value', $test);
+    }
+
+    public function testIfStringExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifString()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test);
+
+        $test = $this->getTestBuilder()
+            ->ifString()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs(45, $test, ['key' => 45]);
+    }
+
+    public function testIfNullExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifNull()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test, ['key' => null]);
+
+        $test = $this->getTestBuilder()
+            ->ifNull()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('value', $test);
+    }
+
+    public function testIfEmptyExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifEmpty()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test, ['key' => []]);
+
+        $test = $this->getTestBuilder()
+            ->ifEmpty()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('value', $test);
+    }
+
+    public function testIfArrayExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifArray()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test, ['key' => []]);
+
+        $test = $this->getTestBuilder()
+            ->ifArray()
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('value', $test);
+    }
+
+    public function testIfInArrayExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifInArray(['foo', 'bar', 'value'])
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test);
+
+        $test = $this->getTestBuilder()
+            ->ifInArray(['foo', 'bar'])
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('value', $test);
+    }
+
+    public function testIfNotInArrayExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifNotInArray(['foo', 'bar'])
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test);
+
+        $test = $this->getTestBuilder()
+            ->ifNotInArray(['foo', 'bar', 'value_from_config'])
+            ->then($this->returnClosure('new_value'))
+        ->end();
+        $this->assertFinalizedValueIs('new_value', $test);
+    }
+
+    public function testThenEmptyArrayExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifString()
+            ->thenEmptyArray()
+        ->end();
+        $this->assertFinalizedValueIs([], $test);
+    }
+
+    /**
+     * @dataProvider castToArrayValues
+     */
+    public function testcastToArrayExpression($configValue, $expectedValue)
+    {
+        $test = $this->getTestBuilder()
+            ->castToArray()
+        ->end();
+        $this->assertFinalizedValueIs($expectedValue, $test, ['key' => $configValue]);
+    }
+
+    public function castToArrayValues()
+    {
+        yield ['value', ['value']];
+        yield [-3.14, [-3.14]];
+        yield [null, [null]];
+        yield [['value'], ['value']];
+    }
+
+    public function testThenInvalid()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $test = $this->getTestBuilder()
+            ->ifString()
+            ->thenInvalid('Invalid value')
+        ->end();
+        $this->finalizeTestBuilder($test);
+    }
+
+    public function testThenUnsetExpression()
+    {
+        $test = $this->getTestBuilder()
+            ->ifString()
+            ->thenUnset()
+        ->end();
+        $this->assertEquals([], $this->finalizeTestBuilder($test));
+    }
+
+    public function testEndIfPartNotSpecified()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('You must specify an if part.');
+        $this->getTestBuilder()->end();
+    }
+
+    public function testEndThenPartNotSpecified()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('You must specify a then part.');
+        $builder = $this->getTestBuilder();
+        $builder->ifPart = 'test';
+        $builder->end();
+    }
+
+    /**
+     * Create a test treebuilder with a variable node, and init the validation.
+     *
+     * @return TreeBuilder
+     */
+    protected function getTestBuilder()
+    {
+        $builder = new TreeBuilder();
+
+        return $builder
+            ->root('test')
+            ->children()
+            ->variableNode('key')
+            ->validate()
+        ;
+    }
+
+    /**
+     * Close the validation process and finalize with the given config.
+     *
+     * @param TreeBuilder $testBuilder The tree builder to finalize
+     * @param array       $config      The config you want to use for the finalization, if nothing provided
+     *                                 a simple ['key'=>'value'] will be used
+     *
+     * @return array The finalized config values
+     */
+    protected function finalizeTestBuilder($testBuilder, $config = null)
+    {
+        return $testBuilder
+            ->end()
+            ->end()
+            ->end()
+            ->buildTree()
+            ->finalize(null === $config ? ['key' => 'value'] : $config)
+        ;
+    }
+
+    /**
+     * Return a closure that will return the given value.
+     *
+     * @param mixed $val The value that the closure must return
+     *
+     * @return \Closure
+     */
+    protected function returnClosure($val)
+    {
+        return function ($v) use ($val) {
+            return $val;
+        };
+    }
+
+    /**
+     * Assert that the given test builder, will return the given value.
+     *
+     * @param mixed       $value       The value to test
+     * @param TreeBuilder $treeBuilder The tree builder to finalize
+     * @param mixed       $config      The config values that new to be finalized
+     */
+    protected function assertFinalizedValueIs($value, $treeBuilder, $config = null)
+    {
+        $this->assertEquals(['key' => $value], $this->finalizeTestBuilder($treeBuilder, $config));
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/Builder/NodeBuilderTest.php b/lib/symfony/config/Tests/Definition/Builder/NodeBuilderTest.php
new file mode 100644
index 000000000..5cc7cfea4
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Builder/NodeBuilderTest.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Builder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;
+use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;
+
+class NodeBuilderTest extends TestCase
+{
+    public function testThrowsAnExceptionWhenTryingToCreateANonRegisteredNodeType()
+    {
+        $this->expectException('RuntimeException');
+        $builder = new BaseNodeBuilder();
+        $builder->node('', 'foobar');
+    }
+
+    public function testThrowsAnExceptionWhenTheNodeClassIsNotFound()
+    {
+        $this->expectException('RuntimeException');
+        $builder = new BaseNodeBuilder();
+        $builder
+            ->setNodeClass('noclasstype', '\\foo\\bar\\noclass')
+            ->node('', 'noclasstype');
+    }
+
+    public function testAddingANewNodeType()
+    {
+        $class = __NAMESPACE__.'\\SomeNodeDefinition';
+
+        $builder = new BaseNodeBuilder();
+        $node = $builder
+            ->setNodeClass('newtype', $class)
+            ->node('', 'newtype');
+
+        $this->assertInstanceOf($class, $node);
+    }
+
+    public function testOverridingAnExistingNodeType()
+    {
+        $class = __NAMESPACE__.'\\SomeNodeDefinition';
+
+        $builder = new BaseNodeBuilder();
+        $node = $builder
+            ->setNodeClass('variable', $class)
+            ->node('', 'variable');
+
+        $this->assertInstanceOf($class, $node);
+    }
+
+    public function testNodeTypesAreNotCaseSensitive()
+    {
+        $builder = new BaseNodeBuilder();
+
+        $node1 = $builder->node('', 'VaRiAbLe');
+        $node2 = $builder->node('', 'variable');
+
+        $this->assertInstanceOf(\get_class($node1), $node2);
+
+        $builder->setNodeClass('CuStOm', __NAMESPACE__.'\\SomeNodeDefinition');
+
+        $node1 = $builder->node('', 'CUSTOM');
+        $node2 = $builder->node('', 'custom');
+
+        $this->assertInstanceOf(\get_class($node1), $node2);
+    }
+
+    public function testNumericNodeCreation()
+    {
+        $builder = new BaseNodeBuilder();
+
+        $node = $builder->integerNode('foo')->min(3)->max(5);
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition', $node);
+
+        $node = $builder->floatNode('bar')->min(3.0)->max(5.0);
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\Builder\FloatNodeDefinition', $node);
+    }
+}
+
+class SomeNodeDefinition extends BaseVariableNodeDefinition
+{
+}
diff --git a/lib/symfony/config/Tests/Definition/Builder/NumericNodeDefinitionTest.php b/lib/symfony/config/Tests/Definition/Builder/NumericNodeDefinitionTest.php
new file mode 100644
index 000000000..aa938bbaa
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Builder/NumericNodeDefinitionTest.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Builder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\FloatNodeDefinition;
+use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition;
+
+class NumericNodeDefinitionTest extends TestCase
+{
+    public function testIncoherentMinAssertion()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('You cannot define a min(4) as you already have a max(3)');
+        $def = new IntegerNodeDefinition('foo');
+        $def->max(3)->min(4);
+    }
+
+    public function testIncoherentMaxAssertion()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('You cannot define a max(2) as you already have a min(3)');
+        $node = new IntegerNodeDefinition('foo');
+        $node->min(3)->max(2);
+    }
+
+    public function testIntegerMinAssertion()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('The value 4 is too small for path "foo". Should be greater than or equal to 5');
+        $def = new IntegerNodeDefinition('foo');
+        $def->min(5)->getNode()->finalize(4);
+    }
+
+    public function testIntegerMaxAssertion()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('The value 4 is too big for path "foo". Should be less than or equal to 3');
+        $def = new IntegerNodeDefinition('foo');
+        $def->max(3)->getNode()->finalize(4);
+    }
+
+    public function testIntegerValidMinMaxAssertion()
+    {
+        $def = new IntegerNodeDefinition('foo');
+        $node = $def->min(3)->max(7)->getNode();
+        $this->assertEquals(4, $node->finalize(4));
+    }
+
+    public function testFloatMinAssertion()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('The value 400 is too small for path "foo". Should be greater than or equal to 500');
+        $def = new FloatNodeDefinition('foo');
+        $def->min(5E2)->getNode()->finalize(4e2);
+    }
+
+    public function testFloatMaxAssertion()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('The value 4.3 is too big for path "foo". Should be less than or equal to 0.3');
+        $def = new FloatNodeDefinition('foo');
+        $def->max(0.3)->getNode()->finalize(4.3);
+    }
+
+    public function testFloatValidMinMaxAssertion()
+    {
+        $def = new FloatNodeDefinition('foo');
+        $node = $def->min(3.0)->max(7e2)->getNode();
+        $this->assertEquals(4.5, $node->finalize(4.5));
+    }
+
+    public function testCannotBeEmptyThrowsAnException()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidDefinitionException');
+        $this->expectExceptionMessage('->cannotBeEmpty() is not applicable to NumericNodeDefinition.');
+        $def = new IntegerNodeDefinition('foo');
+        $def->cannotBeEmpty();
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/Builder/TreeBuilderTest.php b/lib/symfony/config/Tests/Definition/Builder/TreeBuilderTest.php
new file mode 100644
index 000000000..53c9c256b
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Builder/TreeBuilderTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Builder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder as CustomNodeBuilder;
+
+class TreeBuilderTest extends TestCase
+{
+    public function testUsingACustomNodeBuilder()
+    {
+        $builder = new TreeBuilder();
+        $root = $builder->root('custom', 'array', new CustomNodeBuilder());
+
+        $nodeBuilder = $root->children();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder', $nodeBuilder);
+
+        $nodeBuilder = $nodeBuilder->arrayNode('deeper')->children();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder', $nodeBuilder);
+    }
+
+    public function testOverrideABuiltInNodeType()
+    {
+        $builder = new TreeBuilder();
+        $root = $builder->root('override', 'array', new CustomNodeBuilder());
+
+        $definition = $root->children()->variableNode('variable');
+
+        $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\VariableNodeDefinition', $definition);
+    }
+
+    public function testAddANodeType()
+    {
+        $builder = new TreeBuilder();
+        $root = $builder->root('override', 'array', new CustomNodeBuilder());
+
+        $definition = $root->children()->barNode('variable');
+
+        $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\BarNodeDefinition', $definition);
+    }
+
+    public function testCreateABuiltInNodeTypeWithACustomNodeBuilder()
+    {
+        $builder = new TreeBuilder();
+        $root = $builder->root('builtin', 'array', new CustomNodeBuilder());
+
+        $definition = $root->children()->booleanNode('boolean');
+
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition', $definition);
+    }
+
+    public function testPrototypedArrayNodeUseTheCustomNodeBuilder()
+    {
+        $builder = new TreeBuilder();
+        $root = $builder->root('override', 'array', new CustomNodeBuilder());
+
+        $root->prototype('bar')->end();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\BarNode', $root->getNode(true)->getPrototype());
+    }
+
+    public function testAnExtendedNodeBuilderGetsPropagatedToTheChildren()
+    {
+        $builder = new TreeBuilder();
+
+        $builder->root('propagation')
+            ->children()
+                ->setNodeClass('extended', 'Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition')
+                ->node('foo', 'extended')->end()
+                ->arrayNode('child')
+                    ->children()
+                        ->node('foo', 'extended')
+                    ->end()
+                ->end()
+            ->end()
+        ->end();
+
+        $node = $builder->buildTree();
+        $children = $node->getChildren();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\BooleanNode', $children['foo']);
+
+        $childChildren = $children['child']->getChildren();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\BooleanNode', $childChildren['foo']);
+    }
+
+    public function testDefinitionInfoGetsTransferredToNode()
+    {
+        $builder = new TreeBuilder();
+
+        $builder->root('test')->info('root info')
+            ->children()
+                ->node('child', 'variable')->info('child info')->defaultValue('default')
+            ->end()
+        ->end();
+
+        $tree = $builder->buildTree();
+        $children = $tree->getChildren();
+
+        $this->assertEquals('root info', $tree->getInfo());
+        $this->assertEquals('child info', $children['child']->getInfo());
+    }
+
+    public function testDefinitionExampleGetsTransferredToNode()
+    {
+        $builder = new TreeBuilder();
+
+        $builder->root('test')
+            ->example(['key' => 'value'])
+            ->children()
+                ->node('child', 'variable')->info('child info')->defaultValue('default')->example('example')
+            ->end()
+        ->end();
+
+        $tree = $builder->buildTree();
+        $children = $tree->getChildren();
+
+        $this->assertIsArray($tree->getExample());
+        $this->assertEquals('example', $children['child']->getExample());
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/Dumper/XmlReferenceDumperTest.php b/lib/symfony/config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
new file mode 100644
index 000000000..5bc961bab
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Dumper\XmlReferenceDumper;
+use Symfony\Component\Config\Tests\Fixtures\Configuration\ExampleConfiguration;
+
+class XmlReferenceDumperTest extends TestCase
+{
+    public function testDumper()
+    {
+        $configuration = new ExampleConfiguration();
+
+        $dumper = new XmlReferenceDumper();
+        $this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));
+    }
+
+    public function testNamespaceDumper()
+    {
+        $configuration = new ExampleConfiguration();
+
+        $dumper = new XmlReferenceDumper();
+        $this->assertEquals(str_replace('http://example.org/schema/dic/acme_root', 'http://symfony.com/schema/dic/symfony', $this->getConfigurationAsString()), $dumper->dump($configuration, 'http://symfony.com/schema/dic/symfony'));
+    }
+
+    private function getConfigurationAsString()
+    {
+        return str_replace("\n", PHP_EOL, <<<'EOL'
+<!-- Namespace: http://example.org/schema/dic/acme_root -->
+<!-- scalar-required: Required -->
+<!-- scalar-deprecated: Deprecated (The child node "scalar_deprecated" at path "acme_root" is deprecated.) -->
+<!-- scalar-deprecated-with-message: Deprecated (Deprecation custom message for "scalar_deprecated_with_message" at "acme_root") -->
+<!-- enum-with-default: One of "this"; "that" -->
+<!-- enum: One of "this"; "that" -->
+<config
+    boolean="true"
+    scalar-empty=""
+    scalar-null="null"
+    scalar-true="true"
+    scalar-false="false"
+    scalar-default="default"
+    scalar-array-empty=""
+    scalar-array-defaults="elem1,elem2"
+    scalar-required=""
+    scalar-deprecated=""
+    scalar-deprecated-with-message=""
+    node-with-a-looong-name=""
+    enum-with-default="this"
+    enum=""
+>
+
+    <!-- some info -->
+    <!--
+        child3: this is a long
+                multi-line info text
+                which should be indented;
+                Example: example setting
+    -->
+    <array
+        child1=""
+        child2=""
+        child3=""
+    />
+
+    <!-- prototype -->
+    <scalar-prototyped>scalar value</scalar-prototyped>
+
+    <!-- prototype: Parameter name -->
+    <parameter name="parameter name">scalar value</parameter>
+
+    <!-- prototype -->
+    <connection
+        user=""
+        pass=""
+    />
+
+    <!-- prototype -->
+    <cms-page page="cms page page">
+
+        <!-- prototype -->
+        <!-- title: Required -->
+        <!-- path: Required -->
+        <page
+            locale="page locale"
+            title=""
+            path=""
+        />
+
+    </cms-page>
+
+    <!-- prototype -->
+    <pipou name="pipou name">
+
+        <!-- prototype -->
+        <name didou="" />
+
+    </pipou>
+
+</config>
+
+EOL
+        );
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/lib/symfony/config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
new file mode 100644
index 000000000..3cb9121ba
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper;
+use Symfony\Component\Config\Tests\Fixtures\Configuration\ExampleConfiguration;
+
+class YamlReferenceDumperTest extends TestCase
+{
+    public function testDumper()
+    {
+        $configuration = new ExampleConfiguration();
+
+        $dumper = new YamlReferenceDumper();
+
+        $this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));
+    }
+
+    public function provideDumpAtPath()
+    {
+        return [
+            'Regular node' => ['scalar_true', <<<EOL
+scalar_true:          true
+EOL
+            ],
+            'Array node' => ['array', <<<EOL
+# some info
+array:
+    child1:               ~
+    child2:               ~
+
+    # this is a long
+    # multi-line info text
+    # which should be indented
+    child3:               ~ # Example: example setting
+EOL
+            ],
+            'Regular nested' => ['array.child2', <<<EOL
+child2:               ~
+EOL
+            ],
+            'Prototype' => ['cms_pages.page', <<<EOL
+# Prototype
+page:
+
+    # Prototype
+    locale:
+        title:                ~ # Required
+        path:                 ~ # Required
+EOL
+            ],
+            'Nested prototype' => ['cms_pages.page.locale', <<<EOL
+# Prototype
+locale:
+    title:                ~ # Required
+    path:                 ~ # Required
+EOL
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideDumpAtPath
+     */
+    public function testDumpAtPath($path, $expected)
+    {
+        $configuration = new ExampleConfiguration();
+
+        $dumper = new YamlReferenceDumper();
+
+        $this->assertSame(trim($expected), trim($dumper->dumpAtPath($configuration, $path)));
+    }
+
+    private function getConfigurationAsString()
+    {
+        return <<<'EOL'
+acme_root:
+    boolean:              true
+    scalar_empty:         ~
+    scalar_null:          null
+    scalar_true:          true
+    scalar_false:         false
+    scalar_default:       default
+    scalar_array_empty:   []
+    scalar_array_defaults:
+
+        # Defaults:
+        - elem1
+        - elem2
+    scalar_required:      ~ # Required
+    scalar_deprecated:    ~ # Deprecated (The child node "scalar_deprecated" at path "acme_root" is deprecated.)
+    scalar_deprecated_with_message: ~ # Deprecated (Deprecation custom message for "scalar_deprecated_with_message" at "acme_root")
+    node_with_a_looong_name: ~
+    enum_with_default:    this # One of "this"; "that"
+    enum:                 ~ # One of "this"; "that"
+
+    # some info
+    array:
+        child1:               ~
+        child2:               ~
+
+        # this is a long
+        # multi-line info text
+        # which should be indented
+        child3:               ~ # Example: example setting
+    scalar_prototyped:    []
+    parameters:
+
+        # Prototype: Parameter name
+        name:                 ~
+    connections:
+
+        # Prototype
+        -
+            user:                 ~
+            pass:                 ~
+    cms_pages:
+
+        # Prototype
+        page:
+
+            # Prototype
+            locale:
+                title:                ~ # Required
+                path:                 ~ # Required
+    pipou:
+
+        # Prototype
+        name:                 []
+
+EOL;
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/EnumNodeTest.php b/lib/symfony/config/Tests/Definition/EnumNodeTest.php
new file mode 100644
index 000000000..fa89eea23
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/EnumNodeTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\EnumNode;
+
+class EnumNodeTest extends TestCase
+{
+    public function testFinalizeValue()
+    {
+        $node = new EnumNode('foo', null, ['foo', 'bar']);
+        $this->assertSame('foo', $node->finalize('foo'));
+    }
+
+    public function testConstructionWithNoValues()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('$values must contain at least one element.');
+        new EnumNode('foo', null, []);
+    }
+
+    public function testConstructionWithOneValue()
+    {
+        $node = new EnumNode('foo', null, ['foo']);
+        $this->assertSame('foo', $node->finalize('foo'));
+    }
+
+    public function testConstructionWithOneDistinctValue()
+    {
+        $node = new EnumNode('foo', null, ['foo', 'foo']);
+        $this->assertSame('foo', $node->finalize('foo'));
+    }
+
+    public function testFinalizeWithInvalidValue()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('The value "foobar" is not allowed for path "foo". Permissible values: "foo", "bar"');
+        $node = new EnumNode('foo', null, ['foo', 'bar']);
+        $node->finalize('foobar');
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/FinalizationTest.php b/lib/symfony/config/Tests/Definition/FinalizationTest.php
new file mode 100644
index 000000000..be68a27c6
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/FinalizationTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\NodeInterface;
+use Symfony\Component\Config\Definition\Processor;
+
+class FinalizationTest extends TestCase
+{
+    public function testUnsetKeyWithDeepHierarchy()
+    {
+        $tb = new TreeBuilder();
+        $tree = $tb
+            ->root('config', 'array')
+                ->children()
+                    ->node('level1', 'array')
+                        ->canBeUnset()
+                        ->children()
+                            ->node('level2', 'array')
+                                ->canBeUnset()
+                                ->children()
+                                    ->node('somevalue', 'scalar')->end()
+                                    ->node('anothervalue', 'scalar')->end()
+                                ->end()
+                            ->end()
+                            ->node('level1_scalar', 'scalar')->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        $a = [
+            'level1' => [
+                'level2' => [
+                    'somevalue' => 'foo',
+                    'anothervalue' => 'bar',
+                ],
+                'level1_scalar' => 'foo',
+            ],
+        ];
+
+        $b = [
+            'level1' => [
+                'level2' => false,
+            ],
+        ];
+
+        $this->assertEquals([
+            'level1' => [
+                'level1_scalar' => 'foo',
+            ],
+        ], $this->process($tree, [$a, $b]));
+    }
+
+    protected function process(NodeInterface $tree, array $configs)
+    {
+        $processor = new Processor();
+
+        return $processor->process($tree, $configs);
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/FloatNodeTest.php b/lib/symfony/config/Tests/Definition/FloatNodeTest.php
new file mode 100644
index 000000000..fed9f013d
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/FloatNodeTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\FloatNode;
+
+class FloatNodeTest extends TestCase
+{
+    /**
+     * @dataProvider getValidValues
+     */
+    public function testNormalize($value)
+    {
+        $node = new FloatNode('test');
+        $this->assertSame($value, $node->normalize($value));
+    }
+
+    /**
+     * @dataProvider getValidValues
+     *
+     * @param int $value
+     */
+    public function testValidNonEmptyValues($value)
+    {
+        $node = new FloatNode('test');
+        $node->setAllowEmptyValue(false);
+
+        $this->assertSame($value, $node->finalize($value));
+    }
+
+    public function getValidValues()
+    {
+        return [
+            [1798.0],
+            [-678.987],
+            [12.56E45],
+            [0.0],
+            // Integer are accepted too, they will be cast
+            [17],
+            [-10],
+            [0],
+        ];
+    }
+
+    /**
+     * @dataProvider getInvalidValues
+     */
+    public function testNormalizeThrowsExceptionOnInvalidValues($value)
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+        $node = new FloatNode('test');
+        $node->normalize($value);
+    }
+
+    public function getInvalidValues()
+    {
+        return [
+            [null],
+            [''],
+            ['foo'],
+            [true],
+            [false],
+            [[]],
+            [['foo' => 'bar']],
+            [new \stdClass()],
+        ];
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/IntegerNodeTest.php b/lib/symfony/config/Tests/Definition/IntegerNodeTest.php
new file mode 100644
index 000000000..3fb1b771e
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/IntegerNodeTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\IntegerNode;
+
+class IntegerNodeTest extends TestCase
+{
+    /**
+     * @dataProvider getValidValues
+     */
+    public function testNormalize($value)
+    {
+        $node = new IntegerNode('test');
+        $this->assertSame($value, $node->normalize($value));
+    }
+
+    /**
+     * @dataProvider getValidValues
+     *
+     * @param int $value
+     */
+    public function testValidNonEmptyValues($value)
+    {
+        $node = new IntegerNode('test');
+        $node->setAllowEmptyValue(false);
+
+        $this->assertSame($value, $node->finalize($value));
+    }
+
+    public function getValidValues()
+    {
+        return [
+            [1798],
+            [-678],
+            [0],
+        ];
+    }
+
+    /**
+     * @dataProvider getInvalidValues
+     */
+    public function testNormalizeThrowsExceptionOnInvalidValues($value)
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+        $node = new IntegerNode('test');
+        $node->normalize($value);
+    }
+
+    public function getInvalidValues()
+    {
+        return [
+            [null],
+            [''],
+            ['foo'],
+            [true],
+            [false],
+            [0.0],
+            [0.1],
+            [[]],
+            [['foo' => 'bar']],
+            [new \stdClass()],
+        ];
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/MergeTest.php b/lib/symfony/config/Tests/Definition/MergeTest.php
new file mode 100644
index 000000000..8fee2635c
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/MergeTest.php
@@ -0,0 +1,192 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+
+class MergeTest extends TestCase
+{
+    public function testForbiddenOverwrite()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\ForbiddenOverwriteException');
+        $tb = new TreeBuilder();
+        $tree = $tb
+            ->root('root', 'array')
+                ->children()
+                    ->node('foo', 'scalar')
+                        ->cannotBeOverwritten()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        $a = [
+            'foo' => 'bar',
+        ];
+
+        $b = [
+            'foo' => 'moo',
+        ];
+
+        $tree->merge($a, $b);
+    }
+
+    public function testUnsetKey()
+    {
+        $tb = new TreeBuilder();
+        $tree = $tb
+            ->root('root', 'array')
+                ->children()
+                    ->node('foo', 'scalar')->end()
+                    ->node('bar', 'scalar')->end()
+                    ->node('unsettable', 'array')
+                        ->canBeUnset()
+                        ->children()
+                            ->node('foo', 'scalar')->end()
+                            ->node('bar', 'scalar')->end()
+                        ->end()
+                    ->end()
+                    ->node('unsetted', 'array')
+                        ->canBeUnset()
+                        ->prototype('scalar')->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        $a = [
+            'foo' => 'bar',
+            'unsettable' => [
+                'foo' => 'a',
+                'bar' => 'b',
+            ],
+            'unsetted' => false,
+        ];
+
+        $b = [
+            'foo' => 'moo',
+            'bar' => 'b',
+            'unsettable' => false,
+            'unsetted' => ['a', 'b'],
+        ];
+
+        $this->assertEquals([
+            'foo' => 'moo',
+            'bar' => 'b',
+            'unsettable' => false,
+            'unsetted' => ['a', 'b'],
+        ], $tree->merge($a, $b));
+    }
+
+    public function testDoesNotAllowNewKeysInSubsequentConfigs()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $tb = new TreeBuilder();
+        $tree = $tb
+            ->root('config', 'array')
+                ->children()
+                    ->node('test', 'array')
+                        ->disallowNewKeysInSubsequentConfigs()
+                        ->useAttributeAsKey('key')
+                        ->prototype('array')
+                            ->children()
+                                ->node('value', 'scalar')->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree();
+
+        $a = [
+            'test' => [
+                'a' => ['value' => 'foo'],
+            ],
+        ];
+
+        $b = [
+            'test' => [
+                'b' => ['value' => 'foo'],
+            ],
+        ];
+
+        $tree->merge($a, $b);
+    }
+
+    public function testPerformsNoDeepMerging()
+    {
+        $tb = new TreeBuilder();
+
+        $tree = $tb
+            ->root('config', 'array')
+                ->children()
+                    ->node('no_deep_merging', 'array')
+                        ->performNoDeepMerging()
+                        ->children()
+                            ->node('foo', 'scalar')->end()
+                            ->node('bar', 'scalar')->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        $a = [
+            'no_deep_merging' => [
+                'foo' => 'a',
+                'bar' => 'b',
+            ],
+        ];
+
+        $b = [
+            'no_deep_merging' => [
+                'c' => 'd',
+            ],
+        ];
+
+        $this->assertEquals([
+            'no_deep_merging' => [
+                'c' => 'd',
+            ],
+        ], $tree->merge($a, $b));
+    }
+
+    public function testPrototypeWithoutAKeyAttribute()
+    {
+        $tb = new TreeBuilder();
+
+        $tree = $tb
+            ->root('config', 'array')
+                ->children()
+                    ->arrayNode('append_elements')
+                        ->prototype('scalar')->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        $a = [
+            'append_elements' => ['a', 'b'],
+        ];
+
+        $b = [
+            'append_elements' => ['c', 'd'],
+        ];
+
+        $this->assertEquals(['append_elements' => ['a', 'b', 'c', 'd']], $tree->merge($a, $b));
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/NormalizationTest.php b/lib/symfony/config/Tests/Definition/NormalizationTest.php
new file mode 100644
index 000000000..200a98594
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/NormalizationTest.php
@@ -0,0 +1,228 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\NodeInterface;
+
+class NormalizationTest extends TestCase
+{
+    /**
+     * @dataProvider getEncoderTests
+     */
+    public function testNormalizeEncoders($denormalized)
+    {
+        $tb = new TreeBuilder();
+        $tree = $tb
+            ->root('root_name', 'array')
+                ->fixXmlConfig('encoder')
+                ->children()
+                    ->node('encoders', 'array')
+                        ->useAttributeAsKey('class')
+                        ->prototype('array')
+                            ->beforeNormalization()->ifString()->then(function ($v) { return ['algorithm' => $v]; })->end()
+                            ->children()
+                                ->node('algorithm', 'scalar')->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        $normalized = [
+            'encoders' => [
+                'foo' => ['algorithm' => 'plaintext'],
+            ],
+        ];
+
+        $this->assertNormalized($tree, $denormalized, $normalized);
+    }
+
+    public function getEncoderTests()
+    {
+        $configs = [];
+
+        // XML
+        $configs[] = [
+            'encoder' => [
+                ['class' => 'foo', 'algorithm' => 'plaintext'],
+            ],
+        ];
+
+        // XML when only one element of this type
+        $configs[] = [
+            'encoder' => ['class' => 'foo', 'algorithm' => 'plaintext'],
+        ];
+
+        // YAML/PHP
+        $configs[] = [
+            'encoders' => [
+                ['class' => 'foo', 'algorithm' => 'plaintext'],
+            ],
+        ];
+
+        // YAML/PHP
+        $configs[] = [
+            'encoders' => [
+                'foo' => 'plaintext',
+            ],
+        ];
+
+        // YAML/PHP
+        $configs[] = [
+            'encoders' => [
+                'foo' => ['algorithm' => 'plaintext'],
+            ],
+        ];
+
+        return array_map(function ($v) {
+            return [$v];
+        }, $configs);
+    }
+
+    /**
+     * @dataProvider getAnonymousKeysTests
+     */
+    public function testAnonymousKeysArray($denormalized)
+    {
+        $tb = new TreeBuilder();
+        $tree = $tb
+            ->root('root', 'array')
+                ->children()
+                    ->node('logout', 'array')
+                        ->fixXmlConfig('handler')
+                        ->children()
+                            ->node('handlers', 'array')
+                                ->prototype('scalar')->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        $normalized = ['logout' => ['handlers' => ['a', 'b', 'c']]];
+
+        $this->assertNormalized($tree, $denormalized, $normalized);
+    }
+
+    public function getAnonymousKeysTests()
+    {
+        $configs = [];
+
+        $configs[] = [
+            'logout' => [
+                'handlers' => ['a', 'b', 'c'],
+            ],
+        ];
+
+        $configs[] = [
+            'logout' => [
+                'handler' => ['a', 'b', 'c'],
+            ],
+        ];
+
+        return array_map(function ($v) { return [$v]; }, $configs);
+    }
+
+    /**
+     * @dataProvider getNumericKeysTests
+     */
+    public function testNumericKeysAsAttributes($denormalized)
+    {
+        $normalized = [
+            'thing' => [42 => ['foo', 'bar'], 1337 => ['baz', 'qux']],
+        ];
+
+        $this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, $normalized);
+    }
+
+    public function getNumericKeysTests()
+    {
+        $configs = [];
+
+        $configs[] = [
+            'thing' => [
+                42 => ['foo', 'bar'], 1337 => ['baz', 'qux'],
+            ],
+        ];
+
+        $configs[] = [
+            'thing' => [
+                ['foo', 'bar', 'id' => 42], ['baz', 'qux', 'id' => 1337],
+            ],
+        ];
+
+        return array_map(function ($v) { return [$v]; }, $configs);
+    }
+
+    public function testNonAssociativeArrayThrowsExceptionIfAttributeNotSet()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('The attribute "id" must be set for path "root.thing".');
+        $denormalized = [
+            'thing' => [
+                ['foo', 'bar'], ['baz', 'qux'],
+            ],
+        ];
+
+        $this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, []);
+    }
+
+    public function testAssociativeArrayPreserveKeys()
+    {
+        $tb = new TreeBuilder();
+        $tree = $tb
+            ->root('root', 'array')
+                ->prototype('array')
+                    ->children()
+                        ->node('foo', 'scalar')->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        $data = ['first' => ['foo' => 'bar']];
+
+        $this->assertNormalized($tree, $data, $data);
+    }
+
+    public static function assertNormalized(NodeInterface $tree, $denormalized, $normalized)
+    {
+        self::assertSame($normalized, $tree->normalize($denormalized));
+    }
+
+    private function getNumericKeysTestTree()
+    {
+        $tb = new TreeBuilder();
+        $tree = $tb
+            ->root('root', 'array')
+                ->children()
+                    ->node('thing', 'array')
+                        ->useAttributeAsKey('id')
+                        ->prototype('array')
+                            ->prototype('scalar')->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+            ->buildTree()
+        ;
+
+        return $tree;
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/PrototypedArrayNodeTest.php b/lib/symfony/config/Tests/Definition/PrototypedArrayNodeTest.php
new file mode 100644
index 000000000..7a58ead8d
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/PrototypedArrayNodeTest.php
@@ -0,0 +1,341 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\ArrayNode;
+use Symfony\Component\Config\Definition\PrototypedArrayNode;
+use Symfony\Component\Config\Definition\ScalarNode;
+use Symfony\Component\Config\Definition\VariableNode;
+
+class PrototypedArrayNodeTest extends TestCase
+{
+    public function testGetDefaultValueReturnsAnEmptyArrayForPrototypes()
+    {
+        $node = new PrototypedArrayNode('root');
+        $prototype = new ArrayNode(null, $node);
+        $node->setPrototype($prototype);
+        $this->assertEmpty($node->getDefaultValue());
+    }
+
+    public function testGetDefaultValueReturnsDefaultValueForPrototypes()
+    {
+        $node = new PrototypedArrayNode('root');
+        $prototype = new ArrayNode(null, $node);
+        $node->setPrototype($prototype);
+        $node->setDefaultValue(['test']);
+        $this->assertEquals(['test'], $node->getDefaultValue());
+    }
+
+    // a remapped key (e.g. "mapping" -> "mappings") should be unset after being used
+    public function testRemappedKeysAreUnset()
+    {
+        $node = new ArrayNode('root');
+        $mappingsNode = new PrototypedArrayNode('mappings');
+        $node->addChild($mappingsNode);
+
+        // each item under mappings is just a scalar
+        $prototype = new ScalarNode(null, $mappingsNode);
+        $mappingsNode->setPrototype($prototype);
+
+        $remappings = [];
+        $remappings[] = ['mapping', 'mappings'];
+        $node->setXmlRemappings($remappings);
+
+        $normalized = $node->normalize(['mapping' => ['foo', 'bar']]);
+        $this->assertEquals(['mappings' => ['foo', 'bar']], $normalized);
+    }
+
+    /**
+     * Tests that when a key attribute is mapped, that key is removed from the array.
+     *
+     *     <things>
+     *         <option id="option1" value="foo">
+     *         <option id="option2" value="bar">
+     *     </things>
+     *
+     * The above should finally be mapped to an array that looks like this
+     * (because "id" is the key attribute).
+     *
+     *     [
+     *         'things' => [
+     *             'option1' => 'foo',
+     *             'option2' => 'bar',
+     *         ]
+     *     ]
+     */
+    public function testMappedAttributeKeyIsRemoved()
+    {
+        $node = new PrototypedArrayNode('root');
+        $node->setKeyAttribute('id', true);
+
+        // each item under the root is an array, with one scalar item
+        $prototype = new ArrayNode(null, $node);
+        $prototype->addChild(new ScalarNode('foo'));
+        $node->setPrototype($prototype);
+
+        $children = [];
+        $children[] = ['id' => 'item_name', 'foo' => 'bar'];
+        $normalized = $node->normalize($children);
+
+        $expected = [];
+        $expected['item_name'] = ['foo' => 'bar'];
+        $this->assertEquals($expected, $normalized);
+    }
+
+    /**
+     * Tests the opposite of the testMappedAttributeKeyIsRemoved because
+     * the removal can be toggled with an option.
+     */
+    public function testMappedAttributeKeyNotRemoved()
+    {
+        $node = new PrototypedArrayNode('root');
+        $node->setKeyAttribute('id', false);
+
+        // each item under the root is an array, with two scalar items
+        $prototype = new ArrayNode(null, $node);
+        $prototype->addChild(new ScalarNode('foo'));
+        $prototype->addChild(new ScalarNode('id')); // the key attribute will remain
+        $node->setPrototype($prototype);
+
+        $children = [];
+        $children[] = ['id' => 'item_name', 'foo' => 'bar'];
+        $normalized = $node->normalize($children);
+
+        $expected = [];
+        $expected['item_name'] = ['id' => 'item_name', 'foo' => 'bar'];
+        $this->assertEquals($expected, $normalized);
+    }
+
+    public function testAddDefaultChildren()
+    {
+        $node = $this->getPrototypeNodeWithDefaultChildren();
+        $node->setAddChildrenIfNoneSet();
+        $this->assertTrue($node->hasDefaultValue());
+        $this->assertEquals([['foo' => 'bar']], $node->getDefaultValue());
+
+        $node = $this->getPrototypeNodeWithDefaultChildren();
+        $node->setKeyAttribute('foobar');
+        $node->setAddChildrenIfNoneSet();
+        $this->assertTrue($node->hasDefaultValue());
+        $this->assertEquals(['defaults' => ['foo' => 'bar']], $node->getDefaultValue());
+
+        $node = $this->getPrototypeNodeWithDefaultChildren();
+        $node->setKeyAttribute('foobar');
+        $node->setAddChildrenIfNoneSet('defaultkey');
+        $this->assertTrue($node->hasDefaultValue());
+        $this->assertEquals(['defaultkey' => ['foo' => 'bar']], $node->getDefaultValue());
+
+        $node = $this->getPrototypeNodeWithDefaultChildren();
+        $node->setKeyAttribute('foobar');
+        $node->setAddChildrenIfNoneSet(['defaultkey']);
+        $this->assertTrue($node->hasDefaultValue());
+        $this->assertEquals(['defaultkey' => ['foo' => 'bar']], $node->getDefaultValue());
+
+        $node = $this->getPrototypeNodeWithDefaultChildren();
+        $node->setKeyAttribute('foobar');
+        $node->setAddChildrenIfNoneSet(['dk1', 'dk2']);
+        $this->assertTrue($node->hasDefaultValue());
+        $this->assertEquals(['dk1' => ['foo' => 'bar'], 'dk2' => ['foo' => 'bar']], $node->getDefaultValue());
+
+        $node = $this->getPrototypeNodeWithDefaultChildren();
+        $node->setAddChildrenIfNoneSet([5, 6]);
+        $this->assertTrue($node->hasDefaultValue());
+        $this->assertEquals([0 => ['foo' => 'bar'], 1 => ['foo' => 'bar']], $node->getDefaultValue());
+
+        $node = $this->getPrototypeNodeWithDefaultChildren();
+        $node->setAddChildrenIfNoneSet(2);
+        $this->assertTrue($node->hasDefaultValue());
+        $this->assertEquals([['foo' => 'bar'], ['foo' => 'bar']], $node->getDefaultValue());
+    }
+
+    public function testDefaultChildrenWinsOverDefaultValue()
+    {
+        $node = $this->getPrototypeNodeWithDefaultChildren();
+        $node->setAddChildrenIfNoneSet();
+        $node->setDefaultValue(['bar' => 'foo']);
+        $this->assertTrue($node->hasDefaultValue());
+        $this->assertEquals([['foo' => 'bar']], $node->getDefaultValue());
+    }
+
+    protected function getPrototypeNodeWithDefaultChildren()
+    {
+        $node = new PrototypedArrayNode('root');
+        $prototype = new ArrayNode(null, $node);
+        $child = new ScalarNode('foo');
+        $child->setDefaultValue('bar');
+        $prototype->addChild($child);
+        $prototype->setAddIfNotSet(true);
+        $node->setPrototype($prototype);
+
+        return $node;
+    }
+
+    /**
+     * Tests that when a key attribute is mapped, that key is removed from the array.
+     * And if only 'value' element is left in the array, it will replace its wrapper array.
+     *
+     *     <things>
+     *         <option id="option1" value="value1">
+     *     </things>
+     *
+     * The above should finally be mapped to an array that looks like this
+     * (because "id" is the key attribute).
+     *
+     *     [
+     *         'things' => [
+     *             'option1' => 'value1'
+     *         ]
+     *     ]
+     *
+     * It's also possible to mix 'value-only' and 'non-value-only' elements in the array.
+     *
+     * <things>
+     *     <option id="option1" value="value1">
+     *     <option id="option2" value="value2" foo="foo2">
+     * </things>
+     *
+     * The above should finally be mapped to an array as follows
+     *
+     * [
+     *     'things' => [
+     *         'option1' => 'value1',
+     *         'option2' => [
+     *             'value' => 'value2',
+     *             'foo' => 'foo2'
+     *         ]
+     *     ]
+     * ]
+     *
+     * The 'value' element can also be ArrayNode:
+     *
+     * <things>
+     *     <option id="option1">
+     *         <value>
+     *            <foo>foo1</foo>
+     *            <bar>bar1</bar>
+     *         </value>
+     *     </option>
+     * </things>
+     *
+     * The above should be finally be mapped to an array as follows
+     *
+     * [
+     *     'things' => [
+     *         'option1' => [
+     *             'foo' => 'foo1',
+     *             'bar' => 'bar1'
+     *         ]
+     *     ]
+     * ]
+     *
+     * If using VariableNode for value node, it's also possible to mix different types of value nodes:
+     *
+     * <things>
+     *     <option id="option1">
+     *         <value>
+     *            <foo>foo1</foo>
+     *            <bar>bar1</bar>
+     *         </value>
+     *     </option>
+     *     <option id="option2" value="value2">
+     * </things>
+     *
+     * The above should be finally mapped to an array as follows
+     *
+     * [
+     *     'things' => [
+     *         'option1' => [
+     *             'foo' => 'foo1',
+     *             'bar' => 'bar1'
+     *         ],
+     *         'option2' => 'value2'
+     *     ]
+     * ]
+     *
+     * @dataProvider getDataForKeyRemovedLeftValueOnly
+     */
+    public function testMappedAttributeKeyIsRemovedLeftValueOnly($value, $children, $expected)
+    {
+        $node = new PrototypedArrayNode('root');
+        $node->setKeyAttribute('id', true);
+
+        // each item under the root is an array, with one scalar item
+        $prototype = new ArrayNode(null, $node);
+        $prototype->addChild(new ScalarNode('id'));
+        $prototype->addChild(new ScalarNode('foo'));
+        $prototype->addChild($value);
+        $node->setPrototype($prototype);
+
+        $normalized = $node->normalize($children);
+        $this->assertEquals($expected, $normalized);
+    }
+
+    public function getDataForKeyRemovedLeftValueOnly()
+    {
+        $scalarValue = new ScalarNode('value');
+
+        $arrayValue = new ArrayNode('value');
+        $arrayValue->addChild(new ScalarNode('foo'));
+        $arrayValue->addChild(new ScalarNode('bar'));
+
+        $variableValue = new VariableNode('value');
+
+        return [
+           [
+               $scalarValue,
+               [
+                   ['id' => 'option1', 'value' => 'value1'],
+               ],
+               ['option1' => 'value1'],
+           ],
+
+           [
+               $scalarValue,
+               [
+                   ['id' => 'option1', 'value' => 'value1'],
+                   ['id' => 'option2', 'value' => 'value2', 'foo' => 'foo2'],
+               ],
+               [
+                   'option1' => 'value1',
+                   'option2' => ['value' => 'value2', 'foo' => 'foo2'],
+               ],
+           ],
+
+           [
+               $arrayValue,
+               [
+                   [
+                       'id' => 'option1',
+                       'value' => ['foo' => 'foo1', 'bar' => 'bar1'],
+                   ],
+               ],
+               [
+                   'option1' => ['foo' => 'foo1', 'bar' => 'bar1'],
+               ],
+           ],
+
+           [$variableValue,
+               [
+                   [
+                       'id' => 'option1', 'value' => ['foo' => 'foo1', 'bar' => 'bar1'],
+                   ],
+                   ['id' => 'option2', 'value' => 'value2'],
+               ],
+               [
+                   'option1' => ['foo' => 'foo1', 'bar' => 'bar1'],
+                   'option2' => 'value2',
+               ],
+           ],
+        ];
+    }
+}
diff --git a/lib/symfony/config/Tests/Definition/ScalarNodeTest.php b/lib/symfony/config/Tests/Definition/ScalarNodeTest.php
new file mode 100644
index 000000000..4413baf3c
--- /dev/null
+++ b/lib/symfony/config/Tests/Definition/ScalarNodeTest.php
@@ -0,0 +1,161 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Definition;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\ArrayNode;
+use Symfony\Component\Config\Definition\ScalarNode;
+
+class ScalarNodeTest extends TestCase
+{
+    /**
+     * @dataProvider getValidValues
+     */
+    public function testNormalize($value)
+    {
+        $node = new ScalarNode('test');
+        $this->assertSame($value, $node->normalize($value));
+    }
+
+    public function getValidValues()
+    {
+        return [
+            [false],
+            [true],
+            [null],
+            [''],
+            ['foo'],
+            [0],
+            [1],
+            [0.0],
+            [0.1],
+        ];
+    }
+
+    public function testSetDeprecated()
+    {
+        $childNode = new ScalarNode('foo');
+        $childNode->setDeprecated('"%node%" is deprecated');
+
+        $this->assertTrue($childNode->isDeprecated());
+        $this->assertSame('"foo" is deprecated', $childNode->getDeprecationMessage($childNode->getName(), $childNode->getPath()));
+
+        $node = new ArrayNode('root');
+        $node->addChild($childNode);
+
+        $deprecationTriggered = 0;
+        $deprecationHandler = function ($level, $message, $file, $line) use (&$prevErrorHandler, &$deprecationTriggered) {
+            if (E_USER_DEPRECATED === $level) {
+                return ++$deprecationTriggered;
+            }
+
+            return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;
+        };
+
+        $prevErrorHandler = set_error_handler($deprecationHandler);
+        $node->finalize([]);
+        restore_error_handler();
+        $this->assertSame(0, $deprecationTriggered, '->finalize() should not trigger if the deprecated node is not set');
+
+        $prevErrorHandler = set_error_handler($deprecationHandler);
+        $node->finalize(['foo' => '']);
+        restore_error_handler();
+        $this->assertSame(1, $deprecationTriggered, '->finalize() should trigger if the deprecated node is set');
+    }
+
+    /**
+     * @dataProvider getInvalidValues
+     */
+    public function testNormalizeThrowsExceptionOnInvalidValues($value)
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+        $node = new ScalarNode('test');
+        $node->normalize($value);
+    }
+
+    public function getInvalidValues()
+    {
+        return [
+            [[]],
+            [['foo' => 'bar']],
+            [new \stdClass()],
+        ];
+    }
+
+    public function testNormalizeThrowsExceptionWithoutHint()
+    {
+        $node = new ScalarNode('test');
+
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+        $this->expectExceptionMessage('Invalid type for path "test". Expected scalar, but got array.');
+
+        $node->normalize([]);
+    }
+
+    public function testNormalizeThrowsExceptionWithErrorMessage()
+    {
+        $node = new ScalarNode('test');
+        $node->setInfo('"the test value"');
+
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
+        $this->expectExceptionMessage("Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
+
+        $node->normalize([]);
+    }
+
+    /**
+     * @dataProvider getValidNonEmptyValues
+     *
+     * @param mixed $value
+     */
+    public function testValidNonEmptyValues($value)
+    {
+        $node = new ScalarNode('test');
+        $node->setAllowEmptyValue(false);
+
+        $this->assertSame($value, $node->finalize($value));
+    }
+
+    public function getValidNonEmptyValues()
+    {
+        return [
+            [false],
+            [true],
+            ['foo'],
+            [0],
+            [1],
+            [0.0],
+            [0.1],
+        ];
+    }
+
+    /**
+     * @dataProvider getEmptyValues
+     *
+     * @param mixed $value
+     */
+    public function testNotAllowedEmptyValuesThrowException($value)
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $node = new ScalarNode('test');
+        $node->setAllowEmptyValue(false);
+        $node->finalize($value);
+    }
+
+    public function getEmptyValues()
+    {
+        return [
+            [null],
+            [''],
+        ];
+    }
+}
diff --git a/lib/symfony/config/Tests/DependencyInjection/ConfigCachePassTest.php b/lib/symfony/config/Tests/DependencyInjection/ConfigCachePassTest.php
new file mode 100644
index 000000000..c2b95195d
--- /dev/null
+++ b/lib/symfony/config/Tests/DependencyInjection/ConfigCachePassTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\DependencyInjection\ConfigCachePass;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @group legacy
+ */
+class ConfigCachePassTest extends TestCase
+{
+    public function testThatCheckersAreProcessedInPriorityOrder()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register('config_cache_factory')->addArgument(null);
+        $container->register('checker_2')->addTag('config_cache.resource_checker', ['priority' => 100]);
+        $container->register('checker_1')->addTag('config_cache.resource_checker', ['priority' => 200]);
+        $container->register('checker_3')->addTag('config_cache.resource_checker');
+
+        $pass = new ConfigCachePass();
+        $pass->process($container);
+
+        $expected = new IteratorArgument([
+            new Reference('checker_1'),
+            new Reference('checker_2'),
+            new Reference('checker_3'),
+        ]);
+        $this->assertEquals($expected, $definition->getArgument(0));
+    }
+
+    public function testThatCheckersCanBeMissing()
+    {
+        $container = new ContainerBuilder();
+
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
+
+        $pass = new ConfigCachePass();
+        $pass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
+    }
+}
diff --git a/lib/symfony/config/Tests/Exception/FileLoaderLoadExceptionTest.php b/lib/symfony/config/Tests/Exception/FileLoaderLoadExceptionTest.php
new file mode 100644
index 000000000..8363084c1
--- /dev/null
+++ b/lib/symfony/config/Tests/Exception/FileLoaderLoadExceptionTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Exception;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Exception\FileLoaderLoadException;
+
+class FileLoaderLoadExceptionTest extends TestCase
+{
+    public function testMessageCannotLoadResource()
+    {
+        $exception = new FileLoaderLoadException('resource', null);
+        $this->assertEquals('Cannot load resource "resource".', $exception->getMessage());
+    }
+
+    public function testMessageCannotLoadResourceWithType()
+    {
+        $exception = new FileLoaderLoadException('resource', null, null, null, 'foobar');
+        $this->assertEquals('Cannot load resource "resource". Make sure there is a loader supporting the "foobar" type.', $exception->getMessage());
+    }
+
+    public function testMessageCannotLoadResourceWithAnnotationType()
+    {
+        $exception = new FileLoaderLoadException('resource', null, null, null, 'annotation');
+        $this->assertEquals('Cannot load resource "resource". Make sure annotations are installed and enabled.', $exception->getMessage());
+    }
+
+    public function testMessageCannotImportResourceFromSource()
+    {
+        $exception = new FileLoaderLoadException('resource', 'sourceResource');
+        $this->assertEquals('Cannot import resource "resource" from "sourceResource".', $exception->getMessage());
+    }
+
+    public function testMessageCannotImportBundleResource()
+    {
+        $exception = new FileLoaderLoadException('@resource', 'sourceResource');
+        $this->assertEquals(
+            'Cannot import resource "@resource" from "sourceResource". '.
+            'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class. '.
+            'If the bundle is registered, make sure the bundle path "@resource" is not empty.',
+            $exception->getMessage()
+        );
+    }
+
+    public function testMessageHasPreviousErrorWithDotAndUnableToLoad()
+    {
+        $exception = new FileLoaderLoadException(
+            'resource',
+            null,
+            null,
+            new \Exception('There was a previous error with an ending dot.')
+        );
+        $this->assertEquals(
+            'There was a previous error with an ending dot in resource (which is loaded in resource "resource").',
+            $exception->getMessage()
+        );
+    }
+
+    public function testMessageHasPreviousErrorWithoutDotAndUnableToLoad()
+    {
+        $exception = new FileLoaderLoadException(
+            'resource',
+            null,
+            null,
+            new \Exception('There was a previous error with no ending dot')
+        );
+        $this->assertEquals(
+            'There was a previous error with no ending dot in resource (which is loaded in resource "resource").',
+            $exception->getMessage()
+        );
+    }
+
+    public function testMessageHasPreviousErrorAndUnableToLoadBundle()
+    {
+        $exception = new FileLoaderLoadException(
+            '@resource',
+            null,
+            null,
+            new \Exception('There was a previous error with an ending dot.')
+        );
+        $this->assertEquals(
+            'There was a previous error with an ending dot in @resource '.
+            '(which is loaded in resource "@resource"). '.
+            'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class. '.
+            'If the bundle is registered, make sure the bundle path "@resource" is not empty.',
+            $exception->getMessage()
+        );
+    }
+}
diff --git a/lib/symfony/config/Tests/FileLocatorTest.php b/lib/symfony/config/Tests/FileLocatorTest.php
new file mode 100644
index 000000000..e931916af
--- /dev/null
+++ b/lib/symfony/config/Tests/FileLocatorTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+
+class FileLocatorTest extends TestCase
+{
+    /**
+     * @dataProvider getIsAbsolutePathTests
+     */
+    public function testIsAbsolutePath($path)
+    {
+        $loader = new FileLocator([]);
+        $r = new \ReflectionObject($loader);
+        $m = $r->getMethod('isAbsolutePath');
+        $m->setAccessible(true);
+
+        $this->assertTrue($m->invoke($loader, $path), '->isAbsolutePath() returns true for an absolute path');
+    }
+
+    public function getIsAbsolutePathTests()
+    {
+        return [
+            ['/foo.xml'],
+            ['c:\\\\foo.xml'],
+            ['c:/foo.xml'],
+            ['\\server\\foo.xml'],
+            ['https://server/foo.xml'],
+            ['phar://server/foo.xml'],
+        ];
+    }
+
+    public function testLocate()
+    {
+        $loader = new FileLocator(__DIR__.'/Fixtures');
+
+        $this->assertEquals(
+            __DIR__.\DIRECTORY_SEPARATOR.'FileLocatorTest.php',
+            $loader->locate('FileLocatorTest.php', __DIR__),
+            '->locate() returns the absolute filename if the file exists in the given path'
+        );
+
+        $this->assertEquals(
+            __DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml',
+            $loader->locate('foo.xml', __DIR__),
+            '->locate() returns the absolute filename if the file exists in one of the paths given in the constructor'
+        );
+
+        $this->assertEquals(
+            __DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml',
+            $loader->locate(__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__),
+            '->locate() returns the absolute filename if the file exists in one of the paths given in the constructor'
+        );
+
+        $loader = new FileLocator([__DIR__.'/Fixtures', __DIR__.'/Fixtures/Again']);
+
+        $this->assertEquals(
+            [__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'],
+            $loader->locate('foo.xml', __DIR__, false),
+            '->locate() returns an array of absolute filenames'
+        );
+
+        $this->assertEquals(
+            [__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'],
+            $loader->locate('foo.xml', __DIR__.'/Fixtures', false),
+            '->locate() returns an array of absolute filenames'
+        );
+
+        $loader = new FileLocator(__DIR__.'/Fixtures/Again');
+
+        $this->assertEquals(
+            [__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'],
+            $loader->locate('foo.xml', __DIR__.'/Fixtures', false),
+            '->locate() returns an array of absolute filenames'
+        );
+    }
+
+    public function testLocateThrowsAnExceptionIfTheFileDoesNotExists()
+    {
+        $this->expectException('Symfony\Component\Config\Exception\FileLocatorFileNotFoundException');
+        $this->expectExceptionMessage('The file "foobar.xml" does not exist');
+        $loader = new FileLocator([__DIR__.'/Fixtures']);
+
+        $loader->locate('foobar.xml', __DIR__);
+    }
+
+    public function testLocateThrowsAnExceptionIfTheFileDoesNotExistsInAbsolutePath()
+    {
+        $this->expectException('Symfony\Component\Config\Exception\FileLocatorFileNotFoundException');
+        $loader = new FileLocator([__DIR__.'/Fixtures']);
+
+        $loader->locate(__DIR__.'/Fixtures/foobar.xml', __DIR__);
+    }
+
+    public function testLocateEmpty()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('An empty file name is not valid to be located.');
+        $loader = new FileLocator([__DIR__.'/Fixtures']);
+
+        $loader->locate(null, __DIR__);
+    }
+}
diff --git a/lib/symfony/config/Tests/Fixtures/Again/foo.xml b/lib/symfony/config/Tests/Fixtures/Again/foo.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/config/Tests/Fixtures/BadParent.php b/lib/symfony/config/Tests/Fixtures/BadParent.php
new file mode 100644
index 000000000..68d7296ed
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/BadParent.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Config\Tests\Fixtures;
+
+class BadParent extends MissingParent
+{
+}
diff --git a/lib/symfony/config/Tests/Fixtures/BarNode.php b/lib/symfony/config/Tests/Fixtures/BarNode.php
new file mode 100644
index 000000000..0b9c32ded
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/BarNode.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Fixtures;
+
+use Symfony\Component\Config\Definition\ArrayNode;
+
+class BarNode extends ArrayNode
+{
+}
diff --git a/lib/symfony/config/Tests/Fixtures/Builder/BarNodeDefinition.php b/lib/symfony/config/Tests/Fixtures/Builder/BarNodeDefinition.php
new file mode 100644
index 000000000..b9c62e537
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Builder/BarNodeDefinition.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Fixtures\Builder;
+
+use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\Config\Tests\Fixtures\BarNode;
+
+class BarNodeDefinition extends NodeDefinition
+{
+    protected function createNode()
+    {
+        return new BarNode($this->name);
+    }
+}
diff --git a/lib/symfony/config/Tests/Fixtures/Builder/NodeBuilder.php b/lib/symfony/config/Tests/Fixtures/Builder/NodeBuilder.php
new file mode 100644
index 000000000..22b8b32fb
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Builder/NodeBuilder.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Fixtures\Builder;
+
+use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;
+
+class NodeBuilder extends BaseNodeBuilder
+{
+    public function barNode($name)
+    {
+        return $this->node($name, 'bar');
+    }
+
+    protected function getNodeClass($type)
+    {
+        switch ($type) {
+            case 'variable':
+                return __NAMESPACE__.'\\'.ucfirst($type).'NodeDefinition';
+            case 'bar':
+                return __NAMESPACE__.'\\'.ucfirst($type).'NodeDefinition';
+            default:
+                return parent::getNodeClass($type);
+        }
+    }
+}
diff --git a/lib/symfony/config/Tests/Fixtures/Builder/VariableNodeDefinition.php b/lib/symfony/config/Tests/Fixtures/Builder/VariableNodeDefinition.php
new file mode 100644
index 000000000..6126ed434
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Builder/VariableNodeDefinition.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Fixtures\Builder;
+
+use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;
+
+class VariableNodeDefinition extends BaseVariableNodeDefinition
+{
+}
diff --git a/lib/symfony/config/Tests/Fixtures/Configuration/ExampleConfiguration.php b/lib/symfony/config/Tests/Fixtures/Configuration/ExampleConfiguration.php
new file mode 100644
index 000000000..3f02700a1
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Configuration/ExampleConfiguration.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Fixtures\Configuration;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class ExampleConfiguration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('acme_root');
+
+        $rootNode
+            ->fixXmlConfig('parameter')
+            ->fixXmlConfig('connection')
+            ->fixXmlConfig('cms_page')
+            ->children()
+                ->booleanNode('boolean')->defaultTrue()->end()
+                ->scalarNode('scalar_empty')->end()
+                ->scalarNode('scalar_null')->defaultNull()->end()
+                ->scalarNode('scalar_true')->defaultTrue()->end()
+                ->scalarNode('scalar_false')->defaultFalse()->end()
+                ->scalarNode('scalar_default')->defaultValue('default')->end()
+                ->scalarNode('scalar_array_empty')->defaultValue([])->end()
+                ->scalarNode('scalar_array_defaults')->defaultValue(['elem1', 'elem2'])->end()
+                ->scalarNode('scalar_required')->isRequired()->end()
+                ->scalarNode('scalar_deprecated')->setDeprecated()->end()
+                ->scalarNode('scalar_deprecated_with_message')->setDeprecated('Deprecation custom message for "%node%" at "%path%"')->end()
+                ->scalarNode('node_with_a_looong_name')->end()
+                ->enumNode('enum_with_default')->values(['this', 'that'])->defaultValue('this')->end()
+                ->enumNode('enum')->values(['this', 'that'])->end()
+                ->arrayNode('array')
+                    ->info('some info')
+                    ->canBeUnset()
+                    ->children()
+                        ->scalarNode('child1')->end()
+                        ->scalarNode('child2')->end()
+                        ->scalarNode('child3')
+                            ->info(
+                                "this is a long\n".
+                                "multi-line info text\n".
+                                'which should be indented'
+                            )
+                            ->example('example setting')
+                        ->end()
+                    ->end()
+                ->end()
+                ->arrayNode('scalar_prototyped')
+                    ->prototype('scalar')->end()
+                ->end()
+                ->arrayNode('parameters')
+                    ->useAttributeAsKey('name')
+                    ->prototype('scalar')->info('Parameter name')->end()
+                ->end()
+                ->arrayNode('connections')
+                    ->prototype('array')
+                        ->children()
+                            ->scalarNode('user')->end()
+                            ->scalarNode('pass')->end()
+                        ->end()
+                    ->end()
+                ->end()
+                ->arrayNode('cms_pages')
+                    ->useAttributeAsKey('page')
+                    ->prototype('array')
+                        ->useAttributeAsKey('locale')
+                        ->prototype('array')
+                            ->children()
+                                ->scalarNode('title')->isRequired()->end()
+                                ->scalarNode('path')->isRequired()->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+                ->arrayNode('pipou')
+                    ->useAttributeAsKey('name')
+                    ->prototype('array')
+                        ->prototype('array')
+                            ->children()
+                                ->scalarNode('didou')
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+
+        return $treeBuilder;
+    }
+}
diff --git a/lib/symfony/config/Tests/Fixtures/Resource/.hiddenFile b/lib/symfony/config/Tests/Fixtures/Resource/.hiddenFile
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/config/Tests/Fixtures/Resource/ConditionalClass.php b/lib/symfony/config/Tests/Fixtures/Resource/ConditionalClass.php
new file mode 100644
index 000000000..2ba48c5b0
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Resource/ConditionalClass.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\Config\Tests\Fixtures\Resource;
+
+if (!class_exists(MissingClass::class)) {
+    class ConditionalClass
+    {
+    }
+}
diff --git a/lib/symfony/config/Tests/Fixtures/Util/document_type.xml b/lib/symfony/config/Tests/Fixtures/Util/document_type.xml
new file mode 100644
index 000000000..4c2522826
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Util/document_type.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE scan [<!ENTITY test SYSTEM "php://filter/read=convert.base64-encode/resource={{ resource }}">]>
+<scan></scan>
diff --git a/lib/symfony/config/Tests/Fixtures/Util/invalid.xml b/lib/symfony/config/Tests/Fixtures/Util/invalid.xml
new file mode 100644
index 000000000..a07af9fd8
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Util/invalid.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
diff --git a/lib/symfony/config/Tests/Fixtures/Util/invalid_schema.xml b/lib/symfony/config/Tests/Fixtures/Util/invalid_schema.xml
new file mode 100644
index 000000000..e2725a2c2
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Util/invalid_schema.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root2 xmlns="http://example.com/schema" />
diff --git a/lib/symfony/config/Tests/Fixtures/Util/schema.xsd b/lib/symfony/config/Tests/Fixtures/Util/schema.xsd
new file mode 100644
index 000000000..e56820f69
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Util/schema.xsd
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsd:schema xmlns="http://example.com/schema"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://example.com/schema"
+    elementFormDefault="qualified">
+
+  <xsd:element name="root" />
+</xsd:schema>
diff --git a/lib/symfony/config/Tests/Fixtures/Util/valid.xml b/lib/symfony/config/Tests/Fixtures/Util/valid.xml
new file mode 100644
index 000000000..a96bb3826
--- /dev/null
+++ b/lib/symfony/config/Tests/Fixtures/Util/valid.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root xmlns="http://example.com/schema">
+</root>
diff --git a/lib/symfony/config/Tests/Fixtures/foo.xml b/lib/symfony/config/Tests/Fixtures/foo.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/config/Tests/Loader/DelegatingLoaderTest.php b/lib/symfony/config/Tests/Loader/DelegatingLoaderTest.php
new file mode 100644
index 000000000..38ae6ff7b
--- /dev/null
+++ b/lib/symfony/config/Tests/Loader/DelegatingLoaderTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Loader\DelegatingLoader;
+use Symfony\Component\Config\Loader\LoaderResolver;
+
+class DelegatingLoaderTest extends TestCase
+{
+    public function testConstructor()
+    {
+        new DelegatingLoader($resolver = new LoaderResolver());
+        $this->assertTrue(true, '__construct() takes a loader resolver as its first argument');
+    }
+
+    public function testGetSetResolver()
+    {
+        $resolver = new LoaderResolver();
+        $loader = new DelegatingLoader($resolver);
+        $this->assertSame($resolver, $loader->getResolver(), '->getResolver() gets the resolver loader');
+        $loader->setResolver($resolver = new LoaderResolver());
+        $this->assertSame($resolver, $loader->getResolver(), '->setResolver() sets the resolver loader');
+    }
+
+    public function testSupports()
+    {
+        $loader1 = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $loader1->expects($this->once())->method('supports')->willReturn(true);
+        $loader = new DelegatingLoader(new LoaderResolver([$loader1]));
+        $this->assertTrue($loader->supports('foo.xml'), '->supports() returns true if the resource is loadable');
+
+        $loader1 = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $loader1->expects($this->once())->method('supports')->willReturn(false);
+        $loader = new DelegatingLoader(new LoaderResolver([$loader1]));
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
+    }
+
+    public function testLoad()
+    {
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $loader->expects($this->once())->method('supports')->willReturn(true);
+        $loader->expects($this->once())->method('load');
+        $resolver = new LoaderResolver([$loader]);
+        $loader = new DelegatingLoader($resolver);
+
+        $loader->load('foo');
+    }
+
+    public function testLoadThrowsAnExceptionIfTheResourceCannotBeLoaded()
+    {
+        $this->expectException('Symfony\Component\Config\Exception\FileLoaderLoadException');
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $loader->expects($this->once())->method('supports')->willReturn(false);
+        $resolver = new LoaderResolver([$loader]);
+        $loader = new DelegatingLoader($resolver);
+
+        $loader->load('foo');
+    }
+}
diff --git a/lib/symfony/config/Tests/Loader/FileLoaderTest.php b/lib/symfony/config/Tests/Loader/FileLoaderTest.php
new file mode 100644
index 000000000..b59ace46f
--- /dev/null
+++ b/lib/symfony/config/Tests/Loader/FileLoaderTest.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\FileLoader;
+use Symfony\Component\Config\Loader\LoaderResolver;
+
+class FileLoaderTest extends TestCase
+{
+    public function testImportWithFileLocatorDelegation()
+    {
+        $locatorMock = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+
+        $locatorMockForAdditionalLoader = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $locatorMockForAdditionalLoader->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
+                ['path/to/file1'],                    // Default
+                ['path/to/file1', 'path/to/file2'],   // First is imported
+                ['path/to/file1', 'path/to/file2'],   // Second is imported
+                ['path/to/file1'],                    // Exception
+                ['path/to/file1', 'path/to/file2']    // Exception
+                ));
+
+        $fileLoader = new TestFileLoader($locatorMock);
+        $fileLoader->setSupports(false);
+        $fileLoader->setCurrentDir('.');
+
+        $additionalLoader = new TestFileLoader($locatorMockForAdditionalLoader);
+        $additionalLoader->setCurrentDir('.');
+
+        $fileLoader->setResolver($loaderResolver = new LoaderResolver([$fileLoader, $additionalLoader]));
+
+        // Default case
+        $this->assertSame('path/to/file1', $fileLoader->import('my_resource'));
+
+        // Check first file is imported if not already loading
+        $this->assertSame('path/to/file1', $fileLoader->import('my_resource'));
+
+        // Check second file is imported if first is already loading
+        $fileLoader->addLoading('path/to/file1');
+        $this->assertSame('path/to/file2', $fileLoader->import('my_resource'));
+
+        // Check exception throws if first (and only available) file is already loading
+        try {
+            $fileLoader->import('my_resource');
+            $this->fail('->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceException', $e, '->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
+        }
+
+        // Check exception throws if all files are already loading
+        try {
+            $fileLoader->addLoading('path/to/file2');
+            $fileLoader->import('my_resource');
+            $this->fail('->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceException', $e, '->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
+        }
+    }
+
+    public function testImportWithGlobLikeResource()
+    {
+        $locatorMock = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $loader = new TestFileLoader($locatorMock);
+
+        $this->assertSame('[foo]', $loader->import('[foo]'));
+    }
+
+    public function testImportWithNoGlobMatch()
+    {
+        $locatorMock = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $loader = new TestFileLoader($locatorMock);
+
+        $this->assertNull($loader->import('./*.abc'));
+    }
+
+    public function testImportWithSimpleGlob()
+    {
+        $loader = new TestFileLoader(new FileLocator(__DIR__));
+
+        $this->assertSame(__FILE__, strtr($loader->import('FileLoaderTest.*'), '/', \DIRECTORY_SEPARATOR));
+    }
+}
+
+class TestFileLoader extends FileLoader
+{
+    private $supports = true;
+
+    public function load($resource, $type = null)
+    {
+        return $resource;
+    }
+
+    public function supports($resource, $type = null)
+    {
+        return $this->supports;
+    }
+
+    public function addLoading($resource)
+    {
+        self::$loading[$resource] = true;
+    }
+
+    public function removeLoading($resource)
+    {
+        unset(self::$loading[$resource]);
+    }
+
+    public function clearLoading()
+    {
+        self::$loading = [];
+    }
+
+    public function setSupports($supports)
+    {
+        $this->supports = $supports;
+    }
+}
diff --git a/lib/symfony/config/Tests/Loader/LoaderResolverTest.php b/lib/symfony/config/Tests/Loader/LoaderResolverTest.php
new file mode 100644
index 000000000..aabc2a600
--- /dev/null
+++ b/lib/symfony/config/Tests/Loader/LoaderResolverTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Loader\LoaderResolver;
+
+class LoaderResolverTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $resolver = new LoaderResolver([
+            $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock(),
+        ]);
+
+        $this->assertEquals([$loader], $resolver->getLoaders(), '__construct() takes an array of loaders as its first argument');
+    }
+
+    public function testResolve()
+    {
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $resolver = new LoaderResolver([$loader]);
+        $this->assertFalse($resolver->resolve('foo.foo'), '->resolve() returns false if no loader is able to load the resource');
+
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $loader->expects($this->once())->method('supports')->willReturn(true);
+        $resolver = new LoaderResolver([$loader]);
+        $this->assertEquals($loader, $resolver->resolve(function () {}), '->resolve() returns the loader for the given resource');
+    }
+
+    public function testLoaders()
+    {
+        $resolver = new LoaderResolver();
+        $resolver->addLoader($loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock());
+
+        $this->assertEquals([$loader], $resolver->getLoaders(), 'addLoader() adds a loader');
+    }
+}
diff --git a/lib/symfony/config/Tests/Loader/LoaderTest.php b/lib/symfony/config/Tests/Loader/LoaderTest.php
new file mode 100644
index 000000000..35a911ef3
--- /dev/null
+++ b/lib/symfony/config/Tests/Loader/LoaderTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Loader\Loader;
+
+class LoaderTest extends TestCase
+{
+    public function testGetSetResolver()
+    {
+        $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
+
+        $loader = new ProjectLoader1();
+        $loader->setResolver($resolver);
+
+        $this->assertSame($resolver, $loader->getResolver(), '->setResolver() sets the resolver loader');
+    }
+
+    public function testResolve()
+    {
+        $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+
+        $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
+        $resolver->expects($this->once())
+            ->method('resolve')
+            ->with('foo.xml')
+            ->willReturn($resolvedLoader);
+
+        $loader = new ProjectLoader1();
+        $loader->setResolver($resolver);
+
+        $this->assertSame($loader, $loader->resolve('foo.foo'), '->resolve() finds a loader');
+        $this->assertSame($resolvedLoader, $loader->resolve('foo.xml'), '->resolve() finds a loader');
+    }
+
+    public function testResolveWhenResolverCannotFindLoader()
+    {
+        $this->expectException('Symfony\Component\Config\Exception\FileLoaderLoadException');
+        $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
+        $resolver->expects($this->once())
+            ->method('resolve')
+            ->with('FOOBAR')
+            ->willReturn(false);
+
+        $loader = new ProjectLoader1();
+        $loader->setResolver($resolver);
+
+        $loader->resolve('FOOBAR');
+    }
+
+    public function testImport()
+    {
+        $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $resolvedLoader->expects($this->once())
+            ->method('load')
+            ->with('foo')
+            ->willReturn('yes');
+
+        $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
+        $resolver->expects($this->once())
+            ->method('resolve')
+            ->with('foo')
+            ->willReturn($resolvedLoader);
+
+        $loader = new ProjectLoader1();
+        $loader->setResolver($resolver);
+
+        $this->assertEquals('yes', $loader->import('foo'));
+    }
+
+    public function testImportWithType()
+    {
+        $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $resolvedLoader->expects($this->once())
+            ->method('load')
+            ->with('foo', 'bar')
+            ->willReturn('yes');
+
+        $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
+        $resolver->expects($this->once())
+            ->method('resolve')
+            ->with('foo', 'bar')
+            ->willReturn($resolvedLoader);
+
+        $loader = new ProjectLoader1();
+        $loader->setResolver($resolver);
+
+        $this->assertEquals('yes', $loader->import('foo', 'bar'));
+    }
+}
+
+class ProjectLoader1 extends Loader
+{
+    public function load($resource, $type = null)
+    {
+    }
+
+    public function supports($resource, $type = null)
+    {
+        return \is_string($resource) && 'foo' === pathinfo($resource, PATHINFO_EXTENSION);
+    }
+
+    public function getType()
+    {
+    }
+}
diff --git a/lib/symfony/config/Tests/Resource/ClassExistenceResourceTest.php b/lib/symfony/config/Tests/Resource/ClassExistenceResourceTest.php
new file mode 100644
index 000000000..b7ae81eaa
--- /dev/null
+++ b/lib/symfony/config/Tests/Resource/ClassExistenceResourceTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Resource;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\ClassExistenceResource;
+use Symfony\Component\Config\Tests\Fixtures\BadParent;
+use Symfony\Component\Config\Tests\Fixtures\Resource\ConditionalClass;
+
+class ClassExistenceResourceTest extends TestCase
+{
+    public function testToString()
+    {
+        $res = new ClassExistenceResource('BarClass');
+        $this->assertSame('BarClass', (string) $res);
+    }
+
+    public function testGetResource()
+    {
+        $res = new ClassExistenceResource('BarClass');
+        $this->assertSame('BarClass', $res->getResource());
+    }
+
+    public function testIsFreshWhenClassDoesNotExist()
+    {
+        $res = new ClassExistenceResource('Symfony\Component\Config\Tests\Fixtures\BarClass');
+
+        $this->assertTrue($res->isFresh(time()));
+
+        eval(<<<EOF
+namespace Symfony\Component\Config\Tests\Fixtures;
+
+class BarClass
+{
+}
+EOF
+        );
+
+        $this->assertFalse($res->isFresh(time()));
+    }
+
+    public function testIsFreshWhenClassExists()
+    {
+        $res = new ClassExistenceResource('Symfony\Component\Config\Tests\Resource\ClassExistenceResourceTest');
+
+        $this->assertTrue($res->isFresh(time()));
+    }
+
+    public function testExistsKo()
+    {
+        spl_autoload_register($autoloader = function ($class) use (&$loadedClass) { $loadedClass = $class; });
+
+        try {
+            $res = new ClassExistenceResource('MissingFooClass');
+            $this->assertTrue($res->isFresh(0));
+
+            $this->assertSame('MissingFooClass', $loadedClass);
+
+            $loadedClass = 123;
+
+            new ClassExistenceResource('MissingFooClass', false);
+
+            $this->assertSame(123, $loadedClass);
+        } finally {
+            spl_autoload_unregister($autoloader);
+        }
+    }
+
+    public function testBadParentWithTimestamp()
+    {
+        $res = new ClassExistenceResource(BadParent::class, false);
+        $this->assertTrue($res->isFresh(time()));
+    }
+
+    public function testBadParentWithNoTimestamp()
+    {
+        $this->expectException('ReflectionException');
+        $this->expectExceptionMessage('Class "Symfony\Component\Config\Tests\Fixtures\MissingParent" not found while loading "Symfony\Component\Config\Tests\Fixtures\BadParent".');
+
+        $res = new ClassExistenceResource(BadParent::class, false);
+        $res->isFresh(0);
+    }
+
+    public function testConditionalClass()
+    {
+        $res = new ClassExistenceResource(ConditionalClass::class, false);
+
+        $this->assertFalse($res->isFresh(0));
+    }
+}
diff --git a/lib/symfony/config/Tests/Resource/ComposerResourceTest.php b/lib/symfony/config/Tests/Resource/ComposerResourceTest.php
new file mode 100644
index 000000000..6857c766d
--- /dev/null
+++ b/lib/symfony/config/Tests/Resource/ComposerResourceTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Resource;
+
+use Composer\Autoload\ClassLoader;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\ComposerResource;
+
+class ComposerResourceTest extends TestCase
+{
+    public function testGetVendor()
+    {
+        $res = new ComposerResource();
+
+        $r = new \ReflectionClass(ClassLoader::class);
+        $found = false;
+
+        foreach ($res->getVendors() as $vendor) {
+            if ($vendor && 0 === strpos($r->getFileName(), $vendor)) {
+                $found = true;
+                break;
+            }
+        }
+
+        $this->assertTrue($found);
+    }
+
+    public function testSerializeUnserialize()
+    {
+        $res = new ComposerResource();
+        $ser = unserialize(serialize($res));
+
+        $this->assertTrue($res->isFresh(0));
+        $this->assertTrue($ser->isFresh(0));
+
+        $this->assertEquals($res, $ser);
+    }
+}
diff --git a/lib/symfony/config/Tests/Resource/DirectoryResourceTest.php b/lib/symfony/config/Tests/Resource/DirectoryResourceTest.php
new file mode 100644
index 000000000..40b179010
--- /dev/null
+++ b/lib/symfony/config/Tests/Resource/DirectoryResourceTest.php
@@ -0,0 +1,181 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Resource;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\DirectoryResource;
+
+class DirectoryResourceTest extends TestCase
+{
+    protected $directory;
+
+    protected function setUp()
+    {
+        $this->directory = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'symfonyDirectoryIterator';
+        if (!file_exists($this->directory)) {
+            mkdir($this->directory);
+        }
+        touch($this->directory.'/tmp.xml');
+    }
+
+    protected function tearDown()
+    {
+        if (!is_dir($this->directory)) {
+            return;
+        }
+        $this->removeDirectory($this->directory);
+    }
+
+    protected function removeDirectory($directory)
+    {
+        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory), \RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($iterator as $path) {
+            if (preg_match('#[/\\\\]\.\.?$#', $path->__toString())) {
+                continue;
+            }
+            if ($path->isDir()) {
+                rmdir($path->__toString());
+            } else {
+                unlink($path->__toString());
+            }
+        }
+        rmdir($directory);
+    }
+
+    public function testGetResource()
+    {
+        $resource = new DirectoryResource($this->directory);
+        $this->assertSame(realpath($this->directory), $resource->getResource(), '->getResource() returns the path to the resource');
+    }
+
+    public function testGetPattern()
+    {
+        $resource = new DirectoryResource($this->directory, 'bar');
+        $this->assertEquals('bar', $resource->getPattern());
+    }
+
+    public function testResourceDoesNotExist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The directory ".*" does not exist./');
+        new DirectoryResource('/____foo/foobar'.mt_rand(1, 999999));
+    }
+
+    public function testIsFresh()
+    {
+        $resource = new DirectoryResource($this->directory);
+        $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if the resource has not changed');
+        $this->assertFalse($resource->isFresh(time() - 86400), '->isFresh() returns false if the resource has been updated');
+    }
+
+    public function testIsFreshForDeletedResources()
+    {
+        $resource = new DirectoryResource($this->directory);
+        $this->removeDirectory($this->directory);
+
+        $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if the resource does not exist');
+    }
+
+    public function testIsFreshUpdateFile()
+    {
+        $resource = new DirectoryResource($this->directory);
+        touch($this->directory.'/tmp.xml', time() + 20);
+        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if an existing file is modified');
+    }
+
+    public function testIsFreshNewFile()
+    {
+        $resource = new DirectoryResource($this->directory);
+        touch($this->directory.'/new.xml', time() + 20);
+        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if a new file is added');
+    }
+
+    public function testIsFreshNewFileWithDifferentPattern()
+    {
+        $resource = new DirectoryResource($this->directory, '/.xml$/');
+        touch($this->directory.'/new.yaml', time() + 20);
+        $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if a new file with a non-matching pattern is added');
+    }
+
+    public function testIsFreshDeleteFile()
+    {
+        $resource = new DirectoryResource($this->directory);
+        $time = time();
+        sleep(1);
+        unlink($this->directory.'/tmp.xml');
+        $this->assertFalse($resource->isFresh($time), '->isFresh() returns false if an existing file is removed');
+    }
+
+    public function testIsFreshDeleteDirectory()
+    {
+        $resource = new DirectoryResource($this->directory);
+        $this->removeDirectory($this->directory);
+        $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if the whole resource is removed');
+    }
+
+    public function testIsFreshCreateFileInSubdirectory()
+    {
+        $subdirectory = $this->directory.'/subdirectory';
+        mkdir($subdirectory);
+
+        $resource = new DirectoryResource($this->directory);
+        $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if an unmodified subdirectory exists');
+
+        touch($subdirectory.'/newfile.xml', time() + 20);
+        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if a new file in a subdirectory is added');
+    }
+
+    public function testIsFreshModifySubdirectory()
+    {
+        $resource = new DirectoryResource($this->directory);
+
+        $subdirectory = $this->directory.'/subdirectory';
+        mkdir($subdirectory);
+        touch($subdirectory, time() + 20);
+
+        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if a subdirectory is modified (e.g. a file gets deleted)');
+    }
+
+    public function testFilterRegexListNoMatch()
+    {
+        $resource = new DirectoryResource($this->directory, '/\.(foo|xml)$/');
+
+        touch($this->directory.'/new.bar', time() + 20);
+        $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if a new file not matching the filter regex is created');
+    }
+
+    public function testFilterRegexListMatch()
+    {
+        $resource = new DirectoryResource($this->directory, '/\.(foo|xml)$/');
+
+        touch($this->directory.'/new.xml', time() + 20);
+        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if an new file matching the filter regex is created ');
+    }
+
+    public function testSerializeUnserialize()
+    {
+        $resource = new DirectoryResource($this->directory, '/\.(foo|xml)$/');
+
+        unserialize(serialize($resource));
+
+        $this->assertSame(realpath($this->directory), $resource->getResource());
+        $this->assertSame('/\.(foo|xml)$/', $resource->getPattern());
+    }
+
+    public function testResourcesWithDifferentPatternsAreDifferent()
+    {
+        $resourceA = new DirectoryResource($this->directory, '/.xml$/');
+        $resourceB = new DirectoryResource($this->directory, '/.yaml$/');
+
+        $this->assertCount(2, array_unique([$resourceA, $resourceB]));
+    }
+}
diff --git a/lib/symfony/config/Tests/Resource/FileExistenceResourceTest.php b/lib/symfony/config/Tests/Resource/FileExistenceResourceTest.php
new file mode 100644
index 000000000..433f65e82
--- /dev/null
+++ b/lib/symfony/config/Tests/Resource/FileExistenceResourceTest.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Resource;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\FileExistenceResource;
+
+class FileExistenceResourceTest extends TestCase
+{
+    protected $resource;
+    protected $file;
+    protected $time;
+
+    protected function setUp()
+    {
+        $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';
+        $this->time = time();
+        $this->resource = new FileExistenceResource($this->file);
+    }
+
+    protected function tearDown()
+    {
+        if (file_exists($this->file)) {
+            unlink($this->file);
+        }
+    }
+
+    public function testToString()
+    {
+        $this->assertSame($this->file, (string) $this->resource);
+    }
+
+    public function testGetResource()
+    {
+        $this->assertSame($this->file, $this->resource->getResource(), '->getResource() returns the path to the resource');
+    }
+
+    public function testIsFreshWithExistingResource()
+    {
+        touch($this->file, $this->time);
+        $serialized = serialize(new FileExistenceResource($this->file));
+
+        $resource = unserialize($serialized);
+        $this->assertTrue($resource->isFresh($this->time), '->isFresh() returns true if the resource is still present');
+
+        unlink($this->file);
+        $resource = unserialize($serialized);
+        $this->assertFalse($resource->isFresh($this->time), '->isFresh() returns false if the resource has been deleted');
+    }
+
+    public function testIsFreshWithAbsentResource()
+    {
+        $serialized = serialize(new FileExistenceResource($this->file));
+
+        $resource = unserialize($serialized);
+        $this->assertTrue($resource->isFresh($this->time), '->isFresh() returns true if the resource is still absent');
+
+        touch($this->file, $this->time);
+        $resource = unserialize($serialized);
+        $this->assertFalse($resource->isFresh($this->time), '->isFresh() returns false if the resource has been created');
+    }
+}
diff --git a/lib/symfony/config/Tests/Resource/FileResourceTest.php b/lib/symfony/config/Tests/Resource/FileResourceTest.php
new file mode 100644
index 000000000..968c7e926
--- /dev/null
+++ b/lib/symfony/config/Tests/Resource/FileResourceTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Resource;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\FileResource;
+
+class FileResourceTest extends TestCase
+{
+    protected $resource;
+    protected $file;
+    protected $time;
+
+    protected function setUp()
+    {
+        $this->file = sys_get_temp_dir().'/tmp.xml';
+        $this->time = time();
+        touch($this->file, $this->time);
+        $this->resource = new FileResource($this->file);
+    }
+
+    protected function tearDown()
+    {
+        if (!file_exists($this->file)) {
+            return;
+        }
+
+        unlink($this->file);
+    }
+
+    public function testGetResource()
+    {
+        $this->assertSame(realpath($this->file), $this->resource->getResource(), '->getResource() returns the path to the resource');
+    }
+
+    public function testGetResourceWithScheme()
+    {
+        $resource = new FileResource('file://'.$this->file);
+        $this->assertSame('file://'.$this->file, $resource->getResource(), '->getResource() returns the path to the schemed resource');
+    }
+
+    public function testToString()
+    {
+        $this->assertSame(realpath($this->file), (string) $this->resource);
+    }
+
+    public function testResourceDoesNotExist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The file ".*" does not exist./');
+        new FileResource('/____foo/foobar'.mt_rand(1, 999999));
+    }
+
+    public function testIsFresh()
+    {
+        $this->assertTrue($this->resource->isFresh($this->time), '->isFresh() returns true if the resource has not changed in same second');
+        $this->assertTrue($this->resource->isFresh($this->time + 10), '->isFresh() returns true if the resource has not changed');
+        $this->assertFalse($this->resource->isFresh($this->time - 86400), '->isFresh() returns false if the resource has been updated');
+    }
+
+    public function testIsFreshForDeletedResources()
+    {
+        unlink($this->file);
+
+        $this->assertFalse($this->resource->isFresh($this->time), '->isFresh() returns false if the resource does not exist');
+    }
+
+    public function testSerializeUnserialize()
+    {
+        unserialize(serialize($this->resource));
+
+        $this->assertSame(realpath($this->file), $this->resource->getResource());
+    }
+}
diff --git a/lib/symfony/config/Tests/Resource/GlobResourceTest.php b/lib/symfony/config/Tests/Resource/GlobResourceTest.php
new file mode 100644
index 000000000..cfbfd2b45
--- /dev/null
+++ b/lib/symfony/config/Tests/Resource/GlobResourceTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Resource;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\GlobResource;
+
+class GlobResourceTest extends TestCase
+{
+    protected function tearDown()
+    {
+        $dir = \dirname(__DIR__).'/Fixtures';
+        @rmdir($dir.'/TmpGlob');
+        @unlink($dir.'/TmpGlob');
+        @unlink($dir.'/Resource/TmpGlob');
+        touch($dir.'/Resource/.hiddenFile');
+    }
+
+    public function testIterator()
+    {
+        $dir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures';
+        $resource = new GlobResource($dir, '/Resource', true);
+
+        $paths = iterator_to_array($resource);
+
+        $file = $dir.'/Resource'.\DIRECTORY_SEPARATOR.'ConditionalClass.php';
+        $this->assertEquals([$file => new \SplFileInfo($file)], $paths);
+        $this->assertInstanceOf('SplFileInfo', current($paths));
+        $this->assertSame($dir, $resource->getPrefix());
+
+        $resource = new GlobResource($dir, '/**/Resource', true);
+
+        $paths = iterator_to_array($resource);
+
+        $file = $dir.\DIRECTORY_SEPARATOR.'Resource'.\DIRECTORY_SEPARATOR.'ConditionalClass.php';
+        $this->assertEquals([$file => $file], $paths);
+        $this->assertInstanceOf('SplFileInfo', current($paths));
+        $this->assertSame($dir, $resource->getPrefix());
+    }
+
+    public function testIsFreshNonRecursiveDetectsNewFile()
+    {
+        $dir = \dirname(__DIR__).'/Fixtures';
+        $resource = new GlobResource($dir, '/*', false);
+
+        $this->assertTrue($resource->isFresh(0));
+
+        mkdir($dir.'/TmpGlob');
+        $this->assertTrue($resource->isFresh(0));
+
+        rmdir($dir.'/TmpGlob');
+        $this->assertTrue($resource->isFresh(0));
+
+        touch($dir.'/TmpGlob');
+        $this->assertFalse($resource->isFresh(0));
+
+        unlink($dir.'/TmpGlob');
+        $this->assertTrue($resource->isFresh(0));
+    }
+
+    public function testIsFreshNonRecursiveDetectsRemovedFile()
+    {
+        $dir = \dirname(__DIR__).'/Fixtures';
+        $resource = new GlobResource($dir, '/*', false);
+
+        touch($dir.'/TmpGlob');
+        touch($dir.'/.TmpGlob');
+        $this->assertTrue($resource->isFresh(0));
+
+        unlink($dir.'/.TmpGlob');
+        $this->assertTrue($resource->isFresh(0));
+
+        unlink($dir.'/TmpGlob');
+        $this->assertFalse($resource->isFresh(0));
+    }
+
+    public function testIsFreshRecursiveDetectsRemovedFile()
+    {
+        $dir = \dirname(__DIR__).'/Fixtures';
+        $resource = new GlobResource($dir, '/*', true);
+
+        touch($dir.'/Resource/TmpGlob');
+        $this->assertTrue($resource->isFresh(0));
+
+        unlink($dir.'/Resource/TmpGlob');
+        $this->assertFalse($resource->isFresh(0));
+
+        touch($dir.'/Resource/TmpGlob');
+        $this->assertTrue($resource->isFresh(0));
+
+        unlink($dir.'/Resource/.hiddenFile');
+        $this->assertTrue($resource->isFresh(0));
+    }
+
+    public function testIsFreshRecursiveDetectsNewFile()
+    {
+        $dir = \dirname(__DIR__).'/Fixtures';
+        $resource = new GlobResource($dir, '/*', true);
+
+        $this->assertTrue($resource->isFresh(0));
+
+        touch($dir.'/Resource/TmpGlob');
+        $this->assertFalse($resource->isFresh(0));
+    }
+}
diff --git a/lib/symfony/config/Tests/Resource/ReflectionClassResourceTest.php b/lib/symfony/config/Tests/Resource/ReflectionClassResourceTest.php
new file mode 100644
index 000000000..74ed6b3ed
--- /dev/null
+++ b/lib/symfony/config/Tests/Resource/ReflectionClassResourceTest.php
@@ -0,0 +1,223 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Resource;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\ReflectionClassResource;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class ReflectionClassResourceTest extends TestCase
+{
+    public function testToString()
+    {
+        $res = new ReflectionClassResource(new \ReflectionClass('ErrorException'));
+
+        $this->assertSame('reflection.ErrorException', (string) $res);
+    }
+
+    public function testSerializeUnserialize()
+    {
+        $res = new ReflectionClassResource(new \ReflectionClass(DummyInterface::class));
+        $ser = unserialize(serialize($res));
+
+        $this->assertTrue($res->isFresh(0));
+        $this->assertTrue($ser->isFresh(0));
+
+        $this->assertSame((string) $res, (string) $ser);
+    }
+
+    public function testIsFresh()
+    {
+        $res = new ReflectionClassResource(new \ReflectionClass(__CLASS__));
+        $mtime = filemtime(__FILE__);
+
+        $this->assertTrue($res->isFresh($mtime), '->isFresh() returns true if the resource has not changed in same second');
+        $this->assertTrue($res->isFresh($mtime + 10), '->isFresh() returns true if the resource has not changed');
+        $this->assertTrue($res->isFresh($mtime - 86400), '->isFresh() returns true if the resource has not changed');
+    }
+
+    public function testIsFreshForDeletedResources()
+    {
+        $now = time();
+        $tmp = sys_get_temp_dir().'/tmp.php';
+        file_put_contents($tmp, '<?php class ReflectionClassResourceTestClass {}');
+        require $tmp;
+
+        $res = new ReflectionClassResource(new \ReflectionClass('ReflectionClassResourceTestClass'));
+        $this->assertTrue($res->isFresh($now));
+
+        unlink($tmp);
+        $this->assertFalse($res->isFresh($now), '->isFresh() returns false if the resource does not exist');
+    }
+
+    /**
+     * @dataProvider provideHashedSignature
+     */
+    public function testHashedSignature($changeExpected, $changedLine, $changedCode, $setContext = null)
+    {
+        if ($setContext) {
+            $setContext();
+        }
+
+        $code = <<<'EOPHP'
+/* 0*/
+/* 1*/  class %s extends ErrorException
+/* 2*/  {
+/* 3*/      const FOO = 123;
+/* 4*/
+/* 5*/      public $pub = [];
+/* 6*/
+/* 7*/      protected $prot;
+/* 8*/
+/* 9*/      private $priv;
+/*10*/
+/*11*/      public function pub($arg = null) {}
+/*12*/
+/*13*/      protected function prot($a = []) {}
+/*14*/
+/*15*/      private function priv() {}
+/*16*/
+/*17*/      public function ccc($bar = A_CONSTANT_THAT_FOR_SURE_WILL_NEVER_BE_DEFINED_CCCCCC) {}
+/*18*/  }
+EOPHP;
+
+        static $expectedSignature, $generateSignature;
+
+        if (null === $expectedSignature) {
+            eval(sprintf($code, $class = 'Foo'.str_replace('.', '_', uniqid('', true))));
+            $r = new \ReflectionClass(ReflectionClassResource::class);
+            $generateSignature = $r->getMethod('generateSignature');
+            $generateSignature->setAccessible(true);
+            $generateSignature = $generateSignature->getClosure($r->newInstanceWithoutConstructor());
+            $expectedSignature = implode("\n", iterator_to_array($generateSignature(new \ReflectionClass($class))));
+        }
+
+        $code = explode("\n", $code);
+        if (null !== $changedCode) {
+            $code[$changedLine] = $changedCode;
+        }
+        eval(sprintf(implode("\n", $code), $class = 'Foo'.str_replace('.', '_', uniqid('', true))));
+        $signature = implode("\n", iterator_to_array($generateSignature(new \ReflectionClass($class))));
+
+        if ($changeExpected) {
+            $this->assertNotSame($expectedSignature, $signature);
+        } else {
+            $this->assertSame($expectedSignature, $signature);
+        }
+    }
+
+    public function provideHashedSignature()
+    {
+        yield [0, 0, "// line change\n\n"];
+        yield [1, 0, '/** class docblock */'];
+        yield [1, 1, 'abstract class %s'];
+        yield [1, 1, 'final class %s'];
+        yield [1, 1, 'class %s extends Exception'];
+        yield [1, 1, 'class %s implements '.DummyInterface::class];
+        yield [1, 3, 'const FOO = 456;'];
+        yield [1, 3, 'const BAR = 123;'];
+        yield [1, 4, '/** pub docblock */'];
+        yield [1, 5, 'protected $pub = [];'];
+        yield [1, 5, 'public $pub = [123];'];
+        yield [1, 6, '/** prot docblock */'];
+        yield [1, 7, 'private $prot;'];
+        yield [0, 8, '/** priv docblock */'];
+        yield [0, 9, 'private $priv = 123;'];
+        yield [1, 10, '/** pub docblock */'];
+        if (\PHP_VERSION_ID >= 50600) {
+            yield [1, 11, 'public function pub(...$arg) {}'];
+        }
+        if (\PHP_VERSION_ID >= 70000) {
+            yield [1, 11, 'public function pub($arg = null): Foo {}'];
+        }
+        yield [0, 11, "public function pub(\$arg = null) {\nreturn 123;\n}"];
+        yield [1, 12, '/** prot docblock */'];
+        yield [1, 13, 'protected function prot($a = [123]) {}'];
+        yield [0, 14, '/** priv docblock */'];
+        yield [0, 15, ''];
+
+        if (\PHP_VERSION_ID >= 70400) {
+            // PHP7.4 typed properties without default value are
+            // undefined, make sure this doesn't throw an error
+            yield [1, 5, 'public array $pub;'];
+            yield [0, 7, 'protected int $prot;'];
+            yield [0, 9, 'private string $priv;'];
+        }
+
+        yield [1, 17, 'public function ccc($bar = 187) {}'];
+        yield [1, 17, 'public function ccc($bar = ANOTHER_ONE_THAT_WILL_NEVER_BE_DEFINED_CCCCCCCCC) {}'];
+        yield [1, 17, null, static function () { \define('A_CONSTANT_THAT_FOR_SURE_WILL_NEVER_BE_DEFINED_CCCCCC', 'foo'); }];
+    }
+
+    public function testEventSubscriber()
+    {
+        $res = new ReflectionClassResource(new \ReflectionClass(TestEventSubscriber::class));
+        $this->assertTrue($res->isFresh(0));
+
+        TestEventSubscriber::$subscribedEvents = [123];
+        $this->assertFalse($res->isFresh(0));
+
+        $res = new ReflectionClassResource(new \ReflectionClass(TestEventSubscriber::class));
+        $this->assertTrue($res->isFresh(0));
+    }
+
+    public function testServiceSubscriber()
+    {
+        $res = new ReflectionClassResource(new \ReflectionClass(TestServiceSubscriber::class));
+        $this->assertTrue($res->isFresh(0));
+
+        TestServiceSubscriber::$subscribedServices = [123];
+        $this->assertFalse($res->isFresh(0));
+
+        $res = new ReflectionClassResource(new \ReflectionClass(TestServiceSubscriber::class));
+        $this->assertTrue($res->isFresh(0));
+    }
+
+    public function testIgnoresObjectsInSignature()
+    {
+        $res = new ReflectionClassResource(new \ReflectionClass(TestServiceWithStaticProperty::class));
+        $this->assertTrue($res->isFresh(0));
+
+        TestServiceWithStaticProperty::$initializedObject = new TestServiceWithStaticProperty();
+        $this->assertTrue($res->isFresh(0));
+    }
+}
+
+interface DummyInterface
+{
+}
+
+class TestEventSubscriber implements EventSubscriberInterface
+{
+    public static $subscribedEvents = [];
+
+    public static function getSubscribedEvents()
+    {
+        return self::$subscribedEvents;
+    }
+}
+
+class TestServiceSubscriber implements ServiceSubscriberInterface
+{
+    public static $subscribedServices = [];
+
+    public static function getSubscribedServices()
+    {
+        return self::$subscribedServices;
+    }
+}
+
+class TestServiceWithStaticProperty
+{
+    public static $initializedObject;
+}
diff --git a/lib/symfony/config/Tests/Resource/ResourceStub.php b/lib/symfony/config/Tests/Resource/ResourceStub.php
new file mode 100644
index 000000000..b01729cbf
--- /dev/null
+++ b/lib/symfony/config/Tests/Resource/ResourceStub.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Resource;
+
+use Symfony\Component\Config\Resource\SelfCheckingResourceInterface;
+
+class ResourceStub implements SelfCheckingResourceInterface
+{
+    private $fresh = true;
+
+    public function setFresh($isFresh)
+    {
+        $this->fresh = $isFresh;
+    }
+
+    public function __toString()
+    {
+        return 'stub';
+    }
+
+    public function isFresh($timestamp)
+    {
+        return $this->fresh;
+    }
+}
diff --git a/lib/symfony/config/Tests/ResourceCheckerConfigCacheTest.php b/lib/symfony/config/Tests/ResourceCheckerConfigCacheTest.php
new file mode 100644
index 000000000..a2c2eeb81
--- /dev/null
+++ b/lib/symfony/config/Tests/ResourceCheckerConfigCacheTest.php
@@ -0,0 +1,150 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Config\ResourceCheckerConfigCache;
+use Symfony\Component\Config\Tests\Resource\ResourceStub;
+
+class ResourceCheckerConfigCacheTest extends TestCase
+{
+    private $cacheFile = null;
+
+    protected function setUp()
+    {
+        $this->cacheFile = tempnam(sys_get_temp_dir(), 'config_');
+    }
+
+    protected function tearDown()
+    {
+        $files = [$this->cacheFile, "{$this->cacheFile}.meta"];
+
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                unlink($file);
+            }
+        }
+    }
+
+    public function testGetPath()
+    {
+        $cache = new ResourceCheckerConfigCache($this->cacheFile);
+
+        $this->assertSame($this->cacheFile, $cache->getPath());
+    }
+
+    public function testCacheIsNotFreshIfEmpty()
+    {
+        $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock()
+            ->expects($this->never())->method('supports');
+
+        /* If there is nothing in the cache, it needs to be filled (and thus it's not fresh).
+            It does not matter if you provide checkers or not. */
+
+        unlink($this->cacheFile); // remove tempnam() side effect
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+
+        $this->assertFalse($cache->isFresh());
+    }
+
+    public function testCacheIsFreshIfNoCheckerProvided()
+    {
+        /* For example in prod mode, you may choose not to run any checkers
+           at all. In that case, the cache should always be considered fresh. */
+        $cache = new ResourceCheckerConfigCache($this->cacheFile);
+        $this->assertTrue($cache->isFresh());
+    }
+
+    public function testCacheIsFreshIfEmptyCheckerIteratorProvided()
+    {
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, new \ArrayIterator([]));
+        $this->assertTrue($cache->isFresh());
+    }
+
+    public function testResourcesWithoutcheckersAreIgnoredAndConsideredFresh()
+    {
+        /* As in the previous test, but this time we have a resource. */
+        $cache = new ResourceCheckerConfigCache($this->cacheFile);
+        $cache->write('', [new ResourceStub()]);
+
+        $this->assertTrue($cache->isFresh()); // no (matching) ResourceChecker passed
+    }
+
+    public function testIsFreshWithchecker()
+    {
+        $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
+
+        $checker->expects($this->once())
+                  ->method('supports')
+                  ->willReturn(true);
+
+        $checker->expects($this->once())
+                  ->method('isFresh')
+                  ->willReturn(true);
+
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+        $cache->write('', [new ResourceStub()]);
+
+        $this->assertTrue($cache->isFresh());
+    }
+
+    public function testIsNotFreshWithchecker()
+    {
+        $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
+
+        $checker->expects($this->once())
+                  ->method('supports')
+                  ->willReturn(true);
+
+        $checker->expects($this->once())
+                  ->method('isFresh')
+                  ->willReturn(false);
+
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+        $cache->write('', [new ResourceStub()]);
+
+        $this->assertFalse($cache->isFresh());
+    }
+
+    public function testCacheIsNotFreshWhenUnserializeFails()
+    {
+        $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+        $cache->write('foo', [new FileResource(__FILE__)]);
+
+        $metaFile = "{$this->cacheFile}.meta";
+        file_put_contents($metaFile, str_replace('FileResource', 'ClassNotHere', file_get_contents($metaFile)));
+
+        $this->assertFalse($cache->isFresh());
+    }
+
+    public function testCacheKeepsContent()
+    {
+        $cache = new ResourceCheckerConfigCache($this->cacheFile);
+        $cache->write('FOOBAR');
+
+        $this->assertSame('FOOBAR', file_get_contents($cache->getPath()));
+    }
+
+    public function testCacheIsNotFreshIfNotExistsMetaFile()
+    {
+        $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+        $cache->write('foo', [new FileResource(__FILE__)]);
+
+        $metaFile = "{$this->cacheFile}.meta";
+        unlink($metaFile);
+
+        $this->assertFalse($cache->isFresh());
+    }
+}
diff --git a/lib/symfony/config/Tests/Util/XmlUtilsTest.php b/lib/symfony/config/Tests/Util/XmlUtilsTest.php
new file mode 100644
index 000000000..4653c8d7c
--- /dev/null
+++ b/lib/symfony/config/Tests/Util/XmlUtilsTest.php
@@ -0,0 +1,211 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Util;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Util\XmlUtils;
+
+class XmlUtilsTest extends TestCase
+{
+    public function testLoadFile()
+    {
+        $fixtures = __DIR__.'/../Fixtures/Util/';
+
+        try {
+            XmlUtils::loadFile($fixtures.'invalid.xml');
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertStringContainsString('ERROR 77', $e->getMessage());
+        }
+
+        try {
+            XmlUtils::loadFile($fixtures.'document_type.xml');
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertStringContainsString('Document types are not allowed', $e->getMessage());
+        }
+
+        try {
+            XmlUtils::loadFile($fixtures.'invalid_schema.xml', $fixtures.'schema.xsd');
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertStringContainsString('ERROR 1845', $e->getMessage());
+        }
+
+        try {
+            XmlUtils::loadFile($fixtures.'invalid_schema.xml', 'invalid_callback_or_file');
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertStringContainsString('XSD file or callable', $e->getMessage());
+        }
+
+        $mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
+        $mock->expects($this->exactly(2))->method('validate')->will($this->onConsecutiveCalls(false, true));
+
+        try {
+            XmlUtils::loadFile($fixtures.'valid.xml', [$mock, 'validate']);
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertRegExp('/The XML file ".+" is not valid\./', $e->getMessage());
+        }
+
+        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', [$mock, 'validate']));
+        $this->assertSame([], libxml_get_errors());
+    }
+
+    public function testParseWithInvalidValidatorCallable()
+    {
+        $this->expectException('Symfony\Component\Config\Util\Exception\InvalidXmlException');
+        $this->expectExceptionMessage('The XML is not valid');
+        $fixtures = __DIR__.'/../Fixtures/Util/';
+
+        $mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
+        $mock->expects($this->once())->method('validate')->willReturn(false);
+
+        XmlUtils::parse(file_get_contents($fixtures.'valid.xml'), [$mock, 'validate']);
+    }
+
+    public function testLoadFileWithInternalErrorsEnabled()
+    {
+        $internalErrors = libxml_use_internal_errors(true);
+
+        $this->assertSame([], libxml_get_errors());
+        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
+        $this->assertSame([], libxml_get_errors());
+
+        libxml_clear_errors();
+        libxml_use_internal_errors($internalErrors);
+    }
+
+    /**
+     * @dataProvider getDataForConvertDomToArray
+     */
+    public function testConvertDomToArray($expected, $xml, $root = false, $checkPrefix = true)
+    {
+        $dom = new \DOMDocument();
+        $dom->loadXML($root ? $xml : '<root>'.$xml.'</root>');
+
+        $this->assertSame($expected, XmlUtils::convertDomElementToArray($dom->documentElement, $checkPrefix));
+    }
+
+    public function getDataForConvertDomToArray()
+    {
+        return [
+            [null, ''],
+            ['bar', 'bar'],
+            [['bar' => 'foobar'], '<foo bar="foobar" />', true],
+            [['foo' => null], '<foo />'],
+            [['foo' => 'bar'], '<foo>bar</foo>'],
+            [['foo' => ['foo' => 'bar']], '<foo foo="bar"/>'],
+            [['foo' => ['foo' => 0]], '<foo><foo>0</foo></foo>'],
+            [['foo' => ['foo' => 'bar']], '<foo><foo>bar</foo></foo>'],
+            [['foo' => ['foo' => 'bar', 'value' => 'text']], '<foo foo="bar">text</foo>'],
+            [['foo' => ['attr' => 'bar', 'foo' => 'text']], '<foo attr="bar"><foo>text</foo></foo>'],
+            [['foo' => ['bar', 'text']], '<foo>bar</foo><foo>text</foo>'],
+            [['foo' => [['foo' => 'bar'], ['foo' => 'text']]], '<foo foo="bar"/><foo foo="text" />'],
+            [['foo' => ['foo' => ['bar', 'text']]], '<foo foo="bar"><foo>text</foo></foo>'],
+            [['foo' => 'bar'], '<foo><!-- Comment -->bar</foo>'],
+            [['foo' => 'text'], '<foo xmlns:h="http://www.example.org/bar" h:bar="bar">text</foo>'],
+            [['foo' => ['bar' => 'bar', 'value' => 'text']], '<foo xmlns:h="http://www.example.org/bar" h:bar="bar">text</foo>', false, false],
+            [['attr' => 1, 'b' => 'hello'], '<foo:a xmlns:foo="http://www.example.org/foo" xmlns:h="http://www.example.org/bar" attr="1" h:bar="bar"><foo:b>hello</foo:b><h:c>2</h:c></foo:a>', true],
+        ];
+    }
+
+    /**
+     * @dataProvider getDataForPhpize
+     */
+    public function testPhpize($expected, $value)
+    {
+        $this->assertSame($expected, XmlUtils::phpize($value));
+    }
+
+    public function getDataForPhpize()
+    {
+        return [
+            ['', ''],
+            [null, 'null'],
+            [true, 'true'],
+            [false, 'false'],
+            [null, 'Null'],
+            [true, 'True'],
+            [false, 'False'],
+            [0, '0'],
+            [1, '1'],
+            [-1, '-1'],
+            [0777, '0777'],
+            [255, '0xFF'],
+            [100.0, '1e2'],
+            [-120.0, '-1.2E2'],
+            [-10100.1, '-10100.1'],
+            ['-10,100.1', '-10,100.1'],
+            ['1234 5678 9101 1121 3141', '1234 5678 9101 1121 3141'],
+            ['1,2,3,4', '1,2,3,4'],
+            ['11,22,33,44', '11,22,33,44'],
+            ['11,222,333,4', '11,222,333,4'],
+            ['1,222,333,444', '1,222,333,444'],
+            ['11,222,333,444', '11,222,333,444'],
+            ['111,222,333,444', '111,222,333,444'],
+            ['1111,2222,3333,4444,5555', '1111,2222,3333,4444,5555'],
+            ['foo', 'foo'],
+            [6, '0b0110'],
+        ];
+    }
+
+    public function testLoadEmptyXmlFile()
+    {
+        $file = __DIR__.'/../Fixtures/foo.xml';
+
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(sprintf('File %s does not contain valid XML, it is empty.', $file));
+
+        XmlUtils::loadFile($file);
+    }
+
+    // test for issue https://github.com/symfony/symfony/issues/9731
+    public function testLoadWrongEmptyXMLWithErrorHandler()
+    {
+        $originalDisableEntities = libxml_disable_entity_loader(false);
+        $errorReporting = error_reporting(-1);
+
+        set_error_handler(function ($errno, $errstr) {
+            throw new \Exception($errstr, $errno);
+        });
+
+        $file = __DIR__.'/../Fixtures/foo.xml';
+        try {
+            try {
+                XmlUtils::loadFile($file);
+                $this->fail('An exception should have been raised');
+            } catch (\InvalidArgumentException $e) {
+                $this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage());
+            }
+        } finally {
+            restore_error_handler();
+            error_reporting($errorReporting);
+        }
+
+        $disableEntities = libxml_disable_entity_loader(true);
+        libxml_disable_entity_loader($disableEntities);
+
+        libxml_disable_entity_loader($originalDisableEntities);
+
+        $this->assertFalse($disableEntities);
+
+        // should not throw an exception
+        XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/valid.xml', __DIR__.'/../Fixtures/Util/schema.xsd');
+    }
+}
+
+interface Validator
+{
+    public function validate();
+}
diff --git a/lib/symfony/console/Tests/ApplicationTest.php b/lib/symfony/console/Tests/ApplicationTest.php
new file mode 100644
index 000000000..1ef2ed3d7
--- /dev/null
+++ b/lib/symfony/console/Tests/ApplicationTest.php
@@ -0,0 +1,1744 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\CommandLoader\FactoryCommandLoader;
+use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
+use Symfony\Component\Console\Event\ConsoleCommandEvent;
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
+use Symfony\Component\Console\Event\ConsoleExceptionEvent;
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
+use Symfony\Component\Console\Helper\FormatterHelper;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Console\Tester\ApplicationTester;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+class ApplicationTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    private $colSize;
+
+    protected function setUp()
+    {
+        $this->colSize = getenv('COLUMNS');
+    }
+
+    protected function tearDown()
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+        putenv('SHELL_VERBOSITY');
+        unset($_ENV['SHELL_VERBOSITY']);
+        unset($_SERVER['SHELL_VERBOSITY']);
+    }
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/Fixtures/');
+        require_once self::$fixturesPath.'/FooCommand.php';
+        require_once self::$fixturesPath.'/FooOptCommand.php';
+        require_once self::$fixturesPath.'/Foo1Command.php';
+        require_once self::$fixturesPath.'/Foo2Command.php';
+        require_once self::$fixturesPath.'/Foo3Command.php';
+        require_once self::$fixturesPath.'/Foo4Command.php';
+        require_once self::$fixturesPath.'/Foo5Command.php';
+        require_once self::$fixturesPath.'/FooSameCaseUppercaseCommand.php';
+        require_once self::$fixturesPath.'/FooSameCaseLowercaseCommand.php';
+        require_once self::$fixturesPath.'/FoobarCommand.php';
+        require_once self::$fixturesPath.'/BarBucCommand.php';
+        require_once self::$fixturesPath.'/FooSubnamespaced1Command.php';
+        require_once self::$fixturesPath.'/FooSubnamespaced2Command.php';
+        require_once self::$fixturesPath.'/TestAmbiguousCommandRegistering.php';
+        require_once self::$fixturesPath.'/TestAmbiguousCommandRegistering2.php';
+        require_once self::$fixturesPath.'/FooHiddenCommand.php';
+    }
+
+    protected function normalizeLineBreaks($text)
+    {
+        return str_replace(PHP_EOL, "\n", $text);
+    }
+
+    /**
+     * Replaces the dynamic placeholders of the command help text with a static version.
+     * The placeholder %command.full_name% includes the script path that is not predictable
+     * and can not be tested against.
+     */
+    protected function ensureStaticCommandHelp(Application $application)
+    {
+        foreach ($application->all() as $command) {
+            $command->setHelp(str_replace('%command.full_name%', 'app/console %command.name%', $command->getHelp()));
+        }
+    }
+
+    public function testConstructor()
+    {
+        $application = new Application('foo', 'bar');
+        $this->assertEquals('foo', $application->getName(), '__construct() takes the application name as its first argument');
+        $this->assertEquals('bar', $application->getVersion(), '__construct() takes the application version as its second argument');
+        $this->assertEquals(['help', 'list'], array_keys($application->all()), '__construct() registered the help and list commands by default');
+    }
+
+    public function testSetGetName()
+    {
+        $application = new Application();
+        $application->setName('foo');
+        $this->assertEquals('foo', $application->getName(), '->setName() sets the name of the application');
+    }
+
+    public function testSetGetVersion()
+    {
+        $application = new Application();
+        $application->setVersion('bar');
+        $this->assertEquals('bar', $application->getVersion(), '->setVersion() sets the version of the application');
+    }
+
+    public function testGetLongVersion()
+    {
+        $application = new Application('foo', 'bar');
+        $this->assertEquals('foo <info>bar</info>', $application->getLongVersion(), '->getLongVersion() returns the long version of the application');
+    }
+
+    public function testHelp()
+    {
+        $application = new Application();
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_gethelp.txt', $this->normalizeLineBreaks($application->getHelp()), '->getHelp() returns a help message');
+    }
+
+    public function testAll()
+    {
+        $application = new Application();
+        $commands = $application->all();
+        $this->assertInstanceOf('Symfony\\Component\\Console\\Command\\HelpCommand', $commands['help'], '->all() returns the registered commands');
+
+        $application->add(new \FooCommand());
+        $commands = $application->all('foo');
+        $this->assertCount(1, $commands, '->all() takes a namespace as its first argument');
+    }
+
+    public function testAllWithCommandLoader()
+    {
+        $application = new Application();
+        $commands = $application->all();
+        $this->assertInstanceOf('Symfony\\Component\\Console\\Command\\HelpCommand', $commands['help'], '->all() returns the registered commands');
+
+        $application->add(new \FooCommand());
+        $commands = $application->all('foo');
+        $this->assertCount(1, $commands, '->all() takes a namespace as its first argument');
+
+        $application->setCommandLoader(new FactoryCommandLoader([
+            'foo:bar1' => function () { return new \Foo1Command(); },
+        ]));
+        $commands = $application->all('foo');
+        $this->assertCount(2, $commands, '->all() takes a namespace as its first argument');
+        $this->assertInstanceOf(\FooCommand::class, $commands['foo:bar'], '->all() returns the registered commands');
+        $this->assertInstanceOf(\Foo1Command::class, $commands['foo:bar1'], '->all() returns the registered commands');
+    }
+
+    public function testRegister()
+    {
+        $application = new Application();
+        $command = $application->register('foo');
+        $this->assertEquals('foo', $command->getName(), '->register() registers a new command');
+    }
+
+    public function testRegisterAmbiguous()
+    {
+        $code = function (InputInterface $input, OutputInterface $output) {
+            $output->writeln('It works!');
+        };
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application
+            ->register('test-foo')
+            ->setAliases(['test'])
+            ->setCode($code);
+
+        $application
+            ->register('test-bar')
+            ->setCode($code);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['test']);
+        $this->assertStringContainsString('It works!', $tester->getDisplay(true));
+    }
+
+    public function testAdd()
+    {
+        $application = new Application();
+        $application->add($foo = new \FooCommand());
+        $commands = $application->all();
+        $this->assertEquals($foo, $commands['foo:bar'], '->add() registers a command');
+
+        $application = new Application();
+        $application->addCommands([$foo = new \FooCommand(), $foo1 = new \Foo1Command()]);
+        $commands = $application->all();
+        $this->assertEquals([$foo, $foo1], [$commands['foo:bar'], $commands['foo:bar1']], '->addCommands() registers an array of commands');
+    }
+
+    public function testAddCommandWithEmptyConstructor()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Command class "Foo5Command" is not correctly initialized. You probably forgot to call the parent constructor.');
+        $application = new Application();
+        $application->add(new \Foo5Command());
+    }
+
+    public function testHasGet()
+    {
+        $application = new Application();
+        $this->assertTrue($application->has('list'), '->has() returns true if a named command is registered');
+        $this->assertFalse($application->has('afoobar'), '->has() returns false if a named command is not registered');
+
+        $application->add($foo = new \FooCommand());
+        $this->assertTrue($application->has('afoobar'), '->has() returns true if an alias is registered');
+        $this->assertEquals($foo, $application->get('foo:bar'), '->get() returns a command by name');
+        $this->assertEquals($foo, $application->get('afoobar'), '->get() returns a command by alias');
+
+        $application = new Application();
+        $application->add($foo = new \FooCommand());
+        // simulate --help
+        $r = new \ReflectionObject($application);
+        $p = $r->getProperty('wantHelps');
+        $p->setAccessible(true);
+        $p->setValue($application, true);
+        $command = $application->get('foo:bar');
+        $this->assertInstanceOf('Symfony\Component\Console\Command\HelpCommand', $command, '->get() returns the help command if --help is provided as the input');
+    }
+
+    public function testHasGetWithCommandLoader()
+    {
+        $application = new Application();
+        $this->assertTrue($application->has('list'), '->has() returns true if a named command is registered');
+        $this->assertFalse($application->has('afoobar'), '->has() returns false if a named command is not registered');
+
+        $application->add($foo = new \FooCommand());
+        $this->assertTrue($application->has('afoobar'), '->has() returns true if an alias is registered');
+        $this->assertEquals($foo, $application->get('foo:bar'), '->get() returns a command by name');
+        $this->assertEquals($foo, $application->get('afoobar'), '->get() returns a command by alias');
+
+        $application->setCommandLoader(new FactoryCommandLoader([
+            'foo:bar1' => function () { return new \Foo1Command(); },
+        ]));
+
+        $this->assertTrue($application->has('afoobar'), '->has() returns true if an instance is registered for an alias even with command loader');
+        $this->assertEquals($foo, $application->get('foo:bar'), '->get() returns an instance by name even with command loader');
+        $this->assertEquals($foo, $application->get('afoobar'), '->get() returns an instance by alias even with command loader');
+        $this->assertTrue($application->has('foo:bar1'), '->has() returns true for commands registered in the loader');
+        $this->assertInstanceOf(\Foo1Command::class, $foo1 = $application->get('foo:bar1'), '->get() returns a command by name from the command loader');
+        $this->assertTrue($application->has('afoobar1'), '->has() returns true for commands registered in the loader');
+        $this->assertEquals($foo1, $application->get('afoobar1'), '->get() returns a command by name from the command loader');
+    }
+
+    public function testSilentHelp()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['-h' => true, '-q' => true], ['decorated' => false]);
+
+        $this->assertEmpty($tester->getDisplay(true));
+    }
+
+    public function testGetInvalidCommand()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectExceptionMessage('The command "foofoo" does not exist.');
+        $application = new Application();
+        $application->get('foofoo');
+    }
+
+    public function testGetNamespaces()
+    {
+        $application = new Application();
+        $application->add(new \FooCommand());
+        $application->add(new \Foo1Command());
+        $this->assertEquals(['foo'], $application->getNamespaces(), '->getNamespaces() returns an array of unique used namespaces');
+    }
+
+    public function testFindNamespace()
+    {
+        $application = new Application();
+        $application->add(new \FooCommand());
+        $this->assertEquals('foo', $application->findNamespace('foo'), '->findNamespace() returns the given namespace if it exists');
+        $this->assertEquals('foo', $application->findNamespace('f'), '->findNamespace() finds a namespace given an abbreviation');
+        $application->add(new \Foo2Command());
+        $this->assertEquals('foo', $application->findNamespace('foo'), '->findNamespace() returns the given namespace if it exists');
+    }
+
+    public function testFindNamespaceWithSubnamespaces()
+    {
+        $application = new Application();
+        $application->add(new \FooSubnamespaced1Command());
+        $application->add(new \FooSubnamespaced2Command());
+        $this->assertEquals('foo', $application->findNamespace('foo'), '->findNamespace() returns commands even if the commands are only contained in subnamespaces');
+    }
+
+    public function testFindAmbiguousNamespace()
+    {
+        $application = new Application();
+        $application->add(new \BarBucCommand());
+        $application->add(new \FooCommand());
+        $application->add(new \Foo2Command());
+
+        $expectedMsg = "The namespace \"f\" is ambiguous.\nDid you mean one of these?\n    foo\n    foo1";
+
+        $this->expectException(CommandNotFoundException::class);
+        $this->expectExceptionMessage($expectedMsg);
+
+        $application->findNamespace('f');
+    }
+
+    public function testFindNonAmbiguous()
+    {
+        $application = new Application();
+        $application->add(new \TestAmbiguousCommandRegistering());
+        $application->add(new \TestAmbiguousCommandRegistering2());
+        $this->assertEquals('test-ambiguous', $application->find('test')->getName());
+    }
+
+    public function testFindInvalidNamespace()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectExceptionMessage('There are no commands defined in the "bar" namespace.');
+        $application = new Application();
+        $application->findNamespace('bar');
+    }
+
+    public function testFindUniqueNameButNamespaceName()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectExceptionMessage('Command "foo1" is not defined');
+        $application = new Application();
+        $application->add(new \FooCommand());
+        $application->add(new \Foo1Command());
+        $application->add(new \Foo2Command());
+
+        $application->find($commandName = 'foo1');
+    }
+
+    public function testFind()
+    {
+        $application = new Application();
+        $application->add(new \FooCommand());
+
+        $this->assertInstanceOf('FooCommand', $application->find('foo:bar'), '->find() returns a command if its name exists');
+        $this->assertInstanceOf('Symfony\Component\Console\Command\HelpCommand', $application->find('h'), '->find() returns a command if its name exists');
+        $this->assertInstanceOf('FooCommand', $application->find('f:bar'), '->find() returns a command if the abbreviation for the namespace exists');
+        $this->assertInstanceOf('FooCommand', $application->find('f:b'), '->find() returns a command if the abbreviation for the namespace and the command name exist');
+        $this->assertInstanceOf('FooCommand', $application->find('a'), '->find() returns a command if the abbreviation exists for an alias');
+    }
+
+    public function testFindCaseSensitiveFirst()
+    {
+        $application = new Application();
+        $application->add(new \FooSameCaseUppercaseCommand());
+        $application->add(new \FooSameCaseLowercaseCommand());
+
+        $this->assertInstanceOf('FooSameCaseUppercaseCommand', $application->find('f:B'), '->find() returns a command if the abbreviation is the correct case');
+        $this->assertInstanceOf('FooSameCaseUppercaseCommand', $application->find('f:BAR'), '->find() returns a command if the abbreviation is the correct case');
+        $this->assertInstanceOf('FooSameCaseLowercaseCommand', $application->find('f:b'), '->find() returns a command if the abbreviation is the correct case');
+        $this->assertInstanceOf('FooSameCaseLowercaseCommand', $application->find('f:bar'), '->find() returns a command if the abbreviation is the correct case');
+    }
+
+    public function testFindCaseInsensitiveAsFallback()
+    {
+        $application = new Application();
+        $application->add(new \FooSameCaseLowercaseCommand());
+
+        $this->assertInstanceOf('FooSameCaseLowercaseCommand', $application->find('f:b'), '->find() returns a command if the abbreviation is the correct case');
+        $this->assertInstanceOf('FooSameCaseLowercaseCommand', $application->find('f:B'), '->find() will fallback to case insensitivity');
+        $this->assertInstanceOf('FooSameCaseLowercaseCommand', $application->find('FoO:BaR'), '->find() will fallback to case insensitivity');
+    }
+
+    public function testFindCaseInsensitiveSuggestions()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectExceptionMessage('Command "FoO:BaR" is ambiguous');
+        $application = new Application();
+        $application->add(new \FooSameCaseLowercaseCommand());
+        $application->add(new \FooSameCaseUppercaseCommand());
+
+        $this->assertInstanceOf('FooSameCaseLowercaseCommand', $application->find('FoO:BaR'), '->find() will find two suggestions with case insensitivity');
+    }
+
+    public function testFindWithCommandLoader()
+    {
+        $application = new Application();
+        $application->setCommandLoader(new FactoryCommandLoader([
+            'foo:bar' => $f = function () { return new \FooCommand(); },
+        ]));
+
+        $this->assertInstanceOf('FooCommand', $application->find('foo:bar'), '->find() returns a command if its name exists');
+        $this->assertInstanceOf('Symfony\Component\Console\Command\HelpCommand', $application->find('h'), '->find() returns a command if its name exists');
+        $this->assertInstanceOf('FooCommand', $application->find('f:bar'), '->find() returns a command if the abbreviation for the namespace exists');
+        $this->assertInstanceOf('FooCommand', $application->find('f:b'), '->find() returns a command if the abbreviation for the namespace and the command name exist');
+        $this->assertInstanceOf('FooCommand', $application->find('a'), '->find() returns a command if the abbreviation exists for an alias');
+    }
+
+    /**
+     * @dataProvider provideAmbiguousAbbreviations
+     */
+    public function testFindWithAmbiguousAbbreviations($abbreviation, $expectedExceptionMessage)
+    {
+        putenv('COLUMNS=120');
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $application = new Application();
+        $application->add(new \FooCommand());
+        $application->add(new \Foo1Command());
+        $application->add(new \Foo2Command());
+
+        $application->find($abbreviation);
+    }
+
+    public function provideAmbiguousAbbreviations()
+    {
+        return [
+            ['f', 'Command "f" is not defined.'],
+            [
+                'a',
+                "Command \"a\" is ambiguous.\nDid you mean one of these?\n".
+                "    afoobar  The foo:bar command\n".
+                "    afoobar1 The foo:bar1 command\n".
+                '    afoobar2 The foo1:bar command',
+            ],
+            [
+                'foo:b',
+                "Command \"foo:b\" is ambiguous.\nDid you mean one of these?\n".
+                "    foo:bar  The foo:bar command\n".
+                "    foo:bar1 The foo:bar1 command\n".
+                '    foo1:bar The foo1:bar command',
+            ],
+        ];
+    }
+
+    public function testFindCommandEqualNamespace()
+    {
+        $application = new Application();
+        $application->add(new \Foo3Command());
+        $application->add(new \Foo4Command());
+
+        $this->assertInstanceOf('Foo3Command', $application->find('foo3:bar'), '->find() returns the good command even if a namespace has same name');
+        $this->assertInstanceOf('Foo4Command', $application->find('foo3:bar:toh'), '->find() returns a command even if its namespace equals another command name');
+    }
+
+    public function testFindCommandWithAmbiguousNamespacesButUniqueName()
+    {
+        $application = new Application();
+        $application->add(new \FooCommand());
+        $application->add(new \FoobarCommand());
+
+        $this->assertInstanceOf('FoobarCommand', $application->find('f:f'));
+    }
+
+    public function testFindCommandWithMissingNamespace()
+    {
+        $application = new Application();
+        $application->add(new \Foo4Command());
+
+        $this->assertInstanceOf('Foo4Command', $application->find('f::t'));
+    }
+
+    /**
+     * @dataProvider provideInvalidCommandNamesSingle
+     */
+    public function testFindAlternativeExceptionMessageSingle($name)
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectExceptionMessage('Did you mean this');
+        $application = new Application();
+        $application->add(new \Foo3Command());
+        $application->find($name);
+    }
+
+    public function provideInvalidCommandNamesSingle()
+    {
+        return [
+            ['foo3:barr'],
+            ['fooo3:bar'],
+        ];
+    }
+
+    public function testFindAlternativeExceptionMessageMultiple()
+    {
+        putenv('COLUMNS=120');
+        $application = new Application();
+        $application->add(new \FooCommand());
+        $application->add(new \Foo1Command());
+        $application->add(new \Foo2Command());
+
+        // Command + plural
+        try {
+            $application->find('foo:baR');
+            $this->fail('->find() throws a CommandNotFoundException if command does not exist, with alternatives');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
+            $this->assertRegExp('/Did you mean one of these/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
+            $this->assertRegExp('/foo1:bar/', $e->getMessage());
+            $this->assertRegExp('/foo:bar/', $e->getMessage());
+        }
+
+        // Namespace + plural
+        try {
+            $application->find('foo2:bar');
+            $this->fail('->find() throws a CommandNotFoundException if command does not exist, with alternatives');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
+            $this->assertRegExp('/Did you mean one of these/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
+            $this->assertRegExp('/foo1/', $e->getMessage());
+        }
+
+        $application->add(new \Foo3Command());
+        $application->add(new \Foo4Command());
+
+        // Subnamespace + plural
+        try {
+            $application->find('foo3:');
+            $this->fail('->find() should throw an Symfony\Component\Console\Exception\CommandNotFoundException if a command is ambiguous because of a subnamespace, with alternatives');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e);
+            $this->assertRegExp('/foo3:bar/', $e->getMessage());
+            $this->assertRegExp('/foo3:bar:toh/', $e->getMessage());
+        }
+    }
+
+    public function testFindAlternativeCommands()
+    {
+        $application = new Application();
+
+        $application->add(new \FooCommand());
+        $application->add(new \Foo1Command());
+        $application->add(new \Foo2Command());
+
+        try {
+            $application->find($commandName = 'Unknown command');
+            $this->fail('->find() throws a CommandNotFoundException if command does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist');
+            $this->assertSame([], $e->getAlternatives());
+            $this->assertEquals(sprintf('Command "%s" is not defined.', $commandName), $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, without alternatives');
+        }
+
+        // Test if "bar1" command throw a "CommandNotFoundException" and does not contain
+        // "foo:bar" as alternative because "bar1" is too far from "foo:bar"
+        try {
+            $application->find($commandName = 'bar1');
+            $this->fail('->find() throws a CommandNotFoundException if command does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist');
+            $this->assertSame(['afoobar1', 'foo:bar1'], $e->getAlternatives());
+            $this->assertRegExp(sprintf('/Command "%s" is not defined./', $commandName), $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
+            $this->assertRegExp('/afoobar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "afoobar1"');
+            $this->assertRegExp('/foo:bar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "foo:bar1"');
+            $this->assertNotRegExp('/foo:bar(?>!1)/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, without "foo:bar" alternative');
+        }
+    }
+
+    public function testFindAlternativeCommandsWithAnAlias()
+    {
+        $fooCommand = new \FooCommand();
+        $fooCommand->setAliases(['foo2']);
+
+        $application = new Application();
+        $application->add($fooCommand);
+
+        $result = $application->find('foo');
+
+        $this->assertSame($fooCommand, $result);
+    }
+
+    public function testFindAlternativeNamespace()
+    {
+        $application = new Application();
+
+        $application->add(new \FooCommand());
+        $application->add(new \Foo1Command());
+        $application->add(new \Foo2Command());
+        $application->add(new \Foo3Command());
+
+        try {
+            $application->find('Unknown-namespace:Unknown-command');
+            $this->fail('->find() throws a CommandNotFoundException if namespace does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if namespace does not exist');
+            $this->assertSame([], $e->getAlternatives());
+            $this->assertEquals('There are no commands defined in the "Unknown-namespace" namespace.', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, without alternatives');
+        }
+
+        try {
+            $application->find('foo2:command');
+            $this->fail('->find() throws a CommandNotFoundException if namespace does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if namespace does not exist');
+            $this->assertCount(3, $e->getAlternatives());
+            $this->assertContains('foo', $e->getAlternatives());
+            $this->assertContains('foo1', $e->getAlternatives());
+            $this->assertContains('foo3', $e->getAlternatives());
+            $this->assertRegExp('/There are no commands defined in the "foo2" namespace./', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative');
+            $this->assertRegExp('/foo/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo"');
+            $this->assertRegExp('/foo1/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo1"');
+            $this->assertRegExp('/foo3/', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, with alternative : "foo3"');
+        }
+    }
+
+    public function testFindAlternativesOutput()
+    {
+        $application = new Application();
+
+        $application->add(new \FooCommand());
+        $application->add(new \Foo1Command());
+        $application->add(new \Foo2Command());
+        $application->add(new \Foo3Command());
+        $application->add(new \FooHiddenCommand());
+
+        $expectedAlternatives = [
+            'afoobar',
+            'afoobar1',
+            'afoobar2',
+            'foo1:bar',
+            'foo3:bar',
+            'foo:bar',
+            'foo:bar1',
+        ];
+
+        try {
+            $application->find('foo');
+            $this->fail('->find() throws a CommandNotFoundException if command is not defined');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command is not defined');
+            $this->assertSame($expectedAlternatives, $e->getAlternatives());
+
+            $this->assertRegExp('/Command "foo" is not defined\..*Did you mean one of these\?.*/Ums', $e->getMessage());
+        }
+    }
+
+    public function testFindNamespaceDoesNotFailOnDeepSimilarNamespaces()
+    {
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['getNamespaces'])->getMock();
+        $application->expects($this->once())
+            ->method('getNamespaces')
+            ->willReturn(['foo:sublong', 'bar:sub']);
+
+        $this->assertEquals('foo:sublong', $application->findNamespace('f:sub'));
+    }
+
+    public function testFindWithDoubleColonInNameThrowsException()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectExceptionMessage('Command "foo::bar" is not defined.');
+        $application = new Application();
+        $application->add(new \FooCommand());
+        $application->add(new \Foo4Command());
+        $application->find('foo::bar');
+    }
+
+    public function testSetCatchExceptions()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        putenv('COLUMNS=120');
+        $tester = new ApplicationTester($application);
+
+        $application->setCatchExceptions(true);
+        $this->assertTrue($application->areExceptionsCaught());
+
+        $tester->run(['command' => 'foo'], ['decorated' => false]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception1.txt', $tester->getDisplay(true), '->setCatchExceptions() sets the catch exception flag');
+
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'capture_stderr_separately' => true]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception1.txt', $tester->getErrorOutput(true), '->setCatchExceptions() sets the catch exception flag');
+        $this->assertSame('', $tester->getDisplay(true));
+
+        $application->setCatchExceptions(false);
+        try {
+            $tester->run(['command' => 'foo'], ['decorated' => false]);
+            $this->fail('->setCatchExceptions() sets the catch exception flag');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\Exception', $e, '->setCatchExceptions() sets the catch exception flag');
+            $this->assertEquals('Command "foo" is not defined.', $e->getMessage(), '->setCatchExceptions() sets the catch exception flag');
+        }
+    }
+
+    public function testAutoExitSetting()
+    {
+        $application = new Application();
+        $this->assertTrue($application->isAutoExitEnabled());
+
+        $application->setAutoExit(false);
+        $this->assertFalse($application->isAutoExitEnabled());
+    }
+
+    public function testRenderException()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        putenv('COLUMNS=120');
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'capture_stderr_separately' => true]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception1.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exception');
+
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE, 'capture_stderr_separately' => true]);
+        $this->assertStringContainsString('Exception trace', $tester->getErrorOutput(), '->renderException() renders a pretty exception with a stack trace when verbosity is verbose');
+
+        $tester->run(['command' => 'list', '--foo' => true], ['decorated' => false, 'capture_stderr_separately' => true]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception2.txt', $tester->getErrorOutput(true), '->renderException() renders the command synopsis when an exception occurs in the context of a command');
+
+        $application->add(new \Foo3Command());
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo3:bar'], ['decorated' => false, 'capture_stderr_separately' => true]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
+
+        $tester->run(['command' => 'foo3:bar'], ['decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
+        $this->assertRegExp('/\[Exception\]\s*First exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is default and verbosity is verbose');
+        $this->assertRegExp('/\[Exception\]\s*Second exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is 0 and verbosity is verbose');
+        $this->assertRegExp('/\[Exception \(404\)\]\s*Third exception/', $tester->getDisplay(), '->renderException() renders a pretty exception with code exception when code exception is 404 and verbosity is verbose');
+
+        $tester->run(['command' => 'foo3:bar'], ['decorated' => true]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3decorated.txt', $tester->getDisplay(true), '->renderException() renders a pretty exceptions with previous exceptions');
+
+        $tester->run(['command' => 'foo3:bar'], ['decorated' => true, 'capture_stderr_separately' => true]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3decorated.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        putenv('COLUMNS=32');
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'foo'], ['decorated' => false,  'capture_stderr_separately' => true]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception4.txt', $tester->getErrorOutput(true), '->renderException() wraps messages when they are bigger than the terminal');
+        putenv('COLUMNS=120');
+    }
+
+    public function testRenderExceptionWithDoubleWidthCharacters()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        putenv('COLUMNS=120');
+        $application->register('foo')->setCode(function () {
+            throw new \Exception('エラーメッセージ');
+        });
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'capture_stderr_separately' => true]);
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth1.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
+
+        $tester->run(['command' => 'foo'], ['decorated' => true, 'capture_stderr_separately' => true]);
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth1decorated.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        putenv('COLUMNS=32');
+        $application->register('foo')->setCode(function () {
+            throw new \Exception('コマンドの実行中にエラーが発生しました。');
+        });
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'capture_stderr_separately' => true]);
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth2.txt', $tester->getErrorOutput(true), '->renderException() wraps messages when they are bigger than the terminal');
+        putenv('COLUMNS=120');
+    }
+
+    public function testRenderExceptionEscapesLines()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        putenv('COLUMNS=22');
+        $application->register('foo')->setCode(function () {
+            throw new \Exception('dont break here <info>!</info>');
+        });
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'foo'], ['decorated' => false]);
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_escapeslines.txt', $tester->getDisplay(true), '->renderException() escapes lines containing formatting');
+        putenv('COLUMNS=120');
+    }
+
+    public function testRenderExceptionLineBreaks()
+    {
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['getTerminalWidth'])->getMock();
+        $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->willReturn(120);
+        $application->register('foo')->setCode(function () {
+            throw new \InvalidArgumentException("\n\nline 1 with extra spaces        \nline 2\n\nline 4\n");
+        });
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'foo'], ['decorated' => false]);
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_linebreaks.txt', $tester->getDisplay(true), '->renderException() keep multiple line breaks');
+    }
+
+    public function testRenderExceptionStackTraceContainsRootException()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->register('foo')->setCode(function () {
+            throw new \Exception('Verbose exception');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
+
+        $this->assertStringContainsString(sprintf('() at %s:', __FILE__), $tester->getDisplay());
+    }
+
+    public function testRun()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application->add($command = new \Foo1Command());
+        $_SERVER['argv'] = ['cli.php', 'foo:bar1'];
+
+        ob_start();
+        $application->run();
+        ob_end_clean();
+
+        $this->assertInstanceOf('Symfony\Component\Console\Input\ArgvInput', $command->input, '->run() creates an ArgvInput by default if none is given');
+        $this->assertInstanceOf('Symfony\Component\Console\Output\ConsoleOutput', $command->output, '->run() creates a ConsoleOutput by default if none is given');
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $this->ensureStaticCommandHelp($application);
+        $tester = new ApplicationTester($application);
+
+        $tester->run([], ['decorated' => false]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_run1.txt', $tester->getDisplay(true), '->run() runs the list command if no argument is passed');
+
+        $tester->run(['--help' => true], ['decorated' => false]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_run2.txt', $tester->getDisplay(true), '->run() runs the help command if --help is passed');
+
+        $tester->run(['-h' => true], ['decorated' => false]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_run2.txt', $tester->getDisplay(true), '->run() runs the help command if -h is passed');
+
+        $tester->run(['command' => 'list', '--help' => true], ['decorated' => false]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_run3.txt', $tester->getDisplay(true), '->run() displays the help if --help is passed');
+
+        $tester->run(['command' => 'list', '-h' => true], ['decorated' => false]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_run3.txt', $tester->getDisplay(true), '->run() displays the help if -h is passed');
+
+        $tester->run(['--ansi' => true]);
+        $this->assertTrue($tester->getOutput()->isDecorated(), '->run() forces color output if --ansi is passed');
+
+        $tester->run(['--no-ansi' => true]);
+        $this->assertFalse($tester->getOutput()->isDecorated(), '->run() forces color output to be disabled if --no-ansi is passed');
+
+        $tester->run(['--version' => true], ['decorated' => false]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_run4.txt', $tester->getDisplay(true), '->run() displays the program version if --version is passed');
+
+        $tester->run(['-V' => true], ['decorated' => false]);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_run4.txt', $tester->getDisplay(true), '->run() displays the program version if -v is passed');
+
+        $tester->run(['command' => 'list', '--quiet' => true]);
+        $this->assertSame('', $tester->getDisplay(), '->run() removes all output if --quiet is passed');
+        $this->assertFalse($tester->getInput()->isInteractive(), '->run() sets off the interactive mode if --quiet is passed');
+
+        $tester->run(['command' => 'list', '-q' => true]);
+        $this->assertSame('', $tester->getDisplay(), '->run() removes all output if -q is passed');
+        $this->assertFalse($tester->getInput()->isInteractive(), '->run() sets off the interactive mode if -q is passed');
+
+        $tester->run(['command' => 'list', '--verbose' => true]);
+        $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if --verbose is passed');
+
+        $tester->run(['command' => 'list', '--verbose' => 1]);
+        $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if --verbose=1 is passed');
+
+        $tester->run(['command' => 'list', '--verbose' => 2]);
+        $this->assertSame(Output::VERBOSITY_VERY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to very verbose if --verbose=2 is passed');
+
+        $tester->run(['command' => 'list', '--verbose' => 3]);
+        $this->assertSame(Output::VERBOSITY_DEBUG, $tester->getOutput()->getVerbosity(), '->run() sets the output to debug if --verbose=3 is passed');
+
+        $tester->run(['command' => 'list', '--verbose' => 4]);
+        $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if unknown --verbose level is passed');
+
+        $tester->run(['command' => 'list', '-v' => true]);
+        $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
+
+        $tester->run(['command' => 'list', '-vv' => true]);
+        $this->assertSame(Output::VERBOSITY_VERY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
+
+        $tester->run(['command' => 'list', '-vvv' => true]);
+        $this->assertSame(Output::VERBOSITY_DEBUG, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application->add(new \FooCommand());
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'foo:bar', '--no-interaction' => true], ['decorated' => false]);
+        $this->assertSame('called'.PHP_EOL, $tester->getDisplay(), '->run() does not call interact() if --no-interaction is passed');
+
+        $tester->run(['command' => 'foo:bar', '-n' => true], ['decorated' => false]);
+        $this->assertSame('called'.PHP_EOL, $tester->getDisplay(), '->run() does not call interact() if -n is passed');
+    }
+
+    public function testRunWithGlobalOptionAndNoCommand()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application->getDefinition()->addOption(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL));
+
+        $output = new StreamOutput(fopen('php://memory', 'w', false));
+        $input = new ArgvInput(['cli.php', '--foo', 'bar']);
+
+        $this->assertSame(0, $application->run($input, $output));
+    }
+
+    /**
+     * Issue #9285.
+     *
+     * If the "verbose" option is just before an argument in ArgvInput,
+     * an argument value should not be treated as verbosity value.
+     * This test will fail with "Not enough arguments." if broken
+     */
+    public function testVerboseValueNotBreakArguments()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application->add(new \FooCommand());
+
+        $output = new StreamOutput(fopen('php://memory', 'w', false));
+
+        $input = new ArgvInput(['cli.php', '-v', 'foo:bar']);
+        $application->run($input, $output);
+
+        $this->addToAssertionCount(1);
+
+        $input = new ArgvInput(['cli.php', '--verbose', 'foo:bar']);
+        $application->run($input, $output);
+
+        $this->addToAssertionCount(1);
+    }
+
+    public function testRunReturnsIntegerExitCode()
+    {
+        $exception = new \Exception('', 4);
+
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['doRun'])->getMock();
+        $application->setAutoExit(false);
+        $application->expects($this->once())
+            ->method('doRun')
+            ->willThrowException($exception);
+
+        $exitCode = $application->run(new ArrayInput([]), new NullOutput());
+
+        $this->assertSame(4, $exitCode, '->run() returns integer exit code extracted from raised exception');
+    }
+
+    public function testRunDispatchesIntegerExitCode()
+    {
+        $passedRightValue = false;
+
+        // We can assume here that some other test asserts that the event is dispatched at all
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener('console.terminate', function (ConsoleTerminateEvent $event) use (&$passedRightValue) {
+            $passedRightValue = (4 === $event->getExitCode());
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('test')->setCode(function (InputInterface $input, OutputInterface $output) {
+            throw new \Exception('', 4);
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'test']);
+
+        $this->assertTrue($passedRightValue, '-> exit code 4 was passed in the console.terminate event');
+    }
+
+    public function testRunReturnsExitCodeOneForExceptionCodeZero()
+    {
+        $exception = new \Exception('', 0);
+
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['doRun'])->getMock();
+        $application->setAutoExit(false);
+        $application->expects($this->once())
+            ->method('doRun')
+            ->willThrowException($exception);
+
+        $exitCode = $application->run(new ArrayInput([]), new NullOutput());
+
+        $this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
+    }
+
+    public function testRunDispatchesExitCodeOneForExceptionCodeZero()
+    {
+        $passedRightValue = false;
+
+        // We can assume here that some other test asserts that the event is dispatched at all
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener('console.terminate', function (ConsoleTerminateEvent $event) use (&$passedRightValue) {
+            $passedRightValue = (1 === $event->getExitCode());
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('test')->setCode(function (InputInterface $input, OutputInterface $output) {
+            throw new \Exception();
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'test']);
+
+        $this->assertTrue($passedRightValue, '-> exit code 1 was passed in the console.terminate event');
+    }
+
+    public function testAddingOptionWithDuplicateShortcut()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('An option with shortcut "e" already exists.');
+        $dispatcher = new EventDispatcher();
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application->setDispatcher($dispatcher);
+
+        $application->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'Environment'));
+
+        $application
+            ->register('foo')
+            ->setAliases(['f'])
+            ->setDefinition([new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')])
+            ->setCode(function (InputInterface $input, OutputInterface $output) {})
+        ;
+
+        $input = new ArrayInput(['command' => 'foo']);
+        $output = new NullOutput();
+
+        $application->run($input, $output);
+    }
+
+    /**
+     * @dataProvider getAddingAlreadySetDefinitionElementData
+     */
+    public function testAddingAlreadySetDefinitionElementData($def)
+    {
+        $this->expectException('LogicException');
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application
+            ->register('foo')
+            ->setDefinition([$def])
+            ->setCode(function (InputInterface $input, OutputInterface $output) {})
+        ;
+
+        $input = new ArrayInput(['command' => 'foo']);
+        $output = new NullOutput();
+        $application->run($input, $output);
+    }
+
+    public function getAddingAlreadySetDefinitionElementData()
+    {
+        return [
+            [new InputArgument('command', InputArgument::REQUIRED)],
+            [new InputOption('quiet', '', InputOption::VALUE_NONE)],
+            [new InputOption('query', 'q', InputOption::VALUE_NONE)],
+        ];
+    }
+
+    public function testGetDefaultHelperSetReturnsDefaultValues()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $helperSet = $application->getHelperSet();
+
+        $this->assertTrue($helperSet->has('formatter'));
+    }
+
+    public function testAddingSingleHelperSetOverwritesDefaultValues()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->setHelperSet(new HelperSet([new FormatterHelper()]));
+
+        $helperSet = $application->getHelperSet();
+
+        $this->assertTrue($helperSet->has('formatter'));
+
+        // no other default helper set should be returned
+        $this->assertFalse($helperSet->has('dialog'));
+        $this->assertFalse($helperSet->has('progress'));
+    }
+
+    public function testOverwritingDefaultHelperSetOverwritesDefaultValues()
+    {
+        $application = new CustomApplication();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->setHelperSet(new HelperSet([new FormatterHelper()]));
+
+        $helperSet = $application->getHelperSet();
+
+        $this->assertTrue($helperSet->has('formatter'));
+
+        // no other default helper set should be returned
+        $this->assertFalse($helperSet->has('dialog'));
+        $this->assertFalse($helperSet->has('progress'));
+    }
+
+    public function testGetDefaultInputDefinitionReturnsDefaultValues()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $inputDefinition = $application->getDefinition();
+
+        $this->assertTrue($inputDefinition->hasArgument('command'));
+
+        $this->assertTrue($inputDefinition->hasOption('help'));
+        $this->assertTrue($inputDefinition->hasOption('quiet'));
+        $this->assertTrue($inputDefinition->hasOption('verbose'));
+        $this->assertTrue($inputDefinition->hasOption('version'));
+        $this->assertTrue($inputDefinition->hasOption('ansi'));
+        $this->assertTrue($inputDefinition->hasOption('no-ansi'));
+        $this->assertTrue($inputDefinition->hasOption('no-interaction'));
+    }
+
+    public function testOverwritingDefaultInputDefinitionOverwritesDefaultValues()
+    {
+        $application = new CustomApplication();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $inputDefinition = $application->getDefinition();
+
+        // check whether the default arguments and options are not returned any more
+        $this->assertFalse($inputDefinition->hasArgument('command'));
+
+        $this->assertFalse($inputDefinition->hasOption('help'));
+        $this->assertFalse($inputDefinition->hasOption('quiet'));
+        $this->assertFalse($inputDefinition->hasOption('verbose'));
+        $this->assertFalse($inputDefinition->hasOption('version'));
+        $this->assertFalse($inputDefinition->hasOption('ansi'));
+        $this->assertFalse($inputDefinition->hasOption('no-ansi'));
+        $this->assertFalse($inputDefinition->hasOption('no-interaction'));
+
+        $this->assertTrue($inputDefinition->hasOption('custom'));
+    }
+
+    public function testSettingCustomInputDefinitionOverwritesDefaultValues()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->setDefinition(new InputDefinition([new InputOption('--custom', '-c', InputOption::VALUE_NONE, 'Set the custom input definition.')]));
+
+        $inputDefinition = $application->getDefinition();
+
+        // check whether the default arguments and options are not returned any more
+        $this->assertFalse($inputDefinition->hasArgument('command'));
+
+        $this->assertFalse($inputDefinition->hasOption('help'));
+        $this->assertFalse($inputDefinition->hasOption('quiet'));
+        $this->assertFalse($inputDefinition->hasOption('verbose'));
+        $this->assertFalse($inputDefinition->hasOption('version'));
+        $this->assertFalse($inputDefinition->hasOption('ansi'));
+        $this->assertFalse($inputDefinition->hasOption('no-ansi'));
+        $this->assertFalse($inputDefinition->hasOption('no-interaction'));
+
+        $this->assertTrue($inputDefinition->hasOption('custom'));
+    }
+
+    public function testRunWithDispatcher()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setDispatcher($this->getDispatcher());
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('foo.');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo']);
+        $this->assertEquals('before.foo.after.'.PHP_EOL, $tester->getDisplay());
+    }
+
+    public function testRunWithExceptionAndDispatcher()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('error');
+        $application = new Application();
+        $application->setDispatcher($this->getDispatcher());
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            throw new \RuntimeException('foo');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo']);
+    }
+
+    public function testRunDispatchesAllEventsWithException()
+    {
+        $application = new Application();
+        $application->setDispatcher($this->getDispatcher());
+        $application->setAutoExit(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('foo.');
+
+            throw new \RuntimeException('foo');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo']);
+        $this->assertStringContainsString('before.foo.error.after.', $tester->getDisplay());
+    }
+
+    public function testRunDispatchesAllEventsWithExceptionInListener()
+    {
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->addListener('console.command', function () {
+            throw new \RuntimeException('foo');
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('foo.');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo']);
+        $this->assertStringContainsString('before.error.after.', $tester->getDisplay());
+    }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testRunWithError()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('dym.');
+
+            throw new \Error('dymerr');
+        });
+
+        $tester = new ApplicationTester($application);
+
+        try {
+            $tester->run(['command' => 'dym']);
+            $this->fail('Error expected.');
+        } catch (\Error $e) {
+            $this->assertSame('dymerr', $e->getMessage());
+        }
+    }
+
+    public function testRunAllowsErrorListenersToSilenceTheException()
+    {
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->addListener('console.error', function (ConsoleErrorEvent $event) {
+            $event->getOutput()->write('silenced.');
+
+            $event->setExitCode(0);
+        });
+
+        $dispatcher->addListener('console.command', function () {
+            throw new \RuntimeException('foo');
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('foo.');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo']);
+        $this->assertStringContainsString('before.error.silenced.after.', $tester->getDisplay());
+        $this->assertEquals(ConsoleCommandEvent::RETURN_CODE_DISABLED, $tester->getStatusCode());
+    }
+
+    public function testConsoleErrorEventIsTriggeredOnCommandNotFound()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener('console.error', function (ConsoleErrorEvent $event) {
+            $this->assertNull($event->getCommand());
+            $this->assertInstanceOf(CommandNotFoundException::class, $event->getError());
+            $event->getOutput()->write('silenced command not found');
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'unknown']);
+        $this->assertStringContainsString('silenced command not found', $tester->getDisplay());
+        $this->assertEquals(1, $tester->getStatusCode());
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "ConsoleEvents::EXCEPTION" event is deprecated since Symfony 3.3 and will be removed in 4.0. Listen to the "ConsoleEvents::ERROR" event instead.
+     */
+    public function testLegacyExceptionListenersAreStillTriggered()
+    {
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->addListener('console.exception', function (ConsoleExceptionEvent $event) {
+            $event->getOutput()->write('caught.');
+
+            $event->setException(new \RuntimeException('replaced in caught.'));
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            throw new \RuntimeException('foo');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo']);
+        $this->assertStringContainsString('before.caught.error.after.', $tester->getDisplay());
+        $this->assertStringContainsString('replaced in caught.', $tester->getDisplay());
+    }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testErrorIsRethrownIfNotHandledByConsoleErrorEvent()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application->setDispatcher(new EventDispatcher());
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            new \UnknownClass();
+        });
+
+        $tester = new ApplicationTester($application);
+
+        try {
+            $tester->run(['command' => 'dym']);
+            $this->fail('->run() should rethrow PHP errors if not handled via ConsoleErrorEvent.');
+        } catch (\Error $e) {
+            $this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');
+        }
+    }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testRunWithErrorAndDispatcher()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('error');
+        $application = new Application();
+        $application->setDispatcher($this->getDispatcher());
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('dym.');
+
+            throw new \Error('dymerr');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'dym']);
+        $this->assertStringContainsString('before.dym.error.after.', $tester->getDisplay(), 'The PHP Error did not dispached events');
+    }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testRunDispatchesAllEventsWithError()
+    {
+        $application = new Application();
+        $application->setDispatcher($this->getDispatcher());
+        $application->setAutoExit(false);
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('dym.');
+
+            throw new \Error('dymerr');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'dym']);
+        $this->assertStringContainsString('before.dym.error.after.', $tester->getDisplay(), 'The PHP Error did not dispached events');
+    }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testRunWithErrorFailingStatusCode()
+    {
+        $application = new Application();
+        $application->setDispatcher($this->getDispatcher());
+        $application->setAutoExit(false);
+
+        $application->register('dus')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('dus.');
+
+            throw new \Error('duserr');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'dus']);
+        $this->assertSame(1, $tester->getStatusCode(), 'Status code should be 1');
+    }
+
+    public function testRunWithDispatcherSkippingCommand()
+    {
+        $application = new Application();
+        $application->setDispatcher($this->getDispatcher(true));
+        $application->setAutoExit(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('foo.');
+        });
+
+        $tester = new ApplicationTester($application);
+        $exitCode = $tester->run(['command' => 'foo']);
+        $this->assertStringContainsString('before.after.', $tester->getDisplay());
+        $this->assertEquals(ConsoleCommandEvent::RETURN_CODE_DISABLED, $exitCode);
+    }
+
+    public function testRunWithDispatcherAccessingInputOptions()
+    {
+        $noInteractionValue = null;
+        $quietValue = null;
+
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->addListener('console.command', function (ConsoleCommandEvent $event) use (&$noInteractionValue, &$quietValue) {
+            $input = $event->getInput();
+
+            $noInteractionValue = $input->getOption('no-interaction');
+            $quietValue = $input->getOption('quiet');
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('foo.');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo', '--no-interaction' => true]);
+
+        $this->assertTrue($noInteractionValue);
+        $this->assertFalse($quietValue);
+    }
+
+    public function testRunWithDispatcherAddingInputOptions()
+    {
+        $extraValue = null;
+
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->addListener('console.command', function (ConsoleCommandEvent $event) use (&$extraValue) {
+            $definition = $event->getCommand()->getDefinition();
+            $input = $event->getInput();
+
+            $definition->addOption(new InputOption('extra', null, InputOption::VALUE_REQUIRED));
+            $input->bind($definition);
+
+            $extraValue = $input->getOption('extra');
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('foo.');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'foo', '--extra' => 'some test value']);
+
+        $this->assertEquals('some test value', $extraValue);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testTerminalDimensions()
+    {
+        $application = new Application();
+        $originalDimensions = $application->getTerminalDimensions();
+        $this->assertCount(2, $originalDimensions);
+
+        $width = 80;
+        if ($originalDimensions[0] == $width) {
+            $width = 100;
+        }
+
+        $application->setTerminalDimensions($width, 80);
+        $this->assertSame([$width, 80], $application->getTerminalDimensions());
+    }
+
+    public function testSetRunCustomDefaultCommand()
+    {
+        $command = new \FooCommand();
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->add($command);
+        $application->setDefaultCommand($command->getName());
+
+        $tester = new ApplicationTester($application);
+        $tester->run([], ['interactive' => false]);
+        $this->assertEquals('called'.PHP_EOL, $tester->getDisplay(), 'Application runs the default set command if different from \'list\' command');
+
+        $application = new CustomDefaultCommandApplication();
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run([], ['interactive' => false]);
+
+        $this->assertEquals('called'.PHP_EOL, $tester->getDisplay(), 'Application runs the default set command if different from \'list\' command');
+    }
+
+    public function testSetRunCustomDefaultCommandWithOption()
+    {
+        $command = new \FooOptCommand();
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->add($command);
+        $application->setDefaultCommand($command->getName());
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['--fooopt' => 'opt'], ['interactive' => false]);
+
+        $this->assertEquals('called'.PHP_EOL.'opt'.PHP_EOL, $tester->getDisplay(), 'Application runs the default set command if different from \'list\' command');
+    }
+
+    public function testSetRunCustomSingleCommand()
+    {
+        $command = new \FooCommand();
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->add($command);
+        $application->setDefaultCommand($command->getName(), true);
+
+        $tester = new ApplicationTester($application);
+
+        $tester->run([]);
+        $this->assertStringContainsString('called', $tester->getDisplay());
+
+        $tester->run(['--help' => true]);
+        $this->assertStringContainsString('The foo:bar command', $tester->getDisplay());
+    }
+
+    public function testRunLazyCommandService()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass());
+        $container
+            ->register('lazy-command', LazyCommand::class)
+            ->addTag('console.command', ['command' => 'lazy:command'])
+            ->addTag('console.command', ['command' => 'lazy:alias'])
+            ->addTag('console.command', ['command' => 'lazy:alias2']);
+        $container->compile();
+
+        $application = new Application();
+        $application->setCommandLoader($container->get('console.command_loader'));
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'lazy:command']);
+        $this->assertSame("lazy-command called\n", $tester->getDisplay(true));
+
+        $tester->run(['command' => 'lazy:alias']);
+        $this->assertSame("lazy-command called\n", $tester->getDisplay(true));
+
+        $tester->run(['command' => 'lazy:alias2']);
+        $this->assertSame("lazy-command called\n", $tester->getDisplay(true));
+
+        $command = $application->get('lazy:command');
+        $this->assertSame(['lazy:alias', 'lazy:alias2'], $command->getAliases());
+    }
+
+    public function testGetDisabledLazyCommand()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $application = new Application();
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
+        $application->get('disabled');
+    }
+
+    public function testHasReturnsFalseForDisabledLazyCommand()
+    {
+        $application = new Application();
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
+        $this->assertFalse($application->has('disabled'));
+    }
+
+    public function testAllExcludesDisabledLazyCommand()
+    {
+        $application = new Application();
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
+        $this->assertArrayNotHasKey('disabled', $application->all());
+    }
+
+    protected function getDispatcher($skipCommand = false)
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener('console.command', function (ConsoleCommandEvent $event) use ($skipCommand) {
+            $event->getOutput()->write('before.');
+
+            if ($skipCommand) {
+                $event->disableCommand();
+            }
+        });
+        $dispatcher->addListener('console.terminate', function (ConsoleTerminateEvent $event) use ($skipCommand) {
+            $event->getOutput()->writeln('after.');
+
+            if (!$skipCommand) {
+                $event->setExitCode(ConsoleCommandEvent::RETURN_CODE_DISABLED);
+            }
+        });
+        $dispatcher->addListener('console.error', function (ConsoleErrorEvent $event) {
+            $event->getOutput()->write('error.');
+
+            $event->setError(new \LogicException('error.', $event->getExitCode(), $event->getError()));
+        });
+
+        return $dispatcher;
+    }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testErrorIsRethrownIfNotHandledByConsoleErrorEventWithCatchingEnabled()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setDispatcher(new EventDispatcher());
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            new \UnknownClass();
+        });
+
+        $tester = new ApplicationTester($application);
+
+        try {
+            $tester->run(['command' => 'dym']);
+            $this->fail('->run() should rethrow PHP errors if not handled via ConsoleErrorEvent.');
+        } catch (\Error $e) {
+            $this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');
+        }
+    }
+}
+
+class CustomApplication extends Application
+{
+    /**
+     * Overwrites the default input definition.
+     *
+     * @return InputDefinition An InputDefinition instance
+     */
+    protected function getDefaultInputDefinition()
+    {
+        return new InputDefinition([new InputOption('--custom', '-c', InputOption::VALUE_NONE, 'Set the custom input definition.')]);
+    }
+
+    /**
+     * Gets the default helper set with the helpers that should always be available.
+     *
+     * @return HelperSet A HelperSet instance
+     */
+    protected function getDefaultHelperSet()
+    {
+        return new HelperSet([new FormatterHelper()]);
+    }
+}
+
+class CustomDefaultCommandApplication extends Application
+{
+    /**
+     * Overwrites the constructor in order to set a different default command.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $command = new \FooCommand();
+        $this->add($command);
+        $this->setDefaultCommand($command->getName());
+    }
+}
+
+class LazyCommand extends Command
+{
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('lazy-command called');
+    }
+}
+
+class DisabledCommand extends Command
+{
+    public function isEnabled()
+    {
+        return false;
+    }
+}
diff --git a/lib/symfony/console/Tests/Command/CommandTest.php b/lib/symfony/console/Tests/Command/CommandTest.php
new file mode 100644
index 000000000..207302fdf
--- /dev/null
+++ b/lib/symfony/console/Tests/Command/CommandTest.php
@@ -0,0 +1,430 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\FormatterHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class CommandTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = __DIR__.'/../Fixtures/';
+        require_once self::$fixturesPath.'/TestCommand.php';
+    }
+
+    public function testConstructor()
+    {
+        $command = new Command('foo:bar');
+        $this->assertEquals('foo:bar', $command->getName(), '__construct() takes the command name as its first argument');
+    }
+
+    public function testCommandNameCannotBeEmpty()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('The command defined in "Symfony\Component\Console\Command\Command" cannot have an empty name.');
+        (new Application())->add(new Command());
+    }
+
+    public function testSetApplication()
+    {
+        $application = new Application();
+        $command = new \TestCommand();
+        $command->setApplication($application);
+        $this->assertEquals($application, $command->getApplication(), '->setApplication() sets the current application');
+        $this->assertEquals($application->getHelperSet(), $command->getHelperSet());
+    }
+
+    public function testSetApplicationNull()
+    {
+        $command = new \TestCommand();
+        $command->setApplication(null);
+        $this->assertNull($command->getHelperSet());
+    }
+
+    public function testSetGetDefinition()
+    {
+        $command = new \TestCommand();
+        $ret = $command->setDefinition($definition = new InputDefinition());
+        $this->assertEquals($command, $ret, '->setDefinition() implements a fluent interface');
+        $this->assertEquals($definition, $command->getDefinition(), '->setDefinition() sets the current InputDefinition instance');
+        $command->setDefinition([new InputArgument('foo'), new InputOption('bar')]);
+        $this->assertTrue($command->getDefinition()->hasArgument('foo'), '->setDefinition() also takes an array of InputArguments and InputOptions as an argument');
+        $this->assertTrue($command->getDefinition()->hasOption('bar'), '->setDefinition() also takes an array of InputArguments and InputOptions as an argument');
+        $command->setDefinition(new InputDefinition());
+    }
+
+    public function testAddArgument()
+    {
+        $command = new \TestCommand();
+        $ret = $command->addArgument('foo');
+        $this->assertEquals($command, $ret, '->addArgument() implements a fluent interface');
+        $this->assertTrue($command->getDefinition()->hasArgument('foo'), '->addArgument() adds an argument to the command');
+    }
+
+    public function testAddOption()
+    {
+        $command = new \TestCommand();
+        $ret = $command->addOption('foo');
+        $this->assertEquals($command, $ret, '->addOption() implements a fluent interface');
+        $this->assertTrue($command->getDefinition()->hasOption('foo'), '->addOption() adds an option to the command');
+    }
+
+    public function testSetHidden()
+    {
+        $command = new \TestCommand();
+        $command->setHidden(true);
+        $this->assertTrue($command->isHidden());
+    }
+
+    public function testGetNamespaceGetNameSetName()
+    {
+        $command = new \TestCommand();
+        $this->assertEquals('namespace:name', $command->getName(), '->getName() returns the command name');
+        $command->setName('foo');
+        $this->assertEquals('foo', $command->getName(), '->setName() sets the command name');
+
+        $ret = $command->setName('foobar:bar');
+        $this->assertEquals($command, $ret, '->setName() implements a fluent interface');
+        $this->assertEquals('foobar:bar', $command->getName(), '->setName() sets the command name');
+    }
+
+    /**
+     * @dataProvider provideInvalidCommandNames
+     */
+    public function testInvalidCommandNames($name)
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(sprintf('Command name "%s" is invalid.', $name));
+
+        $command = new \TestCommand();
+        $command->setName($name);
+    }
+
+    public function provideInvalidCommandNames()
+    {
+        return [
+            [''],
+            ['foo:'],
+        ];
+    }
+
+    public function testGetSetDescription()
+    {
+        $command = new \TestCommand();
+        $this->assertEquals('description', $command->getDescription(), '->getDescription() returns the description');
+        $ret = $command->setDescription('description1');
+        $this->assertEquals($command, $ret, '->setDescription() implements a fluent interface');
+        $this->assertEquals('description1', $command->getDescription(), '->setDescription() sets the description');
+    }
+
+    public function testGetSetHelp()
+    {
+        $command = new \TestCommand();
+        $this->assertEquals('help', $command->getHelp(), '->getHelp() returns the help');
+        $ret = $command->setHelp('help1');
+        $this->assertEquals($command, $ret, '->setHelp() implements a fluent interface');
+        $this->assertEquals('help1', $command->getHelp(), '->setHelp() sets the help');
+        $command->setHelp('');
+        $this->assertEquals('', $command->getHelp(), '->getHelp() does not fall back to the description');
+    }
+
+    public function testGetProcessedHelp()
+    {
+        $command = new \TestCommand();
+        $command->setHelp('The %command.name% command does... Example: php %command.full_name%.');
+        $this->assertStringContainsString('The namespace:name command does...', $command->getProcessedHelp(), '->getProcessedHelp() replaces %command.name% correctly');
+        $this->assertStringNotContainsString('%command.full_name%', $command->getProcessedHelp(), '->getProcessedHelp() replaces %command.full_name%');
+
+        $command = new \TestCommand();
+        $command->setHelp('');
+        $this->assertStringContainsString('description', $command->getProcessedHelp(), '->getProcessedHelp() falls back to the description');
+
+        $command = new \TestCommand();
+        $command->setHelp('The %command.name% command does... Example: php %command.full_name%.');
+        $application = new Application();
+        $application->add($command);
+        $application->setDefaultCommand('namespace:name', true);
+        $this->assertStringContainsString('The namespace:name command does...', $command->getProcessedHelp(), '->getProcessedHelp() replaces %command.name% correctly in single command applications');
+        $this->assertStringNotContainsString('%command.full_name%', $command->getProcessedHelp(), '->getProcessedHelp() replaces %command.full_name% in single command applications');
+    }
+
+    public function testGetSetAliases()
+    {
+        $command = new \TestCommand();
+        $this->assertEquals(['name'], $command->getAliases(), '->getAliases() returns the aliases');
+        $ret = $command->setAliases(['name1']);
+        $this->assertEquals($command, $ret, '->setAliases() implements a fluent interface');
+        $this->assertEquals(['name1'], $command->getAliases(), '->setAliases() sets the aliases');
+    }
+
+    public function testSetAliasesNull()
+    {
+        $command = new \TestCommand();
+        $this->expectException('InvalidArgumentException');
+        $command->setAliases(null);
+    }
+
+    public function testGetSynopsis()
+    {
+        $command = new \TestCommand();
+        $command->addOption('foo');
+        $command->addArgument('bar');
+        $this->assertEquals('namespace:name [--foo] [--] [<bar>]', $command->getSynopsis(), '->getSynopsis() returns the synopsis');
+    }
+
+    public function testAddGetUsages()
+    {
+        $command = new \TestCommand();
+        $command->addUsage('foo1');
+        $command->addUsage('foo2');
+        $this->assertContains('namespace:name foo1', $command->getUsages());
+        $this->assertContains('namespace:name foo2', $command->getUsages());
+    }
+
+    public function testGetHelper()
+    {
+        $application = new Application();
+        $command = new \TestCommand();
+        $command->setApplication($application);
+        $formatterHelper = new FormatterHelper();
+        $this->assertEquals($formatterHelper->getName(), $command->getHelper('formatter')->getName(), '->getHelper() returns the correct helper');
+    }
+
+    public function testGetHelperWithoutHelperSet()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Cannot retrieve helper "formatter" because there is no HelperSet defined.');
+        $command = new \TestCommand();
+        $command->getHelper('formatter');
+    }
+
+    public function testMergeApplicationDefinition()
+    {
+        $application1 = new Application();
+        $application1->getDefinition()->addArguments([new InputArgument('foo')]);
+        $application1->getDefinition()->addOptions([new InputOption('bar')]);
+        $command = new \TestCommand();
+        $command->setApplication($application1);
+        $command->setDefinition($definition = new InputDefinition([new InputArgument('bar'), new InputOption('foo')]));
+
+        $r = new \ReflectionObject($command);
+        $m = $r->getMethod('mergeApplicationDefinition');
+        $m->setAccessible(true);
+        $m->invoke($command);
+        $this->assertTrue($command->getDefinition()->hasArgument('foo'), '->mergeApplicationDefinition() merges the application arguments and the command arguments');
+        $this->assertTrue($command->getDefinition()->hasArgument('bar'), '->mergeApplicationDefinition() merges the application arguments and the command arguments');
+        $this->assertTrue($command->getDefinition()->hasOption('foo'), '->mergeApplicationDefinition() merges the application options and the command options');
+        $this->assertTrue($command->getDefinition()->hasOption('bar'), '->mergeApplicationDefinition() merges the application options and the command options');
+
+        $m->invoke($command);
+        $this->assertEquals(3, $command->getDefinition()->getArgumentCount(), '->mergeApplicationDefinition() does not try to merge twice the application arguments and options');
+    }
+
+    public function testMergeApplicationDefinitionWithoutArgsThenWithArgsAddsArgs()
+    {
+        $application1 = new Application();
+        $application1->getDefinition()->addArguments([new InputArgument('foo')]);
+        $application1->getDefinition()->addOptions([new InputOption('bar')]);
+        $command = new \TestCommand();
+        $command->setApplication($application1);
+        $command->setDefinition($definition = new InputDefinition([]));
+
+        $r = new \ReflectionObject($command);
+        $m = $r->getMethod('mergeApplicationDefinition');
+        $m->setAccessible(true);
+        $m->invoke($command, false);
+        $this->assertTrue($command->getDefinition()->hasOption('bar'), '->mergeApplicationDefinition(false) merges the application and the command options');
+        $this->assertFalse($command->getDefinition()->hasArgument('foo'), '->mergeApplicationDefinition(false) does not merge the application arguments');
+
+        $m->invoke($command, true);
+        $this->assertTrue($command->getDefinition()->hasArgument('foo'), '->mergeApplicationDefinition(true) merges the application arguments and the command arguments');
+
+        $m->invoke($command);
+        $this->assertEquals(2, $command->getDefinition()->getArgumentCount(), '->mergeApplicationDefinition() does not try to merge twice the application arguments');
+    }
+
+    public function testRunInteractive()
+    {
+        $tester = new CommandTester(new \TestCommand());
+
+        $tester->execute([], ['interactive' => true]);
+
+        $this->assertEquals('interact called'.PHP_EOL.'execute called'.PHP_EOL, $tester->getDisplay(), '->run() calls the interact() method if the input is interactive');
+    }
+
+    public function testRunNonInteractive()
+    {
+        $tester = new CommandTester(new \TestCommand());
+
+        $tester->execute([], ['interactive' => false]);
+
+        $this->assertEquals('execute called'.PHP_EOL, $tester->getDisplay(), '->run() does not call the interact() method if the input is not interactive');
+    }
+
+    public function testExecuteMethodNeedsToBeOverridden()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('You must override the execute() method in the concrete command class.');
+        $command = new Command('foo');
+        $command->run(new StringInput(''), new NullOutput());
+    }
+
+    public function testRunWithInvalidOption()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\InvalidOptionException');
+        $this->expectExceptionMessage('The "--bar" option does not exist.');
+        $command = new \TestCommand();
+        $tester = new CommandTester($command);
+        $tester->execute(['--bar' => true]);
+    }
+
+    public function testRunReturnsIntegerExitCode()
+    {
+        $command = new \TestCommand();
+        $exitCode = $command->run(new StringInput(''), new NullOutput());
+        $this->assertSame(0, $exitCode, '->run() returns integer exit code (treats null as 0)');
+
+        $command = $this->getMockBuilder('TestCommand')->setMethods(['execute'])->getMock();
+        $command->expects($this->once())
+            ->method('execute')
+            ->willReturn('2.3');
+        $exitCode = $command->run(new StringInput(''), new NullOutput());
+        $this->assertSame(2, $exitCode, '->run() returns integer exit code (casts numeric to int)');
+    }
+
+    public function testRunWithApplication()
+    {
+        $command = new \TestCommand();
+        $command->setApplication(new Application());
+        $exitCode = $command->run(new StringInput(''), new NullOutput());
+
+        $this->assertSame(0, $exitCode, '->run() returns an integer exit code');
+    }
+
+    public function testRunReturnsAlwaysInteger()
+    {
+        $command = new \TestCommand();
+
+        $this->assertSame(0, $command->run(new StringInput(''), new NullOutput()));
+    }
+
+    public function testRunWithProcessTitle()
+    {
+        $command = new \TestCommand();
+        $command->setApplication(new Application());
+        $command->setProcessTitle('foo');
+        $this->assertSame(0, $command->run(new StringInput(''), new NullOutput()));
+        if (\function_exists('cli_set_process_title')) {
+            if (null === @cli_get_process_title() && 'Darwin' === PHP_OS) {
+                $this->markTestSkipped('Running "cli_get_process_title" as an unprivileged user is not supported on MacOS.');
+            }
+            $this->assertEquals('foo', cli_get_process_title());
+        }
+    }
+
+    public function testSetCode()
+    {
+        $command = new \TestCommand();
+        $ret = $command->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->writeln('from the code...');
+        });
+        $this->assertEquals($command, $ret, '->setCode() implements a fluent interface');
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+        $this->assertEquals('interact called'.PHP_EOL.'from the code...'.PHP_EOL, $tester->getDisplay());
+    }
+
+    public function getSetCodeBindToClosureTests()
+    {
+        return [
+            [true, 'not bound to the command'],
+            [false, 'bound to the command'],
+        ];
+    }
+
+    /**
+     * @dataProvider getSetCodeBindToClosureTests
+     */
+    public function testSetCodeBindToClosure($previouslyBound, $expected)
+    {
+        $code = createClosure();
+        if ($previouslyBound) {
+            $code = $code->bindTo($this);
+        }
+
+        $command = new \TestCommand();
+        $command->setCode($code);
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+        $this->assertEquals('interact called'.PHP_EOL.$expected.PHP_EOL, $tester->getDisplay());
+    }
+
+    public function testSetCodeWithStaticClosure()
+    {
+        $command = new \TestCommand();
+        $command->setCode(self::createClosure());
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+
+        if (\PHP_VERSION_ID < 70000) {
+            // Cannot bind static closures in PHP 5
+            $this->assertEquals('interact called'.PHP_EOL.'not bound'.PHP_EOL, $tester->getDisplay());
+        } else {
+            // Can bind static closures in PHP 7
+            $this->assertEquals('interact called'.PHP_EOL.'bound'.PHP_EOL, $tester->getDisplay());
+        }
+    }
+
+    private static function createClosure()
+    {
+        return function (InputInterface $input, OutputInterface $output) {
+            $output->writeln(isset($this) ? 'bound' : 'not bound');
+        };
+    }
+
+    public function testSetCodeWithNonClosureCallable()
+    {
+        $command = new \TestCommand();
+        $ret = $command->setCode([$this, 'callableMethodCommand']);
+        $this->assertEquals($command, $ret, '->setCode() implements a fluent interface');
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+        $this->assertEquals('interact called'.PHP_EOL.'from the code...'.PHP_EOL, $tester->getDisplay());
+    }
+
+    public function callableMethodCommand(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('from the code...');
+    }
+}
+
+// In order to get an unbound closure, we should create it outside a class
+// scope.
+function createClosure()
+{
+    return function (InputInterface $input, OutputInterface $output) {
+        $output->writeln($this instanceof Command ? 'bound to the command' : 'not bound to the command');
+    };
+}
diff --git a/lib/symfony/console/Tests/Command/HelpCommandTest.php b/lib/symfony/console/Tests/Command/HelpCommandTest.php
new file mode 100644
index 000000000..5b25550a6
--- /dev/null
+++ b/lib/symfony/console/Tests/Command/HelpCommandTest.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\HelpCommand;
+use Symfony\Component\Console\Command\ListCommand;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class HelpCommandTest extends TestCase
+{
+    public function testExecuteForCommandAlias()
+    {
+        $command = new HelpCommand();
+        $command->setApplication(new Application());
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(['command_name' => 'li'], ['decorated' => false]);
+        $this->assertStringContainsString('list [options] [--] [<namespace>]', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
+        $this->assertStringContainsString('format=FORMAT', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
+        $this->assertStringContainsString('raw', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
+    }
+
+    public function testExecuteForCommand()
+    {
+        $command = new HelpCommand();
+        $commandTester = new CommandTester($command);
+        $command->setCommand(new ListCommand());
+        $commandTester->execute([], ['decorated' => false]);
+        $this->assertStringContainsString('list [options] [--] [<namespace>]', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertStringContainsString('format=FORMAT', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertStringContainsString('raw', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+    }
+
+    public function testExecuteForCommandWithXmlOption()
+    {
+        $command = new HelpCommand();
+        $commandTester = new CommandTester($command);
+        $command->setCommand(new ListCommand());
+        $commandTester->execute(['--format' => 'xml']);
+        $this->assertStringContainsString('<command', $commandTester->getDisplay(), '->execute() returns an XML help text if --xml is passed');
+    }
+
+    public function testExecuteForApplicationCommand()
+    {
+        $application = new Application();
+        $commandTester = new CommandTester($application->get('help'));
+        $commandTester->execute(['command_name' => 'list']);
+        $this->assertStringContainsString('list [options] [--] [<namespace>]', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertStringContainsString('format=FORMAT', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertStringContainsString('raw', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+    }
+
+    public function testExecuteForApplicationCommandWithXmlOption()
+    {
+        $application = new Application();
+        $commandTester = new CommandTester($application->get('help'));
+        $commandTester->execute(['command_name' => 'list', '--format' => 'xml']);
+        $this->assertStringContainsString('list [--raw] [--format FORMAT] [--] [&lt;namespace&gt;]', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertStringContainsString('<command', $commandTester->getDisplay(), '->execute() returns an XML help text if --format=xml is passed');
+    }
+}
diff --git a/lib/symfony/console/Tests/Command/ListCommandTest.php b/lib/symfony/console/Tests/Command/ListCommandTest.php
new file mode 100644
index 000000000..57687d4c6
--- /dev/null
+++ b/lib/symfony/console/Tests/Command/ListCommandTest.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class ListCommandTest extends TestCase
+{
+    public function testExecuteListsCommands()
+    {
+        $application = new Application();
+        $commandTester = new CommandTester($command = $application->get('list'));
+        $commandTester->execute(['command' => $command->getName()], ['decorated' => false]);
+
+        $this->assertRegExp('/help\s{2,}Displays help for a command/', $commandTester->getDisplay(), '->execute() returns a list of available commands');
+    }
+
+    public function testExecuteListsCommandsWithXmlOption()
+    {
+        $application = new Application();
+        $commandTester = new CommandTester($command = $application->get('list'));
+        $commandTester->execute(['command' => $command->getName(), '--format' => 'xml']);
+        $this->assertRegExp('/<command id="list" name="list" hidden="0">/', $commandTester->getDisplay(), '->execute() returns a list of available commands in XML if --xml is passed');
+    }
+
+    public function testExecuteListsCommandsWithRawOption()
+    {
+        $application = new Application();
+        $commandTester = new CommandTester($command = $application->get('list'));
+        $commandTester->execute(['command' => $command->getName(), '--raw' => true]);
+        $output = <<<'EOF'
+help   Displays help for a command
+list   Lists commands
+
+EOF;
+
+        $this->assertEquals($output, $commandTester->getDisplay(true));
+    }
+
+    public function testExecuteListsCommandsWithNamespaceArgument()
+    {
+        require_once realpath(__DIR__.'/../Fixtures/FooCommand.php');
+        $application = new Application();
+        $application->add(new \FooCommand());
+        $commandTester = new CommandTester($command = $application->get('list'));
+        $commandTester->execute(['command' => $command->getName(), 'namespace' => 'foo', '--raw' => true]);
+        $output = <<<'EOF'
+foo:bar   The foo:bar command
+
+EOF;
+
+        $this->assertEquals($output, $commandTester->getDisplay(true));
+    }
+
+    public function testExecuteListsCommandsOrder()
+    {
+        require_once realpath(__DIR__.'/../Fixtures/Foo6Command.php');
+        $application = new Application();
+        $application->add(new \Foo6Command());
+        $commandTester = new CommandTester($command = $application->get('list'));
+        $commandTester->execute(['command' => $command->getName()], ['decorated' => false]);
+        $output = <<<'EOF'
+Console Tool
+
+Usage:
+  command [options] [arguments]
+
+Options:
+  -h, --help            Display this help message
+  -q, --quiet           Do not output any message
+  -V, --version         Display this application version
+      --ansi            Force ANSI output
+      --no-ansi         Disable ANSI output
+  -n, --no-interaction  Do not ask any interactive question
+  -v|vv|vvv, --verbose  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+Available commands:
+  help      Displays help for a command
+  list      Lists commands
+ 0foo
+  0foo:bar  0foo:bar command
+EOF;
+
+        $this->assertEquals($output, trim($commandTester->getDisplay(true)));
+    }
+
+    public function testExecuteListsCommandsOrderRaw()
+    {
+        require_once realpath(__DIR__.'/../Fixtures/Foo6Command.php');
+        $application = new Application();
+        $application->add(new \Foo6Command());
+        $commandTester = new CommandTester($command = $application->get('list'));
+        $commandTester->execute(['command' => $command->getName(), '--raw' => true]);
+        $output = <<<'EOF'
+help       Displays help for a command
+list       Lists commands
+0foo:bar   0foo:bar command
+EOF;
+
+        $this->assertEquals($output, trim($commandTester->getDisplay(true)));
+    }
+}
diff --git a/lib/symfony/console/Tests/Command/LockableTraitTest.php b/lib/symfony/console/Tests/Command/LockableTraitTest.php
new file mode 100644
index 000000000..6a72706ee
--- /dev/null
+++ b/lib/symfony/console/Tests/Command/LockableTraitTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Lock\Factory;
+use Symfony\Component\Lock\Store\FlockStore;
+use Symfony\Component\Lock\Store\SemaphoreStore;
+
+class LockableTraitTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = __DIR__.'/../Fixtures/';
+        require_once self::$fixturesPath.'/FooLockCommand.php';
+        require_once self::$fixturesPath.'/FooLock2Command.php';
+    }
+
+    public function testLockIsReleased()
+    {
+        $command = new \FooLockCommand();
+
+        $tester = new CommandTester($command);
+        $this->assertSame(2, $tester->execute([]));
+        $this->assertSame(2, $tester->execute([]));
+    }
+
+    public function testLockReturnsFalseIfAlreadyLockedByAnotherCommand()
+    {
+        $command = new \FooLockCommand();
+
+        if (SemaphoreStore::isSupported(false)) {
+            $store = new SemaphoreStore();
+        } else {
+            $store = new FlockStore();
+        }
+
+        $lock = (new Factory($store))->createLock($command->getName());
+        $lock->acquire();
+
+        $tester = new CommandTester($command);
+        $this->assertSame(1, $tester->execute([]));
+
+        $lock->release();
+        $this->assertSame(2, $tester->execute([]));
+    }
+
+    public function testMultipleLockCallsThrowLogicException()
+    {
+        $command = new \FooLock2Command();
+
+        $tester = new CommandTester($command);
+        $this->assertSame(1, $tester->execute([]));
+    }
+}
diff --git a/lib/symfony/console/Tests/CommandLoader/ContainerCommandLoaderTest.php b/lib/symfony/console/Tests/CommandLoader/ContainerCommandLoaderTest.php
new file mode 100644
index 000000000..50fe125a6
--- /dev/null
+++ b/lib/symfony/console/Tests/CommandLoader/ContainerCommandLoaderTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\CommandLoader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+
+class ContainerCommandLoaderTest extends TestCase
+{
+    public function testHas()
+    {
+        $loader = new ContainerCommandLoader(new ServiceLocator([
+            'foo-service' => function () { return new Command('foo'); },
+            'bar-service' => function () { return new Command('bar'); },
+        ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
+
+        $this->assertTrue($loader->has('foo'));
+        $this->assertTrue($loader->has('bar'));
+        $this->assertFalse($loader->has('baz'));
+    }
+
+    public function testGet()
+    {
+        $loader = new ContainerCommandLoader(new ServiceLocator([
+            'foo-service' => function () { return new Command('foo'); },
+            'bar-service' => function () { return new Command('bar'); },
+        ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
+
+        $this->assertInstanceOf(Command::class, $loader->get('foo'));
+        $this->assertInstanceOf(Command::class, $loader->get('bar'));
+    }
+
+    public function testGetUnknownCommandThrows()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        (new ContainerCommandLoader(new ServiceLocator([]), []))->get('unknown');
+    }
+
+    public function testGetCommandNames()
+    {
+        $loader = new ContainerCommandLoader(new ServiceLocator([
+            'foo-service' => function () { return new Command('foo'); },
+            'bar-service' => function () { return new Command('bar'); },
+        ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
+
+        $this->assertSame(['foo', 'bar'], $loader->getNames());
+    }
+}
diff --git a/lib/symfony/console/Tests/CommandLoader/FactoryCommandLoaderTest.php b/lib/symfony/console/Tests/CommandLoader/FactoryCommandLoaderTest.php
new file mode 100644
index 000000000..a37ad18de
--- /dev/null
+++ b/lib/symfony/console/Tests/CommandLoader/FactoryCommandLoaderTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\CommandLoader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\CommandLoader\FactoryCommandLoader;
+
+class FactoryCommandLoaderTest extends TestCase
+{
+    public function testHas()
+    {
+        $loader = new FactoryCommandLoader([
+            'foo' => function () { return new Command('foo'); },
+            'bar' => function () { return new Command('bar'); },
+        ]);
+
+        $this->assertTrue($loader->has('foo'));
+        $this->assertTrue($loader->has('bar'));
+        $this->assertFalse($loader->has('baz'));
+    }
+
+    public function testGet()
+    {
+        $loader = new FactoryCommandLoader([
+            'foo' => function () { return new Command('foo'); },
+            'bar' => function () { return new Command('bar'); },
+        ]);
+
+        $this->assertInstanceOf(Command::class, $loader->get('foo'));
+        $this->assertInstanceOf(Command::class, $loader->get('bar'));
+    }
+
+    public function testGetUnknownCommandThrows()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        (new FactoryCommandLoader([]))->get('unknown');
+    }
+
+    public function testGetCommandNames()
+    {
+        $loader = new FactoryCommandLoader([
+            'foo' => function () { return new Command('foo'); },
+            'bar' => function () { return new Command('bar'); },
+        ]);
+
+        $this->assertSame(['foo', 'bar'], $loader->getNames());
+    }
+}
diff --git a/lib/symfony/console/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/lib/symfony/console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
new file mode 100644
index 000000000..1f8ae58e7
--- /dev/null
+++ b/lib/symfony/console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -0,0 +1,256 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
+use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\TypedReference;
+
+class AddConsoleCommandPassTest extends TestCase
+{
+    /**
+     * @dataProvider visibilityProvider
+     */
+    public function testProcess($public)
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+        $container->setParameter('my-command.class', 'Symfony\Component\Console\Tests\DependencyInjection\MyCommand');
+
+        $definition = new Definition('%my-command.class%');
+        $definition->setPublic($public);
+        $definition->addTag('console.command');
+        $container->setDefinition('my-command', $definition);
+
+        $container->compile();
+
+        $alias = 'console.command.symfony_component_console_tests_dependencyinjection_mycommand';
+
+        if ($public) {
+            $this->assertFalse($container->hasAlias($alias));
+            $id = 'my-command';
+        } else {
+            $id = $alias;
+            // The alias is replaced by a Definition by the ReplaceAliasByActualDefinitionPass
+            // in case the original service is private
+            $this->assertFalse($container->hasDefinition('my-command'));
+            $this->assertTrue($container->hasDefinition($alias));
+        }
+
+        $this->assertTrue($container->hasParameter('console.command.ids'));
+        $this->assertSame([$alias => $id], $container->getParameter('console.command.ids'));
+    }
+
+    public function testProcessRegistersLazyCommands()
+    {
+        $container = new ContainerBuilder();
+        $command = $container
+            ->register('my-command', MyCommand::class)
+            ->setPublic(false)
+            ->addTag('console.command', ['command' => 'my:command'])
+            ->addTag('console.command', ['command' => 'my:alias'])
+        ;
+
+        (new AddConsoleCommandPass())->process($container);
+
+        $commandLoader = $container->getDefinition('console.command_loader');
+        $commandLocator = $container->getDefinition((string) $commandLoader->getArgument(0));
+
+        $this->assertSame(ContainerCommandLoader::class, $commandLoader->getClass());
+        $this->assertSame(['my:command' => 'my-command', 'my:alias' => 'my-command'], $commandLoader->getArgument(1));
+        $this->assertEquals([['my-command' => new ServiceClosureArgument(new TypedReference('my-command', MyCommand::class))]], $commandLocator->getArguments());
+        $this->assertSame(['console.command.symfony_component_console_tests_dependencyinjection_mycommand' => 'my-command'], $container->getParameter('console.command.ids'));
+        $this->assertSame(['my-command' => true], $container->getParameter('console.lazy_command.ids'));
+        $this->assertSame([['setName', ['my:command']], ['setAliases', [['my:alias']]]], $command->getMethodCalls());
+    }
+
+    public function testProcessFallsBackToDefaultName()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('with-default-name', NamedCommand::class)
+            ->setPublic(false)
+            ->addTag('console.command')
+        ;
+
+        $pass = new AddConsoleCommandPass();
+        $pass->process($container);
+
+        $commandLoader = $container->getDefinition('console.command_loader');
+        $commandLocator = $container->getDefinition((string) $commandLoader->getArgument(0));
+
+        $this->assertSame(ContainerCommandLoader::class, $commandLoader->getClass());
+        $this->assertSame(['default' => 'with-default-name'], $commandLoader->getArgument(1));
+        $this->assertEquals([['with-default-name' => new ServiceClosureArgument(new TypedReference('with-default-name', NamedCommand::class))]], $commandLocator->getArguments());
+        $this->assertSame(['console.command.symfony_component_console_tests_dependencyinjection_namedcommand' => 'with-default-name'], $container->getParameter('console.command.ids'));
+        $this->assertSame(['with-default-name' => true], $container->getParameter('console.lazy_command.ids'));
+
+        $container = new ContainerBuilder();
+        $container
+            ->register('with-default-name', NamedCommand::class)
+            ->setPublic(false)
+            ->addTag('console.command', ['command' => 'new-name'])
+        ;
+
+        $pass->process($container);
+
+        $this->assertSame(['new-name' => 'with-default-name'], $container->getDefinition('console.command_loader')->getArgument(1));
+    }
+
+    public function visibilityProvider()
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
+
+    public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The service "my-command" tagged "console.command" must not be abstract.');
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+
+        $definition = new Definition('Symfony\Component\Console\Tests\DependencyInjection\MyCommand');
+        $definition->addTag('console.command');
+        $definition->setAbstract(true);
+        $container->setDefinition('my-command', $definition);
+
+        $container->compile();
+    }
+
+    public function testProcessThrowAnExceptionIfTheServiceIsNotASubclassOfCommand()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The service "my-command" tagged "console.command" must be a subclass of "Symfony\Component\Console\Command\Command".');
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+
+        $definition = new Definition('SplObjectStorage');
+        $definition->addTag('console.command');
+        $container->setDefinition('my-command', $definition);
+
+        $container->compile();
+    }
+
+    public function testProcessPrivateServicesWithSameCommand()
+    {
+        $container = new ContainerBuilder();
+        $className = 'Symfony\Component\Console\Tests\DependencyInjection\MyCommand';
+
+        $definition1 = new Definition($className);
+        $definition1->addTag('console.command')->setPublic(false);
+
+        $definition2 = new Definition($className);
+        $definition2->addTag('console.command')->setPublic(false);
+
+        $container->setDefinition('my-command1', $definition1);
+        $container->setDefinition('my-command2', $definition2);
+
+        (new AddConsoleCommandPass())->process($container);
+
+        $alias1 = 'console.command.symfony_component_console_tests_dependencyinjection_mycommand';
+        $alias2 = $alias1.'_my-command2';
+        $this->assertTrue($container->hasAlias($alias1));
+        $this->assertTrue($container->hasAlias($alias2));
+    }
+
+    public function testProcessOnChildDefinitionWithClass()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+        $className = 'Symfony\Component\Console\Tests\DependencyInjection\MyCommand';
+
+        $parentId = 'my-parent-command';
+        $childId = 'my-child-command';
+
+        $parentDefinition = new Definition(/* no class */);
+        $parentDefinition->setAbstract(true)->setPublic(false);
+
+        $childDefinition = new ChildDefinition($parentId);
+        $childDefinition->addTag('console.command')->setPublic(true);
+        $childDefinition->setClass($className);
+
+        $container->setDefinition($parentId, $parentDefinition);
+        $container->setDefinition($childId, $childDefinition);
+
+        $container->compile();
+        $command = $container->get($childId);
+
+        $this->assertInstanceOf($className, $command);
+    }
+
+    public function testProcessOnChildDefinitionWithParentClass()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+        $className = 'Symfony\Component\Console\Tests\DependencyInjection\MyCommand';
+
+        $parentId = 'my-parent-command';
+        $childId = 'my-child-command';
+
+        $parentDefinition = new Definition($className);
+        $parentDefinition->setAbstract(true)->setPublic(false);
+
+        $childDefinition = new ChildDefinition($parentId);
+        $childDefinition->addTag('console.command')->setPublic(true);
+
+        $container->setDefinition($parentId, $parentDefinition);
+        $container->setDefinition($childId, $childDefinition);
+
+        $container->compile();
+        $command = $container->get($childId);
+
+        $this->assertInstanceOf($className, $command);
+    }
+
+    public function testProcessOnChildDefinitionWithoutClass()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('The definition for "my-child-command" has no class.');
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+
+        $parentId = 'my-parent-command';
+        $childId = 'my-child-command';
+
+        $parentDefinition = new Definition();
+        $parentDefinition->setAbstract(true)->setPublic(false);
+
+        $childDefinition = new ChildDefinition($parentId);
+        $childDefinition->addTag('console.command')->setPublic(true);
+
+        $container->setDefinition($parentId, $parentDefinition);
+        $container->setDefinition($childId, $childDefinition);
+
+        $container->compile();
+    }
+}
+
+class MyCommand extends Command
+{
+}
+
+class NamedCommand extends Command
+{
+    protected static $defaultName = 'default';
+}
diff --git a/lib/symfony/console/Tests/Descriptor/AbstractDescriptorTest.php b/lib/symfony/console/Tests/Descriptor/AbstractDescriptorTest.php
new file mode 100644
index 000000000..320a4fb9f
--- /dev/null
+++ b/lib/symfony/console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Descriptor;
+
+use PHPUnit\Framework\TestCase;
+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\BufferedOutput;
+
+abstract class AbstractDescriptorTest extends TestCase
+{
+    /** @dataProvider getDescribeInputArgumentTestData */
+    public function testDescribeInputArgument(InputArgument $argument, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $argument);
+    }
+
+    /** @dataProvider getDescribeInputOptionTestData */
+    public function testDescribeInputOption(InputOption $option, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $option);
+    }
+
+    /** @dataProvider getDescribeInputDefinitionTestData */
+    public function testDescribeInputDefinition(InputDefinition $definition, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $definition);
+    }
+
+    /** @dataProvider getDescribeCommandTestData */
+    public function testDescribeCommand(Command $command, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $command);
+    }
+
+    /** @dataProvider getDescribeApplicationTestData */
+    public function testDescribeApplication(Application $application, $expectedDescription)
+    {
+        // Replaces the dynamic placeholders of the command help text with a static version.
+        // The placeholder %command.full_name% includes the script path that is not predictable
+        // and can not be tested against.
+        foreach ($application->all() as $command) {
+            $command->setHelp(str_replace('%command.full_name%', 'app/console %command.name%', $command->getHelp()));
+        }
+
+        $this->assertDescription($expectedDescription, $application);
+    }
+
+    public function getDescribeInputArgumentTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getInputArguments());
+    }
+
+    public function getDescribeInputOptionTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getInputOptions());
+    }
+
+    public function getDescribeInputDefinitionTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getInputDefinitions());
+    }
+
+    public function getDescribeCommandTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getCommands());
+    }
+
+    public function getDescribeApplicationTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getApplications());
+    }
+
+    abstract protected function getDescriptor();
+
+    abstract protected function getFormat();
+
+    protected function getDescriptionTestData(array $objects)
+    {
+        $data = [];
+        foreach ($objects as $name => $object) {
+            $description = file_get_contents(sprintf('%s/../Fixtures/%s.%s', __DIR__, $name, $this->getFormat()));
+            $data[] = [$object, $description];
+        }
+
+        return $data;
+    }
+
+    protected function assertDescription($expectedDescription, $describedObject, array $options = [])
+    {
+        $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
+        $this->getDescriptor()->describe($output, $describedObject, $options + ['raw_output' => true]);
+        $this->assertEquals(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $output->fetch())));
+    }
+}
diff --git a/lib/symfony/console/Tests/Descriptor/ApplicationDescriptionTest.php b/lib/symfony/console/Tests/Descriptor/ApplicationDescriptionTest.php
new file mode 100644
index 000000000..33d5c3840
--- /dev/null
+++ b/lib/symfony/console/Tests/Descriptor/ApplicationDescriptionTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Descriptor;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\ApplicationDescription;
+
+final class ApplicationDescriptionTest extends TestCase
+{
+    /**
+     * @dataProvider getNamespacesProvider
+     */
+    public function testGetNamespaces(array $expected, array $names)
+    {
+        $application = new TestApplication();
+        foreach ($names as $name) {
+            $application->add(new Command($name));
+        }
+
+        $this->assertSame($expected, array_keys((new ApplicationDescription($application))->getNamespaces()));
+    }
+
+    public function getNamespacesProvider()
+    {
+        return [
+            [['_global'], ['foobar']],
+            [['a', 'b'], ['b:foo', 'a:foo', 'b:bar']],
+            [['_global', 'b', 'z', 22, 33], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],
+        ];
+    }
+}
+
+final class TestApplication extends Application
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDefaultCommands()
+    {
+        return [];
+    }
+}
diff --git a/lib/symfony/console/Tests/Descriptor/JsonDescriptorTest.php b/lib/symfony/console/Tests/Descriptor/JsonDescriptorTest.php
new file mode 100644
index 000000000..fb596b8d7
--- /dev/null
+++ b/lib/symfony/console/Tests/Descriptor/JsonDescriptorTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\JsonDescriptor;
+use Symfony\Component\Console\Output\BufferedOutput;
+
+class JsonDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new JsonDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'json';
+    }
+
+    protected function assertDescription($expectedDescription, $describedObject, array $options = [])
+    {
+        $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
+        $this->getDescriptor()->describe($output, $describedObject, $options + ['raw_output' => true]);
+        $this->assertEquals(json_decode(trim($expectedDescription), true), json_decode(trim(str_replace(PHP_EOL, "\n", $output->fetch())), true));
+    }
+}
diff --git a/lib/symfony/console/Tests/Descriptor/MarkdownDescriptorTest.php b/lib/symfony/console/Tests/Descriptor/MarkdownDescriptorTest.php
new file mode 100644
index 000000000..a8f11cb4a
--- /dev/null
+++ b/lib/symfony/console/Tests/Descriptor/MarkdownDescriptorTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
+
+class MarkdownDescriptorTest extends AbstractDescriptorTest
+{
+    public function getDescribeCommandTestData()
+    {
+        return $this->getDescriptionTestData(array_merge(
+            ObjectsProvider::getCommands(),
+            ['command_mbstring' => new DescriptorCommandMbString()]
+        ));
+    }
+
+    public function getDescribeApplicationTestData()
+    {
+        return $this->getDescriptionTestData(array_merge(
+            ObjectsProvider::getApplications(),
+            ['application_mbstring' => new DescriptorApplicationMbString()]
+        ));
+    }
+
+    protected function getDescriptor()
+    {
+        return new MarkdownDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'md';
+    }
+}
diff --git a/lib/symfony/console/Tests/Descriptor/ObjectsProvider.php b/lib/symfony/console/Tests/Descriptor/ObjectsProvider.php
new file mode 100644
index 000000000..d46d6f18b
--- /dev/null
+++ b/lib/symfony/console/Tests/Descriptor/ObjectsProvider.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Descriptor;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplication1;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplication2;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommand1;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommand2;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class ObjectsProvider
+{
+    public static function getInputArguments()
+    {
+        return [
+            'input_argument_1' => new InputArgument('argument_name', InputArgument::REQUIRED),
+            'input_argument_2' => new InputArgument('argument_name', InputArgument::IS_ARRAY, 'argument description'),
+            'input_argument_3' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', 'default_value'),
+            'input_argument_4' => new InputArgument('argument_name', InputArgument::REQUIRED, "multiline\nargument description"),
+            'input_argument_with_style' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', '<comment>style</>'),
+            'input_argument_with_default_inf_value' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', INF),
+        ];
+    }
+
+    public static function getInputOptions()
+    {
+        return [
+            'input_option_1' => new InputOption('option_name', 'o', InputOption::VALUE_NONE),
+            'input_option_2' => new InputOption('option_name', 'o', InputOption::VALUE_OPTIONAL, 'option description', 'default_value'),
+            'input_option_3' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, 'option description'),
+            'input_option_4' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'option description', []),
+            'input_option_5' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, "multiline\noption description"),
+            'input_option_6' => new InputOption('option_name', ['o', 'O'], InputOption::VALUE_REQUIRED, 'option with multiple shortcuts'),
+            'input_option_with_style' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, 'option description', '<comment>style</>'),
+            'input_option_with_style_array' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'option description', ['<comment>Hello</comment>', '<info>world</info>']),
+            'input_option_with_default_inf_value' => new InputOption('option_name', 'o', InputOption::VALUE_OPTIONAL, 'option description', INF),
+        ];
+    }
+
+    public static function getInputDefinitions()
+    {
+        return [
+            'input_definition_1' => new InputDefinition(),
+            'input_definition_2' => new InputDefinition([new InputArgument('argument_name', InputArgument::REQUIRED)]),
+            'input_definition_3' => new InputDefinition([new InputOption('option_name', 'o', InputOption::VALUE_NONE)]),
+            'input_definition_4' => new InputDefinition([
+                new InputArgument('argument_name', InputArgument::REQUIRED),
+                new InputOption('option_name', 'o', InputOption::VALUE_NONE),
+            ]),
+        ];
+    }
+
+    public static function getCommands()
+    {
+        return [
+            'command_1' => new DescriptorCommand1(),
+            'command_2' => new DescriptorCommand2(),
+        ];
+    }
+
+    public static function getApplications()
+    {
+        return [
+            'application_1' => new DescriptorApplication1(),
+            'application_2' => new DescriptorApplication2(),
+        ];
+    }
+}
diff --git a/lib/symfony/console/Tests/Descriptor/TextDescriptorTest.php b/lib/symfony/console/Tests/Descriptor/TextDescriptorTest.php
new file mode 100644
index 000000000..26bbd907a
--- /dev/null
+++ b/lib/symfony/console/Tests/Descriptor/TextDescriptorTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\TextDescriptor;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplication2;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
+
+class TextDescriptorTest extends AbstractDescriptorTest
+{
+    public function getDescribeCommandTestData()
+    {
+        return $this->getDescriptionTestData(array_merge(
+            ObjectsProvider::getCommands(),
+            ['command_mbstring' => new DescriptorCommandMbString()]
+        ));
+    }
+
+    public function getDescribeApplicationTestData()
+    {
+        return $this->getDescriptionTestData(array_merge(
+            ObjectsProvider::getApplications(),
+            ['application_mbstring' => new DescriptorApplicationMbString()]
+        ));
+    }
+
+    public function testDescribeApplicationWithFilteredNamespace()
+    {
+        $application = new DescriptorApplication2();
+
+        $this->assertDescription(file_get_contents(__DIR__.'/../Fixtures/application_filtered_namespace.txt'), $application, ['namespace' => 'command4']);
+    }
+
+    protected function getDescriptor()
+    {
+        return new TextDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'txt';
+    }
+}
diff --git a/lib/symfony/console/Tests/Descriptor/XmlDescriptorTest.php b/lib/symfony/console/Tests/Descriptor/XmlDescriptorTest.php
new file mode 100644
index 000000000..59a5d1ed8
--- /dev/null
+++ b/lib/symfony/console/Tests/Descriptor/XmlDescriptorTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\XmlDescriptor;
+
+class XmlDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new XmlDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'xml';
+    }
+}
diff --git a/lib/symfony/console/Tests/EventListener/ErrorListenerTest.php b/lib/symfony/console/Tests/EventListener/ErrorListenerTest.php
new file mode 100644
index 000000000..39766db3d
--- /dev/null
+++ b/lib/symfony/console/Tests/EventListener/ErrorListenerTest.php
@@ -0,0 +1,156 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
+use Symfony\Component\Console\EventListener\ErrorListener;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\Input;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ErrorListenerTest extends TestCase
+{
+    public function testOnConsoleError()
+    {
+        $error = new \TypeError('An error occurred');
+
+        $logger = $this->getLogger();
+        $logger
+            ->expects($this->once())
+            ->method('error')
+            ->with('Error thrown while running command "{command}". Message: "{message}"', ['exception' => $error, 'command' => 'test:run --foo=baz buzz', 'message' => 'An error occurred'])
+        ;
+
+        $listener = new ErrorListener($logger);
+        $listener->onConsoleError(new ConsoleErrorEvent(new ArgvInput(['console.php', 'test:run', '--foo=baz', 'buzz']), $this->getOutput(), $error, new Command('test:run')));
+    }
+
+    public function testOnConsoleErrorWithNoCommandAndNoInputString()
+    {
+        $error = new \RuntimeException('An error occurred');
+
+        $logger = $this->getLogger();
+        $logger
+            ->expects($this->once())
+            ->method('error')
+            ->with('An error occurred while using the console. Message: "{message}"', ['exception' => $error, 'message' => 'An error occurred'])
+        ;
+
+        $listener = new ErrorListener($logger);
+        $listener->onConsoleError(new ConsoleErrorEvent(new NonStringInput(), $this->getOutput(), $error));
+    }
+
+    public function testOnConsoleTerminateForNonZeroExitCodeWritesToLog()
+    {
+        $logger = $this->getLogger();
+        $logger
+            ->expects($this->once())
+            ->method('debug')
+            ->with('Command "{command}" exited with code "{code}"', ['command' => 'test:run', 'code' => 255])
+        ;
+
+        $listener = new ErrorListener($logger);
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(['console.php', 'test:run']), 255));
+    }
+
+    public function testOnConsoleTerminateForZeroExitCodeDoesNotWriteToLog()
+    {
+        $logger = $this->getLogger();
+        $logger
+            ->expects($this->never())
+            ->method('debug')
+        ;
+
+        $listener = new ErrorListener($logger);
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(['console.php', 'test:run']), 0));
+    }
+
+    public function testGetSubscribedEvents()
+    {
+        $this->assertEquals(
+            [
+                'console.error' => ['onConsoleError', -128],
+                'console.terminate' => ['onConsoleTerminate', -128],
+            ],
+            ErrorListener::getSubscribedEvents()
+        );
+    }
+
+    public function testAllKindsOfInputCanBeLogged()
+    {
+        $logger = $this->getLogger();
+        $logger
+            ->expects($this->exactly(3))
+            ->method('debug')
+            ->with('Command "{command}" exited with code "{code}"', ['command' => 'test:run --foo=bar', 'code' => 255])
+        ;
+
+        $listener = new ErrorListener($logger);
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(['console.php', 'test:run', '--foo=bar']), 255));
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArrayInput(['name' => 'test:run', '--foo' => 'bar']), 255));
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new StringInput('test:run --foo=bar'), 255));
+    }
+
+    public function testCommandNameIsDisplayedForNonStringableInput()
+    {
+        $logger = $this->getLogger();
+        $logger
+            ->expects($this->once())
+            ->method('debug')
+            ->with('Command "{command}" exited with code "{code}"', ['command' => 'test:run', 'code' => 255])
+        ;
+
+        $listener = new ErrorListener($logger);
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent($this->getMockBuilder(InputInterface::class)->getMock(), 255));
+    }
+
+    private function getLogger()
+    {
+        return $this->getMockForAbstractClass(LoggerInterface::class);
+    }
+
+    private function getConsoleTerminateEvent(InputInterface $input, $exitCode)
+    {
+        return new ConsoleTerminateEvent(new Command('test:run'), $input, $this->getOutput(), $exitCode);
+    }
+
+    private function getOutput()
+    {
+        return $this->getMockBuilder(OutputInterface::class)->getMock();
+    }
+}
+
+class NonStringInput extends Input
+{
+    public function getFirstArgument()
+    {
+    }
+
+    public function hasParameterOption($values, $onlyParams = false)
+    {
+    }
+
+    public function getParameterOption($values, $default = false, $onlyParams = false)
+    {
+    }
+
+    public function parse()
+    {
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/BarBucCommand.php b/lib/symfony/console/Tests/Fixtures/BarBucCommand.php
new file mode 100644
index 000000000..52b619e82
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/BarBucCommand.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+
+class BarBucCommand extends Command
+{
+    protected function configure()
+    {
+        $this->setName('bar:buc');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DescriptorApplication1.php b/lib/symfony/console/Tests/Fixtures/DescriptorApplication1.php
new file mode 100644
index 000000000..132b6d57d
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DescriptorApplication1.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Application;
+
+class DescriptorApplication1 extends Application
+{
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DescriptorApplication2.php b/lib/symfony/console/Tests/Fixtures/DescriptorApplication2.php
new file mode 100644
index 000000000..7bb02fa54
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DescriptorApplication2.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Application;
+
+class DescriptorApplication2 extends Application
+{
+    public function __construct()
+    {
+        parent::__construct('My Symfony application', 'v1.0');
+        $this->add(new DescriptorCommand1());
+        $this->add(new DescriptorCommand2());
+        $this->add(new DescriptorCommand3());
+        $this->add(new DescriptorCommand4());
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DescriptorApplicationMbString.php b/lib/symfony/console/Tests/Fixtures/DescriptorApplicationMbString.php
new file mode 100644
index 000000000..bf170c449
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DescriptorApplicationMbString.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Application;
+
+class DescriptorApplicationMbString extends Application
+{
+    public function __construct()
+    {
+        parent::__construct('MbString åpplicätion');
+
+        $this->add(new DescriptorCommandMbString());
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DescriptorCommand1.php b/lib/symfony/console/Tests/Fixtures/DescriptorCommand1.php
new file mode 100644
index 000000000..14bb20486
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DescriptorCommand1.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Command\Command;
+
+class DescriptorCommand1 extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('descriptor:command1')
+            ->setAliases(['alias1', 'alias2'])
+            ->setDescription('command 1 description')
+            ->setHelp('command 1 help')
+        ;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DescriptorCommand2.php b/lib/symfony/console/Tests/Fixtures/DescriptorCommand2.php
new file mode 100644
index 000000000..51106b961
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DescriptorCommand2.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+
+class DescriptorCommand2 extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('descriptor:command2')
+            ->setDescription('command 2 description')
+            ->setHelp('command 2 help')
+            ->addUsage('-o|--option_name <argument_name>')
+            ->addUsage('<argument_name>')
+            ->addArgument('argument_name', InputArgument::REQUIRED)
+            ->addOption('option_name', 'o', InputOption::VALUE_NONE)
+        ;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DescriptorCommand3.php b/lib/symfony/console/Tests/Fixtures/DescriptorCommand3.php
new file mode 100644
index 000000000..77f92e233
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DescriptorCommand3.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Command\Command;
+
+class DescriptorCommand3 extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('descriptor:command3')
+            ->setDescription('command 3 description')
+            ->setHelp('command 3 help')
+            ->setHidden(true)
+        ;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DescriptorCommand4.php b/lib/symfony/console/Tests/Fixtures/DescriptorCommand4.php
new file mode 100644
index 000000000..22dcae0e3
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DescriptorCommand4.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Command\Command;
+
+class DescriptorCommand4 extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('descriptor:command4')
+            ->setAliases(['descriptor:alias_command4', 'command4:descriptor'])
+        ;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DescriptorCommandMbString.php b/lib/symfony/console/Tests/Fixtures/DescriptorCommandMbString.php
new file mode 100644
index 000000000..66de917e2
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DescriptorCommandMbString.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+
+class DescriptorCommandMbString extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('descriptor:åèä')
+            ->setDescription('command åèä description')
+            ->setHelp('command åèä help')
+            ->addUsage('-o|--option_name <argument_name>')
+            ->addUsage('<argument_name>')
+            ->addArgument('argument_åèä', InputArgument::REQUIRED)
+            ->addOption('option_åèä', 'o', InputOption::VALUE_NONE)
+        ;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/DummyOutput.php b/lib/symfony/console/Tests/Fixtures/DummyOutput.php
new file mode 100644
index 000000000..e9cf6ce7d
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/DummyOutput.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Console\Output\BufferedOutput;
+
+/**
+ * Dummy output.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class DummyOutput extends BufferedOutput
+{
+    /**
+     * @return array
+     */
+    public function getLogs()
+    {
+        $logs = [];
+        foreach (explode(PHP_EOL, trim($this->fetch())) as $message) {
+            preg_match('/^\[(.*)\] (.*)/', $message, $matches);
+            $logs[] = sprintf('%s %s', $matches[1], $matches[2]);
+        }
+
+        return $logs;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/Foo1Command.php b/lib/symfony/console/Tests/Fixtures/Foo1Command.php
new file mode 100644
index 000000000..6069576d1
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Foo1Command.php
@@ -0,0 +1,26 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Foo1Command extends Command
+{
+    public $input;
+    public $output;
+
+    protected function configure()
+    {
+        $this
+            ->setName('foo:bar1')
+            ->setDescription('The foo:bar1 command')
+            ->setAliases(['afoobar1'])
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/Foo2Command.php b/lib/symfony/console/Tests/Fixtures/Foo2Command.php
new file mode 100644
index 000000000..0d9884013
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Foo2Command.php
@@ -0,0 +1,21 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Foo2Command extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('foo1:bar')
+            ->setDescription('The foo1:bar command')
+            ->setAliases(['afoobar2'])
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/Foo3Command.php b/lib/symfony/console/Tests/Fixtures/Foo3Command.php
new file mode 100644
index 000000000..adb3a2d80
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Foo3Command.php
@@ -0,0 +1,29 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Foo3Command extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('foo3:bar')
+            ->setDescription('The foo3:bar command')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            try {
+                throw new \Exception('First exception <p>this is html</p>');
+            } catch (\Exception $e) {
+                throw new \Exception('Second exception <comment>comment</comment>', 0, $e);
+            }
+        } catch (\Exception $e) {
+            throw new \Exception('Third exception <fg=blue;bg=red>comment</>', 404, $e);
+        }
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/Foo4Command.php b/lib/symfony/console/Tests/Fixtures/Foo4Command.php
new file mode 100644
index 000000000..1c5463995
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Foo4Command.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+
+class Foo4Command extends Command
+{
+    protected function configure()
+    {
+        $this->setName('foo3:bar:toh');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/Foo5Command.php b/lib/symfony/console/Tests/Fixtures/Foo5Command.php
new file mode 100644
index 000000000..a1c60827a
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Foo5Command.php
@@ -0,0 +1,10 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+
+class Foo5Command extends Command
+{
+    public function __construct()
+    {
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/Foo6Command.php b/lib/symfony/console/Tests/Fixtures/Foo6Command.php
new file mode 100644
index 000000000..ef5bd7702
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Foo6Command.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+
+class Foo6Command extends Command
+{
+    protected function configure()
+    {
+        $this->setName('0foo:bar')->setDescription('0foo:bar command');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooCommand.php b/lib/symfony/console/Tests/Fixtures/FooCommand.php
new file mode 100644
index 000000000..314460044
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooCommand.php
@@ -0,0 +1,33 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooCommand extends Command
+{
+    public $input;
+    public $output;
+
+    protected function configure()
+    {
+        $this
+            ->setName('foo:bar')
+            ->setDescription('The foo:bar command')
+            ->setAliases(['afoobar'])
+        ;
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('interact called');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+
+        $output->writeln('called');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooHiddenCommand.php b/lib/symfony/console/Tests/Fixtures/FooHiddenCommand.php
new file mode 100644
index 000000000..75fbf7804
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooHiddenCommand.php
@@ -0,0 +1,21 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooHiddenCommand extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('foo:hidden')
+            ->setAliases(['afoohidden'])
+            ->setHidden(true)
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooLock2Command.php b/lib/symfony/console/Tests/Fixtures/FooLock2Command.php
new file mode 100644
index 000000000..4e4656f20
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooLock2Command.php
@@ -0,0 +1,28 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Command\LockableTrait;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooLock2Command extends Command
+{
+    use LockableTrait;
+
+    protected function configure()
+    {
+        $this->setName('foo:lock2');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            $this->lock();
+            $this->lock();
+        } catch (LogicException $e) {
+            return 1;
+        }
+
+        return 2;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooLockCommand.php b/lib/symfony/console/Tests/Fixtures/FooLockCommand.php
new file mode 100644
index 000000000..dfa28a6be
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooLockCommand.php
@@ -0,0 +1,27 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Command\LockableTrait;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooLockCommand extends Command
+{
+    use LockableTrait;
+
+    protected function configure()
+    {
+        $this->setName('foo:lock');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        if (!$this->lock()) {
+            return 1;
+        }
+
+        $this->release();
+
+        return 2;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooOptCommand.php b/lib/symfony/console/Tests/Fixtures/FooOptCommand.php
new file mode 100644
index 000000000..c9054671f
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooOptCommand.php
@@ -0,0 +1,36 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooOptCommand extends Command
+{
+    public $input;
+    public $output;
+
+    protected function configure()
+    {
+        $this
+            ->setName('foo:bar')
+            ->setDescription('The foo:bar command')
+            ->setAliases(['afoobar'])
+            ->addOption('fooopt', 'fo', InputOption::VALUE_OPTIONAL, 'fooopt description')
+        ;
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('interact called');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+
+        $output->writeln('called');
+        $output->writeln($this->input->getOption('fooopt'));
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooSameCaseLowercaseCommand.php b/lib/symfony/console/Tests/Fixtures/FooSameCaseLowercaseCommand.php
new file mode 100644
index 000000000..c875be0cd
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooSameCaseLowercaseCommand.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+
+class FooSameCaseLowercaseCommand extends Command
+{
+    protected function configure()
+    {
+        $this->setName('foo:bar')->setDescription('foo:bar command');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooSameCaseUppercaseCommand.php b/lib/symfony/console/Tests/Fixtures/FooSameCaseUppercaseCommand.php
new file mode 100644
index 000000000..75c8d0024
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooSameCaseUppercaseCommand.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+
+class FooSameCaseUppercaseCommand extends Command
+{
+    protected function configure()
+    {
+        $this->setName('foo:BAR')->setDescription('foo:BAR command');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooSubnamespaced1Command.php b/lib/symfony/console/Tests/Fixtures/FooSubnamespaced1Command.php
new file mode 100644
index 000000000..95a4e6152
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooSubnamespaced1Command.php
@@ -0,0 +1,26 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooSubnamespaced1Command extends Command
+{
+    public $input;
+    public $output;
+
+    protected function configure()
+    {
+        $this
+            ->setName('foo:bar:baz')
+            ->setDescription('The foo:bar:baz command')
+            ->setAliases(['foobarbaz'])
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FooSubnamespaced2Command.php b/lib/symfony/console/Tests/Fixtures/FooSubnamespaced2Command.php
new file mode 100644
index 000000000..08c5ff725
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FooSubnamespaced2Command.php
@@ -0,0 +1,26 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooSubnamespaced2Command extends Command
+{
+    public $input;
+    public $output;
+
+    protected function configure()
+    {
+        $this
+            ->setName('foo:go:bret')
+            ->setDescription('The foo:bar:go command')
+            ->setAliases(['foobargo'])
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/FoobarCommand.php b/lib/symfony/console/Tests/Fixtures/FoobarCommand.php
new file mode 100644
index 000000000..968162804
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/FoobarCommand.php
@@ -0,0 +1,25 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FoobarCommand extends Command
+{
+    public $input;
+    public $output;
+
+    protected function configure()
+    {
+        $this
+            ->setName('foobar:foo')
+            ->setDescription('The foobar:foo command')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
new file mode 100644
index 000000000..8fe7c0771
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line at start when using block element
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->caution('Lorem ipsum dolor sit amet');
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
new file mode 100644
index 000000000..e5c700d60
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between titles and blocks
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->title('Title');
+    $output->warning('Lorem ipsum dolor sit amet');
+    $output->title('Title');
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php
new file mode 100644
index 000000000..3111873dd
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php
@@ -0,0 +1,17 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure that all lines are aligned to the begin of the first line in a very long line block
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->block(
+        'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
+        'CUSTOM',
+        'fg=white;bg=green',
+        'X ',
+        true
+    );
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php
new file mode 100644
index 000000000..3ed897def
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// ensure long words are properly wrapped in blocks
+return function (InputInterface $input, OutputInterface $output) {
+    $word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon';
+    $sfStyle = new SymfonyStyle($input, $output);
+    $sfStyle->block($word, 'CUSTOM', 'fg=white;bg=blue', ' § ', false);
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_12.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_12.php
new file mode 100644
index 000000000..8c458ae76
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_12.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// ensure that all lines are aligned to the begin of the first one and start with '//' in a very long line comment
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->comment(
+        'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum'
+    );
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_13.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_13.php
new file mode 100644
index 000000000..827cbad1d
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_13.php
@@ -0,0 +1,14 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// ensure that nested tags have no effect on the color of the '//' prefix
+return function (InputInterface $input, OutputInterface $output) {
+    $output->setDecorated(true);
+    $output = new SymfonyStyle($input, $output);
+    $output->comment(
+        'Lorem ipsum dolor sit <comment>amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</comment> Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum'
+    );
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_14.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_14.php
new file mode 100644
index 000000000..a893a48bf
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_14.php
@@ -0,0 +1,17 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// ensure that block() behaves properly with a prefix and without type
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->block(
+        'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
+        null,
+        null,
+        '$ ',
+        true
+    );
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_15.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_15.php
new file mode 100644
index 000000000..68402cd40
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_15.php
@@ -0,0 +1,14 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// ensure that block() behaves properly with a type and without prefix
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->block(
+        'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
+        'TEST'
+    );
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_16.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_16.php
new file mode 100644
index 000000000..66e817963
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_16.php
@@ -0,0 +1,15 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// ensure that block() output is properly formatted (even padding lines)
+return function (InputInterface $input, OutputInterface $output) {
+    $output->setDecorated(true);
+    $output = new SymfonyStyle($input, $output);
+    $output->success(
+        'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
+        'TEST'
+    );
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_17.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_17.php
new file mode 100644
index 000000000..311e6b392
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_17.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure symfony style helper methods handle trailing backslashes properly when decorating user texts
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->title('Title ending with \\');
+    $output->section('Section ending with \\');
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
new file mode 100644
index 000000000..791b626f2
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
@@ -0,0 +1,16 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between blocks
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->warning('Warning');
+    $output->caution('Caution');
+    $output->error('Error');
+    $output->success('Success');
+    $output->note('Note');
+    $output->block('Custom block', 'CUSTOM', 'fg=white;bg=green', 'X ', true);
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
new file mode 100644
index 000000000..99253a6c0
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between two titles
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->title('First title');
+    $output->title('Second title');
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
new file mode 100644
index 000000000..b2f3d9954
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
@@ -0,0 +1,34 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line after any text and a title
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->title('First title');
+
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->title('Second title');
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->write('');
+    $output->title('Third title');
+
+    //Ensure edge case by appending empty strings to history:
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->write(['', '', '']);
+    $output->title('Fourth title');
+
+    //Ensure have manual control over number of blank lines:
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->writeln(['', '']); //Should append an extra blank line
+    $output->title('Fifth title');
+
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->newLine(2); //Should append an extra blank line
+    $output->title('Fifth title');
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
new file mode 100644
index 000000000..6fba5737f
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
@@ -0,0 +1,37 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has proper line ending before outputting a text block like with SymfonyStyle::listing() or SymfonyStyle::text()
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->listing([
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ]);
+
+    //Even using write:
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->listing([
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ]);
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->text([
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ]);
+
+    $output->newLine();
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->comment([
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ]);
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
new file mode 100644
index 000000000..3278f6ea0
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
@@ -0,0 +1,16 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has proper blank line after text block when using a block like with SymfonyStyle::success
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->listing([
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ]);
+    $output->success('Lorem ipsum dolor sit amet');
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
new file mode 100644
index 000000000..037c6ab6b
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
@@ -0,0 +1,15 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure questions do not output anything when input is non-interactive
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->title('Title');
+    $output->askHidden('Hidden question');
+    $output->choice('Choice question with default', ['choice1', 'choice2'], 'choice1');
+    $output->confirm('Confirmation with yes default', true);
+    $output->text('Duis aute irure dolor in reprehenderit in voluptate velit esse');
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
new file mode 100644
index 000000000..fe9d484d2
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
@@ -0,0 +1,26 @@
+<?php
+
+use Symfony\Component\Console\Helper\TableCell;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure formatting tables when using multiple headers with TableCell
+return function (InputInterface $input, OutputInterface $output) {
+    $headers = [
+        [new TableCell('Main table title', ['colspan' => 3])],
+        ['ISBN', 'Title', 'Author'],
+    ];
+
+    $rows = [
+        [
+            '978-0521567817',
+            'De Monarchia',
+            new TableCell("Dante Alighieri\nspans multiple rows", ['rowspan' => 2]),
+        ],
+        ['978-0804169127', 'Divine Comedy'],
+    ];
+
+    $output = new SymfonyStyle($input, $output);
+    $output->table($headers, $rows);
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
new file mode 100644
index 000000000..73af4ae1e
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure that all lines are aligned to the begin of the first line in a multi-line block
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->block(['Custom block', 'Second custom block line'], 'CUSTOM', 'fg=white;bg=green', 'X ', true);
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php
new file mode 100644
index 000000000..3c9c74405
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php
@@ -0,0 +1,19 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure that questions have the expected outputs
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $stream = fopen('php://memory', 'r+', false);
+
+    fwrite($stream, "Foo\nBar\nBaz");
+    rewind($stream);
+    $input->setStream($stream);
+
+    $output->ask('What\'s your name?');
+    $output->ask('How are you?');
+    $output->ask('Where do you come from?');
+};
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/interactive_output_1.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/interactive_output_1.txt
new file mode 100644
index 000000000..6fc7d7eb4
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/interactive_output_1.txt
@@ -0,0 +1,7 @@
+
+ What's your name?:
+ > 
+ How are you?:
+ > 
+ Where do you come from?:
+ > 
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt
new file mode 100644
index 000000000..a42e0f792
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt
@@ -0,0 +1,3 @@
+
+ ! [CAUTION] Lorem ipsum dolor sit amet                                                                                 
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt
new file mode 100644
index 000000000..334875f78
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt
@@ -0,0 +1,9 @@
+
+Title
+=====
+
+ [WARNING] Lorem ipsum dolor sit amet                                                                                   
+
+Title
+=====
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt
new file mode 100644
index 000000000..385c6a283
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt
@@ -0,0 +1,7 @@
+
+X [CUSTOM] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et      
+X          dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+X          commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat    
+X          nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit    
+X          anim id est laborum                                                                                          
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt
new file mode 100644
index 000000000..190d78403
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt
@@ -0,0 +1,4 @@
+
+ § [CUSTOM] Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophatto
+ §          peristeralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon                                  
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_12.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_12.txt
new file mode 100644
index 000000000..9983af832
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_12.txt
@@ -0,0 +1,6 @@
+
+ // Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
+ // aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+ // Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur    
+ // sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum                 
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_13.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_13.txt
new file mode 100644
index 000000000..0f3704b74
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_13.txt
@@ -0,0 +1,7 @@
+
+ // Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et             
+ // dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea       
+ // commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla     
+ // pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim            
+ // id est laborum                                                                                                      
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_14.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_14.txt
new file mode 100644
index 000000000..1d0d37e7f
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_14.txt
@@ -0,0 +1,6 @@
+
+$ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna  
+$ aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.   
+$ Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint 
+$ occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum                        
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_15.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_15.txt
new file mode 100644
index 000000000..66404b815
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_15.txt
@@ -0,0 +1,7 @@
+
+ [TEST] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore  
+        magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo  
+        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla         
+        pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est 
+        laborum                                                                                                         
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_16.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_16.txt
new file mode 100644
index 000000000..a0d180165
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_16.txt
@@ -0,0 +1,8 @@
+
+                                                                                                                        
+ [OK] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore    
+      magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo    
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
+      Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum     
+                                                                                                                        
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_17.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_17.txt
new file mode 100644
index 000000000..59d00e04a
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_17.txt
@@ -0,0 +1,7 @@
+
+Title ending with \
+===================
+
+Section ending with \
+---------------------
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt
new file mode 100644
index 000000000..ca609760c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt
@@ -0,0 +1,13 @@
+
+ [WARNING] Warning                                                                                                      
+
+ ! [CAUTION] Caution                                                                                                    
+
+ [ERROR] Error                                                                                                          
+
+ [OK] Success                                                                                                           
+
+ ! [NOTE] Note                                                                                                          
+
+X [CUSTOM] Custom block                                                                                                 
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt
new file mode 100644
index 000000000..f4b6d5827
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt
@@ -0,0 +1,7 @@
+
+First title
+===========
+
+Second title
+============
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt
new file mode 100644
index 000000000..2646d858e
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt
@@ -0,0 +1,32 @@
+Lorem ipsum dolor sit amet
+
+First title
+===========
+
+Lorem ipsum dolor sit amet
+
+Second title
+============
+
+Lorem ipsum dolor sit amet
+
+Third title
+===========
+
+Lorem ipsum dolor sit amet
+
+Fourth title
+============
+
+Lorem ipsum dolor sit amet
+
+
+Fifth title
+===========
+
+Lorem ipsum dolor sit amet
+
+
+Fifth title
+===========
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
new file mode 100644
index 000000000..be4a2db60
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
@@ -0,0 +1,18 @@
+Lorem ipsum dolor sit amet
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+Lorem ipsum dolor sit amet
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+Lorem ipsum dolor sit amet
+ Lorem ipsum dolor sit amet
+ consectetur adipiscing elit
+
+Lorem ipsum dolor sit amet
+
+ // Lorem ipsum dolor sit amet                                                                                          
+ //                                                                                                                     
+ // consectetur adipiscing elit                                                                                         
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
new file mode 100644
index 000000000..5f2d33c14
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
@@ -0,0 +1,6 @@
+
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+ [OK] Lorem ipsum dolor sit amet                                                                                        
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt
new file mode 100644
index 000000000..ecea9778b
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt
@@ -0,0 +1,5 @@
+
+Title
+=====
+
+ Duis aute irure dolor in reprehenderit in voluptate velit esse
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt
new file mode 100644
index 000000000..005b846ea
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt
@@ -0,0 +1,9 @@
+ ---------------- --------------- --------------------- 
+  Main table title                                      
+ ---------------- --------------- --------------------- 
+  ISBN             Title           Author               
+ ---------------- --------------- --------------------- 
+  978-0521567817   De Monarchia    Dante Alighieri      
+  978-0804169127   Divine Comedy   spans multiple rows  
+ ---------------- --------------- --------------------- 
+
diff --git a/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt
new file mode 100644
index 000000000..069c0d511
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt
@@ -0,0 +1,5 @@
+
+X [CUSTOM] Custom block                                                                                                 
+X                                                                                                                       
+X          Second custom block line                                                                                     
+
diff --git a/lib/symfony/console/Tests/Fixtures/TestAmbiguousCommandRegistering.php b/lib/symfony/console/Tests/Fixtures/TestAmbiguousCommandRegistering.php
new file mode 100644
index 000000000..bece09fcd
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/TestAmbiguousCommandRegistering.php
@@ -0,0 +1,22 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class TestAmbiguousCommandRegistering extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('test-ambiguous')
+            ->setDescription('The test-ambiguous command')
+            ->setAliases(['test'])
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $output->write('test-ambiguous');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php b/lib/symfony/console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php
new file mode 100644
index 000000000..9dde48624
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php
@@ -0,0 +1,21 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class TestAmbiguousCommandRegistering2 extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('test-ambiguous2')
+            ->setDescription('The test-ambiguous2 command')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $output->write('test-ambiguous2');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/TestCommand.php b/lib/symfony/console/Tests/Fixtures/TestCommand.php
new file mode 100644
index 000000000..eb7ccb33f
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/TestCommand.php
@@ -0,0 +1,28 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class TestCommand extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('namespace:name')
+            ->setAliases(['name'])
+            ->setDescription('description')
+            ->setHelp('help')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('execute called');
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('interact called');
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/application_1.json b/lib/symfony/console/Tests/Fixtures/application_1.json
new file mode 100644
index 000000000..29faa8262
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_1.json
@@ -0,0 +1,156 @@
+{
+    "commands": [
+        {
+            "name": "help",
+            "hidden": false,
+            "usage": [
+                "help [--format FORMAT] [--raw] [--] [<command_name>]"
+            ],
+            "description": "Displays help for a command",
+            "help": "The <info>help<\/info> command displays help for a given command:\n\n  <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n  <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
+            "definition": {
+                "arguments": {
+                    "command_name": {
+                        "name": "command_name",
+                        "is_required": false,
+                        "is_array": false,
+                        "description": "The command name",
+                        "default": "help"
+                    }
+                },
+                "options": {
+                    "format": {
+                        "name": "--format",
+                        "shortcut": "",
+                        "accept_value": true,
+                        "is_value_required": true,
+                        "is_multiple": false,
+                        "description": "The output format (txt, xml, json, or md)",
+                        "default": "txt"
+                    },
+                    "raw": {
+                        "name": "--raw",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "To output raw command help",
+                        "default": false
+                    },
+                    "help": {
+                        "name": "--help",
+                        "shortcut": "-h",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this help message",
+                        "default": false
+                    },
+                    "quiet": {
+                        "name": "--quiet",
+                        "shortcut": "-q",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not output any message",
+                        "default": false
+                    },
+                    "verbose": {
+                        "name": "--verbose",
+                        "shortcut": "-v|-vv|-vvv",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug",
+                        "default": false
+                    },
+                    "version": {
+                        "name": "--version",
+                        "shortcut": "-V",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this application version",
+                        "default": false
+                    },
+                    "ansi": {
+                        "name": "--ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Force ANSI output",
+                        "default": false
+                    },
+                    "no-ansi": {
+                        "name": "--no-ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Disable ANSI output",
+                        "default": false
+                    },
+                    "no-interaction": {
+                        "name": "--no-interaction",
+                        "shortcut": "-n",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not ask any interactive question",
+                        "default": false
+                    }
+                }
+            }
+        },
+        {
+            "name": "list",
+            "hidden": false,
+            "usage": [
+                "list [--raw] [--format FORMAT] [--] [<namespace>]"
+            ],
+            "description": "Lists commands",
+            "help": "The <info>list<\/info> command lists all commands:\n\n  <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n  <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php app\/console list --raw<\/info>",
+            "definition": {
+                "arguments": {
+                    "namespace": {
+                        "name": "namespace",
+                        "is_required": false,
+                        "is_array": false,
+                        "description": "The namespace name",
+                        "default": null
+                    }
+                },
+                "options": {
+                    "raw": {
+                        "name": "--raw",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "To output raw command list",
+                        "default": false
+                    },
+                    "format": {
+                        "name": "--format",
+                        "shortcut": "",
+                        "accept_value": true,
+                        "is_value_required": true,
+                        "is_multiple": false,
+                        "description": "The output format (txt, xml, json, or md)",
+                        "default": "txt"
+                    }
+                }
+            }
+        }
+    ],
+    "namespaces": [
+        {
+            "id": "_global",
+            "commands": [
+                "help",
+                "list"
+            ]
+        }
+    ]
+}
diff --git a/lib/symfony/console/Tests/Fixtures/application_1.md b/lib/symfony/console/Tests/Fixtures/application_1.md
new file mode 100644
index 000000000..b46c975a7
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_1.md
@@ -0,0 +1,172 @@
+Console Tool
+============
+
+* [`help`](#help)
+* [`list`](#list)
+
+`help`
+------
+
+Displays help for a command
+
+### Usage
+
+* `help [--format FORMAT] [--raw] [--] [<command_name>]`
+
+The help command displays help for a given command:
+
+  php app/console help list
+
+You can also output the help in other formats by using the --format option:
+
+  php app/console help --format=xml list
+
+To display the list of available commands, please use the list command.
+
+### Arguments
+
+#### `command_name`
+
+The command name
+
+* Is required: no
+* Is array: no
+* Default: `'help'`
+
+### Options
+
+#### `--format`
+
+The output format (txt, xml, json, or md)
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `'txt'`
+
+#### `--raw`
+
+To output raw command help
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--help|-h`
+
+Display this help message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--quiet|-q`
+
+Do not output any message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--verbose|-v|-vv|-vvv`
+
+Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--version|-V`
+
+Display this application version
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--ansi`
+
+Force ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-ansi`
+
+Disable ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-interaction|-n`
+
+Do not ask any interactive question
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+`list`
+------
+
+Lists commands
+
+### Usage
+
+* `list [--raw] [--format FORMAT] [--] [<namespace>]`
+
+The list command lists all commands:
+
+  php app/console list
+
+You can also display the commands for a specific namespace:
+
+  php app/console list test
+
+You can also output the information in other formats by using the --format option:
+
+  php app/console list --format=xml
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  php app/console list --raw
+
+### Arguments
+
+#### `namespace`
+
+The namespace name
+
+* Is required: no
+* Is array: no
+* Default: `NULL`
+
+### Options
+
+#### `--raw`
+
+To output raw command list
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--format`
+
+The output format (txt, xml, json, or md)
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `'txt'`
diff --git a/lib/symfony/console/Tests/Fixtures/application_1.txt b/lib/symfony/console/Tests/Fixtures/application_1.txt
new file mode 100644
index 000000000..8a7b47e0c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_1.txt
@@ -0,0 +1,17 @@
+Console Tool
+
+<comment>Usage:</comment>
+  command [options] [arguments]
+
+<comment>Options:</comment>
+  <info>-h, --help</info>            Display this help message
+  <info>-q, --quiet</info>           Do not output any message
+  <info>-V, --version</info>         Display this application version
+  <info>    --ansi</info>            Force ANSI output
+  <info>    --no-ansi</info>         Disable ANSI output
+  <info>-n, --no-interaction</info>  Do not ask any interactive question
+  <info>-v|vv|vvv, --verbose</info>  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+<comment>Available commands:</comment>
+  <info>help</info>  Displays help for a command
+  <info>list</info>  Lists commands
diff --git a/lib/symfony/console/Tests/Fixtures/application_1.xml b/lib/symfony/console/Tests/Fixtures/application_1.xml
new file mode 100644
index 000000000..a0bd076c5
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_1.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<symfony>
+  <commands>
+    <command id="help" name="help" hidden="0">
+      <usages>
+        <usage>help [--format FORMAT] [--raw] [--] [&lt;command_name&gt;]</usage>
+      </usages>
+      <description>Displays help for a command</description>
+      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
+ 
+   &lt;info&gt;php app/console help list&lt;/info&gt;
+ 
+ You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
+ 
+ To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
+      <arguments>
+        <argument name="command_name" is_required="0" is_array="0">
+          <description>The command name</description>
+          <defaults>
+            <default>help</default>
+          </defaults>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>The output format (txt, xml, json, or md)</description>
+          <defaults>
+            <default>txt</default>
+          </defaults>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command help</description>
+        </option>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
+    <command id="list" name="list" hidden="0">
+      <usages>
+        <usage>list [--raw] [--format FORMAT] [--] [&lt;namespace&gt;]</usage>
+      </usages>
+      <description>Lists commands</description>
+      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
+ 
+   &lt;info&gt;php app/console list&lt;/info&gt;
+ 
+ You can also display the commands for a specific namespace:
+ 
+   &lt;info&gt;php app/console list test&lt;/info&gt;
+ 
+ You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
+ 
+ It's also possible to get raw list of commands (useful for embedding command runner):
+ 
+   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
+      <arguments>
+        <argument name="namespace" is_required="0" is_array="0">
+          <description>The namespace name</description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>The output format (txt, xml, json, or md)</description>
+          <defaults>
+            <default>txt</default>
+          </defaults>
+        </option>
+      </options>
+    </command>
+  </commands>
+  <namespaces>
+    <namespace id="_global">
+      <command>help</command>
+      <command>list</command>
+    </namespace>
+  </namespaces>
+</symfony>
diff --git a/lib/symfony/console/Tests/Fixtures/application_2.json b/lib/symfony/console/Tests/Fixtures/application_2.json
new file mode 100644
index 000000000..4777a60b5
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_2.json
@@ -0,0 +1,509 @@
+{
+    "application": {
+        "name": "My Symfony application",
+        "version": "v1.0"
+    },
+    "commands": [
+        {
+            "name": "help",
+            "hidden": false,
+            "usage": [
+                "help [--format FORMAT] [--raw] [--] [<command_name>]"
+            ],
+            "description": "Displays help for a command",
+            "help": "The <info>help<\/info> command displays help for a given command:\n\n  <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n  <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
+            "definition": {
+                "arguments": {
+                    "command_name": {
+                        "name": "command_name",
+                        "is_required": false,
+                        "is_array": false,
+                        "description": "The command name",
+                        "default": "help"
+                    }
+                },
+                "options": {
+                    "format": {
+                        "name": "--format",
+                        "shortcut": "",
+                        "accept_value": true,
+                        "is_value_required": true,
+                        "is_multiple": false,
+                        "description": "The output format (txt, xml, json, or md)",
+                        "default": "txt"
+                    },
+                    "raw": {
+                        "name": "--raw",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "To output raw command help",
+                        "default": false
+                    },
+                    "help": {
+                        "name": "--help",
+                        "shortcut": "-h",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this help message",
+                        "default": false
+                    },
+                    "quiet": {
+                        "name": "--quiet",
+                        "shortcut": "-q",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not output any message",
+                        "default": false
+                    },
+                    "verbose": {
+                        "name": "--verbose",
+                        "shortcut": "-v|-vv|-vvv",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug",
+                        "default": false
+                    },
+                    "version": {
+                        "name": "--version",
+                        "shortcut": "-V",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this application version",
+                        "default": false
+                    },
+                    "ansi": {
+                        "name": "--ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Force ANSI output",
+                        "default": false
+                    },
+                    "no-ansi": {
+                        "name": "--no-ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Disable ANSI output",
+                        "default": false
+                    },
+                    "no-interaction": {
+                        "name": "--no-interaction",
+                        "shortcut": "-n",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not ask any interactive question",
+                        "default": false
+                    }
+                }
+            }
+        },
+        {
+            "name": "list",
+            "hidden": false,
+            "usage": [
+                "list [--raw] [--format FORMAT] [--] [<namespace>]"
+            ],
+            "description": "Lists commands",
+            "help": "The <info>list<\/info> command lists all commands:\n\n  <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n  <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php app\/console list --raw<\/info>",
+            "definition": {
+                "arguments": {
+                    "namespace": {
+                        "name": "namespace",
+                        "is_required": false,
+                        "is_array": false,
+                        "description": "The namespace name",
+                        "default": null
+                    }
+                },
+                "options": {
+                    "raw": {
+                        "name": "--raw",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "To output raw command list",
+                        "default": false
+                    },
+                    "format": {
+                        "name": "--format",
+                        "shortcut": "",
+                        "accept_value": true,
+                        "is_value_required": true,
+                        "is_multiple": false,
+                        "description": "The output format (txt, xml, json, or md)",
+                        "default": "txt"
+                    }
+                }
+            }
+        },
+        {
+            "name": "descriptor:command1",
+            "hidden": false,
+            "usage": [
+                "descriptor:command1",
+                "alias1",
+                "alias2"
+            ],
+            "description": "command 1 description",
+            "help": "command 1 help",
+            "definition": {
+                "arguments": [],
+                "options": {
+                    "help": {
+                        "name": "--help",
+                        "shortcut": "-h",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this help message",
+                        "default": false
+                    },
+                    "quiet": {
+                        "name": "--quiet",
+                        "shortcut": "-q",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not output any message",
+                        "default": false
+                    },
+                    "verbose": {
+                        "name": "--verbose",
+                        "shortcut": "-v|-vv|-vvv",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug",
+                        "default": false
+                    },
+                    "version": {
+                        "name": "--version",
+                        "shortcut": "-V",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this application version",
+                        "default": false
+                    },
+                    "ansi": {
+                        "name": "--ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Force ANSI output",
+                        "default": false
+                    },
+                    "no-ansi": {
+                        "name": "--no-ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Disable ANSI output",
+                        "default": false
+                    },
+                    "no-interaction": {
+                        "name": "--no-interaction",
+                        "shortcut": "-n",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not ask any interactive question",
+                        "default": false
+                    }
+                }
+            }
+        },
+        {
+            "name": "descriptor:command2",
+            "hidden": false,
+            "usage": [
+                "descriptor:command2 [-o|--option_name] [--] <argument_name>",
+                "descriptor:command2 -o|--option_name <argument_name>",
+                "descriptor:command2 <argument_name>"
+            ],
+            "description": "command 2 description",
+            "help": "command 2 help",
+            "definition": {
+                "arguments": {
+                    "argument_name": {
+                        "name": "argument_name",
+                        "is_required": true,
+                        "is_array": false,
+                        "description": "",
+                        "default": null
+                    }
+                },
+                "options": {
+                    "option_name": {
+                        "name": "--option_name",
+                        "shortcut": "-o",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "",
+                        "default": false
+                    },
+                    "help": {
+                        "name": "--help",
+                        "shortcut": "-h",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this help message",
+                        "default": false
+                    },
+                    "quiet": {
+                        "name": "--quiet",
+                        "shortcut": "-q",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not output any message",
+                        "default": false
+                    },
+                    "verbose": {
+                        "name": "--verbose",
+                        "shortcut": "-v|-vv|-vvv",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug",
+                        "default": false
+                    },
+                    "version": {
+                        "name": "--version",
+                        "shortcut": "-V",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this application version",
+                        "default": false
+                    },
+                    "ansi": {
+                        "name": "--ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Force ANSI output",
+                        "default": false
+                    },
+                    "no-ansi": {
+                        "name": "--no-ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Disable ANSI output",
+                        "default": false
+                    },
+                    "no-interaction": {
+                        "name": "--no-interaction",
+                        "shortcut": "-n",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not ask any interactive question",
+                        "default": false
+                    }
+                }
+            }
+        },
+        {
+            "name": "descriptor:command3",
+            "hidden": true,
+            "usage": [
+                "descriptor:command3"
+            ],
+            "description": "command 3 description",
+            "help": "command 3 help",
+            "definition": {
+                "arguments": {},
+                "options": {
+                    "help": {
+                        "name": "--help",
+                        "shortcut": "-h",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this help message",
+                        "default": false
+                    },
+                    "quiet": {
+                        "name": "--quiet",
+                        "shortcut": "-q",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not output any message",
+                        "default": false
+                    },
+                    "verbose": {
+                        "name": "--verbose",
+                        "shortcut": "-v|-vv|-vvv",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug",
+                        "default": false
+                    },
+                    "version": {
+                        "name": "--version",
+                        "shortcut": "-V",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this application version",
+                        "default": false
+                    },
+                    "ansi": {
+                        "name": "--ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Force ANSI output",
+                        "default": false
+                    },
+                    "no-ansi": {
+                        "name": "--no-ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Disable ANSI output",
+                        "default": false
+                    },
+                    "no-interaction": {
+                        "name": "--no-interaction",
+                        "shortcut": "-n",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not ask any interactive question",
+                        "default": false
+                    }
+                }
+            }
+        },
+        {
+            "name": "descriptor:command4",
+            "hidden": false,
+            "usage": [
+                "descriptor:command4",
+                "descriptor:alias_command4",
+                "command4:descriptor"
+            ],
+            "description": null,
+            "help": "",
+            "definition": {
+                "arguments": {},
+                "options": {
+                    "help": {
+                        "name": "--help",
+                        "shortcut": "-h",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this help message",
+                        "default": false
+                    },
+                    "quiet": {
+                        "name": "--quiet",
+                        "shortcut": "-q",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not output any message",
+                        "default": false
+                    },
+                    "verbose": {
+                        "name": "--verbose",
+                        "shortcut": "-v|-vv|-vvv",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug",
+                        "default": false
+                    },
+                    "version": {
+                        "name": "--version",
+                        "shortcut": "-V",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Display this application version",
+                        "default": false
+                    },
+                    "ansi": {
+                        "name": "--ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Force ANSI output",
+                        "default": false
+                    },
+                    "no-ansi": {
+                        "name": "--no-ansi",
+                        "shortcut": "",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Disable ANSI output",
+                        "default": false
+                    },
+                    "no-interaction": {
+                        "name": "--no-interaction",
+                        "shortcut": "-n",
+                        "accept_value": false,
+                        "is_value_required": false,
+                        "is_multiple": false,
+                        "description": "Do not ask any interactive question",
+                        "default": false
+                    }
+                }
+            }
+        }
+    ],
+    "namespaces": [
+        {
+            "id": "_global",
+            "commands": [
+                "alias1",
+                "alias2",
+                "help",
+                "list"
+            ]
+        },
+        {
+            "id": "command4",
+            "commands": [
+                "command4:descriptor"
+            ]
+        },
+        {
+            "id": "descriptor",
+            "commands": [
+                "descriptor:alias_command4",
+                "descriptor:command1",
+                "descriptor:command2",
+                "descriptor:command3",
+                "descriptor:command4"
+            ]
+        }
+    ]
+}
diff --git a/lib/symfony/console/Tests/Fixtures/application_2.md b/lib/symfony/console/Tests/Fixtures/application_2.md
new file mode 100644
index 000000000..5b4896c08
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_2.md
@@ -0,0 +1,431 @@
+My Symfony application v1.0
+===========================
+
+* [`alias1`](#descriptorcommand1)
+* [`alias2`](#descriptorcommand1)
+* [`help`](#help)
+* [`list`](#list)
+
+**command4:**
+
+* [`command4:descriptor`](#descriptorcommand4)
+
+**descriptor:**
+
+* [`descriptor:alias_command4`](#descriptorcommand4)
+* [`descriptor:command1`](#descriptorcommand1)
+* [`descriptor:command2`](#descriptorcommand2)
+* [`descriptor:command4`](#descriptorcommand4)
+
+`help`
+------
+
+Displays help for a command
+
+### Usage
+
+* `help [--format FORMAT] [--raw] [--] [<command_name>]`
+
+The help command displays help for a given command:
+
+  php app/console help list
+
+You can also output the help in other formats by using the --format option:
+
+  php app/console help --format=xml list
+
+To display the list of available commands, please use the list command.
+
+### Arguments
+
+#### `command_name`
+
+The command name
+
+* Is required: no
+* Is array: no
+* Default: `'help'`
+
+### Options
+
+#### `--format`
+
+The output format (txt, xml, json, or md)
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `'txt'`
+
+#### `--raw`
+
+To output raw command help
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--help|-h`
+
+Display this help message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--quiet|-q`
+
+Do not output any message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--verbose|-v|-vv|-vvv`
+
+Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--version|-V`
+
+Display this application version
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--ansi`
+
+Force ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-ansi`
+
+Disable ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-interaction|-n`
+
+Do not ask any interactive question
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+`list`
+------
+
+Lists commands
+
+### Usage
+
+* `list [--raw] [--format FORMAT] [--] [<namespace>]`
+
+The list command lists all commands:
+
+  php app/console list
+
+You can also display the commands for a specific namespace:
+
+  php app/console list test
+
+You can also output the information in other formats by using the --format option:
+
+  php app/console list --format=xml
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  php app/console list --raw
+
+### Arguments
+
+#### `namespace`
+
+The namespace name
+
+* Is required: no
+* Is array: no
+* Default: `NULL`
+
+### Options
+
+#### `--raw`
+
+To output raw command list
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--format`
+
+The output format (txt, xml, json, or md)
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `'txt'`
+
+`descriptor:command1`
+---------------------
+
+command 1 description
+
+### Usage
+
+* `descriptor:command1`
+* `alias1`
+* `alias2`
+
+command 1 help
+
+### Options
+
+#### `--help|-h`
+
+Display this help message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--quiet|-q`
+
+Do not output any message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--verbose|-v|-vv|-vvv`
+
+Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--version|-V`
+
+Display this application version
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--ansi`
+
+Force ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-ansi`
+
+Disable ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-interaction|-n`
+
+Do not ask any interactive question
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+`descriptor:command2`
+---------------------
+
+command 2 description
+
+### Usage
+
+* `descriptor:command2 [-o|--option_name] [--] <argument_name>`
+* `descriptor:command2 -o|--option_name <argument_name>`
+* `descriptor:command2 <argument_name>`
+
+command 2 help
+
+### Arguments
+
+#### `argument_name`
+
+* Is required: yes
+* Is array: no
+* Default: `NULL`
+
+### Options
+
+#### `--option_name|-o`
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--help|-h`
+
+Display this help message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--quiet|-q`
+
+Do not output any message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--verbose|-v|-vv|-vvv`
+
+Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--version|-V`
+
+Display this application version
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--ansi`
+
+Force ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-ansi`
+
+Disable ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-interaction|-n`
+
+Do not ask any interactive question
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+`descriptor:command4`
+---------------------
+
+### Usage
+
+* `descriptor:command4`
+* `descriptor:alias_command4`
+* `command4:descriptor`
+
+
+### Options
+
+#### `--help|-h`
+
+Display this help message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--quiet|-q`
+
+Do not output any message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--verbose|-v|-vv|-vvv`
+
+Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--version|-V`
+
+Display this application version
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--ansi`
+
+Force ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-ansi`
+
+Disable ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-interaction|-n`
+
+Do not ask any interactive question
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
diff --git a/lib/symfony/console/Tests/Fixtures/application_2.txt b/lib/symfony/console/Tests/Fixtures/application_2.txt
new file mode 100644
index 000000000..d624f1946
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_2.txt
@@ -0,0 +1,21 @@
+My Symfony application <info>v1.0</info>
+
+<comment>Usage:</comment>
+  command [options] [arguments]
+
+<comment>Options:</comment>
+  <info>-h, --help</info>            Display this help message
+  <info>-q, --quiet</info>           Do not output any message
+  <info>-V, --version</info>         Display this application version
+  <info>    --ansi</info>            Force ANSI output
+  <info>    --no-ansi</info>         Disable ANSI output
+  <info>-n, --no-interaction</info>  Do not ask any interactive question
+  <info>-v|vv|vvv, --verbose</info>  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+<comment>Available commands:</comment>
+  <info>help</info>                 Displays help for a command
+  <info>list</info>                 Lists commands
+ <comment>descriptor</comment>
+  <info>descriptor:command1</info>  [alias1|alias2] command 1 description
+  <info>descriptor:command2</info>  command 2 description
+  <info>descriptor:command4</info>  [descriptor:alias_command4|command4:descriptor]
diff --git a/lib/symfony/console/Tests/Fixtures/application_2.xml b/lib/symfony/console/Tests/Fixtures/application_2.xml
new file mode 100644
index 000000000..5f0f98bd9
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_2.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<symfony name="My Symfony application" version="v1.0">
+  <commands>
+    <command id="help" name="help" hidden="0">
+      <usages>
+        <usage>help [--format FORMAT] [--raw] [--] [&lt;command_name&gt;]</usage>
+      </usages>
+      <description>Displays help for a command</description>
+      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
+ 
+   &lt;info&gt;php app/console help list&lt;/info&gt;
+ 
+ You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
+ 
+ To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
+      <arguments>
+        <argument name="command_name" is_required="0" is_array="0">
+          <description>The command name</description>
+          <defaults>
+            <default>help</default>
+          </defaults>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>The output format (txt, xml, json, or md)</description>
+          <defaults>
+            <default>txt</default>
+          </defaults>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command help</description>
+        </option>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
+    <command id="list" name="list" hidden="0">
+      <usages>
+        <usage>list [--raw] [--format FORMAT] [--] [&lt;namespace&gt;]</usage>
+      </usages>
+      <description>Lists commands</description>
+      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
+ 
+   &lt;info&gt;php app/console list&lt;/info&gt;
+ 
+ You can also display the commands for a specific namespace:
+ 
+   &lt;info&gt;php app/console list test&lt;/info&gt;
+ 
+ You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
+ 
+ It's also possible to get raw list of commands (useful for embedding command runner):
+ 
+   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
+      <arguments>
+        <argument name="namespace" is_required="0" is_array="0">
+          <description>The namespace name</description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>The output format (txt, xml, json, or md)</description>
+          <defaults>
+            <default>txt</default>
+          </defaults>
+        </option>
+      </options>
+    </command>
+    <command id="descriptor:command1" name="descriptor:command1" hidden="0">
+      <usages>
+        <usage>descriptor:command1</usage>
+        <usage>alias1</usage>
+        <usage>alias2</usage>
+      </usages>
+      <description>command 1 description</description>
+      <help>command 1 help</help>
+      <arguments/>
+      <options>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
+    <command id="descriptor:command2" name="descriptor:command2" hidden="0">
+      <usages>
+        <usage>descriptor:command2 [-o|--option_name] [--] &lt;argument_name&gt;</usage>
+        <usage>descriptor:command2 -o|--option_name &lt;argument_name&gt;</usage>
+        <usage>descriptor:command2 &lt;argument_name&gt;</usage>
+      </usages>
+      <description>command 2 description</description>
+      <help>command 2 help</help>
+      <arguments>
+        <argument name="argument_name" is_required="1" is_array="0">
+          <description></description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+          <description></description>
+        </option>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
+    <command id="descriptor:command3" name="descriptor:command3" hidden="1">
+      <usages>
+        <usage>descriptor:command3</usage>
+      </usages>
+      <description>command 3 description</description>
+      <help>command 3 help</help>
+      <arguments/>
+      <options>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
+    <command id="descriptor:command4" name="descriptor:command4" hidden="0">
+      <usages>
+        <usage>descriptor:command4</usage>
+        <usage>descriptor:alias_command4</usage>
+        <usage>command4:descriptor</usage>
+      </usages>
+      <description></description>
+      <help></help>
+      <arguments/>
+      <options>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
+  </commands>
+  <namespaces>
+    <namespace id="_global">
+      <command>alias1</command>
+      <command>alias2</command>
+      <command>help</command>
+      <command>list</command>
+    </namespace>
+    <namespace id="command4">
+      <command>command4:descriptor</command>
+    </namespace>
+    <namespace id="descriptor">
+      <command>descriptor:alias_command4</command>
+      <command>descriptor:command1</command>
+      <command>descriptor:command2</command>
+      <command>descriptor:command3</command>
+      <command>descriptor:command4</command>
+    </namespace>
+  </namespaces>
+</symfony>
diff --git a/lib/symfony/console/Tests/Fixtures/application_filtered_namespace.txt b/lib/symfony/console/Tests/Fixtures/application_filtered_namespace.txt
new file mode 100644
index 000000000..3bca27006
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_filtered_namespace.txt
@@ -0,0 +1,16 @@
+My Symfony application <info>v1.0</info>
+
+<comment>Usage:</comment>
+  command [options] [arguments]
+
+<comment>Options:</comment>
+  <info>-h, --help</info>            Display this help message
+  <info>-q, --quiet</info>           Do not output any message
+  <info>-V, --version</info>         Display this application version
+  <info>    --ansi</info>            Force ANSI output
+  <info>    --no-ansi</info>         Disable ANSI output
+  <info>-n, --no-interaction</info>  Do not ask any interactive question
+  <info>-v|vv|vvv, --verbose</info>  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+<comment>Available commands for the "command4" namespace:</comment>
+  <info>command4:descriptor</info>
diff --git a/lib/symfony/console/Tests/Fixtures/application_gethelp.txt b/lib/symfony/console/Tests/Fixtures/application_gethelp.txt
new file mode 100644
index 000000000..5a5920d0e
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_gethelp.txt
@@ -0,0 +1 @@
+Console Tool
\ No newline at end of file
diff --git a/lib/symfony/console/Tests/Fixtures/application_mbstring.md b/lib/symfony/console/Tests/Fixtures/application_mbstring.md
new file mode 100644
index 000000000..f34e5585c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_mbstring.md
@@ -0,0 +1,269 @@
+MbString åpplicätion
+====================
+
+* [`help`](#help)
+* [`list`](#list)
+
+**descriptor:**
+
+* [`descriptor:åèä`](#descriptoråèä)
+
+`help`
+------
+
+Displays help for a command
+
+### Usage
+
+* `help [--format FORMAT] [--raw] [--] [<command_name>]`
+
+The help command displays help for a given command:
+
+  php app/console help list
+
+You can also output the help in other formats by using the --format option:
+
+  php app/console help --format=xml list
+
+To display the list of available commands, please use the list command.
+
+### Arguments
+
+#### `command_name`
+
+The command name
+
+* Is required: no
+* Is array: no
+* Default: `'help'`
+
+### Options
+
+#### `--format`
+
+The output format (txt, xml, json, or md)
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `'txt'`
+
+#### `--raw`
+
+To output raw command help
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--help|-h`
+
+Display this help message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--quiet|-q`
+
+Do not output any message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--verbose|-v|-vv|-vvv`
+
+Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--version|-V`
+
+Display this application version
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--ansi`
+
+Force ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-ansi`
+
+Disable ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-interaction|-n`
+
+Do not ask any interactive question
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+`list`
+------
+
+Lists commands
+
+### Usage
+
+* `list [--raw] [--format FORMAT] [--] [<namespace>]`
+
+The list command lists all commands:
+
+  php app/console list
+
+You can also display the commands for a specific namespace:
+
+  php app/console list test
+
+You can also output the information in other formats by using the --format option:
+
+  php app/console list --format=xml
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  php app/console list --raw
+
+### Arguments
+
+#### `namespace`
+
+The namespace name
+
+* Is required: no
+* Is array: no
+* Default: `NULL`
+
+### Options
+
+#### `--raw`
+
+To output raw command list
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--format`
+
+The output format (txt, xml, json, or md)
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `'txt'`
+
+`descriptor:åèä`
+----------------
+
+command åèä description
+
+### Usage
+
+* `descriptor:åèä [-o|--option_åèä] [--] <argument_åèä>`
+* `descriptor:åèä -o|--option_name <argument_name>`
+* `descriptor:åèä <argument_name>`
+
+command åèä help
+
+### Arguments
+
+#### `argument_åèä`
+
+* Is required: yes
+* Is array: no
+* Default: `NULL`
+
+### Options
+
+#### `--option_åèä|-o`
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--help|-h`
+
+Display this help message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--quiet|-q`
+
+Do not output any message
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--verbose|-v|-vv|-vvv`
+
+Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--version|-V`
+
+Display this application version
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--ansi`
+
+Force ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-ansi`
+
+Disable ANSI output
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
+
+#### `--no-interaction|-n`
+
+Do not ask any interactive question
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
diff --git a/lib/symfony/console/Tests/Fixtures/application_mbstring.txt b/lib/symfony/console/Tests/Fixtures/application_mbstring.txt
new file mode 100644
index 000000000..b409d1881
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_mbstring.txt
@@ -0,0 +1,19 @@
+MbString åpplicätion
+
+<comment>Usage:</comment>
+  command [options] [arguments]
+
+<comment>Options:</comment>
+  <info>-h, --help</info>            Display this help message
+  <info>-q, --quiet</info>           Do not output any message
+  <info>-V, --version</info>         Display this application version
+  <info>    --ansi</info>            Force ANSI output
+  <info>    --no-ansi</info>         Disable ANSI output
+  <info>-n, --no-interaction</info>  Do not ask any interactive question
+  <info>-v|vv|vvv, --verbose</info>  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+<comment>Available commands:</comment>
+  <info>help</info>            Displays help for a command
+  <info>list</info>            Lists commands
+ <comment>descriptor</comment>
+  <info>descriptor:åèä</info>  command åèä description
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception1.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception1.txt
new file mode 100644
index 000000000..1df5bd649
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception1.txt
@@ -0,0 +1,5 @@
+
+                                 
+  Command "foo" is not defined.  
+                                 
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception2.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception2.txt
new file mode 100644
index 000000000..932063d73
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception2.txt
@@ -0,0 +1,7 @@
+
+                                      
+  The "--foo" option does not exist.  
+                                      
+
+list [--raw] [--format FORMAT] [--] [<namespace>]
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception3.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception3.txt
new file mode 100644
index 000000000..5366b84f8
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception3.txt
@@ -0,0 +1,18 @@
+
+In Foo3Command.php line 26:
+                                              
+  Third exception <fg=blue;bg=red>comment</>  
+                                              
+
+In Foo3Command.php line 23:
+                                               
+  Second exception <comment>comment</comment>  
+                                               
+
+In Foo3Command.php line 21:
+                                       
+  First exception <p>this is html</p>  
+                                       
+
+foo3:bar
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception3decorated.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception3decorated.txt
new file mode 100644
index 000000000..59937092e
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception3decorated.txt
@@ -0,0 +1,18 @@
+
+In Foo3Command.php line 26:
+                                              
+  Third exception <fg=blue;bg=red>comment</>  
+                                              
+
+In Foo3Command.php line 23:
+                                               
+  Second exception <comment>comment</comment>  
+                                               
+
+In Foo3Command.php line 21:
+                                       
+  First exception <p>this is html</p>  
+                                       
+
+foo3:bar
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception4.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception4.txt
new file mode 100644
index 000000000..548a13e56
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception4.txt
@@ -0,0 +1,6 @@
+
+                               
+  Command "foo" is not define  
+  d.                           
+                               
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth1.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth1.txt
new file mode 100644
index 000000000..4677c18e3
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth1.txt
@@ -0,0 +1,8 @@
+
+In ApplicationTest.php line %d:
+                    
+  エラーメッセージ  
+                    
+
+foo
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
new file mode 100644
index 000000000..33d326556
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
@@ -0,0 +1,8 @@
+
+In ApplicationTest.php line %d:
+                    
+  エラーメッセージ  
+                    
+
+foo
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth2.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth2.txt
new file mode 100644
index 000000000..2ee72e22c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception_doublewidth2.txt
@@ -0,0 +1,9 @@
+
+In ApplicationTest.php line %d:
+                              
+  コマンドの実行中にエラーが  
+  発生しました。              
+                              
+
+foo
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception_escapeslines.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception_escapeslines.txt
new file mode 100644
index 000000000..ff7b7b39c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception_escapeslines.txt
@@ -0,0 +1,9 @@
+
+In ApplicationTest.php line %d:
+                     
+  dont break here <  
+  info>!</info>      
+                     
+
+foo
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_renderexception_linebreaks.txt b/lib/symfony/console/Tests/Fixtures/application_renderexception_linebreaks.txt
new file mode 100644
index 000000000..0e5c4b166
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_renderexception_linebreaks.txt
@@ -0,0 +1,11 @@
+
+In ApplicationTest.php line %d:
+                                    
+  line 1 with extra spaces          
+  line 2                            
+                                    
+  line 4                            
+                                    
+
+foo
+
diff --git a/lib/symfony/console/Tests/Fixtures/application_run1.txt b/lib/symfony/console/Tests/Fixtures/application_run1.txt
new file mode 100644
index 000000000..0dc273098
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_run1.txt
@@ -0,0 +1,17 @@
+Console Tool
+
+Usage:
+  command [options] [arguments]
+
+Options:
+  -h, --help            Display this help message
+  -q, --quiet           Do not output any message
+  -V, --version         Display this application version
+      --ansi            Force ANSI output
+      --no-ansi         Disable ANSI output
+  -n, --no-interaction  Do not ask any interactive question
+  -v|vv|vvv, --verbose  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+Available commands:
+  help  Displays help for a command
+  list  Lists commands
diff --git a/lib/symfony/console/Tests/Fixtures/application_run2.txt b/lib/symfony/console/Tests/Fixtures/application_run2.txt
new file mode 100644
index 000000000..65a685d08
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_run2.txt
@@ -0,0 +1,26 @@
+Usage:
+  list [options] [--] [<namespace>]
+
+Arguments:
+  namespace            The namespace name
+
+Options:
+      --raw            To output raw command list
+      --format=FORMAT  The output format (txt, xml, json, or md) [default: "txt"]
+
+Help:
+  The list command lists all commands:
+  
+    php app/console list
+  
+  You can also display the commands for a specific namespace:
+  
+    php app/console list test
+  
+  You can also output the information in other formats by using the --format option:
+  
+    php app/console list --format=xml
+  
+  It's also possible to get raw list of commands (useful for embedding command runner):
+  
+    php app/console list --raw
diff --git a/lib/symfony/console/Tests/Fixtures/application_run3.txt b/lib/symfony/console/Tests/Fixtures/application_run3.txt
new file mode 100644
index 000000000..65a685d08
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_run3.txt
@@ -0,0 +1,26 @@
+Usage:
+  list [options] [--] [<namespace>]
+
+Arguments:
+  namespace            The namespace name
+
+Options:
+      --raw            To output raw command list
+      --format=FORMAT  The output format (txt, xml, json, or md) [default: "txt"]
+
+Help:
+  The list command lists all commands:
+  
+    php app/console list
+  
+  You can also display the commands for a specific namespace:
+  
+    php app/console list test
+  
+  You can also output the information in other formats by using the --format option:
+  
+    php app/console list --format=xml
+  
+  It's also possible to get raw list of commands (useful for embedding command runner):
+  
+    php app/console list --raw
diff --git a/lib/symfony/console/Tests/Fixtures/application_run4.txt b/lib/symfony/console/Tests/Fixtures/application_run4.txt
new file mode 100644
index 000000000..47187fc26
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/application_run4.txt
@@ -0,0 +1 @@
+Console Tool
diff --git a/lib/symfony/console/Tests/Fixtures/command_1.json b/lib/symfony/console/Tests/Fixtures/command_1.json
new file mode 100644
index 000000000..09087900c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_1.json
@@ -0,0 +1,15 @@
+{
+    "name": "descriptor:command1",
+    "hidden": false,
+    "usage": [
+        "descriptor:command1",
+        "alias1",
+        "alias2"
+    ],
+    "description": "command 1 description",
+    "help": "command 1 help",
+    "definition": {
+        "arguments": [],
+        "options": []
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/command_1.md b/lib/symfony/console/Tests/Fixtures/command_1.md
new file mode 100644
index 000000000..e9a0180b0
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_1.md
@@ -0,0 +1,12 @@
+`descriptor:command1`
+---------------------
+
+command 1 description
+
+### Usage
+
+* `descriptor:command1`
+* `alias1`
+* `alias2`
+
+command 1 help
diff --git a/lib/symfony/console/Tests/Fixtures/command_1.txt b/lib/symfony/console/Tests/Fixtures/command_1.txt
new file mode 100644
index 000000000..e5e93ee09
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_1.txt
@@ -0,0 +1,7 @@
+<comment>Usage:</comment>
+  descriptor:command1
+  alias1
+  alias2
+
+<comment>Help:</comment>
+  command 1 help
diff --git a/lib/symfony/console/Tests/Fixtures/command_1.xml b/lib/symfony/console/Tests/Fixtures/command_1.xml
new file mode 100644
index 000000000..fa0cca087
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<command id="descriptor:command1" name="descriptor:command1" hidden="0">
+  <usages>
+    <usage>descriptor:command1</usage>
+    <usage>alias1</usage>
+    <usage>alias2</usage>
+  </usages>
+  <description>command 1 description</description>
+  <help>command 1 help</help>
+  <arguments/>
+  <options/>
+</command>
diff --git a/lib/symfony/console/Tests/Fixtures/command_2.json b/lib/symfony/console/Tests/Fixtures/command_2.json
new file mode 100644
index 000000000..8a1ec0235
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_2.json
@@ -0,0 +1,33 @@
+{
+    "name": "descriptor:command2",
+    "hidden": false,
+    "usage": [
+        "descriptor:command2 [-o|--option_name] [--] <argument_name>",
+        "descriptor:command2 -o|--option_name <argument_name>",
+        "descriptor:command2 <argument_name>"
+    ],
+    "description": "command 2 description",
+    "help": "command 2 help",
+    "definition": {
+        "arguments": {
+            "argument_name": {
+                "name": "argument_name",
+                "is_required": true,
+                "is_array": false,
+                "description": "",
+                "default": null
+            }
+        },
+        "options": {
+            "option_name": {
+                "name": "--option_name",
+                "shortcut": "-o",
+                "accept_value": false,
+                "is_value_required": false,
+                "is_multiple": false,
+                "description": "",
+                "default": false
+            }
+        }
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/command_2.md b/lib/symfony/console/Tests/Fixtures/command_2.md
new file mode 100644
index 000000000..41f51f019
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_2.md
@@ -0,0 +1,29 @@
+`descriptor:command2`
+---------------------
+
+command 2 description
+
+### Usage
+
+* `descriptor:command2 [-o|--option_name] [--] <argument_name>`
+* `descriptor:command2 -o|--option_name <argument_name>`
+* `descriptor:command2 <argument_name>`
+
+command 2 help
+
+### Arguments
+
+#### `argument_name`
+
+* Is required: yes
+* Is array: no
+* Default: `NULL`
+
+### Options
+
+#### `--option_name|-o`
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
diff --git a/lib/symfony/console/Tests/Fixtures/command_2.txt b/lib/symfony/console/Tests/Fixtures/command_2.txt
new file mode 100644
index 000000000..2864c7bdc
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_2.txt
@@ -0,0 +1,13 @@
+<comment>Usage:</comment>
+  descriptor:command2 [options] [--] \<argument_name>
+  descriptor:command2 -o|--option_name \<argument_name>
+  descriptor:command2 \<argument_name>
+
+<comment>Arguments:</comment>
+  <info>argument_name</info>      
+
+<comment>Options:</comment>
+  <info>-o, --option_name</info>  
+
+<comment>Help:</comment>
+  command 2 help
diff --git a/lib/symfony/console/Tests/Fixtures/command_2.xml b/lib/symfony/console/Tests/Fixtures/command_2.xml
new file mode 100644
index 000000000..ae69e2f49
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<command id="descriptor:command2" name="descriptor:command2" hidden="0">
+  <usages>
+    <usage>descriptor:command2 [-o|--option_name] [--] &lt;argument_name&gt;</usage>
+    <usage>descriptor:command2 -o|--option_name &lt;argument_name&gt;</usage>
+    <usage>descriptor:command2 &lt;argument_name&gt;</usage>
+  </usages>
+  <description>command 2 description</description>
+  <help>command 2 help</help>
+  <arguments>
+    <argument name="argument_name" is_required="1" is_array="0">
+      <description></description>
+      <defaults/>
+    </argument>
+  </arguments>
+  <options>
+    <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+      <description></description>
+    </option>
+  </options>
+</command>
diff --git a/lib/symfony/console/Tests/Fixtures/command_mbstring.md b/lib/symfony/console/Tests/Fixtures/command_mbstring.md
new file mode 100644
index 000000000..7ef40d7b3
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_mbstring.md
@@ -0,0 +1,29 @@
+`descriptor:åèä`
+----------------
+
+command åèä description
+
+### Usage
+
+* `descriptor:åèä [-o|--option_åèä] [--] <argument_åèä>`
+* `descriptor:åèä -o|--option_name <argument_name>`
+* `descriptor:åèä <argument_name>`
+
+command åèä help
+
+### Arguments
+
+#### `argument_åèä`
+
+* Is required: yes
+* Is array: no
+* Default: `NULL`
+
+### Options
+
+#### `--option_åèä|-o`
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
diff --git a/lib/symfony/console/Tests/Fixtures/command_mbstring.txt b/lib/symfony/console/Tests/Fixtures/command_mbstring.txt
new file mode 100644
index 000000000..cde457dca
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/command_mbstring.txt
@@ -0,0 +1,13 @@
+<comment>Usage:</comment>
+  descriptor:åèä [options] [--] \<argument_åèä>
+  descriptor:åèä -o|--option_name \<argument_name>
+  descriptor:åèä \<argument_name>
+
+<comment>Arguments:</comment>
+  <info>argument_åèä</info>   
+
+<comment>Options:</comment>
+  <info>-o, --option_åèä</info>  
+
+<comment>Help:</comment>
+  command åèä help
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_1.json b/lib/symfony/console/Tests/Fixtures/input_argument_1.json
new file mode 100644
index 000000000..0ab932960
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_1.json
@@ -0,0 +1,7 @@
+{
+    "name": "argument_name",
+    "is_required": true,
+    "is_array": false,
+    "description": "",
+    "default": null
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_1.md b/lib/symfony/console/Tests/Fixtures/input_argument_1.md
new file mode 100644
index 000000000..7516cbd4c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_1.md
@@ -0,0 +1,5 @@
+#### `argument_name`
+
+* Is required: yes
+* Is array: no
+* Default: `NULL`
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_1.txt b/lib/symfony/console/Tests/Fixtures/input_argument_1.txt
new file mode 100644
index 000000000..55035183f
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_1.txt
@@ -0,0 +1 @@
+  <info>argument_name</info>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_1.xml b/lib/symfony/console/Tests/Fixtures/input_argument_1.xml
new file mode 100644
index 000000000..cb37f812c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="1" is_array="0">
+  <description></description>
+  <defaults/>
+</argument>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_2.json b/lib/symfony/console/Tests/Fixtures/input_argument_2.json
new file mode 100644
index 000000000..7450016ff
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_2.json
@@ -0,0 +1,7 @@
+{
+    "name": "argument_name",
+    "is_required": false,
+    "is_array": true,
+    "description": "argument description",
+    "default": []
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_2.md b/lib/symfony/console/Tests/Fixtures/input_argument_2.md
new file mode 100644
index 000000000..2e7e7580c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_2.md
@@ -0,0 +1,7 @@
+#### `argument_name`
+
+argument description
+
+* Is required: no
+* Is array: yes
+* Default: `array ()`
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_2.txt b/lib/symfony/console/Tests/Fixtures/input_argument_2.txt
new file mode 100644
index 000000000..e71366074
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_2.txt
@@ -0,0 +1 @@
+  <info>argument_name</info>  argument description
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_2.xml b/lib/symfony/console/Tests/Fixtures/input_argument_2.xml
new file mode 100644
index 000000000..629da5a98
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_2.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="0" is_array="1">
+  <description>argument description</description>
+  <defaults/>
+</argument>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_3.json b/lib/symfony/console/Tests/Fixtures/input_argument_3.json
new file mode 100644
index 000000000..9a83c5a54
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_3.json
@@ -0,0 +1,7 @@
+{
+    "name": "argument_name",
+    "is_required": false,
+    "is_array": false,
+    "description": "argument description",
+    "default": "default_value"
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_3.md b/lib/symfony/console/Tests/Fixtures/input_argument_3.md
new file mode 100644
index 000000000..b0dd87852
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_3.md
@@ -0,0 +1,7 @@
+#### `argument_name`
+
+argument description
+
+* Is required: no
+* Is array: no
+* Default: `'default_value'`
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_3.txt b/lib/symfony/console/Tests/Fixtures/input_argument_3.txt
new file mode 100644
index 000000000..6b76639e0
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_3.txt
@@ -0,0 +1 @@
+  <info>argument_name</info>  argument description<comment> [default: "default_value"]</comment>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_3.xml b/lib/symfony/console/Tests/Fixtures/input_argument_3.xml
new file mode 100644
index 000000000..399a5c864
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="0" is_array="0">
+  <description>argument description</description>
+  <defaults>
+    <default>default_value</default>
+  </defaults>
+</argument>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_4.json b/lib/symfony/console/Tests/Fixtures/input_argument_4.json
new file mode 100644
index 000000000..cbcb19b39
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_4.json
@@ -0,0 +1,7 @@
+{
+    "name": "argument_name",
+    "is_required": true,
+    "is_array": false,
+    "description": "multiline argument description",
+    "default": null
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_4.md b/lib/symfony/console/Tests/Fixtures/input_argument_4.md
new file mode 100644
index 000000000..b9bb7edc4
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_4.md
@@ -0,0 +1,8 @@
+#### `argument_name`
+
+multiline
+argument description
+
+* Is required: yes
+* Is array: no
+* Default: `NULL`
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_4.txt b/lib/symfony/console/Tests/Fixtures/input_argument_4.txt
new file mode 100644
index 000000000..fc7d669a1
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_4.txt
@@ -0,0 +1,2 @@
+  <info>argument_name</info>  multiline
+                 argument description
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_4.xml b/lib/symfony/console/Tests/Fixtures/input_argument_4.xml
new file mode 100644
index 000000000..5ca135ec2
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="1" is_array="0">
+  <description>multiline
+argument description</description>
+  <defaults/>
+</argument>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.json b/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.json
new file mode 100644
index 000000000..b61ecf7b8
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.json
@@ -0,0 +1,7 @@
+{
+    "name": "argument_name",
+    "is_required": false,
+    "is_array": false,
+    "description": "argument description",
+    "default": "INF"
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.md b/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.md
new file mode 100644
index 000000000..4f4d9b164
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.md
@@ -0,0 +1,7 @@
+#### `argument_name`
+
+argument description
+
+* Is required: no
+* Is array: no
+* Default: `INF`
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.txt b/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.txt
new file mode 100644
index 000000000..c32d768c6
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.txt
@@ -0,0 +1 @@
+  <info>argument_name</info>  argument description<comment> [default: INF]</comment>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.xml b/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.xml
new file mode 100644
index 000000000..d45726007
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_with_default_inf_value.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="0" is_array="0">
+  <description>argument description</description>
+  <defaults>
+    <default>INF</default>
+  </defaults>
+</argument>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_with_style.json b/lib/symfony/console/Tests/Fixtures/input_argument_with_style.json
new file mode 100644
index 000000000..933423510
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_with_style.json
@@ -0,0 +1,7 @@
+{
+    "name": "argument_name",
+    "is_required": false,
+    "is_array": false,
+    "description": "argument description",
+    "default": "<comment>style</>"
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_with_style.md b/lib/symfony/console/Tests/Fixtures/input_argument_with_style.md
new file mode 100644
index 000000000..a2be96721
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_with_style.md
@@ -0,0 +1,7 @@
+#### `argument_name`
+
+argument description
+
+* Is required: no
+* Is array: no
+* Default: `'style'`
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_with_style.txt b/lib/symfony/console/Tests/Fixtures/input_argument_with_style.txt
new file mode 100644
index 000000000..35384a6be
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_with_style.txt
@@ -0,0 +1 @@
+  <info>argument_name</info>  argument description<comment> [default: "\<comment>style\</>"]</comment>
diff --git a/lib/symfony/console/Tests/Fixtures/input_argument_with_style.xml b/lib/symfony/console/Tests/Fixtures/input_argument_with_style.xml
new file mode 100644
index 000000000..73332c796
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_argument_with_style.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="0" is_array="0">
+  <description>argument description</description>
+  <defaults>
+    <default>&lt;comment&gt;style&lt;/&gt;</default>
+  </defaults>
+</argument>
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_1.json b/lib/symfony/console/Tests/Fixtures/input_definition_1.json
new file mode 100644
index 000000000..44aa2c2e1
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_1.json
@@ -0,0 +1,4 @@
+{
+    "arguments": [],
+    "options": []
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_1.md b/lib/symfony/console/Tests/Fixtures/input_definition_1.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_1.txt b/lib/symfony/console/Tests/Fixtures/input_definition_1.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_1.xml b/lib/symfony/console/Tests/Fixtures/input_definition_1.xml
new file mode 100644
index 000000000..b5481ce12
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments/>
+  <options/>
+</definition>
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_2.json b/lib/symfony/console/Tests/Fixtures/input_definition_2.json
new file mode 100644
index 000000000..7cfd57e56
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_2.json
@@ -0,0 +1,12 @@
+{
+    "arguments": {
+        "argument_name": {
+            "name": "argument_name",
+            "is_required": true,
+            "is_array": false,
+            "description": "",
+            "default": null
+        }
+    },
+    "options": []
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_2.md b/lib/symfony/console/Tests/Fixtures/input_definition_2.md
new file mode 100644
index 000000000..ffc2bbbe8
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_2.md
@@ -0,0 +1,7 @@
+### Arguments
+
+#### `argument_name`
+
+* Is required: yes
+* Is array: no
+* Default: `NULL`
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_2.txt b/lib/symfony/console/Tests/Fixtures/input_definition_2.txt
new file mode 100644
index 000000000..73b0f308a
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_2.txt
@@ -0,0 +1,2 @@
+<comment>Arguments:</comment>
+  <info>argument_name</info>
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_2.xml b/lib/symfony/console/Tests/Fixtures/input_definition_2.xml
new file mode 100644
index 000000000..102efc148
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments>
+    <argument name="argument_name" is_required="1" is_array="0">
+      <description></description>
+      <defaults/>
+    </argument>
+  </arguments>
+  <options/>
+</definition>
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_3.json b/lib/symfony/console/Tests/Fixtures/input_definition_3.json
new file mode 100644
index 000000000..3b3cf73c5
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_3.json
@@ -0,0 +1,14 @@
+{
+    "arguments": [],
+    "options": {
+        "option_name": {
+            "name": "--option_name",
+            "shortcut": "-o",
+            "accept_value": false,
+            "is_value_required": false,
+            "is_multiple": false,
+            "description": "",
+            "default": false
+        }
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_3.md b/lib/symfony/console/Tests/Fixtures/input_definition_3.md
new file mode 100644
index 000000000..11f7cd6b7
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_3.md
@@ -0,0 +1,8 @@
+### Options
+
+#### `--option_name|-o`
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_3.txt b/lib/symfony/console/Tests/Fixtures/input_definition_3.txt
new file mode 100644
index 000000000..c02766fd3
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_3.txt
@@ -0,0 +1,2 @@
+<comment>Options:</comment>
+  <info>-o, --option_name</info>
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_3.xml b/lib/symfony/console/Tests/Fixtures/input_definition_3.xml
new file mode 100644
index 000000000..bc9515154
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments/>
+  <options>
+    <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+      <description></description>
+    </option>
+  </options>
+</definition>
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_4.json b/lib/symfony/console/Tests/Fixtures/input_definition_4.json
new file mode 100644
index 000000000..d4a51e82e
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_4.json
@@ -0,0 +1,22 @@
+{
+    "arguments": {
+        "argument_name": {
+            "name": "argument_name",
+            "is_required": true,
+            "is_array": false,
+            "description": "",
+            "default": null
+        }
+    },
+    "options": {
+        "option_name": {
+            "name": "--option_name",
+            "shortcut": "-o",
+            "accept_value": false,
+            "is_value_required": false,
+            "is_multiple": false,
+            "description": "",
+            "default": false
+        }
+    }
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_4.md b/lib/symfony/console/Tests/Fixtures/input_definition_4.md
new file mode 100644
index 000000000..c4f947f5c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_4.md
@@ -0,0 +1,16 @@
+### Arguments
+
+#### `argument_name`
+
+* Is required: yes
+* Is array: no
+* Default: `NULL`
+
+### Options
+
+#### `--option_name|-o`
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_4.txt b/lib/symfony/console/Tests/Fixtures/input_definition_4.txt
new file mode 100644
index 000000000..63aa81d2d
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_4.txt
@@ -0,0 +1,5 @@
+<comment>Arguments:</comment>
+  <info>argument_name</info>      
+
+<comment>Options:</comment>
+  <info>-o, --option_name</info>
diff --git a/lib/symfony/console/Tests/Fixtures/input_definition_4.xml b/lib/symfony/console/Tests/Fixtures/input_definition_4.xml
new file mode 100644
index 000000000..cffceecef
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_definition_4.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments>
+    <argument name="argument_name" is_required="1" is_array="0">
+      <description></description>
+      <defaults/>
+    </argument>
+  </arguments>
+  <options>
+    <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+      <description></description>
+    </option>
+  </options>
+</definition>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_1.json b/lib/symfony/console/Tests/Fixtures/input_option_1.json
new file mode 100644
index 000000000..f86bf9671
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_1.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": false,
+    "is_value_required": false,
+    "is_multiple": false,
+    "description": "",
+    "default": false
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_1.md b/lib/symfony/console/Tests/Fixtures/input_option_1.md
new file mode 100644
index 000000000..c544a4e60
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_1.md
@@ -0,0 +1,6 @@
+#### `--option_name|-o`
+
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Default: `false`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_1.txt b/lib/symfony/console/Tests/Fixtures/input_option_1.txt
new file mode 100644
index 000000000..3a5e4eede
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_1.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name</info>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_1.xml b/lib/symfony/console/Tests/Fixtures/input_option_1.xml
new file mode 100644
index 000000000..8a64ea652
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_1.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+  <description></description>
+</option>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_2.json b/lib/symfony/console/Tests/Fixtures/input_option_2.json
new file mode 100644
index 000000000..32dbab21a
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_2.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": false,
+    "is_multiple": false,
+    "description": "option description",
+    "default": "default_value"
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_2.md b/lib/symfony/console/Tests/Fixtures/input_option_2.md
new file mode 100644
index 000000000..293e61795
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_2.md
@@ -0,0 +1,8 @@
+#### `--option_name|-o`
+
+option description
+
+* Accept value: yes
+* Is value required: no
+* Is multiple: no
+* Default: `'default_value'`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_2.txt b/lib/symfony/console/Tests/Fixtures/input_option_2.txt
new file mode 100644
index 000000000..1009eff16
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_2.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name[=OPTION_NAME]</info>  option description<comment> [default: "default_value"]</comment>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_2.xml b/lib/symfony/console/Tests/Fixtures/input_option_2.xml
new file mode 100644
index 000000000..4afac5b04
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="0" is_multiple="0">
+  <description>option description</description>
+  <defaults>
+    <default>default_value</default>
+  </defaults>
+</option>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_3.json b/lib/symfony/console/Tests/Fixtures/input_option_3.json
new file mode 100644
index 000000000..6d55a6efe
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_3.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": true,
+    "is_multiple": false,
+    "description": "option description",
+    "default": null
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_3.md b/lib/symfony/console/Tests/Fixtures/input_option_3.md
new file mode 100644
index 000000000..7e89d697c
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_3.md
@@ -0,0 +1,8 @@
+#### `--option_name|-o`
+
+option description
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `NULL`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_3.txt b/lib/symfony/console/Tests/Fixtures/input_option_3.txt
new file mode 100644
index 000000000..947bb6527
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_3.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name=OPTION_NAME</info>  option description
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_3.xml b/lib/symfony/console/Tests/Fixtures/input_option_3.xml
new file mode 100644
index 000000000..dcc0631cf
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_3.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="1" is_multiple="0">
+  <description>option description</description>
+  <defaults/>
+</option>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_4.json b/lib/symfony/console/Tests/Fixtures/input_option_4.json
new file mode 100644
index 000000000..788a8ed43
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_4.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": false,
+    "is_multiple": true,
+    "description": "option description",
+    "default": []
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_4.md b/lib/symfony/console/Tests/Fixtures/input_option_4.md
new file mode 100644
index 000000000..7eb2d2ae3
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_4.md
@@ -0,0 +1,8 @@
+#### `--option_name|-o`
+
+option description
+
+* Accept value: yes
+* Is value required: no
+* Is multiple: yes
+* Default: `array ()`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_4.txt b/lib/symfony/console/Tests/Fixtures/input_option_4.txt
new file mode 100644
index 000000000..27edf77b4
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_4.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name[=OPTION_NAME]</info>  option description<comment> (multiple values allowed)</comment>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_4.xml b/lib/symfony/console/Tests/Fixtures/input_option_4.xml
new file mode 100644
index 000000000..5e2418b14
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_4.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="0" is_multiple="1">
+  <description>option description</description>
+  <defaults/>
+</option>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_5.json b/lib/symfony/console/Tests/Fixtures/input_option_5.json
new file mode 100644
index 000000000..9f34d8321
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_5.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": true,
+    "is_multiple": false,
+    "description": "multiline option description",
+    "default": null
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_5.md b/lib/symfony/console/Tests/Fixtures/input_option_5.md
new file mode 100644
index 000000000..72ca43914
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_5.md
@@ -0,0 +1,9 @@
+#### `--option_name|-o`
+
+multiline
+option description
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `NULL`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_5.txt b/lib/symfony/console/Tests/Fixtures/input_option_5.txt
new file mode 100644
index 000000000..9563b4cab
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_5.txt
@@ -0,0 +1,2 @@
+  <info>-o, --option_name=OPTION_NAME</info>  multiline
+                                 option description
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_5.xml b/lib/symfony/console/Tests/Fixtures/input_option_5.xml
new file mode 100644
index 000000000..90040ccd0
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_5.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="1" is_multiple="0">
+  <description>multiline
+option description</description>
+  <defaults/>
+</option>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_6.json b/lib/symfony/console/Tests/Fixtures/input_option_6.json
new file mode 100644
index 000000000..0638de03e
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_6.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o|-O",
+    "accept_value": true,
+    "is_value_required": true,
+    "is_multiple": false,
+    "description": "option with multiple shortcuts",
+    "default": null
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_6.md b/lib/symfony/console/Tests/Fixtures/input_option_6.md
new file mode 100644
index 000000000..87acd8b99
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_6.md
@@ -0,0 +1,8 @@
+#### `--option_name|-o|-O`
+
+option with multiple shortcuts
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `NULL`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_6.txt b/lib/symfony/console/Tests/Fixtures/input_option_6.txt
new file mode 100644
index 000000000..0e6c9759b
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_6.txt
@@ -0,0 +1 @@
+  <info>-o|O, --option_name=OPTION_NAME</info>  option with multiple shortcuts
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_6.xml b/lib/symfony/console/Tests/Fixtures/input_option_6.xml
new file mode 100644
index 000000000..06126a2f5
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_6.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" shortcuts="-o|-O" accept_value="1" is_value_required="1" is_multiple="0">
+  <description>option with multiple shortcuts</description>
+  <defaults/>
+</option>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.json b/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.json
new file mode 100644
index 000000000..7c96ad304
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": false,
+    "is_multiple": false,
+    "description": "option description",
+    "default": "INF"
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.md b/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.md
new file mode 100644
index 000000000..c27e30a0a
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.md
@@ -0,0 +1,8 @@
+#### `--option_name|-o`
+
+option description
+
+* Accept value: yes
+* Is value required: no
+* Is multiple: no
+* Default: `INF`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.txt b/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.txt
new file mode 100644
index 000000000..d467dcf42
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name[=OPTION_NAME]</info>  option description<comment> [default: INF]</comment>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.xml b/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.xml
new file mode 100644
index 000000000..5d1d21753
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_default_inf_value.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="0" is_multiple="0">
+  <description>option description</description>
+  <defaults>
+    <default>INF</default>
+  </defaults>
+</option>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_style.json b/lib/symfony/console/Tests/Fixtures/input_option_with_style.json
new file mode 100644
index 000000000..df328bf82
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_style.json
@@ -0,0 +1,9 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": true,
+    "is_multiple": false,
+    "description": "option description",
+    "default": "<comment>style</>"
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_style.md b/lib/symfony/console/Tests/Fixtures/input_option_with_style.md
new file mode 100644
index 000000000..e07a5643a
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_style.md
@@ -0,0 +1,8 @@
+#### `--option_name|-o`
+
+option description
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Default: `'style'`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_style.txt b/lib/symfony/console/Tests/Fixtures/input_option_with_style.txt
new file mode 100644
index 000000000..880a53518
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_style.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name=OPTION_NAME</info>  option description<comment> [default: "\<comment>style\</>"]</comment>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_style.xml b/lib/symfony/console/Tests/Fixtures/input_option_with_style.xml
new file mode 100644
index 000000000..764b9e652
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_style.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="1" is_multiple="0">
+  <description>option description</description>
+  <defaults>
+    <default>&lt;comment&gt;style&lt;/&gt;</default>
+  </defaults>
+</option>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.json b/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.json
new file mode 100644
index 000000000..b1754550b
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.json
@@ -0,0 +1,12 @@
+{
+    "name": "--option_name",
+    "shortcut": "-o",
+    "accept_value": true,
+    "is_value_required": true,
+    "is_multiple": true,
+    "description": "option description",
+    "default": [
+        "<comment>Hello</comment>",
+        "<info>world</info>"
+    ]
+}
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.md b/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.md
new file mode 100644
index 000000000..16a045bcf
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.md
@@ -0,0 +1,8 @@
+#### `--option_name|-o`
+
+option description
+
+* Accept value: yes
+* Is value required: yes
+* Is multiple: yes
+* Default: `array (  0 => 'Hello',  1 => 'world',)`
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.txt b/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.txt
new file mode 100644
index 000000000..265c18c5a
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.txt
@@ -0,0 +1 @@
+  <info>-o, --option_name=OPTION_NAME</info>  option description<comment> [default: ["\<comment>Hello\</comment>","\<info>world\</info>"]]</comment><comment> (multiple values allowed)</comment>
diff --git a/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.xml b/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.xml
new file mode 100644
index 000000000..09dc86583
--- /dev/null
+++ b/lib/symfony/console/Tests/Fixtures/input_option_with_style_array.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="1" is_multiple="1">
+  <description>option description</description>
+  <defaults>
+    <default>&lt;comment&gt;Hello&lt;/comment&gt;</default>
+    <default>&lt;info&gt;world&lt;/info&gt;</default>
+  </defaults>
+</option>
diff --git a/lib/symfony/console/Tests/Formatter/OutputFormatterStyleStackTest.php b/lib/symfony/console/Tests/Formatter/OutputFormatterStyleStackTest.php
new file mode 100644
index 000000000..d3020432e
--- /dev/null
+++ b/lib/symfony/console/Tests/Formatter/OutputFormatterStyleStackTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Formatter;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Formatter\OutputFormatterStyleStack;
+
+class OutputFormatterStyleStackTest extends TestCase
+{
+    public function testPush()
+    {
+        $stack = new OutputFormatterStyleStack();
+        $stack->push($s1 = new OutputFormatterStyle('white', 'black'));
+        $stack->push($s2 = new OutputFormatterStyle('yellow', 'blue'));
+
+        $this->assertEquals($s2, $stack->getCurrent());
+
+        $stack->push($s3 = new OutputFormatterStyle('green', 'red'));
+
+        $this->assertEquals($s3, $stack->getCurrent());
+    }
+
+    public function testPop()
+    {
+        $stack = new OutputFormatterStyleStack();
+        $stack->push($s1 = new OutputFormatterStyle('white', 'black'));
+        $stack->push($s2 = new OutputFormatterStyle('yellow', 'blue'));
+
+        $this->assertEquals($s2, $stack->pop());
+        $this->assertEquals($s1, $stack->pop());
+    }
+
+    public function testPopEmpty()
+    {
+        $stack = new OutputFormatterStyleStack();
+        $style = new OutputFormatterStyle();
+
+        $this->assertEquals($style, $stack->pop());
+    }
+
+    public function testPopNotLast()
+    {
+        $stack = new OutputFormatterStyleStack();
+        $stack->push($s1 = new OutputFormatterStyle('white', 'black'));
+        $stack->push($s2 = new OutputFormatterStyle('yellow', 'blue'));
+        $stack->push($s3 = new OutputFormatterStyle('green', 'red'));
+
+        $this->assertEquals($s2, $stack->pop($s2));
+        $this->assertEquals($s1, $stack->pop());
+    }
+
+    public function testInvalidPop()
+    {
+        $this->expectException('InvalidArgumentException');
+        $stack = new OutputFormatterStyleStack();
+        $stack->push(new OutputFormatterStyle('white', 'black'));
+        $stack->pop(new OutputFormatterStyle('yellow', 'blue'));
+    }
+}
diff --git a/lib/symfony/console/Tests/Formatter/OutputFormatterStyleTest.php b/lib/symfony/console/Tests/Formatter/OutputFormatterStyleTest.php
new file mode 100644
index 000000000..4fe79805c
--- /dev/null
+++ b/lib/symfony/console/Tests/Formatter/OutputFormatterStyleTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Formatter;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+
+class OutputFormatterStyleTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $style = new OutputFormatterStyle('green', 'black', ['bold', 'underscore']);
+        $this->assertEquals("\033[32;40;1;4mfoo\033[39;49;22;24m", $style->apply('foo'));
+
+        $style = new OutputFormatterStyle('red', null, ['blink']);
+        $this->assertEquals("\033[31;5mfoo\033[39;25m", $style->apply('foo'));
+
+        $style = new OutputFormatterStyle(null, 'white');
+        $this->assertEquals("\033[47mfoo\033[49m", $style->apply('foo'));
+    }
+
+    public function testForeground()
+    {
+        $style = new OutputFormatterStyle();
+
+        $style->setForeground('black');
+        $this->assertEquals("\033[30mfoo\033[39m", $style->apply('foo'));
+
+        $style->setForeground('blue');
+        $this->assertEquals("\033[34mfoo\033[39m", $style->apply('foo'));
+
+        $style->setForeground('default');
+        $this->assertEquals("\033[39mfoo\033[39m", $style->apply('foo'));
+
+        $this->expectException('InvalidArgumentException');
+        $style->setForeground('undefined-color');
+    }
+
+    public function testBackground()
+    {
+        $style = new OutputFormatterStyle();
+
+        $style->setBackground('black');
+        $this->assertEquals("\033[40mfoo\033[49m", $style->apply('foo'));
+
+        $style->setBackground('yellow');
+        $this->assertEquals("\033[43mfoo\033[49m", $style->apply('foo'));
+
+        $style->setBackground('default');
+        $this->assertEquals("\033[49mfoo\033[49m", $style->apply('foo'));
+
+        $this->expectException('InvalidArgumentException');
+        $style->setBackground('undefined-color');
+    }
+
+    public function testOptions()
+    {
+        $style = new OutputFormatterStyle();
+
+        $style->setOptions(['reverse', 'conceal']);
+        $this->assertEquals("\033[7;8mfoo\033[27;28m", $style->apply('foo'));
+
+        $style->setOption('bold');
+        $this->assertEquals("\033[7;8;1mfoo\033[27;28;22m", $style->apply('foo'));
+
+        $style->unsetOption('reverse');
+        $this->assertEquals("\033[8;1mfoo\033[28;22m", $style->apply('foo'));
+
+        $style->setOption('bold');
+        $this->assertEquals("\033[8;1mfoo\033[28;22m", $style->apply('foo'));
+
+        $style->setOptions(['bold']);
+        $this->assertEquals("\033[1mfoo\033[22m", $style->apply('foo'));
+
+        try {
+            $style->setOption('foo');
+            $this->fail('->setOption() throws an \InvalidArgumentException when the option does not exist in the available options');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->setOption() throws an \InvalidArgumentException when the option does not exist in the available options');
+            $this->assertStringContainsString('Invalid option specified: "foo"', $e->getMessage(), '->setOption() throws an \InvalidArgumentException when the option does not exist in the available options');
+        }
+
+        try {
+            $style->unsetOption('foo');
+            $this->fail('->unsetOption() throws an \InvalidArgumentException when the option does not exist in the available options');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->unsetOption() throws an \InvalidArgumentException when the option does not exist in the available options');
+            $this->assertStringContainsString('Invalid option specified: "foo"', $e->getMessage(), '->unsetOption() throws an \InvalidArgumentException when the option does not exist in the available options');
+        }
+    }
+}
diff --git a/lib/symfony/console/Tests/Formatter/OutputFormatterTest.php b/lib/symfony/console/Tests/Formatter/OutputFormatterTest.php
new file mode 100644
index 000000000..c5c2daed2
--- /dev/null
+++ b/lib/symfony/console/Tests/Formatter/OutputFormatterTest.php
@@ -0,0 +1,344 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Formatter;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+
+class OutputFormatterTest extends TestCase
+{
+    public function testEmptyTag()
+    {
+        $formatter = new OutputFormatter(true);
+        $this->assertEquals('foo<>bar', $formatter->format('foo<>bar'));
+    }
+
+    public function testLGCharEscaping()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals('foo<bar', $formatter->format('foo\\<bar'));
+        $this->assertEquals('foo << bar', $formatter->format('foo << bar'));
+        $this->assertEquals('foo << bar \\', $formatter->format('foo << bar \\'));
+        $this->assertEquals("foo << \033[32mbar \\ baz\033[39m \\", $formatter->format('foo << <info>bar \\ baz</info> \\'));
+        $this->assertEquals('<info>some info</info>', $formatter->format('\\<info>some info\\</info>'));
+        $this->assertEquals('\\<info>some info\\</info>', OutputFormatter::escape('<info>some info</info>'));
+
+        $this->assertEquals(
+            "\033[33mSymfony\\Component\\Console does work very well!\033[39m",
+            $formatter->format('<comment>Symfony\Component\Console does work very well!</comment>')
+        );
+    }
+
+    public function testBundledStyles()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertTrue($formatter->hasStyle('error'));
+        $this->assertTrue($formatter->hasStyle('info'));
+        $this->assertTrue($formatter->hasStyle('comment'));
+        $this->assertTrue($formatter->hasStyle('question'));
+
+        $this->assertEquals(
+            "\033[37;41msome error\033[39;49m",
+            $formatter->format('<error>some error</error>')
+        );
+        $this->assertEquals(
+            "\033[32msome info\033[39m",
+            $formatter->format('<info>some info</info>')
+        );
+        $this->assertEquals(
+            "\033[33msome comment\033[39m",
+            $formatter->format('<comment>some comment</comment>')
+        );
+        $this->assertEquals(
+            "\033[30;46msome question\033[39;49m",
+            $formatter->format('<question>some question</question>')
+        );
+    }
+
+    public function testNestedStyles()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals(
+            "\033[37;41msome \033[39;49m\033[32msome info\033[39m\033[37;41m error\033[39;49m",
+            $formatter->format('<error>some <info>some info</info> error</error>')
+        );
+    }
+
+    public function testAdjacentStyles()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals(
+            "\033[37;41msome error\033[39;49m\033[32msome info\033[39m",
+            $formatter->format('<error>some error</error><info>some info</info>')
+        );
+    }
+
+    public function testStyleMatchingNotGreedy()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals(
+            "(\033[32m>=2.0,<2.3\033[39m)",
+            $formatter->format('(<info>>=2.0,<2.3</info>)')
+        );
+    }
+
+    public function testStyleEscaping()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals(
+            "(\033[32mz>=2.0,<<<a2.3\\\033[39m)",
+            $formatter->format('(<info>'.$formatter->escape('z>=2.0,<\\<<a2.3\\').'</info>)')
+        );
+
+        $this->assertEquals(
+            "\033[32m<error>some error</error>\033[39m",
+            $formatter->format('<info>'.$formatter->escape('<error>some error</error>').'</info>')
+        );
+    }
+
+    public function testDeepNestedStyles()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals(
+            "\033[37;41merror\033[39;49m\033[32minfo\033[39m\033[33mcomment\033[39m\033[37;41merror\033[39;49m",
+            $formatter->format('<error>error<info>info<comment>comment</info>error</error>')
+        );
+    }
+
+    public function testNewStyle()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $style = new OutputFormatterStyle('blue', 'white');
+        $formatter->setStyle('test', $style);
+
+        $this->assertEquals($style, $formatter->getStyle('test'));
+        $this->assertNotEquals($style, $formatter->getStyle('info'));
+
+        $style = new OutputFormatterStyle('blue', 'white');
+        $formatter->setStyle('b', $style);
+
+        $this->assertEquals("\033[34;47msome \033[39;49m\033[34;47mcustom\033[39;49m\033[34;47m msg\033[39;49m", $formatter->format('<test>some <b>custom</b> msg</test>'));
+    }
+
+    public function testRedefineStyle()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $style = new OutputFormatterStyle('blue', 'white');
+        $formatter->setStyle('info', $style);
+
+        $this->assertEquals("\033[34;47msome custom msg\033[39;49m", $formatter->format('<info>some custom msg</info>'));
+    }
+
+    public function testInlineStyle()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals("\033[34;41msome text\033[39;49m", $formatter->format('<fg=blue;bg=red>some text</>'));
+        $this->assertEquals("\033[34;41msome text\033[39;49m", $formatter->format('<fg=blue;bg=red>some text</fg=blue;bg=red>'));
+    }
+
+    /**
+     * @param string      $tag
+     * @param string|null $expected
+     * @param string|null $input
+     *
+     * @dataProvider provideInlineStyleOptionsCases
+     */
+    public function testInlineStyleOptions($tag, $expected = null, $input = null)
+    {
+        $styleString = substr($tag, 1, -1);
+        $formatter = new OutputFormatter(true);
+        $method = new \ReflectionMethod($formatter, 'createStyleFromString');
+        $method->setAccessible(true);
+        $result = $method->invoke($formatter, $styleString);
+        if (null === $expected) {
+            $this->assertFalse($result);
+            $expected = $tag.$input.'</'.$styleString.'>';
+            $this->assertSame($expected, $formatter->format($expected));
+        } else {
+            /* @var OutputFormatterStyle $result */
+            $this->assertInstanceOf(OutputFormatterStyle::class, $result);
+            $this->assertSame($expected, $formatter->format($tag.$input.'</>'));
+            $this->assertSame($expected, $formatter->format($tag.$input.'</'.$styleString.'>'));
+        }
+    }
+
+    public function provideInlineStyleOptionsCases()
+    {
+        return [
+            ['<unknown=_unknown_>'],
+            ['<unknown=_unknown_;a=1;b>'],
+            ['<fg=green;>', "\033[32m[test]\033[39m", '[test]'],
+            ['<fg=green;bg=blue;>', "\033[32;44ma\033[39;49m", 'a'],
+            ['<fg=green;options=bold>', "\033[32;1mb\033[39;22m", 'b'],
+            ['<fg=green;options=reverse;>', "\033[32;7m<a>\033[39;27m", '<a>'],
+            ['<fg=green;options=bold,underscore>', "\033[32;1;4mz\033[39;22;24m", 'z'],
+            ['<fg=green;options=bold,underscore,reverse;>', "\033[32;1;4;7md\033[39;22;24;27m", 'd'],
+        ];
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider provideInlineStyleTagsWithUnknownOptions
+     * @expectedDeprecation Unknown style options are deprecated since Symfony 3.2 and will be removed in 4.0. Exception "Invalid option specified: "%s". Expected one of (bold, underscore, blink, reverse, conceal)".
+     */
+    public function testInlineStyleOptionsUnknownAreDeprecated($tag, $option)
+    {
+        $formatter = new OutputFormatter(true);
+        $formatter->format($tag);
+    }
+
+    public function provideInlineStyleTagsWithUnknownOptions()
+    {
+        return [
+            ['<options=abc;>', 'abc'],
+            ['<options=abc,def;>', 'abc'],
+            ['<fg=green;options=xyz;>', 'xyz'],
+            ['<fg=green;options=efg,abc>', 'efg'],
+        ];
+    }
+
+    public function testNonStyleTag()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals("\033[32msome \033[39m\033[32m<tag>\033[39m\033[32m \033[39m\033[32m<setting=value>\033[39m\033[32m styled \033[39m\033[32m<p>\033[39m\033[32msingle-char tag\033[39m\033[32m</p>\033[39m", $formatter->format('<info>some <tag> <setting=value> styled <p>single-char tag</p></info>'));
+    }
+
+    public function testFormatLongString()
+    {
+        $formatter = new OutputFormatter(true);
+        $long = str_repeat('\\', 14000);
+        $this->assertEquals("\033[37;41msome error\033[39;49m".$long, $formatter->format('<error>some error</error>'.$long));
+    }
+
+    public function testFormatToStringObject()
+    {
+        $formatter = new OutputFormatter(false);
+        $this->assertEquals(
+            'some info', $formatter->format(new TableCell())
+        );
+    }
+
+    public function testNotDecoratedFormatter()
+    {
+        $formatter = new OutputFormatter(false);
+
+        $this->assertTrue($formatter->hasStyle('error'));
+        $this->assertTrue($formatter->hasStyle('info'));
+        $this->assertTrue($formatter->hasStyle('comment'));
+        $this->assertTrue($formatter->hasStyle('question'));
+
+        $this->assertEquals(
+            'some error', $formatter->format('<error>some error</error>')
+        );
+        $this->assertEquals(
+            'some info', $formatter->format('<info>some info</info>')
+        );
+        $this->assertEquals(
+            'some comment', $formatter->format('<comment>some comment</comment>')
+        );
+        $this->assertEquals(
+            'some question', $formatter->format('<question>some question</question>')
+        );
+        $this->assertEquals(
+            'some text with inline style', $formatter->format('<fg=red>some text with inline style</>')
+        );
+
+        $formatter->setDecorated(true);
+
+        $this->assertEquals(
+            "\033[37;41msome error\033[39;49m", $formatter->format('<error>some error</error>')
+        );
+        $this->assertEquals(
+            "\033[32msome info\033[39m", $formatter->format('<info>some info</info>')
+        );
+        $this->assertEquals(
+            "\033[33msome comment\033[39m", $formatter->format('<comment>some comment</comment>')
+        );
+        $this->assertEquals(
+            "\033[30;46msome question\033[39;49m", $formatter->format('<question>some question</question>')
+        );
+        $this->assertEquals(
+            "\033[31msome text with inline style\033[39m", $formatter->format('<fg=red>some text with inline style</>')
+        );
+    }
+
+    public function testContentWithLineBreaks()
+    {
+        $formatter = new OutputFormatter(true);
+
+        $this->assertEquals(<<<EOF
+\033[32m
+some text\033[39m
+EOF
+            , $formatter->format(<<<'EOF'
+<info>
+some text</info>
+EOF
+        ));
+
+        $this->assertEquals(<<<EOF
+\033[32msome text
+\033[39m
+EOF
+            , $formatter->format(<<<'EOF'
+<info>some text
+</info>
+EOF
+        ));
+
+        $this->assertEquals(<<<EOF
+\033[32m
+some text
+\033[39m
+EOF
+            , $formatter->format(<<<'EOF'
+<info>
+some text
+</info>
+EOF
+        ));
+
+        $this->assertEquals(<<<EOF
+\033[32m
+some text
+more text
+\033[39m
+EOF
+            , $formatter->format(<<<'EOF'
+<info>
+some text
+more text
+</info>
+EOF
+        ));
+    }
+}
+
+class TableCell
+{
+    public function __toString()
+    {
+        return '<info>some info</info>';
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/AbstractQuestionHelperTest.php b/lib/symfony/console/Tests/Helper/AbstractQuestionHelperTest.php
new file mode 100644
index 000000000..f12566ded
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/AbstractQuestionHelperTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\StreamableInputInterface;
+
+abstract class AbstractQuestionHelperTest extends TestCase
+{
+    protected function createStreamableInputInterfaceMock($stream = null, $interactive = true)
+    {
+        $mock = $this->getMockBuilder(StreamableInputInterface::class)->getMock();
+        $mock->expects($this->any())
+            ->method('isInteractive')
+            ->willReturn($interactive);
+
+        if ($stream) {
+            $mock->expects($this->any())
+                ->method('getStream')
+                ->willReturn($stream);
+        }
+
+        return $mock;
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/FormatterHelperTest.php b/lib/symfony/console/Tests/Helper/FormatterHelperTest.php
new file mode 100644
index 000000000..934e11ac1
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/FormatterHelperTest.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\FormatterHelper;
+
+class FormatterHelperTest extends TestCase
+{
+    public function testFormatSection()
+    {
+        $formatter = new FormatterHelper();
+
+        $this->assertEquals(
+            '<info>[cli]</info> Some text to display',
+            $formatter->formatSection('cli', 'Some text to display'),
+            '::formatSection() formats a message in a section'
+        );
+    }
+
+    public function testFormatBlock()
+    {
+        $formatter = new FormatterHelper();
+
+        $this->assertEquals(
+            '<error> Some text to display </error>',
+            $formatter->formatBlock('Some text to display', 'error'),
+            '::formatBlock() formats a message in a block'
+        );
+
+        $this->assertEquals(
+            '<error> Some text to display </error>'."\n".
+            '<error> foo bar              </error>',
+            $formatter->formatBlock(['Some text to display', 'foo bar'], 'error'),
+            '::formatBlock() formats a message in a block'
+        );
+
+        $this->assertEquals(
+            '<error>                        </error>'."\n".
+            '<error>  Some text to display  </error>'."\n".
+            '<error>                        </error>',
+            $formatter->formatBlock('Some text to display', 'error', true),
+            '::formatBlock() formats a message in a block'
+        );
+    }
+
+    public function testFormatBlockWithDiacriticLetters()
+    {
+        $formatter = new FormatterHelper();
+
+        $this->assertEquals(
+            '<error>                       </error>'."\n".
+            '<error>  Du texte à afficher  </error>'."\n".
+            '<error>                       </error>',
+            $formatter->formatBlock('Du texte à afficher', 'error', true),
+            '::formatBlock() formats a message in a block'
+        );
+    }
+
+    public function testFormatBlockWithDoubleWidthDiacriticLetters()
+    {
+        $formatter = new FormatterHelper();
+        $this->assertEquals(
+            '<error>                    </error>'."\n".
+            '<error>  表示するテキスト  </error>'."\n".
+            '<error>                    </error>',
+            $formatter->formatBlock('表示するテキスト', 'error', true),
+            '::formatBlock() formats a message in a block'
+        );
+    }
+
+    public function testFormatBlockLGEscaping()
+    {
+        $formatter = new FormatterHelper();
+
+        $this->assertEquals(
+            '<error>                            </error>'."\n".
+            '<error>  \<info>some info\</info>  </error>'."\n".
+            '<error>                            </error>',
+            $formatter->formatBlock('<info>some info</info>', 'error', true),
+            '::formatBlock() escapes \'<\' chars'
+        );
+    }
+
+    public function testTruncatingWithShorterLengthThanMessageWithSuffix()
+    {
+        $formatter = new FormatterHelper();
+        $message = 'testing truncate';
+
+        $this->assertSame('test...', $formatter->truncate($message, 4));
+        $this->assertSame('testing truncat...', $formatter->truncate($message, 15));
+        $this->assertSame('testing truncate...', $formatter->truncate($message, 16));
+        $this->assertSame('zażółć gęślą...', $formatter->truncate('zażółć gęślą jaźń', 12));
+    }
+
+    public function testTruncatingMessageWithCustomSuffix()
+    {
+        $formatter = new FormatterHelper();
+        $message = 'testing truncate';
+
+        $this->assertSame('test!', $formatter->truncate($message, 4, '!'));
+    }
+
+    public function testTruncatingWithLongerLengthThanMessageWithSuffix()
+    {
+        $formatter = new FormatterHelper();
+        $message = 'test';
+
+        $this->assertSame($message, $formatter->truncate($message, 10));
+    }
+
+    public function testTruncatingWithNegativeLength()
+    {
+        $formatter = new FormatterHelper();
+        $message = 'testing truncate';
+
+        $this->assertSame('testing tru...', $formatter->truncate($message, -5));
+        $this->assertSame('...', $formatter->truncate($message, -100));
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/HelperSetTest.php b/lib/symfony/console/Tests/Helper/HelperSetTest.php
new file mode 100644
index 000000000..d608f7bfd
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/HelperSetTest.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\HelperSet;
+
+class HelperSetTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $mock_helper = $this->getGenericMockHelper('fake_helper');
+        $helperset = new HelperSet(['fake_helper_alias' => $mock_helper]);
+
+        $this->assertEquals($mock_helper, $helperset->get('fake_helper_alias'), '__construct sets given helper to helpers');
+        $this->assertTrue($helperset->has('fake_helper_alias'), '__construct sets helper alias for given helper');
+    }
+
+    public function testSet()
+    {
+        $helperset = new HelperSet();
+        $helperset->set($this->getGenericMockHelper('fake_helper', $helperset));
+        $this->assertTrue($helperset->has('fake_helper'), '->set() adds helper to helpers');
+
+        $helperset = new HelperSet();
+        $helperset->set($this->getGenericMockHelper('fake_helper_01', $helperset));
+        $helperset->set($this->getGenericMockHelper('fake_helper_02', $helperset));
+        $this->assertTrue($helperset->has('fake_helper_01'), '->set() will set multiple helpers on consecutive calls');
+        $this->assertTrue($helperset->has('fake_helper_02'), '->set() will set multiple helpers on consecutive calls');
+
+        $helperset = new HelperSet();
+        $helperset->set($this->getGenericMockHelper('fake_helper', $helperset), 'fake_helper_alias');
+        $this->assertTrue($helperset->has('fake_helper'), '->set() adds helper alias when set');
+        $this->assertTrue($helperset->has('fake_helper_alias'), '->set() adds helper alias when set');
+    }
+
+    public function testHas()
+    {
+        $helperset = new HelperSet(['fake_helper_alias' => $this->getGenericMockHelper('fake_helper')]);
+        $this->assertTrue($helperset->has('fake_helper'), '->has() finds set helper');
+        $this->assertTrue($helperset->has('fake_helper_alias'), '->has() finds set helper by alias');
+    }
+
+    public function testGet()
+    {
+        $helper_01 = $this->getGenericMockHelper('fake_helper_01');
+        $helper_02 = $this->getGenericMockHelper('fake_helper_02');
+        $helperset = new HelperSet(['fake_helper_01_alias' => $helper_01, 'fake_helper_02_alias' => $helper_02]);
+        $this->assertEquals($helper_01, $helperset->get('fake_helper_01'), '->get() returns correct helper by name');
+        $this->assertEquals($helper_01, $helperset->get('fake_helper_01_alias'), '->get() returns correct helper by alias');
+        $this->assertEquals($helper_02, $helperset->get('fake_helper_02'), '->get() returns correct helper by name');
+        $this->assertEquals($helper_02, $helperset->get('fake_helper_02_alias'), '->get() returns correct helper by alias');
+
+        $helperset = new HelperSet();
+        try {
+            $helperset->get('foo');
+            $this->fail('->get() throws InvalidArgumentException when helper not found');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->get() throws InvalidArgumentException when helper not found');
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\ExceptionInterface', $e, '->get() throws domain specific exception when helper not found');
+            $this->assertStringContainsString('The helper "foo" is not defined.', $e->getMessage(), '->get() throws InvalidArgumentException when helper not found');
+        }
+    }
+
+    public function testSetCommand()
+    {
+        $cmd_01 = new Command('foo');
+        $cmd_02 = new Command('bar');
+
+        $helperset = new HelperSet();
+        $helperset->setCommand($cmd_01);
+        $this->assertEquals($cmd_01, $helperset->getCommand(), '->setCommand() stores given command');
+
+        $helperset = new HelperSet();
+        $helperset->setCommand($cmd_01);
+        $helperset->setCommand($cmd_02);
+        $this->assertEquals($cmd_02, $helperset->getCommand(), '->setCommand() overwrites stored command with consecutive calls');
+    }
+
+    public function testGetCommand()
+    {
+        $cmd = new Command('foo');
+        $helperset = new HelperSet();
+        $helperset->setCommand($cmd);
+        $this->assertEquals($cmd, $helperset->getCommand(), '->getCommand() retrieves stored command');
+    }
+
+    public function testIteration()
+    {
+        $helperset = new HelperSet();
+        $helperset->set($this->getGenericMockHelper('fake_helper_01', $helperset));
+        $helperset->set($this->getGenericMockHelper('fake_helper_02', $helperset));
+
+        $helpers = ['fake_helper_01', 'fake_helper_02'];
+        $i = 0;
+
+        foreach ($helperset as $helper) {
+            $this->assertEquals($helpers[$i++], $helper->getName());
+        }
+    }
+
+    private function getGenericMockHelper($name, HelperSet $helperset = null)
+    {
+        $mock_helper = $this->getMockBuilder('\Symfony\Component\Console\Helper\HelperInterface')->getMock();
+        $mock_helper->expects($this->any())
+            ->method('getName')
+            ->willReturn($name);
+
+        if ($helperset) {
+            $mock_helper->expects($this->any())
+                ->method('setHelperSet')
+                ->with($this->equalTo($helperset));
+        }
+
+        return $mock_helper;
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/HelperTest.php b/lib/symfony/console/Tests/Helper/HelperTest.php
new file mode 100644
index 000000000..184d86e09
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/HelperTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\Helper;
+
+class HelperTest extends TestCase
+{
+    public function formatTimeProvider()
+    {
+        return [
+            [0,      '< 1 sec'],
+            [1,      '1 sec'],
+            [2,      '2 secs'],
+            [59,     '59 secs'],
+            [60,     '1 min'],
+            [61,     '1 min'],
+            [119,    '1 min'],
+            [120,    '2 mins'],
+            [121,    '2 mins'],
+            [3599,   '59 mins'],
+            [3600,   '1 hr'],
+            [7199,   '1 hr'],
+            [7200,   '2 hrs'],
+            [7201,   '2 hrs'],
+            [86399,  '23 hrs'],
+            [86400,  '1 day'],
+            [86401,  '1 day'],
+            [172799, '1 day'],
+            [172800, '2 days'],
+            [172801, '2 days'],
+        ];
+    }
+
+    /**
+     * @dataProvider formatTimeProvider
+     *
+     * @param int    $secs
+     * @param string $expectedFormat
+     */
+    public function testFormatTime($secs, $expectedFormat)
+    {
+        $this->assertEquals($expectedFormat, Helper::formatTime($secs));
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/ProcessHelperTest.php b/lib/symfony/console/Tests/Helper/ProcessHelperTest.php
new file mode 100644
index 000000000..044c690d6
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/ProcessHelperTest.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\DebugFormatterHelper;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Helper\ProcessHelper;
+use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Process\Process;
+
+class ProcessHelperTest extends TestCase
+{
+    /**
+     * @dataProvider provideCommandsAndOutput
+     */
+    public function testVariousProcessRuns($expected, $cmd, $verbosity, $error)
+    {
+        $helper = new ProcessHelper();
+        $helper->setHelperSet(new HelperSet([new DebugFormatterHelper()]));
+        $output = $this->getOutputStream($verbosity);
+        $helper->run($output, $cmd, $error);
+        $this->assertEquals($expected, $this->getOutput($output));
+    }
+
+    public function testPassedCallbackIsExecuted()
+    {
+        $helper = new ProcessHelper();
+        $helper->setHelperSet(new HelperSet([new DebugFormatterHelper()]));
+        $output = $this->getOutputStream(StreamOutput::VERBOSITY_NORMAL);
+
+        $executed = false;
+        $callback = function () use (&$executed) { $executed = true; };
+
+        $helper->run($output, 'php -r "echo 42;"', null, $callback);
+        $this->assertTrue($executed);
+    }
+
+    public function provideCommandsAndOutput()
+    {
+        $successOutputVerbose = <<<'EOT'
+  RUN  php -r "echo 42;"
+  RES  Command ran successfully
+
+EOT;
+        $successOutputDebug = <<<'EOT'
+  RUN  php -r "echo 42;"
+  OUT  42
+  RES  Command ran successfully
+
+EOT;
+        $successOutputDebugWithTags = <<<'EOT'
+  RUN  php -r "echo '<info>42</info>';"
+  OUT  <info>42</info>
+  RES  Command ran successfully
+
+EOT;
+        $successOutputProcessDebug = <<<'EOT'
+  RUN  'php' '-r' 'echo 42;'
+  OUT  42
+  RES  Command ran successfully
+
+EOT;
+        $syntaxErrorOutputVerbose = <<<'EOT'
+  RUN  php -r "fwrite(STDERR, 'error message');usleep(50000);fwrite(STDOUT, 'out message');exit(252);"
+  RES  252 Command did not run successfully
+
+EOT;
+        $syntaxErrorOutputDebug = <<<'EOT'
+  RUN  php -r "fwrite(STDERR, 'error message');usleep(500000);fwrite(STDOUT, 'out message');exit(252);"
+  ERR  error message
+  OUT  out message
+  RES  252 Command did not run successfully
+
+EOT;
+
+        $errorMessage = 'An error occurred';
+        $args = new Process(['php', '-r', 'echo 42;']);
+        $args = $args->getCommandLine();
+        $successOutputProcessDebug = str_replace("'php' '-r' 'echo 42;'", $args, $successOutputProcessDebug);
+
+        return [
+            ['', 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERBOSE, null],
+            [$successOutputVerbose, 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERY_VERBOSE, null],
+            [$successOutputDebug, 'php -r "echo 42;"', StreamOutput::VERBOSITY_DEBUG, null],
+            [$successOutputDebugWithTags, 'php -r "echo \'<info>42</info>\';"', StreamOutput::VERBOSITY_DEBUG, null],
+            ['', 'php -r "syntax error"', StreamOutput::VERBOSITY_VERBOSE, null],
+            [$syntaxErrorOutputVerbose, 'php -r "fwrite(STDERR, \'error message\');usleep(50000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_VERY_VERBOSE, null],
+            [$syntaxErrorOutputDebug, 'php -r "fwrite(STDERR, \'error message\');usleep(500000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_DEBUG, null],
+            [$errorMessage.PHP_EOL, 'php -r "fwrite(STDERR, \'error message\');usleep(50000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_VERBOSE, $errorMessage],
+            [$syntaxErrorOutputVerbose.$errorMessage.PHP_EOL, 'php -r "fwrite(STDERR, \'error message\');usleep(50000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_VERY_VERBOSE, $errorMessage],
+            [$syntaxErrorOutputDebug.$errorMessage.PHP_EOL, 'php -r "fwrite(STDERR, \'error message\');usleep(500000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_DEBUG, $errorMessage],
+            [$successOutputProcessDebug, ['php', '-r', 'echo 42;'], StreamOutput::VERBOSITY_DEBUG, null],
+            [$successOutputDebug, new Process('php -r "echo 42;"'), StreamOutput::VERBOSITY_DEBUG, null],
+        ];
+    }
+
+    private function getOutputStream($verbosity)
+    {
+        return new StreamOutput(fopen('php://memory', 'r+', false), $verbosity, false);
+    }
+
+    private function getOutput(StreamOutput $output)
+    {
+        rewind($output->getStream());
+
+        return stream_get_contents($output->getStream());
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/ProgressBarTest.php b/lib/symfony/console/Tests/Helper/ProgressBarTest.php
new file mode 100644
index 000000000..a0be9b8a6
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/ProgressBarTest.php
@@ -0,0 +1,805 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\Helper;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Output\StreamOutput;
+
+/**
+ * @group time-sensitive
+ */
+class ProgressBarTest extends TestCase
+{
+    private $colSize;
+
+    protected function setUp()
+    {
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS=120');
+    }
+
+    protected function tearDown()
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+    }
+
+    public function testMultipleStart()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start();
+        $bar->advance();
+        $bar->start();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    1 [->--------------------------]').
+            $this->generateOutput('    0 [>---------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testAdvance()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start();
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    1 [->--------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testAdvanceWithStep()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start();
+        $bar->advance(5);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    5 [----->----------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testAdvanceMultipleTimes()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start();
+        $bar->advance(3);
+        $bar->advance(2);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    3 [--->------------------------]').
+            $this->generateOutput('    5 [----->----------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testAdvanceOverMax()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 10);
+        $bar->setProgress(9);
+        $bar->advance();
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  9/10 [=========================>--]  90%'.
+            $this->generateOutput(' 10/10 [============================] 100%').
+            $this->generateOutput(' 11/11 [============================] 100%'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testRegress()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start();
+        $bar->advance();
+        $bar->advance();
+        $bar->advance(-1);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    1 [->--------------------------]').
+            $this->generateOutput('    2 [-->-------------------------]').
+            $this->generateOutput('    1 [->--------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testRegressWithStep()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start();
+        $bar->advance(4);
+        $bar->advance(4);
+        $bar->advance(-2);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    4 [---->-----------------------]').
+            $this->generateOutput('    8 [-------->-------------------]').
+            $this->generateOutput('    6 [------>---------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testRegressMultipleTimes()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start();
+        $bar->advance(3);
+        $bar->advance(3);
+        $bar->advance(-1);
+        $bar->advance(-2);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    3 [--->------------------------]').
+            $this->generateOutput('    6 [------>---------------------]').
+            $this->generateOutput('    5 [----->----------------------]').
+            $this->generateOutput('    3 [--->------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testRegressBelowMin()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 10);
+        $bar->setProgress(1);
+        $bar->advance(-1);
+        $bar->advance(-1);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  1/10 [==>-------------------------]  10%'.
+            $this->generateOutput('  0/10 [>---------------------------]   0%'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testFormat()
+    {
+        $expected =
+            '  0/10 [>---------------------------]   0%'.
+            $this->generateOutput(' 10/10 [============================] 100%').
+            $this->generateOutput(' 10/10 [============================] 100%')
+        ;
+
+        // max in construct, no format
+        $bar = new ProgressBar($output = $this->getOutputStream(), 10);
+        $bar->start();
+        $bar->advance(10);
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals($expected, stream_get_contents($output->getStream()));
+
+        // max in start, no format
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start(10);
+        $bar->advance(10);
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals($expected, stream_get_contents($output->getStream()));
+
+        // max in construct, explicit format before
+        $bar = new ProgressBar($output = $this->getOutputStream(), 10);
+        $bar->setFormat('normal');
+        $bar->start();
+        $bar->advance(10);
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals($expected, stream_get_contents($output->getStream()));
+
+        // max in start, explicit format before
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setFormat('normal');
+        $bar->start(10);
+        $bar->advance(10);
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals($expected, stream_get_contents($output->getStream()));
+    }
+
+    public function testCustomizations()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 10);
+        $bar->setBarWidth(10);
+        $bar->setBarCharacter('_');
+        $bar->setEmptyBarCharacter(' ');
+        $bar->setProgressCharacter('/');
+        $bar->setFormat(' %current%/%max% [%bar%] %percent:3s%%');
+        $bar->start();
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/10 [/         ]   0%'.
+            $this->generateOutput('  1/10 [_/        ]  10%'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testDisplayWithoutStart()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 50);
+        $bar->display();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/50 [>---------------------------]   0%',
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testDisplayWithQuietVerbosity()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(true, StreamOutput::VERBOSITY_QUIET), 50);
+        $bar->display();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '',
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testFinishWithoutStart()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 50);
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            ' 50/50 [============================] 100%',
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testPercent()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 50);
+        $bar->start();
+        $bar->display();
+        $bar->advance();
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/50 [>---------------------------]   0%'.
+            $this->generateOutput('  0/50 [>---------------------------]   0%').
+            $this->generateOutput('  1/50 [>---------------------------]   2%').
+            $this->generateOutput('  2/50 [=>--------------------------]   4%'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testOverwriteWithShorterLine()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 50);
+        $bar->setFormat(' %current%/%max% [%bar%] %percent:3s%%');
+        $bar->start();
+        $bar->display();
+        $bar->advance();
+
+        // set shorter format
+        $bar->setFormat(' %current%/%max% [%bar%]');
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/50 [>---------------------------]   0%'.
+            $this->generateOutput('  0/50 [>---------------------------]   0%').
+            $this->generateOutput('  1/50 [>---------------------------]   2%').
+            $this->generateOutput('  2/50 [=>--------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testStartWithMax()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setFormat('%current%/%max% [%bar%]');
+        $bar->start(50);
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            ' 0/50 [>---------------------------]'.
+            $this->generateOutput(' 1/50 [>---------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testSetCurrentProgress()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 50);
+        $bar->start();
+        $bar->display();
+        $bar->advance();
+        $bar->setProgress(15);
+        $bar->setProgress(25);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/50 [>---------------------------]   0%'.
+            $this->generateOutput('  0/50 [>---------------------------]   0%').
+            $this->generateOutput('  1/50 [>---------------------------]   2%').
+            $this->generateOutput(' 15/50 [========>-------------------]  30%').
+            $this->generateOutput(' 25/50 [==============>-------------]  50%'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testSetCurrentBeforeStarting()
+    {
+        $bar = new ProgressBar($this->getOutputStream());
+        $bar->setProgress(15);
+        $this->assertNotNull($bar->getStartTime());
+    }
+
+    public function testRedrawFrequency()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 6);
+        $bar->setRedrawFrequency(2);
+        $bar->start();
+        $bar->setProgress(1);
+        $bar->advance(2);
+        $bar->advance(2);
+        $bar->advance(1);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            ' 0/6 [>---------------------------]   0%'.
+            $this->generateOutput(' 3/6 [==============>-------------]  50%').
+            $this->generateOutput(' 5/6 [=======================>----]  83%').
+            $this->generateOutput(' 6/6 [============================] 100%'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testRedrawFrequencyIsAtLeastOneIfZeroGiven()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setRedrawFrequency(0);
+        $bar->start();
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    1 [->--------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testRedrawFrequencyIsAtLeastOneIfSmallerOneGiven()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setRedrawFrequency(0.9);
+        $bar->start();
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    1 [->--------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testMultiByteSupport()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->start();
+        $bar->setBarCharacter('■');
+        $bar->advance(3);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.
+            $this->generateOutput('    3 [■■■>------------------------]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testClear()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 50);
+        $bar->start();
+        $bar->setProgress(25);
+        $bar->clear();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/50 [>---------------------------]   0%'.
+            $this->generateOutput(' 25/50 [==============>-------------]  50%').
+            $this->generateOutput(''),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testPercentNotHundredBeforeComplete()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 200);
+        $bar->start();
+        $bar->display();
+        $bar->advance(199);
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '   0/200 [>---------------------------]   0%'.
+            $this->generateOutput('   0/200 [>---------------------------]   0%').
+            $this->generateOutput(' 199/200 [===========================>]  99%').
+            $this->generateOutput(' 200/200 [============================] 100%'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testNonDecoratedOutput()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(false), 200);
+        $bar->start();
+
+        for ($i = 0; $i < 200; ++$i) {
+            $bar->advance();
+        }
+
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '   0/200 [>---------------------------]   0%'.PHP_EOL.
+            '  20/200 [==>-------------------------]  10%'.PHP_EOL.
+            '  40/200 [=====>----------------------]  20%'.PHP_EOL.
+            '  60/200 [========>-------------------]  30%'.PHP_EOL.
+            '  80/200 [===========>----------------]  40%'.PHP_EOL.
+            ' 100/200 [==============>-------------]  50%'.PHP_EOL.
+            ' 120/200 [================>-----------]  60%'.PHP_EOL.
+            ' 140/200 [===================>--------]  70%'.PHP_EOL.
+            ' 160/200 [======================>-----]  80%'.PHP_EOL.
+            ' 180/200 [=========================>--]  90%'.PHP_EOL.
+            ' 200/200 [============================] 100%',
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testNonDecoratedOutputWithClear()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(false), 50);
+        $bar->start();
+        $bar->setProgress(25);
+        $bar->clear();
+        $bar->setProgress(50);
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/50 [>---------------------------]   0%'.PHP_EOL.
+            ' 25/50 [==============>-------------]  50%'.PHP_EOL.
+            ' 50/50 [============================] 100%',
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testNonDecoratedOutputWithoutMax()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(false));
+        $bar->start();
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]'.PHP_EOL.
+            '    1 [->--------------------------]',
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testParallelBars()
+    {
+        $output = $this->getOutputStream();
+        $bar1 = new ProgressBar($output, 2);
+        $bar2 = new ProgressBar($output, 3);
+        $bar2->setProgressCharacter('#');
+        $bar3 = new ProgressBar($output);
+
+        $bar1->start();
+        $output->write("\n");
+        $bar2->start();
+        $output->write("\n");
+        $bar3->start();
+
+        for ($i = 1; $i <= 3; ++$i) {
+            // up two lines
+            $output->write("\033[2A");
+            if ($i <= 2) {
+                $bar1->advance();
+            }
+            $output->write("\n");
+            $bar2->advance();
+            $output->write("\n");
+            $bar3->advance();
+        }
+        $output->write("\033[2A");
+        $output->write("\n");
+        $output->write("\n");
+        $bar3->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            ' 0/2 [>---------------------------]   0%'."\n".
+            ' 0/3 [#---------------------------]   0%'."\n".
+            rtrim('    0 [>---------------------------]').
+
+            "\033[2A".
+            $this->generateOutput(' 1/2 [==============>-------------]  50%')."\n".
+            $this->generateOutput(' 1/3 [=========#------------------]  33%')."\n".
+            rtrim($this->generateOutput('    1 [->--------------------------]')).
+
+            "\033[2A".
+            $this->generateOutput(' 2/2 [============================] 100%')."\n".
+            $this->generateOutput(' 2/3 [==================#---------]  66%')."\n".
+            rtrim($this->generateOutput('    2 [-->-------------------------]')).
+
+            "\033[2A".
+            "\n".
+            $this->generateOutput(' 3/3 [============================] 100%')."\n".
+            rtrim($this->generateOutput('    3 [--->------------------------]')).
+
+            "\033[2A".
+            "\n".
+            "\n".
+            rtrim($this->generateOutput('    3 [============================]')),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testWithoutMax()
+    {
+        $output = $this->getOutputStream();
+
+        $bar = new ProgressBar($output);
+        $bar->start();
+        $bar->advance();
+        $bar->advance();
+        $bar->advance();
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            rtrim('    0 [>---------------------------]').
+            rtrim($this->generateOutput('    1 [->--------------------------]')).
+            rtrim($this->generateOutput('    2 [-->-------------------------]')).
+            rtrim($this->generateOutput('    3 [--->------------------------]')).
+            rtrim($this->generateOutput('    3 [============================]')),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testWithSmallScreen()
+    {
+        $output = $this->getOutputStream();
+
+        $bar = new ProgressBar($output);
+        putenv('COLUMNS=12');
+        $bar->start();
+        $bar->advance();
+        putenv('COLUMNS=120');
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---]'.
+            $this->generateOutput('    1 [->--]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testAddingPlaceholderFormatter()
+    {
+        ProgressBar::setPlaceholderFormatterDefinition('remaining_steps', function (ProgressBar $bar) {
+            return $bar->getMaxSteps() - $bar->getProgress();
+        });
+        $bar = new ProgressBar($output = $this->getOutputStream(), 3);
+        $bar->setFormat(' %remaining_steps% [%bar%]');
+
+        $bar->start();
+        $bar->advance();
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            ' 3 [>---------------------------]'.
+            $this->generateOutput(' 2 [=========>------------------]').
+            $this->generateOutput(' 0 [============================]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testMultilineFormat()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 3);
+        $bar->setFormat("%bar%\nfoobar");
+
+        $bar->start();
+        $bar->advance();
+        $bar->clear();
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            ">---------------------------\nfoobar".
+            $this->generateOutput("=========>------------------\nfoobar").
+            "\x0D\x1B[2K\x1B[1A\x1B[2K".
+            $this->generateOutput("============================\nfoobar"),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testAnsiColorsAndEmojis()
+    {
+        putenv('COLUMNS=156');
+
+        $bar = new ProgressBar($output = $this->getOutputStream(), 15);
+        ProgressBar::setPlaceholderFormatterDefinition('memory', function (ProgressBar $bar) {
+            static $i = 0;
+            $mem = 100000 * $i;
+            $colors = $i++ ? '41;37' : '44;37';
+
+            return "\033[".$colors.'m '.Helper::formatMemory($mem)." \033[0m";
+        });
+        $bar->setFormat(" \033[44;37m %title:-37s% \033[0m\n %current%/%max% %bar% %percent:3s%%\n 🏁  %remaining:-10s% %memory:37s%");
+        $bar->setBarCharacter($done = "\033[32m●\033[0m");
+        $bar->setEmptyBarCharacter($empty = "\033[31m●\033[0m");
+        $bar->setProgressCharacter($progress = "\033[32m➤ \033[0m");
+
+        $bar->setMessage('Starting the demo... fingers crossed', 'title');
+        $bar->start();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            " \033[44;37m Starting the demo... fingers crossed  \033[0m\n".
+            '  0/15 '.$progress.str_repeat($empty, 26)."   0%\n".
+            " \xf0\x9f\x8f\x81  < 1 sec                        \033[44;37m 0 B \033[0m",
+            stream_get_contents($output->getStream())
+        );
+        ftruncate($output->getStream(), 0);
+        rewind($output->getStream());
+
+        $bar->setMessage('Looks good to me...', 'title');
+        $bar->advance(4);
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            $this->generateOutput(
+                " \033[44;37m Looks good to me...                   \033[0m\n".
+                '  4/15 '.str_repeat($done, 7).$progress.str_repeat($empty, 19)."  26%\n".
+                " \xf0\x9f\x8f\x81  < 1 sec                     \033[41;37m 97 KiB \033[0m"
+            ),
+            stream_get_contents($output->getStream())
+        );
+        ftruncate($output->getStream(), 0);
+        rewind($output->getStream());
+
+        $bar->setMessage('Thanks, bye', 'title');
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            $this->generateOutput(
+                " \033[44;37m Thanks, bye                           \033[0m\n".
+                ' 15/15 '.str_repeat($done, 28)." 100%\n".
+                " \xf0\x9f\x8f\x81  < 1 sec                    \033[41;37m 195 KiB \033[0m"
+            ),
+            stream_get_contents($output->getStream())
+        );
+        putenv('COLUMNS=120');
+    }
+
+    public function testSetFormat()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setFormat('normal');
+        $bar->start();
+        rewind($output->getStream());
+        $this->assertEquals(
+            '    0 [>---------------------------]',
+            stream_get_contents($output->getStream())
+        );
+
+        $bar = new ProgressBar($output = $this->getOutputStream(), 10);
+        $bar->setFormat('normal');
+        $bar->start();
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/10 [>---------------------------]   0%',
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    /**
+     * @dataProvider provideFormat
+     */
+    public function testFormatsWithoutMax($format)
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setFormat($format);
+        $bar->start();
+
+        rewind($output->getStream());
+        $this->assertNotEmpty(stream_get_contents($output->getStream()));
+    }
+
+    /**
+     * Provides each defined format.
+     *
+     * @return array
+     */
+    public function provideFormat()
+    {
+        return [
+            ['normal'],
+            ['verbose'],
+            ['very_verbose'],
+            ['debug'],
+        ];
+    }
+
+    protected function getOutputStream($decorated = true, $verbosity = StreamOutput::VERBOSITY_NORMAL)
+    {
+        return new StreamOutput(fopen('php://memory', 'r+', false), $verbosity, $decorated);
+    }
+
+    protected function generateOutput($expected)
+    {
+        $count = substr_count($expected, "\n");
+
+        return "\x0D\x1B[2K".($count ? str_repeat("\x1B[1A\x1B[2K", $count) : '').$expected;
+    }
+
+    public function testBarWidthWithMultilineFormat()
+    {
+        putenv('COLUMNS=10');
+
+        $bar = new ProgressBar($output = $this->getOutputStream());
+        $bar->setFormat("%bar%\n0123456789");
+
+        // before starting
+        $bar->setBarWidth(5);
+        $this->assertEquals(5, $bar->getBarWidth());
+
+        // after starting
+        $bar->start();
+        rewind($output->getStream());
+        $this->assertEquals(5, $bar->getBarWidth(), stream_get_contents($output->getStream()));
+        putenv('COLUMNS=120');
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/ProgressIndicatorTest.php b/lib/symfony/console/Tests/Helper/ProgressIndicatorTest.php
new file mode 100644
index 000000000..1428cf5e9
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/ProgressIndicatorTest.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\ProgressIndicator;
+use Symfony\Component\Console\Output\StreamOutput;
+
+/**
+ * @group time-sensitive
+ */
+class ProgressIndicatorTest extends TestCase
+{
+    public function testDefaultIndicator()
+    {
+        $bar = new ProgressIndicator($output = $this->getOutputStream());
+        $bar->start('Starting...');
+        usleep(101000);
+        $bar->advance();
+        usleep(101000);
+        $bar->advance();
+        usleep(101000);
+        $bar->advance();
+        usleep(101000);
+        $bar->advance();
+        usleep(101000);
+        $bar->advance();
+        usleep(101000);
+        $bar->setMessage('Advancing...');
+        $bar->advance();
+        $bar->finish('Done...');
+        $bar->start('Starting Again...');
+        usleep(101000);
+        $bar->advance();
+        $bar->finish('Done Again...');
+
+        rewind($output->getStream());
+
+        $this->assertEquals(
+            $this->generateOutput(' - Starting...').
+            $this->generateOutput(' \\ Starting...').
+            $this->generateOutput(' | Starting...').
+            $this->generateOutput(' / Starting...').
+            $this->generateOutput(' - Starting...').
+            $this->generateOutput(' \\ Starting...').
+            $this->generateOutput(' \\ Advancing...').
+            $this->generateOutput(' | Advancing...').
+            $this->generateOutput(' | Done...').
+            PHP_EOL.
+            $this->generateOutput(' - Starting Again...').
+            $this->generateOutput(' \\ Starting Again...').
+            $this->generateOutput(' \\ Done Again...').
+            PHP_EOL,
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testNonDecoratedOutput()
+    {
+        $bar = new ProgressIndicator($output = $this->getOutputStream(false));
+
+        $bar->start('Starting...');
+        $bar->advance();
+        $bar->advance();
+        $bar->setMessage('Midway...');
+        $bar->advance();
+        $bar->advance();
+        $bar->finish('Done...');
+
+        rewind($output->getStream());
+
+        $this->assertEquals(
+            ' Starting...'.PHP_EOL.
+            ' Midway...'.PHP_EOL.
+            ' Done...'.PHP_EOL.PHP_EOL,
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testCustomIndicatorValues()
+    {
+        $bar = new ProgressIndicator($output = $this->getOutputStream(), null, 100, ['a', 'b', 'c']);
+
+        $bar->start('Starting...');
+        usleep(101000);
+        $bar->advance();
+        usleep(101000);
+        $bar->advance();
+        usleep(101000);
+        $bar->advance();
+
+        rewind($output->getStream());
+
+        $this->assertEquals(
+            $this->generateOutput(' a Starting...').
+            $this->generateOutput(' b Starting...').
+            $this->generateOutput(' c Starting...').
+            $this->generateOutput(' a Starting...'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testCannotSetInvalidIndicatorCharacters()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Must have at least 2 indicator value characters.');
+        new ProgressIndicator($this->getOutputStream(), null, 100, ['1']);
+    }
+
+    public function testCannotStartAlreadyStartedIndicator()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Progress indicator already started.');
+        $bar = new ProgressIndicator($this->getOutputStream());
+        $bar->start('Starting...');
+        $bar->start('Starting Again.');
+    }
+
+    public function testCannotAdvanceUnstartedIndicator()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Progress indicator has not yet been started.');
+        $bar = new ProgressIndicator($this->getOutputStream());
+        $bar->advance();
+    }
+
+    public function testCannotFinishUnstartedIndicator()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Progress indicator has not yet been started.');
+        $bar = new ProgressIndicator($this->getOutputStream());
+        $bar->finish('Finished');
+    }
+
+    /**
+     * @dataProvider provideFormat
+     */
+    public function testFormats($format)
+    {
+        $bar = new ProgressIndicator($output = $this->getOutputStream(), $format);
+        $bar->start('Starting...');
+        $bar->advance();
+
+        rewind($output->getStream());
+
+        $this->assertNotEmpty(stream_get_contents($output->getStream()));
+    }
+
+    /**
+     * Provides each defined format.
+     *
+     * @return array
+     */
+    public function provideFormat()
+    {
+        return [
+            ['normal'],
+            ['verbose'],
+            ['very_verbose'],
+            ['debug'],
+        ];
+    }
+
+    protected function getOutputStream($decorated = true, $verbosity = StreamOutput::VERBOSITY_NORMAL)
+    {
+        return new StreamOutput(fopen('php://memory', 'r+', false), $verbosity, $decorated);
+    }
+
+    protected function generateOutput($expected)
+    {
+        $count = substr_count($expected, "\n");
+
+        return "\x0D\x1B[2K".($count ? sprintf("\033[%dA", $count) : '').$expected;
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/QuestionHelperTest.php b/lib/symfony/console/Tests/Helper/QuestionHelperTest.php
new file mode 100644
index 000000000..d2afee42f
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/QuestionHelperTest.php
@@ -0,0 +1,1085 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Helper\FormatterHelper;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Terminal;
+
+/**
+ * @group tty
+ */
+class QuestionHelperTest extends AbstractQuestionHelperTest
+{
+    public function testAskChoice()
+    {
+        $questionHelper = new QuestionHelper();
+
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $questionHelper->setHelperSet($helperSet);
+
+        $heroes = ['Superman', 'Batman', 'Spiderman'];
+
+        $inputStream = $this->getInputStream("\n1\n  1  \nFabien\n1\nFabien\n1\n0,2\n 0 , 2  \n\n\n");
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '2');
+        $question->setMaxAttempts(1);
+        // first answer is an empty answer, we're supposed to receive the default value
+        $this->assertEquals('Spiderman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes);
+        $question->setMaxAttempts(1);
+        $this->assertEquals('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes);
+        $question->setErrorMessage('Input "%s" is not a superhero!');
+        $question->setMaxAttempts(2);
+        $this->assertEquals('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
+
+        rewind($output->getStream());
+        $stream = stream_get_contents($output->getStream());
+        $this->assertStringContainsString('Input "Fabien" is not a superhero!', $stream);
+
+        try {
+            $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '1');
+            $question->setMaxAttempts(1);
+            $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question);
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals('Value "Fabien" is invalid', $e->getMessage());
+        }
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, null);
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0,1');
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, ' 0 , 1 ');
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, 0);
+        // We are supposed to get the default value since we are not in interactive mode
+        $this->assertEquals('Superman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, true), $this->createOutputInterface(), $question));
+    }
+
+    public function testAskChoiceNonInteractive()
+    {
+        $questionHelper = new QuestionHelper();
+
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $questionHelper->setHelperSet($helperSet);
+        $inputStream = $this->getInputStream("\n1\n  1  \nFabien\n1\nFabien\n1\n0,2\n 0 , 2  \n\n\n");
+
+        $heroes = ['Superman', 'Batman', 'Spiderman'];
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0');
+
+        $this->assertSame('Superman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, 'Batman');
+        $this->assertSame('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, null);
+        $this->assertNull($questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0');
+        $question->setValidator(null);
+        $this->assertSame('Superman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+
+        try {
+            $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, null);
+            $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question);
+        } catch (\InvalidArgumentException $e) {
+            $this->assertSame('Value "" is invalid', $e->getMessage());
+        }
+
+        $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, '0, 1');
+        $question->setMultiselect(true);
+        $this->assertSame(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, '0, 1');
+        $question->setMultiselect(true);
+        $question->setValidator(null);
+        $this->assertSame(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, '0, Batman');
+        $question->setMultiselect(true);
+        $this->assertSame(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, null);
+        $question->setMultiselect(true);
+        $this->assertNull($questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('Who are your favorite superheros?', ['a' => 'Batman', 'b' => 'Superman'], 'a');
+        $this->assertSame('a', $questionHelper->ask($this->createStreamableInputInterfaceMock('', false), $this->createOutputInterface(), $question), 'ChoiceQuestion validator returns the key if it\'s a string');
+
+        try {
+            $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, '');
+            $question->setMultiselect(true);
+            $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question);
+        } catch (\InvalidArgumentException $e) {
+            $this->assertSame('Value "" is invalid', $e->getMessage());
+        }
+    }
+
+    public function testAsk()
+    {
+        $dialog = new QuestionHelper();
+
+        $inputStream = $this->getInputStream("\n8AM\n");
+
+        $question = new Question('What time is it?', '2PM');
+        $this->assertEquals('2PM', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        $question = new Question('What time is it?', '2PM');
+        $this->assertEquals('8AM', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
+
+        rewind($output->getStream());
+        $this->assertEquals('What time is it?', stream_get_contents($output->getStream()));
+    }
+
+    public function testAskWithAutocomplete()
+    {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        // Acm<NEWLINE>
+        // Ac<BACKSPACE><BACKSPACE>s<TAB>Test<NEWLINE>
+        // <NEWLINE>
+        // <UP ARROW><UP ARROW><UP ARROW><NEWLINE>
+        // <UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><TAB>Test<NEWLINE>
+        // <DOWN ARROW><NEWLINE>
+        // S<BACKSPACE><BACKSPACE><DOWN ARROW><DOWN ARROW><NEWLINE>
+        // F00<BACKSPACE><BACKSPACE>oo<TAB><NEWLINE>
+        // F⭐<TAB><BACKSPACE><BACKSPACE>⭐<TAB><NEWLINE>
+        $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\nF⭐\t\177\177⭐\t\n");
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new Question('Please select a bundle', 'FrameworkBundle');
+        $question->setAutocompleterValues(['AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle', 'F⭐Y']);
+
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundleTest', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('FrameworkBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('SecurityBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('FooBundleTest', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('FooBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('F⭐Y', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+    }
+
+    public function testAskWithAutocompleteWithNonSequentialKeys()
+    {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        // <UP ARROW><UP ARROW><NEWLINE><DOWN ARROW><DOWN ARROW><NEWLINE>
+        $inputStream = $this->getInputStream("\033[A\033[A\n\033[B\033[B\n");
+
+        $dialog = new QuestionHelper();
+        $dialog->setHelperSet(new HelperSet([new FormatterHelper()]));
+
+        $question = new ChoiceQuestion('Please select a bundle', [1 => 'AcmeDemoBundle', 4 => 'AsseticBundle']);
+        $question->setMaxAttempts(1);
+
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+    }
+
+    public function testAskWithAutocompleteWithExactMatch()
+    {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        $inputStream = $this->getInputStream("b\n");
+
+        $possibleChoices = [
+            'a' => 'berlin',
+            'b' => 'copenhagen',
+            'c' => 'amsterdam',
+        ];
+
+        $dialog = new QuestionHelper();
+        $dialog->setHelperSet(new HelperSet([new FormatterHelper()]));
+
+        $question = new ChoiceQuestion('Please select a city', $possibleChoices);
+        $question->setMaxAttempts(1);
+
+        $this->assertSame('b', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+    }
+
+    public function getInputs()
+    {
+        return [
+            ['$'], // 1 byte character
+            ['¢'], // 2 bytes character
+            ['€'], // 3 bytes character
+            ['𐍈'], // 4 bytes character
+        ];
+    }
+
+    /**
+     * @dataProvider getInputs
+     */
+    public function testAskWithAutocompleteWithMultiByteCharacter($character)
+    {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        $inputStream = $this->getInputStream("$character\n");
+
+        $possibleChoices = [
+            '$' => '1 byte character',
+            '¢' => '2 bytes character',
+            '€' => '3 bytes character',
+            '𐍈' => '4 bytes character',
+        ];
+
+        $dialog = new QuestionHelper();
+        $dialog->setHelperSet(new HelperSet([new FormatterHelper()]));
+
+        $question = new ChoiceQuestion('Please select a character', $possibleChoices);
+        $question->setMaxAttempts(1);
+
+        $this->assertSame($character, $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+    }
+
+    public function testAutocompleteWithTrailingBackslash()
+    {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        $inputStream = $this->getInputStream('E');
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new Question('');
+        $expectedCompletion = 'ExampleNamespace\\';
+        $question->setAutocompleterValues([$expectedCompletion]);
+
+        $output = $this->createOutputInterface();
+        $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $output, $question);
+
+        $outputStream = $output->getStream();
+        rewind($outputStream);
+        $actualOutput = stream_get_contents($outputStream);
+
+        // Shell control (esc) sequences are not so important: we only care that
+        // <hl> tag is interpreted correctly and replaced
+        $irrelevantEscSequences = [
+            "\0337" => '', // Save cursor position
+            "\0338" => '', // Restore cursor position
+            "\033[K" => '', // Clear line from cursor till the end
+        ];
+
+        $importantActualOutput = strtr($actualOutput, $irrelevantEscSequences);
+
+        // Remove colors (e.g. "\033[30m", "\033[31;41m")
+        $importantActualOutput = preg_replace('/\033\[\d+(;\d+)?m/', '', $importantActualOutput);
+
+        $this->assertEquals($expectedCompletion, $importantActualOutput);
+    }
+
+    public function testAskHiddenResponse()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test is not supported on Windows');
+        }
+
+        $dialog = new QuestionHelper();
+
+        $question = new Question('What time is it?');
+        $question->setHidden(true);
+
+        $this->assertEquals('8AM', $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream("8AM\n")), $this->createOutputInterface(), $question));
+    }
+
+    /**
+     * @dataProvider getAskConfirmationData
+     */
+    public function testAskConfirmation($question, $expected, $default = true)
+    {
+        $dialog = new QuestionHelper();
+
+        $inputStream = $this->getInputStream($question."\n");
+        $question = new ConfirmationQuestion('Do you like French fries?', $default);
+        $this->assertEquals($expected, $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question), 'confirmation question should '.($expected ? 'pass' : 'cancel'));
+    }
+
+    public function getAskConfirmationData()
+    {
+        return [
+            ['', true],
+            ['', false, false],
+            ['y', true],
+            ['yes', true],
+            ['n', false],
+            ['no', false],
+        ];
+    }
+
+    public function testAskConfirmationWithCustomTrueAnswer()
+    {
+        $dialog = new QuestionHelper();
+
+        $inputStream = $this->getInputStream("j\ny\n");
+        $question = new ConfirmationQuestion('Do you like French fries?', false, '/^(j|y)/i');
+        $this->assertTrue($dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $question = new ConfirmationQuestion('Do you like French fries?', false, '/^(j|y)/i');
+        $this->assertTrue($dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+    }
+
+    public function testAskAndValidate()
+    {
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $error = 'This is not a color!';
+        $validator = function ($color) use ($error) {
+            if (!\in_array($color, ['white', 'black'])) {
+                throw new \InvalidArgumentException($error);
+            }
+
+            return $color;
+        };
+
+        $question = new Question('What color was the white horse of Henry IV?', 'white');
+        $question->setValidator($validator);
+        $question->setMaxAttempts(2);
+
+        $inputStream = $this->getInputStream("\nblack\n");
+        $this->assertEquals('white', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('black', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        try {
+            $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream("green\nyellow\norange\n")), $this->createOutputInterface(), $question);
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals($error, $e->getMessage());
+        }
+    }
+
+    /**
+     * @dataProvider simpleAnswerProvider
+     */
+    public function testSelectChoiceFromSimpleChoices($providedAnswer, $expectedValue)
+    {
+        $possibleChoices = [
+            'My environment 1',
+            'My environment 2',
+            'My environment 3',
+        ];
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+        $question->setMaxAttempts(1);
+        $answer = $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream($providedAnswer."\n")), $this->createOutputInterface(), $question);
+
+        $this->assertSame($expectedValue, $answer);
+    }
+
+    public function simpleAnswerProvider()
+    {
+        return [
+            [0, 'My environment 1'],
+            [1, 'My environment 2'],
+            [2, 'My environment 3'],
+            ['My environment 1', 'My environment 1'],
+            ['My environment 2', 'My environment 2'],
+            ['My environment 3', 'My environment 3'],
+        ];
+    }
+
+    /**
+     * @dataProvider specialCharacterInMultipleChoice
+     */
+    public function testSpecialCharacterChoiceFromMultipleChoiceList($providedAnswer, $expectedValue)
+    {
+        $possibleChoices = [
+            '.',
+            'src',
+        ];
+
+        $dialog = new QuestionHelper();
+        $inputStream = $this->getInputStream($providedAnswer."\n");
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the directory', $possibleChoices);
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+        $answer = $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question);
+
+        $this->assertSame($expectedValue, $answer);
+    }
+
+    public function specialCharacterInMultipleChoice()
+    {
+        return [
+            ['.', ['.']],
+            ['., src', ['.', 'src']],
+        ];
+    }
+
+    /**
+     * @dataProvider mixedKeysChoiceListAnswerProvider
+     */
+    public function testChoiceFromChoicelistWithMixedKeys($providedAnswer, $expectedValue)
+    {
+        $possibleChoices = [
+            '0' => 'No environment',
+            '1' => 'My environment 1',
+            'env_2' => 'My environment 2',
+            3 => 'My environment 3',
+        ];
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+        $question->setMaxAttempts(1);
+        $answer = $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream($providedAnswer."\n")), $this->createOutputInterface(), $question);
+
+        $this->assertSame($expectedValue, $answer);
+    }
+
+    public function mixedKeysChoiceListAnswerProvider()
+    {
+        return [
+            ['0', '0'],
+            ['No environment', '0'],
+            ['1', '1'],
+            ['env_2', 'env_2'],
+            [3, '3'],
+            ['My environment 1', '1'],
+        ];
+    }
+
+    /**
+     * @dataProvider answerProvider
+     */
+    public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue)
+    {
+        $possibleChoices = [
+            'env_1' => 'My environment 1',
+            'env_2' => 'My environment',
+            'env_3' => 'My environment',
+        ];
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+        $question->setMaxAttempts(1);
+        $answer = $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream($providedAnswer."\n")), $this->createOutputInterface(), $question);
+
+        $this->assertSame($expectedValue, $answer);
+    }
+
+    public function testAmbiguousChoiceFromChoicelist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of env_2 or env_3.');
+        $possibleChoices = [
+            'env_1' => 'My first environment',
+            'env_2' => 'My environment',
+            'env_3' => 'My environment',
+        ];
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+        $question->setMaxAttempts(1);
+
+        $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream("My environment\n")), $this->createOutputInterface(), $question);
+    }
+
+    public function answerProvider()
+    {
+        return [
+            ['env_1', 'env_1'],
+            ['env_2', 'env_2'],
+            ['env_3', 'env_3'],
+            ['My environment 1', 'env_1'],
+        ];
+    }
+
+    public function testNoInteraction()
+    {
+        $dialog = new QuestionHelper();
+        $question = new Question('Do you have a job?', 'not yet');
+        $this->assertEquals('not yet', $dialog->ask($this->createStreamableInputInterfaceMock(null, false), $this->createOutputInterface(), $question));
+    }
+
+    /**
+     * @requires function mb_strwidth
+     */
+    public function testChoiceOutputFormattingQuestionForUtf8Keys()
+    {
+        $question = 'Lorem ipsum?';
+        $possibleChoices = [
+            'foo' => 'foo',
+            'żółw' => 'bar',
+            'łabądź' => 'baz',
+        ];
+        $outputShown = [
+            $question,
+            '  [<info>foo   </info>] foo',
+            '  [<info>żółw  </info>] bar',
+            '  [<info>łabądź</info>] baz',
+        ];
+        $output = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')->getMock();
+        $output->method('getFormatter')->willReturn(new OutputFormatter());
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $output->expects($this->once())->method('writeln')->with($this->equalTo($outputShown));
+
+        $question = new ChoiceQuestion($question, $possibleChoices, 'foo');
+        $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream("\n")), $output, $question);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAskChoice()
+    {
+        $questionHelper = new QuestionHelper();
+
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $questionHelper->setHelperSet($helperSet);
+
+        $heroes = ['Superman', 'Batman', 'Spiderman'];
+
+        $questionHelper->setInputStream($this->getInputStream("\n1\n  1  \nFabien\n1\nFabien\n1\n0,2\n 0 , 2  \n\n\n"));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '2');
+        $question->setMaxAttempts(1);
+        // first answer is an empty answer, we're supposed to receive the default value
+        $this->assertEquals('Spiderman', $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes);
+        $question->setMaxAttempts(1);
+        $this->assertEquals('Batman', $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('Batman', $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes);
+        $question->setErrorMessage('Input "%s" is not a superhero!');
+        $question->setMaxAttempts(2);
+        $this->assertEquals('Batman', $questionHelper->ask($this->createInputInterfaceMock(), $output = $this->createOutputInterface(), $question));
+
+        rewind($output->getStream());
+        $stream = stream_get_contents($output->getStream());
+        $this->assertStringContainsString('Input "Fabien" is not a superhero!', $stream);
+
+        try {
+            $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '1');
+            $question->setMaxAttempts(1);
+            $questionHelper->ask($this->createInputInterfaceMock(), $output = $this->createOutputInterface(), $question);
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals('Value "Fabien" is invalid', $e->getMessage());
+        }
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, null);
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Batman'], $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0,1');
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, ' 0 , 1 ');
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAsk()
+    {
+        $dialog = new QuestionHelper();
+
+        $dialog->setInputStream($this->getInputStream("\n8AM\n"));
+
+        $question = new Question('What time is it?', '2PM');
+        $this->assertEquals('2PM', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+
+        $question = new Question('What time is it?', '2PM');
+        $this->assertEquals('8AM', $dialog->ask($this->createInputInterfaceMock(), $output = $this->createOutputInterface(), $question));
+
+        rewind($output->getStream());
+        $this->assertEquals('What time is it?', stream_get_contents($output->getStream()));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAskWithAutocomplete()
+    {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        // Acm<NEWLINE>
+        // Ac<BACKSPACE><BACKSPACE>s<TAB>Test<NEWLINE>
+        // <NEWLINE>
+        // <UP ARROW><UP ARROW><UP ARROW><NEWLINE>
+        // <UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><TAB>Test<NEWLINE>
+        // <DOWN ARROW><NEWLINE>
+        // S<BACKSPACE><BACKSPACE><DOWN ARROW><DOWN ARROW><NEWLINE>
+        // F00<BACKSPACE><BACKSPACE>oo<TAB><NEWLINE>
+        // F⭐<TAB><BACKSPACE><BACKSPACE>⭐<TAB><NEWLINE>
+        $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\nF⭐\t⭐\t\n");
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($inputStream);
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new Question('Please select a bundle', 'FrameworkBundle');
+        $question->setAutocompleterValues(['AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle', 'F⭐Y']);
+
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundleTest', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('FrameworkBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('SecurityBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('FooBundleTest', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('FooBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('F⭐Y', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAskWithAutocompleteWithNonSequentialKeys()
+    {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        // <UP ARROW><UP ARROW><NEWLINE><DOWN ARROW><DOWN ARROW><NEWLINE>
+        $inputStream = $this->getInputStream("\033[A\033[A\n\033[B\033[B\n");
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($inputStream);
+        $dialog->setHelperSet(new HelperSet([new FormatterHelper()]));
+
+        $question = new ChoiceQuestion('Please select a bundle', [1 => 'AcmeDemoBundle', 4 => 'AsseticBundle']);
+        $question->setMaxAttempts(1);
+
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAskHiddenResponse()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test is not supported on Windows');
+        }
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($this->getInputStream("8AM\n"));
+
+        $question = new Question('What time is it?');
+        $question->setHidden(true);
+
+        $this->assertEquals('8AM', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getAskConfirmationData
+     */
+    public function testLegacyAskConfirmation($question, $expected, $default = true)
+    {
+        $dialog = new QuestionHelper();
+
+        $dialog->setInputStream($this->getInputStream($question."\n"));
+        $question = new ConfirmationQuestion('Do you like French fries?', $default);
+        $this->assertEquals($expected, $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question), 'confirmation question should '.($expected ? 'pass' : 'cancel'));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAskConfirmationWithCustomTrueAnswer()
+    {
+        $dialog = new QuestionHelper();
+
+        $dialog->setInputStream($this->getInputStream("j\ny\n"));
+        $question = new ConfirmationQuestion('Do you like French fries?', false, '/^(j|y)/i');
+        $this->assertTrue($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $question = new ConfirmationQuestion('Do you like French fries?', false, '/^(j|y)/i');
+        $this->assertTrue($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAskAndValidate()
+    {
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $error = 'This is not a color!';
+        $validator = function ($color) use ($error) {
+            if (!\in_array($color, ['white', 'black'])) {
+                throw new \InvalidArgumentException($error);
+            }
+
+            return $color;
+        };
+
+        $question = new Question('What color was the white horse of Henry IV?', 'white');
+        $question->setValidator($validator);
+        $question->setMaxAttempts(2);
+
+        $dialog->setInputStream($this->getInputStream("\nblack\n"));
+        $this->assertEquals('white', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('black', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+
+        $dialog->setInputStream($this->getInputStream("green\nyellow\norange\n"));
+        try {
+            $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals($error, $e->getMessage());
+        }
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider simpleAnswerProvider
+     */
+    public function testLegacySelectChoiceFromSimpleChoices($providedAnswer, $expectedValue)
+    {
+        $possibleChoices = [
+            'My environment 1',
+            'My environment 2',
+            'My environment 3',
+        ];
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+        $question->setMaxAttempts(1);
+        $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+
+        $this->assertSame($expectedValue, $answer);
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider mixedKeysChoiceListAnswerProvider
+     */
+    public function testLegacyChoiceFromChoicelistWithMixedKeys($providedAnswer, $expectedValue)
+    {
+        $possibleChoices = [
+            '0' => 'No environment',
+            '1' => 'My environment 1',
+            'env_2' => 'My environment 2',
+            3 => 'My environment 3',
+        ];
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+        $question->setMaxAttempts(1);
+        $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+
+        $this->assertSame($expectedValue, $answer);
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider answerProvider
+     */
+    public function testLegacySelectChoiceFromChoiceList($providedAnswer, $expectedValue)
+    {
+        $possibleChoices = [
+            'env_1' => 'My environment 1',
+            'env_2' => 'My environment',
+            'env_3' => 'My environment',
+        ];
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+        $question->setMaxAttempts(1);
+        $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+
+        $this->assertSame($expectedValue, $answer);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyAmbiguousChoiceFromChoicelist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of env_2 or env_3.');
+        $possibleChoices = [
+            'env_1' => 'My first environment',
+            'env_2' => 'My environment',
+            'env_3' => 'My environment',
+        ];
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($this->getInputStream("My environment\n"));
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+        $question->setMaxAttempts(1);
+
+        $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+    }
+
+    /**
+     * @requires function mb_strwidth
+     * @group legacy
+     */
+    public function testLegacyChoiceOutputFormattingQuestionForUtf8Keys()
+    {
+        $question = 'Lorem ipsum?';
+        $possibleChoices = [
+            'foo' => 'foo',
+            'żółw' => 'bar',
+            'łabądź' => 'baz',
+        ];
+        $outputShown = [
+            $question,
+            '  [<info>foo   </info>] foo',
+            '  [<info>żółw  </info>] bar',
+            '  [<info>łabądź</info>] baz',
+        ];
+        $output = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')->getMock();
+        $output->method('getFormatter')->willReturn(new OutputFormatter());
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($this->getInputStream("\n"));
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $output->expects($this->once())->method('writeln')->with($this->equalTo($outputShown));
+
+        $question = new ChoiceQuestion($question, $possibleChoices, 'foo');
+        $dialog->ask($this->createInputInterfaceMock(), $output, $question);
+    }
+
+    public function testAskThrowsExceptionOnMissingInput()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\RuntimeException');
+        $this->expectExceptionMessage('Aborted.');
+        $dialog = new QuestionHelper();
+        $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));
+    }
+
+    public function testAskThrowsExceptionOnMissingInputForChoiceQuestion()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\RuntimeException');
+        $this->expectExceptionMessage('Aborted.');
+        $dialog = new QuestionHelper();
+        $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new ChoiceQuestion('Choice', ['a', 'b']));
+    }
+
+    public function testAskThrowsExceptionOnMissingInputWithValidator()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\RuntimeException');
+        $this->expectExceptionMessage('Aborted.');
+        $dialog = new QuestionHelper();
+
+        $question = new Question('What\'s your name?');
+        $question->setValidator(function ($value) {
+            if (!$value) {
+                throw new \Exception('A value is required.');
+            }
+        });
+
+        $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), $question);
+    }
+
+    public function testEmptyChoices()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Choice question must have at least 1 choice available.');
+        new ChoiceQuestion('Question', [], 'irrelevant');
+    }
+
+    public function testTraversableAutocomplete()
+    {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        // Acm<NEWLINE>
+        // Ac<BACKSPACE><BACKSPACE>s<TAB>Test<NEWLINE>
+        // <NEWLINE>
+        // <UP ARROW><UP ARROW><NEWLINE>
+        // <UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><TAB>Test<NEWLINE>
+        // <DOWN ARROW><NEWLINE>
+        // S<BACKSPACE><BACKSPACE><DOWN ARROW><DOWN ARROW><NEWLINE>
+        // F00<BACKSPACE><BACKSPACE>oo<TAB><NEWLINE>
+        $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\n");
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new Question('Please select a bundle', 'FrameworkBundle');
+        $question->setAutocompleterValues(new AutocompleteValues(['irrelevant' => 'AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle']));
+
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundleTest', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('FrameworkBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('SecurityBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('FooBundleTest', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('FooBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+    }
+
+    public function testTraversableMultiselectAutocomplete()
+    {
+        // <NEWLINE>
+        // F<TAB><NEWLINE>
+        // A<3x UP ARROW><TAB>,F<TAB><NEWLINE>
+        // F00<BACKSPACE><BACKSPACE>o<TAB>,A<DOWN ARROW>,<SPACE>SecurityBundle<NEWLINE>
+        // Acme<TAB>,<SPACE>As<TAB><29x BACKSPACE>S<TAB><NEWLINE>
+        // Ac<TAB>,As<TAB><3x BACKSPACE>d<TAB><NEWLINE>
+        $inputStream = $this->getInputStream("\nF\t\nA\033[A\033[A\033[A\t,F\t\nF00\177\177o\t,A\033[B\t, SecurityBundle\nAcme\t, As\t\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177S\t\nAc\t,As\t\177\177\177d\t\n");
+
+        $dialog = new QuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion(
+            'Please select a bundle (defaults to AcmeDemoBundle and AsseticBundle)',
+            ['AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle'],
+            '0,1'
+        );
+
+        // This tests that autocomplete works for all multiselect choices entered by the user
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['AcmeDemoBundle', 'AsseticBundle'], $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['FooBundle'], $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['AsseticBundle', 'FooBundle'], $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['FooBundle', 'AsseticBundle', 'SecurityBundle'], $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['SecurityBundle'], $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['AcmeDemoBundle', 'AsseticBundle'], $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+    }
+
+    protected function getInputStream($input)
+    {
+        $stream = fopen('php://memory', 'r+', false);
+        fwrite($stream, $input);
+        rewind($stream);
+
+        return $stream;
+    }
+
+    protected function createOutputInterface()
+    {
+        return new StreamOutput(fopen('php://memory', 'r+', false));
+    }
+
+    protected function createInputInterfaceMock($interactive = true)
+    {
+        $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();
+        $mock->expects($this->any())
+            ->method('isInteractive')
+            ->willReturn($interactive);
+
+        return $mock;
+    }
+}
+
+class AutocompleteValues implements \IteratorAggregate
+{
+    private $values;
+
+    public function __construct(array $values)
+    {
+        $this->values = $values;
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->values);
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php b/lib/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
new file mode 100644
index 000000000..cbf3b957b
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Helper;
+
+use Symfony\Component\Console\Helper\FormatterHelper;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
+use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\Question;
+
+/**
+ * @group tty
+ */
+class SymfonyQuestionHelperTest extends AbstractQuestionHelperTest
+{
+    public function testAskChoice()
+    {
+        $questionHelper = new SymfonyQuestionHelper();
+
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $questionHelper->setHelperSet($helperSet);
+
+        $heroes = ['Superman', 'Batman', 'Spiderman'];
+
+        $inputStream = $this->getInputStream("\n1\n  1  \nFabien\n1\nFabien\n1\n0,2\n 0 , 2  \n\n\n");
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '2');
+        $question->setMaxAttempts(1);
+        // first answer is an empty answer, we're supposed to receive the default value
+        $this->assertEquals('Spiderman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
+        $this->assertOutputContains('What is your favorite superhero? [Spiderman]', $output);
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes);
+        $question->setMaxAttempts(1);
+        $this->assertEquals('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes);
+        $question->setErrorMessage('Input "%s" is not a superhero!');
+        $question->setMaxAttempts(2);
+        $this->assertEquals('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
+        $this->assertOutputContains('Input "Fabien" is not a superhero!', $output);
+
+        try {
+            $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '1');
+            $question->setMaxAttempts(1);
+            $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question);
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals('Value "Fabien" is invalid', $e->getMessage());
+        }
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, null);
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0,1');
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
+        $this->assertOutputContains('What is your favorite superhero? [Superman, Batman]', $output);
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, ' 0 , 1 ');
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
+        $this->assertOutputContains('What is your favorite superhero? [Superman, Batman]', $output);
+    }
+
+    public function testAskChoiceWithChoiceValueAsDefault()
+    {
+        $questionHelper = new SymfonyQuestionHelper();
+        $helperSet = new HelperSet([new FormatterHelper()]);
+        $questionHelper->setHelperSet($helperSet);
+        $question = new ChoiceQuestion('What is your favorite superhero?', ['Superman', 'Batman', 'Spiderman'], 'Batman');
+        $question->setMaxAttempts(1);
+
+        $this->assertSame('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($this->getInputStream("Batman\n")), $output = $this->createOutputInterface(), $question));
+        $this->assertOutputContains('What is your favorite superhero? [Batman]', $output);
+    }
+
+    public function testAskReturnsNullIfValidatorAllowsIt()
+    {
+        $questionHelper = new SymfonyQuestionHelper();
+        $question = new Question('What is your favorite superhero?');
+        $question->setValidator(function ($value) { return $value; });
+        $input = $this->createStreamableInputInterfaceMock($this->getInputStream("\n"));
+        $this->assertNull($questionHelper->ask($input, $this->createOutputInterface(), $question));
+    }
+
+    public function testAskEscapeDefaultValue()
+    {
+        $helper = new SymfonyQuestionHelper();
+        $input = $this->createStreamableInputInterfaceMock($this->getInputStream('\\'));
+        $helper->ask($input, $output = $this->createOutputInterface(), new Question('Can I have a backslash?', '\\'));
+
+        $this->assertOutputContains('Can I have a backslash? [\]', $output);
+    }
+
+    public function testAskEscapeAndFormatLabel()
+    {
+        $helper = new SymfonyQuestionHelper();
+        $input = $this->createStreamableInputInterfaceMock($this->getInputStream('Foo\\Bar'));
+        $helper->ask($input, $output = $this->createOutputInterface(), new Question('Do you want to use Foo\\Bar <comment>or</comment> Foo\\Baz\\?', 'Foo\\Baz'));
+
+        $this->assertOutputContains('Do you want to use Foo\\Bar or Foo\\Baz\\? [Foo\\Baz]:', $output);
+    }
+
+    public function testLabelTrailingBackslash()
+    {
+        $helper = new SymfonyQuestionHelper();
+        $input = $this->createStreamableInputInterfaceMock($this->getInputStream('sure'));
+        $helper->ask($input, $output = $this->createOutputInterface(), new Question('Question with a trailing \\'));
+
+        $this->assertOutputContains('Question with a trailing \\', $output);
+    }
+
+    public function testAskThrowsExceptionOnMissingInput()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\RuntimeException');
+        $this->expectExceptionMessage('Aborted.');
+        $dialog = new SymfonyQuestionHelper();
+        $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));
+    }
+
+    protected function getInputStream($input)
+    {
+        $stream = fopen('php://memory', 'r+', false);
+        fwrite($stream, $input);
+        rewind($stream);
+
+        return $stream;
+    }
+
+    protected function createOutputInterface()
+    {
+        $output = new StreamOutput(fopen('php://memory', 'r+', false));
+        $output->setDecorated(false);
+
+        return $output;
+    }
+
+    protected function createInputInterfaceMock($interactive = true)
+    {
+        $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();
+        $mock->expects($this->any())
+            ->method('isInteractive')
+            ->willReturn($interactive);
+
+        return $mock;
+    }
+
+    private function assertOutputContains($expected, StreamOutput $output)
+    {
+        rewind($output->getStream());
+        $stream = stream_get_contents($output->getStream());
+        $this->assertStringContainsString($expected, $stream);
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/TableStyleTest.php b/lib/symfony/console/Tests/Helper/TableStyleTest.php
new file mode 100644
index 000000000..598019254
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/TableStyleTest.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\TableStyle;
+
+class TableStyleTest extends TestCase
+{
+    public function testSetPadTypeWithInvalidType()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
+        $style = new TableStyle();
+        $style->setPadType('TEST');
+    }
+}
diff --git a/lib/symfony/console/Tests/Helper/TableTest.php b/lib/symfony/console/Tests/Helper/TableTest.php
new file mode 100644
index 000000000..571cf0a6c
--- /dev/null
+++ b/lib/symfony/console/Tests/Helper/TableTest.php
@@ -0,0 +1,868 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Helper\TableCell;
+use Symfony\Component\Console\Helper\TableSeparator;
+use Symfony\Component\Console\Helper\TableStyle;
+use Symfony\Component\Console\Output\StreamOutput;
+
+class TableTest extends TestCase
+{
+    protected $stream;
+
+    protected function setUp()
+    {
+        $this->stream = fopen('php://memory', 'r+');
+    }
+
+    protected function tearDown()
+    {
+        fclose($this->stream);
+        $this->stream = null;
+    }
+
+    /**
+     * @dataProvider renderProvider
+     */
+    public function testRender($headers, $rows, $style, $expected, $decorated = false)
+    {
+        $table = new Table($output = $this->getOutputStream($decorated));
+        $table
+            ->setHeaders($headers)
+            ->setRows($rows)
+            ->setStyle($style)
+        ;
+        $table->render();
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    /**
+     * @dataProvider renderProvider
+     */
+    public function testRenderAddRows($headers, $rows, $style, $expected, $decorated = false)
+    {
+        $table = new Table($output = $this->getOutputStream($decorated));
+        $table
+            ->setHeaders($headers)
+            ->addRows($rows)
+            ->setStyle($style)
+        ;
+        $table->render();
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    /**
+     * @dataProvider renderProvider
+     */
+    public function testRenderAddRowsOneByOne($headers, $rows, $style, $expected, $decorated = false)
+    {
+        $table = new Table($output = $this->getOutputStream($decorated));
+        $table
+            ->setHeaders($headers)
+            ->setStyle($style)
+        ;
+        foreach ($rows as $row) {
+            $table->addRow($row);
+        }
+        $table->render();
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function renderProvider()
+    {
+        $books = [
+            ['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'],
+            ['80-902734-1-6', 'And Then There Were None', 'Agatha Christie'],
+        ];
+
+        return [
+            [
+                ['ISBN', 'Title', 'Author'],
+                $books,
+                'default',
+<<<'TABLE'
++---------------+--------------------------+------------------+
+| 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 |
+| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
++---------------+--------------------------+------------------+
+
+TABLE
+            ],
+            [
+                ['ISBN', 'Title', 'Author'],
+                $books,
+                'compact',
+<<<'TABLE'
+ 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 
+ 80-902734-1-6 And Then There Were None Agatha Christie  
+
+TABLE
+            ],
+            [
+                ['ISBN', 'Title', 'Author'],
+                $books,
+                'borderless',
+<<<'TABLE'
+ =============== ========================== ================== 
+  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  
+  80-902734-1-6   And Then There Were None   Agatha Christie   
+ =============== ========================== ================== 
+
+TABLE
+            ],
+            [
+                ['ISBN', 'Title'],
+                [
+                    ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
+                    ['9971-5-0210-0'],
+                    ['960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'],
+                    ['80-902734-1-6', 'And Then There Were None', 'Agatha Christie'],
+                ],
+                'default',
+<<<'TABLE'
++---------------+--------------------------+------------------+
+| ISBN          | Title                    |                  |
++---------------+--------------------------+------------------+
+| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+| 9971-5-0210-0 |                          |                  |
+| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
++---------------+--------------------------+------------------+
+
+TABLE
+            ],
+            [
+                [],
+                [
+                    ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
+                    ['9971-5-0210-0'],
+                    ['960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'],
+                    ['80-902734-1-6', 'And Then There Were None', 'Agatha Christie'],
+                ],
+                'default',
+<<<'TABLE'
++---------------+--------------------------+------------------+
+| 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
+| 9971-5-0210-0 |                          |                  |
+| 960-425-059-0 | The Lord of the Rings    | J. R. R. Tolkien |
+| 80-902734-1-6 | And Then There Were None | Agatha Christie  |
++---------------+--------------------------+------------------+
+
+TABLE
+            ],
+            [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    ['99921-58-10-7', "Divine\nComedy", 'Dante Alighieri'],
+                    ['9971-5-0210-2', "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."],
+                    ['9971-5-0210-2', "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."],
+                    ['960-425-059-0', 'The Lord of the Rings', "J. R. R.\nTolkien"],
+                ],
+                'default',
+<<<'TABLE'
++---------------+----------------------------+-----------------+
+| ISBN          | Title                      | Author          |
++---------------+----------------------------+-----------------+
+| 99921-58-10-7 | Divine                     | Dante Alighieri |
+|               | Comedy                     |                 |
+| 9971-5-0210-2 | Harry Potter               | Rowling         |
+|               | and the Chamber of Secrets | Joanne K.       |
+| 9971-5-0210-2 | Harry Potter               | Rowling         |
+|               | and the Chamber of Secrets | Joanne K.       |
+| 960-425-059-0 | The Lord of the Rings      | J. R. R.        |
+|               |                            | Tolkien         |
++---------------+----------------------------+-----------------+
+
+TABLE
+            ],
+            [
+                ['ISBN', 'Title'],
+                [],
+                'default',
+<<<'TABLE'
++------+-------+
+| ISBN | Title |
++------+-------+
+
+TABLE
+            ],
+            [
+                [],
+                [],
+                'default',
+                '',
+            ],
+            'Cell text with tags used for Output styling' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    ['<info>99921-58-10-7</info>', '<error>Divine Comedy</error>', '<fg=blue;bg=white>Dante Alighieri</fg=blue;bg=white>'],
+                    ['9971-5-0210-0', 'A Tale of Two Cities', '<info>Charles Dickens</>'],
+                ],
+                'default',
+<<<'TABLE'
++---------------+----------------------+-----------------+
+| ISBN          | Title                | Author          |
++---------------+----------------------+-----------------+
+| 99921-58-10-7 | Divine Comedy        | Dante Alighieri |
+| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
++---------------+----------------------+-----------------+
+
+TABLE
+            ],
+            'Cell text with tags not used for Output styling' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    ['<strong>99921-58-10-700</strong>', '<f>Divine Com</f>', 'Dante Alighieri'],
+                    ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'],
+                ],
+                'default',
+<<<'TABLE'
++----------------------------------+----------------------+-----------------+
+| ISBN                             | Title                | Author          |
++----------------------------------+----------------------+-----------------+
+| <strong>99921-58-10-700</strong> | <f>Divine Com</f>    | Dante Alighieri |
+| 9971-5-0210-0                    | A Tale of Two Cities | Charles Dickens |
++----------------------------------+----------------------+-----------------+
+
+TABLE
+            ],
+            'Cell with colspan' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
+                    new TableSeparator(),
+                    [new TableCell('Divine Comedy(Dante Alighieri)', ['colspan' => 3])],
+                    new TableSeparator(),
+                    [
+                        new TableCell('Arduino: A Quick-Start Guide', ['colspan' => 2]),
+                        'Mark Schmidt',
+                    ],
+                    new TableSeparator(),
+                    [
+                        '9971-5-0210-0',
+                        new TableCell("A Tale of \nTwo Cities", ['colspan' => 2]),
+                    ],
+                    new TableSeparator(),
+                    [
+                        new TableCell('Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil!', ['colspan' => 3]),
+                    ],
+                ],
+                'default',
+<<<'TABLE'
++-------------------------------+-------------------------------+-----------------------------+
+| ISBN                          | Title                         | Author                      |
++-------------------------------+-------------------------------+-----------------------------+
+| 99921-58-10-7                 | Divine Comedy                 | Dante Alighieri             |
++-------------------------------+-------------------------------+-----------------------------+
+| Divine Comedy(Dante Alighieri)                                                              |
++-------------------------------+-------------------------------+-----------------------------+
+| Arduino: A Quick-Start Guide                                  | Mark Schmidt                |
++-------------------------------+-------------------------------+-----------------------------+
+| 9971-5-0210-0                 | A Tale of                                                   |
+|                               | Two Cities                                                  |
++-------------------------------+-------------------------------+-----------------------------+
+| Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil!       |
++-------------------------------+-------------------------------+-----------------------------+
+
+TABLE
+            ],
+            'Cell with rowspan' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    [
+                        new TableCell('9971-5-0210-0', ['rowspan' => 3]),
+                        new TableCell('Divine Comedy', ['rowspan' => 2]),
+                        'Dante Alighieri',
+                    ],
+                    [],
+                    ["The Lord of \nthe Rings", "J. R. \nR. Tolkien"],
+                    new TableSeparator(),
+                    ['80-902734-1-6', new TableCell("And Then \nThere \nWere None", ['rowspan' => 3]), 'Agatha Christie'],
+                    ['80-902734-1-7', 'Test'],
+                ],
+                'default',
+<<<'TABLE'
++---------------+---------------+-----------------+
+| ISBN          | Title         | Author          |
++---------------+---------------+-----------------+
+| 9971-5-0210-0 | Divine Comedy | Dante Alighieri |
+|               |               |                 |
+|               | The Lord of   | J. R.           |
+|               | the Rings     | R. Tolkien      |
++---------------+---------------+-----------------+
+| 80-902734-1-6 | And Then      | Agatha Christie |
+| 80-902734-1-7 | There         | Test            |
+|               | Were None     |                 |
++---------------+---------------+-----------------+
+
+TABLE
+            ],
+            'Cell with rowspan and colspan' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    [
+                        new TableCell('9971-5-0210-0', ['rowspan' => 2, 'colspan' => 2]),
+                        'Dante Alighieri',
+                    ],
+                    ['Charles Dickens'],
+                    new TableSeparator(),
+                    [
+                        'Dante Alighieri',
+                        new TableCell('9971-5-0210-0', ['rowspan' => 3, 'colspan' => 2]),
+                    ],
+                    ['J. R. R. Tolkien'],
+                    ['J. R. R'],
+                ],
+                'default',
+<<<'TABLE'
++------------------+---------+-----------------+
+| ISBN             | Title   | Author          |
++------------------+---------+-----------------+
+| 9971-5-0210-0              | Dante Alighieri |
+|                            | Charles Dickens |
++------------------+---------+-----------------+
+| Dante Alighieri  | 9971-5-0210-0             |
+| J. R. R. Tolkien |                           |
+| J. R. R          |                           |
++------------------+---------+-----------------+
+
+TABLE
+            ],
+            'Cell with rowspan and colspan contains new line break' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    [
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
+                        'Dante Alighieri',
+                    ],
+                    ['Charles Dickens'],
+                    new TableSeparator(),
+                    [
+                        'Dante Alighieri',
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
+                    ],
+                    ['Charles Dickens'],
+                    new TableSeparator(),
+                    [
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
+                        new TableCell("Dante \nAlighieri", ['rowspan' => 2, 'colspan' => 1]),
+                    ],
+                ],
+                'default',
+<<<'TABLE'
++-----------------+-------+-----------------+
+| ISBN            | Title | Author          |
++-----------------+-------+-----------------+
+| 9971                    | Dante Alighieri |
+| -5-                     | Charles Dickens |
+| 021                     |                 |
+| 0-0                     |                 |
++-----------------+-------+-----------------+
+| Dante Alighieri | 9971                    |
+| Charles Dickens | -5-                     |
+|                 | 021                     |
+|                 | 0-0                     |
++-----------------+-------+-----------------+
+| 9971                    | Dante           |
+| -5-                     | Alighieri       |
+| 021                     |                 |
+| 0-0                     |                 |
++-----------------+-------+-----------------+
+
+TABLE
+            ],
+            'Cell with rowspan and colspan without using TableSeparator' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    [
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
+                        'Dante Alighieri',
+                    ],
+                    ['Charles Dickens'],
+                    [
+                        'Dante Alighieri',
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
+                    ],
+                    ['Charles Dickens'],
+                ],
+                'default',
+<<<'TABLE'
++-----------------+-------+-----------------+
+| ISBN            | Title | Author          |
++-----------------+-------+-----------------+
+| 9971                    | Dante Alighieri |
+| -5-                     | Charles Dickens |
+| 021                     |                 |
+| 0-0                     |                 |
+| Dante Alighieri | 9971                    |
+| Charles Dickens | -5-                     |
+|                 | 021                     |
+|                 | 0-0                     |
++-----------------+-------+-----------------+
+
+TABLE
+            ],
+            'Cell with rowspan and colspan with separator inside a rowspan' => [
+                ['ISBN', 'Author'],
+                [
+                    [
+                        new TableCell('9971-5-0210-0', ['rowspan' => 3, 'colspan' => 1]),
+                        'Dante Alighieri',
+                    ],
+                    [new TableSeparator()],
+                    ['Charles Dickens'],
+                ],
+                'default',
+<<<'TABLE'
++---------------+-----------------+
+| ISBN          | Author          |
++---------------+-----------------+
+| 9971-5-0210-0 | Dante Alighieri |
+|               |-----------------|
+|               | Charles Dickens |
++---------------+-----------------+
+
+TABLE
+            ],
+            'Multiple header lines' => [
+                [
+                    [new TableCell('Main title', ['colspan' => 3])],
+                    ['ISBN', 'Title', 'Author'],
+                ],
+                [],
+                'default',
+<<<'TABLE'
++------+-------+--------+
+| Main title            |
++------+-------+--------+
+| ISBN | Title | Author |
++------+-------+--------+
+
+TABLE
+            ],
+            'Row with multiple cells' => [
+                [],
+                [
+                    [
+                        new TableCell('1', ['colspan' => 3]),
+                        new TableCell('2', ['colspan' => 2]),
+                        new TableCell('3', ['colspan' => 2]),
+                        new TableCell('4', ['colspan' => 2]),
+                    ],
+        ],
+                'default',
+<<<'TABLE'
++---+--+--+---+--+---+--+---+--+
+| 1       | 2    | 3    | 4    |
++---+--+--+---+--+---+--+---+--+
+
+TABLE
+            ],
+            'Coslpan and table cells with comment style' => [
+                [
+                    new TableCell('<comment>Long Title</comment>', ['colspan' => 3]),
+                ],
+                [
+                    [
+                        new TableCell('9971-5-0210-0', ['colspan' => 3]),
+                    ],
+                    new TableSeparator(),
+                    [
+                        'Dante Alighieri',
+                        'J. R. R. Tolkien',
+                        'J. R. R',
+                    ],
+                ],
+                'default',
+                <<<TABLE
++-----------------+------------------+---------+
+|\033[32m \033[39m\033[33mLong Title\033[39m\033[32m                                   \033[39m|
++-----------------+------------------+---------+
+| 9971-5-0210-0                                |
++-----------------+------------------+---------+
+| Dante Alighieri | J. R. R. Tolkien | J. R. R |
++-----------------+------------------+---------+
+
+TABLE
+            ,
+                true,
+            ],
+            'Row with formatted cells containing a newline' => [
+                [],
+                [
+                    [
+                        new TableCell('<error>Dont break'."\n".'here</error>', ['colspan' => 2]),
+                    ],
+                    new TableSeparator(),
+                    [
+                        'foo',
+                         new TableCell('<error>Dont break'."\n".'here</error>', ['rowspan' => 2]),
+                    ],
+                    [
+                        'bar',
+                    ],
+                ],
+                'default',
+                <<<'TABLE'
++-------+------------+
+| Dont break         |
+| here               |
++-------+------------+
+| foo   | Dont break |
+| bar   | here       |
++-------+------------+
+
+TABLE
+            ,
+                true,
+            ],
+        ];
+    }
+
+    public function testRenderMultiByte()
+    {
+        $table = new Table($output = $this->getOutputStream());
+        $table
+            ->setHeaders(['■■'])
+            ->setRows([[1234]])
+            ->setStyle('default')
+        ;
+        $table->render();
+
+        $expected =
+<<<'TABLE'
++------+
+| ■■   |
++------+
+| 1234 |
++------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testTableCellWithNumericIntValue()
+    {
+        $table = new Table($output = $this->getOutputStream());
+
+        $table->setRows([[new TableCell(12345)]]);
+        $table->render();
+
+        $expected =
+<<<'TABLE'
++-------+
+| 12345 |
++-------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testTableCellWithNumericFloatValue()
+    {
+        $table = new Table($output = $this->getOutputStream());
+
+        $table->setRows([[new TableCell(12345.01)]]);
+        $table->render();
+
+        $expected =
+<<<'TABLE'
++----------+
+| 12345.01 |
++----------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testStyle()
+    {
+        $style = new TableStyle();
+        $style
+            ->setHorizontalBorderChar('.')
+            ->setVerticalBorderChar('.')
+            ->setCrossingChar('.')
+        ;
+
+        Table::setStyleDefinition('dotfull', $style);
+        $table = new Table($output = $this->getOutputStream());
+        $table
+            ->setHeaders(['Foo'])
+            ->setRows([['Bar']])
+            ->setStyle('dotfull');
+        $table->render();
+
+        $expected =
+<<<'TABLE'
+.......
+. Foo .
+.......
+. Bar .
+.......
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testRowSeparator()
+    {
+        $table = new Table($output = $this->getOutputStream());
+        $table
+            ->setHeaders(['Foo'])
+            ->setRows([
+                ['Bar1'],
+                new TableSeparator(),
+                ['Bar2'],
+                new TableSeparator(),
+                ['Bar3'],
+            ]);
+        $table->render();
+
+        $expected =
+<<<'TABLE'
++------+
+| Foo  |
++------+
+| Bar1 |
++------+
+| Bar2 |
++------+
+| Bar3 |
++------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+
+        $this->assertEquals($table, $table->addRow(new TableSeparator()), 'fluent interface on addRow() with a single TableSeparator() works');
+    }
+
+    public function testRenderMultiCalls()
+    {
+        $table = new Table($output = $this->getOutputStream());
+        $table->setRows([
+            [new TableCell('foo', ['colspan' => 2])],
+        ]);
+        $table->render();
+        $table->render();
+        $table->render();
+
+        $expected =
+<<<TABLE
++----+---+
+| foo    |
++----+---+
++----+---+
+| foo    |
++----+---+
++----+---+
+| foo    |
++----+---+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testColumnStyle()
+    {
+        $table = new Table($output = $this->getOutputStream());
+        $table
+            ->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
+            ->setRows([
+                ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'],
+                ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'],
+            ]);
+
+        $style = new TableStyle();
+        $style->setPadType(STR_PAD_LEFT);
+        $table->setColumnStyle(3, $style);
+
+        $table->render();
+
+        $expected =
+            <<<TABLE
++---------------+----------------------+-----------------+--------+
+| ISBN          | Title                | Author          |  Price |
++---------------+----------------------+-----------------+--------+
+| 99921-58-10-7 | Divine Comedy        | Dante Alighieri |   9.95 |
+| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
++---------------+----------------------+-----------------+--------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testThrowsWhenTheCellInAnArray()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('A cell must be a TableCell, a scalar or an object implementing __toString, array given.');
+        $table = new Table($output = $this->getOutputStream());
+        $table
+            ->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
+            ->setRows([
+                ['99921-58-10-7', [], 'Dante Alighieri', '9.95'],
+            ]);
+
+        $table->render();
+    }
+
+    public function testColumnWidth()
+    {
+        $table = new Table($output = $this->getOutputStream());
+        $table
+            ->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
+            ->setRows([
+                ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'],
+                ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'],
+            ])
+            ->setColumnWidth(0, 15)
+            ->setColumnWidth(3, 10);
+
+        $style = new TableStyle();
+        $style->setPadType(STR_PAD_LEFT);
+        $table->setColumnStyle(3, $style);
+
+        $table->render();
+
+        $expected =
+            <<<TABLE
++-----------------+----------------------+-----------------+------------+
+| ISBN            | Title                | Author          |      Price |
++-----------------+----------------------+-----------------+------------+
+| 99921-58-10-7   | Divine Comedy        | Dante Alighieri |       9.95 |
+| 9971-5-0210-0   | A Tale of Two Cities | Charles Dickens |     139.25 |
++-----------------+----------------------+-----------------+------------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testColumnWidths()
+    {
+        $table = new Table($output = $this->getOutputStream());
+        $table
+            ->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
+            ->setRows([
+                ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'],
+                ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'],
+            ])
+            ->setColumnWidths([15, 0, -1, 10]);
+
+        $style = new TableStyle();
+        $style->setPadType(STR_PAD_LEFT);
+        $table->setColumnStyle(3, $style);
+
+        $table->render();
+
+        $expected =
+            <<<TABLE
++-----------------+----------------------+-----------------+------------+
+| ISBN            | Title                | Author          |      Price |
++-----------------+----------------------+-----------------+------------+
+| 99921-58-10-7   | Divine Comedy        | Dante Alighieri |       9.95 |
+| 9971-5-0210-0   | A Tale of Two Cities | Charles Dickens |     139.25 |
++-----------------+----------------------+-----------------+------------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testIsNotDefinedStyleException()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Style "absent" is not defined.');
+        $table = new Table($this->getOutputStream());
+        $table->setStyle('absent');
+    }
+
+    public function testGetStyleDefinition()
+    {
+        $this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Style "absent" is not defined.');
+        Table::getStyleDefinition('absent');
+    }
+
+    public function testBoxedStyleWithColspan()
+    {
+        $boxed = new TableStyle();
+        $boxed
+            ->setHorizontalBorderChar('─')
+            ->setVerticalBorderChar('│')
+            ->setCrossingChar('┼')
+        ;
+
+        $table = new Table($output = $this->getOutputStream());
+        $table->setStyle($boxed);
+        $table
+            ->setHeaders(['ISBN', 'Title', 'Author'])
+            ->setRows([
+                ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
+                new TableSeparator(),
+                [new TableCell('This value spans 3 columns.', ['colspan' => 3])],
+            ])
+        ;
+        $table->render();
+
+        $expected =
+            <<<TABLE
+┼───────────────┼───────────────┼─────────────────┼
+│ ISBN          │ Title         │ Author          │
+┼───────────────┼───────────────┼─────────────────┼
+│ 99921-58-10-7 │ Divine Comedy │ Dante Alighieri │
+┼───────────────┼───────────────┼─────────────────┼
+│ This value spans 3 columns.                     │
+┼───────────────┼───────────────┼─────────────────┼
+
+TABLE;
+
+        $this->assertSame($expected, $this->getOutputContent($output));
+    }
+
+    protected function getOutputStream($decorated = false)
+    {
+        return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, $decorated);
+    }
+
+    protected function getOutputContent(StreamOutput $output)
+    {
+        rewind($output->getStream());
+
+        return str_replace(PHP_EOL, "\n", stream_get_contents($output->getStream()));
+    }
+}
diff --git a/lib/symfony/console/Tests/Input/ArgvInputTest.php b/lib/symfony/console/Tests/Input/ArgvInputTest.php
new file mode 100644
index 000000000..51cc6e517
--- /dev/null
+++ b/lib/symfony/console/Tests/Input/ArgvInputTest.php
@@ -0,0 +1,462 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Input;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+class ArgvInputTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $_SERVER['argv'] = ['cli.php', 'foo'];
+        $input = new ArgvInput();
+        $r = new \ReflectionObject($input);
+        $p = $r->getProperty('tokens');
+        $p->setAccessible(true);
+
+        $this->assertEquals(['foo'], $p->getValue($input), '__construct() automatically get its input from the argv server variable');
+    }
+
+    public function testParseArguments()
+    {
+        $input = new ArgvInput(['cli.php', 'foo']);
+        $input->bind(new InputDefinition([new InputArgument('name')]));
+        $this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
+
+        $input->bind(new InputDefinition([new InputArgument('name')]));
+        $this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() is stateless');
+    }
+
+    /**
+     * @dataProvider provideOptions
+     */
+    public function testParseOptions($input, $options, $expectedOptions, $message)
+    {
+        $input = new ArgvInput($input);
+        $input->bind(new InputDefinition($options));
+
+        $this->assertSame($expectedOptions, $input->getOptions(), $message);
+    }
+
+    public function provideOptions()
+    {
+        return [
+            [
+                ['cli.php', '--foo'],
+                [new InputOption('foo')],
+                ['foo' => true],
+                '->parse() parses long options without a value',
+            ],
+            [
+                ['cli.php', '--foo=bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)],
+                ['foo' => 'bar'],
+                '->parse() parses long options with a required value (with a = separator)',
+            ],
+            [
+                ['cli.php', '--foo', 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)],
+                ['foo' => 'bar'],
+                '->parse() parses long options with a required value (with a space separator)',
+            ],
+            [
+                ['cli.php', '--foo='],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)],
+                ['foo' => ''],
+                '->parse() parses long options with optional value which is empty (with a = separator) as empty string',
+            ],
+            [
+                ['cli.php', '--foo=', 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)],
+                ['foo' => ''],
+                '->parse() parses long options with optional value without value specified or an empty string (with a = separator) followed by an argument as empty string',
+            ],
+            [
+                ['cli.php', 'bar', '--foo'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)],
+                ['foo' => null],
+                '->parse() parses long options with optional value which is empty (with a = separator) preceded by an argument',
+            ],
+            [
+                ['cli.php', '--foo', '', 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)],
+                ['foo' => ''],
+                '->parse() parses long options with optional value which is empty as empty string even followed by an argument',
+            ],
+            [
+                ['cli.php', '--foo'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)],
+                ['foo' => null],
+                '->parse() parses long options with optional value specified with no separator and no value as null',
+            ],
+            [
+                ['cli.php', '-f'],
+                [new InputOption('foo', 'f')],
+                ['foo' => true],
+                '->parse() parses short options without a value',
+            ],
+            [
+                ['cli.php', '-fbar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)],
+                ['foo' => 'bar'],
+                '->parse() parses short options with a required value (with no separator)',
+            ],
+            [
+                ['cli.php', '-f', 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)],
+                ['foo' => 'bar'],
+                '->parse() parses short options with a required value (with a space separator)',
+            ],
+            [
+                ['cli.php', '-f', ''],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)],
+                ['foo' => ''],
+                '->parse() parses short options with an optional empty value',
+            ],
+            [
+                ['cli.php', '-f', '', 'foo'],
+                [new InputArgument('name'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)],
+                ['foo' => ''],
+                '->parse() parses short options with an optional empty value followed by an argument',
+            ],
+            [
+                ['cli.php', '-f', '', '-b'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b')],
+                ['foo' => '', 'bar' => true],
+                '->parse() parses short options with an optional empty value followed by an option',
+            ],
+            [
+                ['cli.php', '-f', '-b', 'foo'],
+                [new InputArgument('name'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b')],
+                ['foo' => null, 'bar' => true],
+                '->parse() parses short options with an optional value which is not present',
+            ],
+            [
+                ['cli.php', '-fb'],
+                [new InputOption('foo', 'f'), new InputOption('bar', 'b')],
+                ['foo' => true, 'bar' => true],
+                '->parse() parses short options when they are aggregated as a single one',
+            ],
+            [
+                ['cli.php', '-fb', 'bar'],
+                [new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_REQUIRED)],
+                ['foo' => true, 'bar' => 'bar'],
+                '->parse() parses short options when they are aggregated as a single one and the last one has a required value',
+            ],
+            [
+                ['cli.php', '-fb', 'bar'],
+                [new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)],
+                ['foo' => true, 'bar' => 'bar'],
+                '->parse() parses short options when they are aggregated as a single one and the last one has an optional value',
+            ],
+            [
+                ['cli.php', '-fbbar'],
+                [new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)],
+                ['foo' => true, 'bar' => 'bar'],
+                '->parse() parses short options when they are aggregated as a single one and the last one has an optional value with no separator',
+            ],
+            [
+                ['cli.php', '-fbbar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)],
+                ['foo' => 'bbar', 'bar' => null],
+                '->parse() parses short options when they are aggregated as a single one and one of them takes a value',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideInvalidInput
+     */
+    public function testInvalidInput($argv, $definition, $expectedExceptionMessage)
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $input = new ArgvInput($argv);
+        $input->bind($definition);
+    }
+
+    public function provideInvalidInput()
+    {
+        return [
+            [
+                ['cli.php', '--foo'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)]),
+                'The "--foo" option requires a value.',
+            ],
+            [
+                ['cli.php', '-f'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)]),
+                'The "--foo" option requires a value.',
+            ],
+            [
+                ['cli.php', '-ffoo'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_NONE)]),
+                'The "-o" option does not exist.',
+            ],
+            [
+                ['cli.php', '--foo=bar'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_NONE)]),
+                'The "--foo" option does not accept a value.',
+            ],
+            [
+                ['cli.php', 'foo', 'bar'],
+                new InputDefinition(),
+                'No arguments expected, got "foo".',
+            ],
+            [
+                ['cli.php', 'foo', 'bar'],
+                new InputDefinition([new InputArgument('number')]),
+                'Too many arguments, expected arguments "number".',
+            ],
+            [
+                ['cli.php', 'foo', 'bar', 'zzz'],
+                new InputDefinition([new InputArgument('number'), new InputArgument('county')]),
+                'Too many arguments, expected arguments "number" "county".',
+            ],
+            [
+                ['cli.php', '--foo'],
+                new InputDefinition(),
+                'The "--foo" option does not exist.',
+            ],
+            [
+                ['cli.php', '-f'],
+                new InputDefinition(),
+                'The "-f" option does not exist.',
+            ],
+            [
+                ['cli.php', '-1'],
+                new InputDefinition([new InputArgument('number')]),
+                'The "-1" option does not exist.',
+            ],
+            [
+                ['cli.php', '-fЩ'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_NONE)]),
+                'The "-Щ" option does not exist.',
+            ],
+        ];
+    }
+
+    public function testParseArrayArgument()
+    {
+        $input = new ArgvInput(['cli.php', 'foo', 'bar', 'baz', 'bat']);
+        $input->bind(new InputDefinition([new InputArgument('name', InputArgument::IS_ARRAY)]));
+
+        $this->assertEquals(['name' => ['foo', 'bar', 'baz', 'bat']], $input->getArguments(), '->parse() parses array arguments');
+    }
+
+    public function testParseArrayOption()
+    {
+        $input = new ArgvInput(['cli.php', '--name=foo', '--name=bar', '--name=baz']);
+        $input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
+
+        $this->assertEquals(['name' => ['foo', 'bar', 'baz']], $input->getOptions(), '->parse() parses array options ("--option=value" syntax)');
+
+        $input = new ArgvInput(['cli.php', '--name', 'foo', '--name', 'bar', '--name', 'baz']);
+        $input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
+        $this->assertEquals(['name' => ['foo', 'bar', 'baz']], $input->getOptions(), '->parse() parses array options ("--option value" syntax)');
+
+        $input = new ArgvInput(['cli.php', '--name=foo', '--name=bar', '--name=']);
+        $input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
+        $this->assertSame(['name' => ['foo', 'bar', '']], $input->getOptions(), '->parse() parses empty array options as null ("--option=value" syntax)');
+
+        $input = new ArgvInput(['cli.php', '--name', 'foo', '--name', 'bar', '--name', '--anotherOption']);
+        $input->bind(new InputDefinition([
+            new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY),
+            new InputOption('anotherOption', null, InputOption::VALUE_NONE),
+        ]));
+        $this->assertSame(['name' => ['foo', 'bar', null], 'anotherOption' => true], $input->getOptions(), '->parse() parses empty array options ("--option value" syntax)');
+    }
+
+    public function testParseNegativeNumberAfterDoubleDash()
+    {
+        $input = new ArgvInput(['cli.php', '--', '-1']);
+        $input->bind(new InputDefinition([new InputArgument('number')]));
+        $this->assertEquals(['number' => '-1'], $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
+
+        $input = new ArgvInput(['cli.php', '-f', 'bar', '--', '-1']);
+        $input->bind(new InputDefinition([new InputArgument('number'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)]));
+        $this->assertEquals(['foo' => 'bar'], $input->getOptions(), '->parse() parses arguments with leading dashes as options before having encountered a double-dash sequence');
+        $this->assertEquals(['number' => '-1'], $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
+    }
+
+    public function testParseEmptyStringArgument()
+    {
+        $input = new ArgvInput(['cli.php', '-f', 'bar', '']);
+        $input->bind(new InputDefinition([new InputArgument('empty'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)]));
+
+        $this->assertEquals(['empty' => ''], $input->getArguments(), '->parse() parses empty string arguments');
+    }
+
+    public function testGetFirstArgument()
+    {
+        $input = new ArgvInput(['cli.php', '-fbbar']);
+        $this->assertNull($input->getFirstArgument(), '->getFirstArgument() returns null when there is no arguments');
+
+        $input = new ArgvInput(['cli.php', '-fbbar', 'foo']);
+        $this->assertEquals('foo', $input->getFirstArgument(), '->getFirstArgument() returns the first argument from the raw input');
+
+        $input = new ArgvInput(['cli.php', '--foo', 'fooval', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('arg')]));
+        $this->assertSame('bar', $input->getFirstArgument());
+
+        $input = new ArgvInput(['cli.php', '-bf', 'fooval', 'argval']);
+        $input->bind(new InputDefinition([new InputOption('bar', 'b', InputOption::VALUE_NONE), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('arg')]));
+        $this->assertSame('argval', $input->getFirstArgument());
+    }
+
+    public function testHasParameterOption()
+    {
+        $input = new ArgvInput(['cli.php', '-f', 'foo']);
+        $this->assertTrue($input->hasParameterOption('-f'), '->hasParameterOption() returns true if the given short option is in the raw input');
+
+        $input = new ArgvInput(['cli.php', '-etest']);
+        $this->assertTrue($input->hasParameterOption('-e'), '->hasParameterOption() returns true if the given short option is in the raw input');
+        $this->assertFalse($input->hasParameterOption('-s'), '->hasParameterOption() returns true if the given short option is in the raw input');
+
+        $input = new ArgvInput(['cli.php', '--foo', 'foo']);
+        $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if the given short option is in the raw input');
+
+        $input = new ArgvInput(['cli.php', 'foo']);
+        $this->assertFalse($input->hasParameterOption('--foo'), '->hasParameterOption() returns false if the given short option is not in the raw input');
+
+        $input = new ArgvInput(['cli.php', '--foo=bar']);
+        $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if the given option with provided value is in the raw input');
+    }
+
+    public function testHasParameterOptionOnlyOptions()
+    {
+        $input = new ArgvInput(['cli.php', '-f', 'foo']);
+        $this->assertTrue($input->hasParameterOption('-f', true), '->hasParameterOption() returns true if the given short option is in the raw input');
+
+        $input = new ArgvInput(['cli.php', '--foo', '--', 'foo']);
+        $this->assertTrue($input->hasParameterOption('--foo', true), '->hasParameterOption() returns true if the given long option is in the raw input');
+
+        $input = new ArgvInput(['cli.php', '--foo=bar', 'foo']);
+        $this->assertTrue($input->hasParameterOption('--foo', true), '->hasParameterOption() returns true if the given long option with provided value is in the raw input');
+
+        $input = new ArgvInput(['cli.php', '--', '--foo']);
+        $this->assertFalse($input->hasParameterOption('--foo', true), '->hasParameterOption() returns false if the given option is in the raw input but after an end of options signal');
+    }
+
+    public function testHasParameterOptionEdgeCasesAndLimitations()
+    {
+        $input = new ArgvInput(['cli.php', '-fh']);
+        // hasParameterOption does not know if the previous short option, -f,
+        // takes a value or not. If -f takes a value, then -fh does NOT include
+        // -h; Otherwise it does. Since we do not know which short options take
+        // values, hasParameterOption does not support this use-case.
+        $this->assertFalse($input->hasParameterOption('-h'), '->hasParameterOption() returns true if the given short option is in the raw input');
+        // hasParameterOption does detect that `-fh` contains `-f`, since
+        // `-f` is the first short option in the set.
+        $this->assertTrue($input->hasParameterOption('-f'), '->hasParameterOption() returns true if the given short option is in the raw input');
+        // The test below happens to pass, although it might make more sense
+        // to disallow it, and require the use of
+        // $input->hasParameterOption('-f') && $input->hasParameterOption('-h')
+        // instead.
+        $this->assertTrue($input->hasParameterOption('-fh'), '->hasParameterOption() returns true if the given short option is in the raw input');
+        // In theory, if -fh is supported, then -hf should also work.
+        // However, this is not supported.
+        $this->assertFalse($input->hasParameterOption('-hf'), '->hasParameterOption() returns true if the given short option is in the raw input');
+
+        $input = new ArgvInput(['cli.php', '-f', '-h']);
+        // If hasParameterOption('-fh') is supported for 'cli.php -fh', then
+        // one might also expect that it should also be supported for
+        // 'cli.php -f -h'. However, this is not supported.
+        $this->assertFalse($input->hasParameterOption('-fh'), '->hasParameterOption() returns true if the given short option is in the raw input');
+    }
+
+    public function testNoWarningOnInvalidParameterOption()
+    {
+        $input = new ArgvInput(['cli.php', '-edev']);
+
+        $this->assertTrue($input->hasParameterOption(['-e', '']));
+        // No warning thrown
+        $this->assertFalse($input->hasParameterOption(['-m', '']));
+
+        $this->assertEquals('dev', $input->getParameterOption(['-e', '']));
+        // No warning thrown
+        $this->assertFalse($input->getParameterOption(['-m', '']));
+    }
+
+    public function testToString()
+    {
+        $input = new ArgvInput(['cli.php', '-f', 'foo']);
+        $this->assertEquals('-f foo', (string) $input);
+
+        $input = new ArgvInput(['cli.php', '-f', '--bar=foo', 'a b c d', "A\nB'C"]);
+        $this->assertEquals('-f --bar=foo '.escapeshellarg('a b c d').' '.escapeshellarg("A\nB'C"), (string) $input);
+    }
+
+    /**
+     * @dataProvider provideGetParameterOptionValues
+     */
+    public function testGetParameterOptionEqualSign($argv, $key, $default, $onlyParams, $expected)
+    {
+        $input = new ArgvInput($argv);
+        $this->assertEquals($expected, $input->getParameterOption($key, $default, $onlyParams), '->getParameterOption() returns the expected value');
+    }
+
+    public function provideGetParameterOptionValues()
+    {
+        return [
+            [['app/console', 'foo:bar'], '-e', 'default', false, 'default'],
+            [['app/console', 'foo:bar', '-e', 'dev'], '-e', 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '--env=dev'], '--env', 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '-e', 'dev'], ['-e', '--env'], 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '--env=dev'], ['-e', '--env'], 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '--env=dev', '--en=1'], ['--en'], 'default', false, '1'],
+            [['app/console', 'foo:bar', '--env=dev', '', '--en=1'], ['--en'], 'default', false, '1'],
+            [['app/console', 'foo:bar', '--env', 'val'], '--env', 'default', false, 'val'],
+            [['app/console', 'foo:bar', '--env', 'val', '--dummy'], '--env', 'default', false, 'val'],
+            [['app/console', 'foo:bar', '--', '--env=dev'], '--env', 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '--', '--env=dev'], '--env', 'default', true, 'default'],
+        ];
+    }
+
+    public function testParseSingleDashAsArgument()
+    {
+        $input = new ArgvInput(['cli.php', '-']);
+        $input->bind(new InputDefinition([new InputArgument('file')]));
+        $this->assertEquals(['file' => '-'], $input->getArguments(), '->parse() parses single dash as an argument');
+    }
+
+    public function testParseOptionWithValueOptionalGivenEmptyAndRequiredArgument()
+    {
+        $input = new ArgvInput(['cli.php', '--foo=', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)]));
+        $this->assertEquals(['foo' => null], $input->getOptions(), '->parse() parses optional options with empty value as null');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses required arguments');
+
+        $input = new ArgvInput(['cli.php', '--foo=0', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)]));
+        $this->assertEquals(['foo' => '0'], $input->getOptions(), '->parse() parses optional options with empty value as null');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses required arguments');
+    }
+
+    public function testParseOptionWithValueOptionalGivenEmptyAndOptionalArgument()
+    {
+        $input = new ArgvInput(['cli.php', '--foo=', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::OPTIONAL)]));
+        $this->assertEquals(['foo' => null], $input->getOptions(), '->parse() parses optional options with empty value as null');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses optional arguments');
+
+        $input = new ArgvInput(['cli.php', '--foo=0', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::OPTIONAL)]));
+        $this->assertEquals(['foo' => '0'], $input->getOptions(), '->parse() parses optional options with empty value as null');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses optional arguments');
+    }
+}
diff --git a/lib/symfony/console/Tests/Input/ArrayInputTest.php b/lib/symfony/console/Tests/Input/ArrayInputTest.php
new file mode 100644
index 000000000..5e10223dd
--- /dev/null
+++ b/lib/symfony/console/Tests/Input/ArrayInputTest.php
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Input;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+class ArrayInputTest extends TestCase
+{
+    public function testGetFirstArgument()
+    {
+        $input = new ArrayInput([]);
+        $this->assertNull($input->getFirstArgument(), '->getFirstArgument() returns null if no argument were passed');
+        $input = new ArrayInput(['name' => 'Fabien']);
+        $this->assertEquals('Fabien', $input->getFirstArgument(), '->getFirstArgument() returns the first passed argument');
+        $input = new ArrayInput(['--foo' => 'bar', 'name' => 'Fabien']);
+        $this->assertEquals('Fabien', $input->getFirstArgument(), '->getFirstArgument() returns the first passed argument');
+    }
+
+    public function testHasParameterOption()
+    {
+        $input = new ArrayInput(['name' => 'Fabien', '--foo' => 'bar']);
+        $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if an option is present in the passed parameters');
+        $this->assertFalse($input->hasParameterOption('--bar'), '->hasParameterOption() returns false if an option is not present in the passed parameters');
+
+        $input = new ArrayInput(['--foo']);
+        $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if an option is present in the passed parameters');
+
+        $input = new ArrayInput(['--foo', '--', '--bar']);
+        $this->assertTrue($input->hasParameterOption('--bar'), '->hasParameterOption() returns true if an option is present in the passed parameters');
+        $this->assertFalse($input->hasParameterOption('--bar', true), '->hasParameterOption() returns false if an option is present in the passed parameters after an end of options signal');
+    }
+
+    public function testGetParameterOption()
+    {
+        $input = new ArrayInput(['name' => 'Fabien', '--foo' => 'bar']);
+        $this->assertEquals('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
+        $this->assertEquals('default', $input->getParameterOption('--bar', 'default'), '->getParameterOption() returns the default value if an option is not present in the passed parameters');
+
+        $input = new ArrayInput(['Fabien', '--foo' => 'bar']);
+        $this->assertEquals('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
+
+        $input = new ArrayInput(['--foo', '--', '--bar' => 'woop']);
+        $this->assertEquals('woop', $input->getParameterOption('--bar'), '->getParameterOption() returns the correct value if an option is present in the passed parameters');
+        $this->assertEquals('default', $input->getParameterOption('--bar', 'default', true), '->getParameterOption() returns the default value if an option is present in the passed parameters after an end of options signal');
+    }
+
+    public function testParseArguments()
+    {
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name')]));
+
+        $this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
+    }
+
+    /**
+     * @dataProvider provideOptions
+     */
+    public function testParseOptions($input, $options, $expectedOptions, $message)
+    {
+        $input = new ArrayInput($input, new InputDefinition($options));
+
+        $this->assertEquals($expectedOptions, $input->getOptions(), $message);
+    }
+
+    public function provideOptions()
+    {
+        return [
+            [
+                ['--foo' => 'bar'],
+                [new InputOption('foo')],
+                ['foo' => 'bar'],
+                '->parse() parses long options',
+            ],
+            [
+                ['--foo' => 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')],
+                ['foo' => 'bar'],
+                '->parse() parses long options with a default value',
+            ],
+            [
+                [],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')],
+                ['foo' => 'default'],
+                '->parse() uses the default value for long options with value optional which are not passed',
+            ],
+            [
+                ['--foo' => null],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')],
+                ['foo' => null],
+                '->parse() parses long options with a default value',
+            ],
+            [
+                ['-f' => 'bar'],
+                [new InputOption('foo', 'f')],
+                ['foo' => 'bar'],
+                '->parse() parses short options',
+            ],
+            [
+                ['--' => null, '-f' => 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')],
+                ['foo' => 'default'],
+                '->parse() does not parse opts after an end of options signal',
+            ],
+            [
+                ['--' => null],
+                [],
+                [],
+                '->parse() does not choke on end of options signal',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideInvalidInput
+     */
+    public function testParseInvalidInput($parameters, $definition, $expectedExceptionMessage)
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        new ArrayInput($parameters, $definition);
+    }
+
+    public function provideInvalidInput()
+    {
+        return [
+            [
+                ['foo' => 'foo'],
+                new InputDefinition([new InputArgument('name')]),
+                'The "foo" argument does not exist.',
+            ],
+            [
+                ['--foo' => null],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)]),
+                'The "--foo" option requires a value.',
+            ],
+            [
+                ['--foo' => 'foo'],
+                new InputDefinition(),
+                'The "--foo" option does not exist.',
+            ],
+            [
+                ['-o' => 'foo'],
+                new InputDefinition(),
+                'The "-o" option does not exist.',
+            ],
+        ];
+    }
+
+    public function testToString()
+    {
+        $input = new ArrayInput(['-f' => null, '-b' => 'bar', '--foo' => 'b a z', '--lala' => null, 'test' => 'Foo', 'test2' => "A\nB'C"]);
+        $this->assertEquals('-f -b=bar --foo='.escapeshellarg('b a z').' --lala Foo '.escapeshellarg("A\nB'C"), (string) $input);
+
+        $input = new ArrayInput(['-b' => ['bval_1', 'bval_2'], '--f' => ['fval_1', 'fval_2']]);
+        $this->assertSame('-b=bval_1 -b=bval_2 --f=fval_1 --f=fval_2', (string) $input);
+
+        $input = new ArrayInput(['array_arg' => ['val_1', 'val_2']]);
+        $this->assertSame('val_1 val_2', (string) $input);
+    }
+}
diff --git a/lib/symfony/console/Tests/Input/InputArgumentTest.php b/lib/symfony/console/Tests/Input/InputArgumentTest.php
new file mode 100644
index 000000000..1fbcf9fc9
--- /dev/null
+++ b/lib/symfony/console/Tests/Input/InputArgumentTest.php
@@ -0,0 +1,109 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Input;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\InputArgument;
+
+class InputArgumentTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $argument = new InputArgument('foo');
+        $this->assertEquals('foo', $argument->getName(), '__construct() takes a name as its first argument');
+    }
+
+    public function testModes()
+    {
+        $argument = new InputArgument('foo');
+        $this->assertFalse($argument->isRequired(), '__construct() gives a "InputArgument::OPTIONAL" mode by default');
+
+        $argument = new InputArgument('foo', null);
+        $this->assertFalse($argument->isRequired(), '__construct() can take "InputArgument::OPTIONAL" as its mode');
+
+        $argument = new InputArgument('foo', InputArgument::OPTIONAL);
+        $this->assertFalse($argument->isRequired(), '__construct() can take "InputArgument::OPTIONAL" as its mode');
+
+        $argument = new InputArgument('foo', InputArgument::REQUIRED);
+        $this->assertTrue($argument->isRequired(), '__construct() can take "InputArgument::REQUIRED" as its mode');
+    }
+
+    /**
+     * @dataProvider provideInvalidModes
+     */
+    public function testInvalidModes($mode)
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(sprintf('Argument mode "%s" is not valid.', $mode));
+
+        new InputArgument('foo', $mode);
+    }
+
+    public function provideInvalidModes()
+    {
+        return [
+            ['ANOTHER_ONE'],
+            [-1],
+        ];
+    }
+
+    public function testIsArray()
+    {
+        $argument = new InputArgument('foo', InputArgument::IS_ARRAY);
+        $this->assertTrue($argument->isArray(), '->isArray() returns true if the argument can be an array');
+        $argument = new InputArgument('foo', InputArgument::OPTIONAL | InputArgument::IS_ARRAY);
+        $this->assertTrue($argument->isArray(), '->isArray() returns true if the argument can be an array');
+        $argument = new InputArgument('foo', InputArgument::OPTIONAL);
+        $this->assertFalse($argument->isArray(), '->isArray() returns false if the argument can not be an array');
+    }
+
+    public function testGetDescription()
+    {
+        $argument = new InputArgument('foo', null, 'Some description');
+        $this->assertEquals('Some description', $argument->getDescription(), '->getDescription() return the message description');
+    }
+
+    public function testGetDefault()
+    {
+        $argument = new InputArgument('foo', InputArgument::OPTIONAL, '', 'default');
+        $this->assertEquals('default', $argument->getDefault(), '->getDefault() return the default value');
+    }
+
+    public function testSetDefault()
+    {
+        $argument = new InputArgument('foo', InputArgument::OPTIONAL, '', 'default');
+        $argument->setDefault(null);
+        $this->assertNull($argument->getDefault(), '->setDefault() can reset the default value by passing null');
+        $argument->setDefault('another');
+        $this->assertEquals('another', $argument->getDefault(), '->setDefault() changes the default value');
+
+        $argument = new InputArgument('foo', InputArgument::OPTIONAL | InputArgument::IS_ARRAY);
+        $argument->setDefault([1, 2]);
+        $this->assertEquals([1, 2], $argument->getDefault(), '->setDefault() changes the default value');
+    }
+
+    public function testSetDefaultWithRequiredArgument()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Cannot set a default value except for InputArgument::OPTIONAL mode.');
+        $argument = new InputArgument('foo', InputArgument::REQUIRED);
+        $argument->setDefault('default');
+    }
+
+    public function testSetDefaultWithArrayArgument()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('A default value for an array argument must be an array.');
+        $argument = new InputArgument('foo', InputArgument::IS_ARRAY);
+        $argument->setDefault('default');
+    }
+}
diff --git a/lib/symfony/console/Tests/Input/InputDefinitionTest.php b/lib/symfony/console/Tests/Input/InputDefinitionTest.php
new file mode 100644
index 000000000..4a881f595
--- /dev/null
+++ b/lib/symfony/console/Tests/Input/InputDefinitionTest.php
@@ -0,0 +1,389 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Input;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+class InputDefinitionTest extends TestCase
+{
+    protected static $fixtures;
+
+    protected $multi;
+    protected $foo;
+    protected $bar;
+    protected $foo1;
+    protected $foo2;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixtures = __DIR__.'/../Fixtures/';
+    }
+
+    public function testConstructorArguments()
+    {
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $this->assertEquals([], $definition->getArguments(), '__construct() creates a new InputDefinition object');
+
+        $definition = new InputDefinition([$this->foo, $this->bar]);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getArguments(), '__construct() takes an array of InputArgument objects as its first argument');
+    }
+
+    public function testConstructorOptions()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition();
+        $this->assertEquals([], $definition->getOptions(), '__construct() creates a new InputDefinition object');
+
+        $definition = new InputDefinition([$this->foo, $this->bar]);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getOptions(), '__construct() takes an array of InputOption objects as its first argument');
+    }
+
+    public function testSetArguments()
+    {
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->setArguments([$this->foo]);
+        $this->assertEquals(['foo' => $this->foo], $definition->getArguments(), '->setArguments() sets the array of InputArgument objects');
+        $definition->setArguments([$this->bar]);
+
+        $this->assertEquals(['bar' => $this->bar], $definition->getArguments(), '->setArguments() clears all InputArgument objects');
+    }
+
+    public function testAddArguments()
+    {
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArguments([$this->foo]);
+        $this->assertEquals(['foo' => $this->foo], $definition->getArguments(), '->addArguments() adds an array of InputArgument objects');
+        $definition->addArguments([$this->bar]);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getArguments(), '->addArguments() does not clear existing InputArgument objects');
+    }
+
+    public function testAddArgument()
+    {
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArgument($this->foo);
+        $this->assertEquals(['foo' => $this->foo], $definition->getArguments(), '->addArgument() adds a InputArgument object');
+        $definition->addArgument($this->bar);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getArguments(), '->addArgument() adds a InputArgument object');
+    }
+
+    public function testArgumentsMustHaveDifferentNames()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('An argument with name "foo" already exists.');
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArgument($this->foo);
+        $definition->addArgument($this->foo1);
+    }
+
+    public function testArrayArgumentHasToBeLast()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Cannot add an argument after an array argument.');
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArgument(new InputArgument('fooarray', InputArgument::IS_ARRAY));
+        $definition->addArgument(new InputArgument('anotherbar'));
+    }
+
+    public function testRequiredArgumentCannotFollowAnOptionalOne()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Cannot add a required argument after an optional one.');
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArgument($this->foo);
+        $definition->addArgument($this->foo2);
+    }
+
+    public function testGetArgument()
+    {
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArguments([$this->foo]);
+        $this->assertEquals($this->foo, $definition->getArgument('foo'), '->getArgument() returns a InputArgument by its name');
+    }
+
+    public function testGetInvalidArgument()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "bar" argument does not exist.');
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArguments([$this->foo]);
+        $definition->getArgument('bar');
+    }
+
+    public function testHasArgument()
+    {
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArguments([$this->foo]);
+
+        $this->assertTrue($definition->hasArgument('foo'), '->hasArgument() returns true if a InputArgument exists for the given name');
+        $this->assertFalse($definition->hasArgument('bar'), '->hasArgument() returns false if a InputArgument exists for the given name');
+    }
+
+    public function testGetArgumentRequiredCount()
+    {
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArgument($this->foo2);
+        $this->assertEquals(1, $definition->getArgumentRequiredCount(), '->getArgumentRequiredCount() returns the number of required arguments');
+        $definition->addArgument($this->foo);
+        $this->assertEquals(1, $definition->getArgumentRequiredCount(), '->getArgumentRequiredCount() returns the number of required arguments');
+    }
+
+    public function testGetArgumentCount()
+    {
+        $this->initializeArguments();
+
+        $definition = new InputDefinition();
+        $definition->addArgument($this->foo2);
+        $this->assertEquals(1, $definition->getArgumentCount(), '->getArgumentCount() returns the number of arguments');
+        $definition->addArgument($this->foo);
+        $this->assertEquals(2, $definition->getArgumentCount(), '->getArgumentCount() returns the number of arguments');
+    }
+
+    public function testGetArgumentDefaults()
+    {
+        $definition = new InputDefinition([
+            new InputArgument('foo1', InputArgument::OPTIONAL),
+            new InputArgument('foo2', InputArgument::OPTIONAL, '', 'default'),
+            new InputArgument('foo3', InputArgument::OPTIONAL | InputArgument::IS_ARRAY),
+        //  new InputArgument('foo4', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, '', [1, 2]),
+        ]);
+        $this->assertEquals(['foo1' => null, 'foo2' => 'default', 'foo3' => []], $definition->getArgumentDefaults(), '->getArgumentDefaults() return the default values for each argument');
+
+        $definition = new InputDefinition([
+            new InputArgument('foo4', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, '', [1, 2]),
+        ]);
+        $this->assertEquals(['foo4' => [1, 2]], $definition->getArgumentDefaults(), '->getArgumentDefaults() return the default values for each argument');
+    }
+
+    public function testSetOptions()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $this->assertEquals(['foo' => $this->foo], $definition->getOptions(), '->setOptions() sets the array of InputOption objects');
+        $definition->setOptions([$this->bar]);
+        $this->assertEquals(['bar' => $this->bar], $definition->getOptions(), '->setOptions() clears all InputOption objects');
+    }
+
+    public function testSetOptionsClearsOptions()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "-f" option does not exist.');
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $definition->setOptions([$this->bar]);
+        $definition->getOptionForShortcut('f');
+    }
+
+    public function testAddOptions()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $this->assertEquals(['foo' => $this->foo], $definition->getOptions(), '->addOptions() adds an array of InputOption objects');
+        $definition->addOptions([$this->bar]);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getOptions(), '->addOptions() does not clear existing InputOption objects');
+    }
+
+    public function testAddOption()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition();
+        $definition->addOption($this->foo);
+        $this->assertEquals(['foo' => $this->foo], $definition->getOptions(), '->addOption() adds a InputOption object');
+        $definition->addOption($this->bar);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getOptions(), '->addOption() adds a InputOption object');
+    }
+
+    public function testAddDuplicateOption()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('An option named "foo" already exists.');
+        $this->initializeOptions();
+
+        $definition = new InputDefinition();
+        $definition->addOption($this->foo);
+        $definition->addOption($this->foo2);
+    }
+
+    public function testAddDuplicateShortcutOption()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('An option with shortcut "f" already exists.');
+        $this->initializeOptions();
+
+        $definition = new InputDefinition();
+        $definition->addOption($this->foo);
+        $definition->addOption($this->foo1);
+    }
+
+    public function testGetOption()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $this->assertEquals($this->foo, $definition->getOption('foo'), '->getOption() returns a InputOption by its name');
+    }
+
+    public function testGetInvalidOption()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "--bar" option does not exist.');
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $definition->getOption('bar');
+    }
+
+    public function testHasOption()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $this->assertTrue($definition->hasOption('foo'), '->hasOption() returns true if a InputOption exists for the given name');
+        $this->assertFalse($definition->hasOption('bar'), '->hasOption() returns false if a InputOption exists for the given name');
+    }
+
+    public function testHasShortcut()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $this->assertTrue($definition->hasShortcut('f'), '->hasShortcut() returns true if a InputOption exists for the given shortcut');
+        $this->assertFalse($definition->hasShortcut('b'), '->hasShortcut() returns false if a InputOption exists for the given shortcut');
+    }
+
+    public function testGetOptionForShortcut()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $this->assertEquals($this->foo, $definition->getOptionForShortcut('f'), '->getOptionForShortcut() returns a InputOption by its shortcut');
+    }
+
+    public function testGetOptionForMultiShortcut()
+    {
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->multi]);
+        $this->assertEquals($this->multi, $definition->getOptionForShortcut('m'), '->getOptionForShortcut() returns a InputOption by its shortcut');
+        $this->assertEquals($this->multi, $definition->getOptionForShortcut('mmm'), '->getOptionForShortcut() returns a InputOption by its shortcut');
+    }
+
+    public function testGetOptionForInvalidShortcut()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "-l" option does not exist.');
+        $this->initializeOptions();
+
+        $definition = new InputDefinition([$this->foo]);
+        $definition->getOptionForShortcut('l');
+    }
+
+    public function testGetOptionDefaults()
+    {
+        $definition = new InputDefinition([
+            new InputOption('foo1', null, InputOption::VALUE_NONE),
+            new InputOption('foo2', null, InputOption::VALUE_REQUIRED),
+            new InputOption('foo3', null, InputOption::VALUE_REQUIRED, '', 'default'),
+            new InputOption('foo4', null, InputOption::VALUE_OPTIONAL),
+            new InputOption('foo5', null, InputOption::VALUE_OPTIONAL, '', 'default'),
+            new InputOption('foo6', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY),
+            new InputOption('foo7', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, '', [1, 2]),
+        ]);
+        $defaults = [
+            'foo1' => false,
+            'foo2' => null,
+            'foo3' => 'default',
+            'foo4' => null,
+            'foo5' => 'default',
+            'foo6' => [],
+            'foo7' => [1, 2],
+        ];
+        $this->assertSame($defaults, $definition->getOptionDefaults(), '->getOptionDefaults() returns the default values for all options');
+    }
+
+    /**
+     * @dataProvider getGetSynopsisData
+     */
+    public function testGetSynopsis(InputDefinition $definition, $expectedSynopsis, $message = null)
+    {
+        $this->assertEquals($expectedSynopsis, $definition->getSynopsis(), $message ? '->getSynopsis() '.$message : '');
+    }
+
+    public function getGetSynopsisData()
+    {
+        return [
+            [new InputDefinition([new InputOption('foo')]), '[--foo]', 'puts optional options in square brackets'],
+            [new InputDefinition([new InputOption('foo', 'f')]), '[-f|--foo]', 'separates shortcut with a pipe'],
+            [new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)]), '[-f|--foo FOO]', 'uses shortcut as value placeholder'],
+            [new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)]), '[-f|--foo [FOO]]', 'puts optional values in square brackets'],
+
+            [new InputDefinition([new InputArgument('foo', InputArgument::REQUIRED)]), '<foo>', 'puts arguments in angle brackets'],
+            [new InputDefinition([new InputArgument('foo')]), '[<foo>]', 'puts optional arguments in square brackets'],
+            [new InputDefinition([new InputArgument('foo', InputArgument::IS_ARRAY)]), '[<foo>]...', 'uses an ellipsis for array arguments'],
+            [new InputDefinition([new InputArgument('foo', InputArgument::REQUIRED | InputArgument::IS_ARRAY)]), '<foo> (<foo>)...', 'uses parenthesis and ellipsis for required array arguments'],
+
+            [new InputDefinition([new InputOption('foo'), new InputArgument('foo', InputArgument::REQUIRED)]), '[--foo] [--] <foo>', 'puts [--] between options and arguments'],
+        ];
+    }
+
+    public function testGetShortSynopsis()
+    {
+        $definition = new InputDefinition([new InputOption('foo'), new InputOption('bar'), new InputArgument('cat')]);
+        $this->assertEquals('[options] [--] [<cat>]', $definition->getSynopsis(true), '->getSynopsis(true) groups options in [options]');
+    }
+
+    protected function initializeArguments()
+    {
+        $this->foo = new InputArgument('foo');
+        $this->bar = new InputArgument('bar');
+        $this->foo1 = new InputArgument('foo');
+        $this->foo2 = new InputArgument('foo2', InputArgument::REQUIRED);
+    }
+
+    protected function initializeOptions()
+    {
+        $this->foo = new InputOption('foo', 'f');
+        $this->bar = new InputOption('bar', 'b');
+        $this->foo1 = new InputOption('fooBis', 'f');
+        $this->foo2 = new InputOption('foo', 'p');
+        $this->multi = new InputOption('multi', 'm|mm|mmm');
+    }
+}
diff --git a/lib/symfony/console/Tests/Input/InputOptionTest.php b/lib/symfony/console/Tests/Input/InputOptionTest.php
new file mode 100644
index 000000000..f7dcbd18f
--- /dev/null
+++ b/lib/symfony/console/Tests/Input/InputOptionTest.php
@@ -0,0 +1,194 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Input;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\InputOption;
+
+class InputOptionTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $option = new InputOption('foo');
+        $this->assertEquals('foo', $option->getName(), '__construct() takes a name as its first argument');
+        $option = new InputOption('--foo');
+        $this->assertEquals('foo', $option->getName(), '__construct() removes the leading -- of the option name');
+    }
+
+    public function testArrayModeWithoutValue()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Impossible to have an option mode VALUE_IS_ARRAY if the option does not accept a value.');
+        new InputOption('foo', 'f', InputOption::VALUE_IS_ARRAY);
+    }
+
+    public function testShortcut()
+    {
+        $option = new InputOption('foo', 'f');
+        $this->assertEquals('f', $option->getShortcut(), '__construct() can take a shortcut as its second argument');
+        $option = new InputOption('foo', '-f|-ff|fff');
+        $this->assertEquals('f|ff|fff', $option->getShortcut(), '__construct() removes the leading - of the shortcuts');
+        $option = new InputOption('foo', ['f', 'ff', '-fff']);
+        $this->assertEquals('f|ff|fff', $option->getShortcut(), '__construct() removes the leading - of the shortcuts');
+        $option = new InputOption('foo');
+        $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null by default');
+    }
+
+    public function testModes()
+    {
+        $option = new InputOption('foo', 'f');
+        $this->assertFalse($option->acceptValue(), '__construct() gives a "InputOption::VALUE_NONE" mode by default');
+        $this->assertFalse($option->isValueRequired(), '__construct() gives a "InputOption::VALUE_NONE" mode by default');
+        $this->assertFalse($option->isValueOptional(), '__construct() gives a "InputOption::VALUE_NONE" mode by default');
+
+        $option = new InputOption('foo', 'f', null);
+        $this->assertFalse($option->acceptValue(), '__construct() can take "InputOption::VALUE_NONE" as its mode');
+        $this->assertFalse($option->isValueRequired(), '__construct() can take "InputOption::VALUE_NONE" as its mode');
+        $this->assertFalse($option->isValueOptional(), '__construct() can take "InputOption::VALUE_NONE" as its mode');
+
+        $option = new InputOption('foo', 'f', InputOption::VALUE_NONE);
+        $this->assertFalse($option->acceptValue(), '__construct() can take "InputOption::VALUE_NONE" as its mode');
+        $this->assertFalse($option->isValueRequired(), '__construct() can take "InputOption::VALUE_NONE" as its mode');
+        $this->assertFalse($option->isValueOptional(), '__construct() can take "InputOption::VALUE_NONE" as its mode');
+
+        $option = new InputOption('foo', 'f', InputOption::VALUE_REQUIRED);
+        $this->assertTrue($option->acceptValue(), '__construct() can take "InputOption::VALUE_REQUIRED" as its mode');
+        $this->assertTrue($option->isValueRequired(), '__construct() can take "InputOption::VALUE_REQUIRED" as its mode');
+        $this->assertFalse($option->isValueOptional(), '__construct() can take "InputOption::VALUE_REQUIRED" as its mode');
+
+        $option = new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL);
+        $this->assertTrue($option->acceptValue(), '__construct() can take "InputOption::VALUE_OPTIONAL" as its mode');
+        $this->assertFalse($option->isValueRequired(), '__construct() can take "InputOption::VALUE_OPTIONAL" as its mode');
+        $this->assertTrue($option->isValueOptional(), '__construct() can take "InputOption::VALUE_OPTIONAL" as its mode');
+    }
+
+    /**
+     * @dataProvider provideInvalidModes
+     */
+    public function testInvalidModes($mode)
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(sprintf('Option mode "%s" is not valid.', $mode));
+
+        new InputOption('foo', 'f', $mode);
+    }
+
+    public function provideInvalidModes()
+    {
+        return [
+            ['ANOTHER_ONE'],
+            [-1],
+        ];
+    }
+
+    public function testEmptyNameIsInvalid()
+    {
+        $this->expectException('InvalidArgumentException');
+        new InputOption('');
+    }
+
+    public function testDoubleDashNameIsInvalid()
+    {
+        $this->expectException('InvalidArgumentException');
+        new InputOption('--');
+    }
+
+    public function testSingleDashOptionIsInvalid()
+    {
+        $this->expectException('InvalidArgumentException');
+        new InputOption('foo', '-');
+    }
+
+    public function testIsArray()
+    {
+        $option = new InputOption('foo', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY);
+        $this->assertTrue($option->isArray(), '->isArray() returns true if the option can be an array');
+        $option = new InputOption('foo', null, InputOption::VALUE_NONE);
+        $this->assertFalse($option->isArray(), '->isArray() returns false if the option can not be an array');
+    }
+
+    public function testGetDescription()
+    {
+        $option = new InputOption('foo', 'f', null, 'Some description');
+        $this->assertEquals('Some description', $option->getDescription(), '->getDescription() returns the description message');
+    }
+
+    public function testGetDefault()
+    {
+        $option = new InputOption('foo', null, InputOption::VALUE_OPTIONAL, '', 'default');
+        $this->assertEquals('default', $option->getDefault(), '->getDefault() returns the default value');
+
+        $option = new InputOption('foo', null, InputOption::VALUE_REQUIRED, '', 'default');
+        $this->assertEquals('default', $option->getDefault(), '->getDefault() returns the default value');
+
+        $option = new InputOption('foo', null, InputOption::VALUE_REQUIRED);
+        $this->assertNull($option->getDefault(), '->getDefault() returns null if no default value is configured');
+
+        $option = new InputOption('foo', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY);
+        $this->assertEquals([], $option->getDefault(), '->getDefault() returns an empty array if option is an array');
+
+        $option = new InputOption('foo', null, InputOption::VALUE_NONE);
+        $this->assertFalse($option->getDefault(), '->getDefault() returns false if the option does not take a value');
+    }
+
+    public function testSetDefault()
+    {
+        $option = new InputOption('foo', null, InputOption::VALUE_REQUIRED, '', 'default');
+        $option->setDefault(null);
+        $this->assertNull($option->getDefault(), '->setDefault() can reset the default value by passing null');
+        $option->setDefault('another');
+        $this->assertEquals('another', $option->getDefault(), '->setDefault() changes the default value');
+
+        $option = new InputOption('foo', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY);
+        $option->setDefault([1, 2]);
+        $this->assertEquals([1, 2], $option->getDefault(), '->setDefault() changes the default value');
+    }
+
+    public function testDefaultValueWithValueNoneMode()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Cannot set a default value when using InputOption::VALUE_NONE mode.');
+        $option = new InputOption('foo', 'f', InputOption::VALUE_NONE);
+        $option->setDefault('default');
+    }
+
+    public function testDefaultValueWithIsArrayMode()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('A default value for an array option must be an array.');
+        $option = new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY);
+        $option->setDefault('default');
+    }
+
+    public function testEquals()
+    {
+        $option = new InputOption('foo', 'f', null, 'Some description');
+        $option2 = new InputOption('foo', 'f', null, 'Alternative description');
+        $this->assertTrue($option->equals($option2));
+
+        $option = new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, 'Some description');
+        $option2 = new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, 'Some description', true);
+        $this->assertFalse($option->equals($option2));
+
+        $option = new InputOption('foo', 'f', null, 'Some description');
+        $option2 = new InputOption('bar', 'f', null, 'Some description');
+        $this->assertFalse($option->equals($option2));
+
+        $option = new InputOption('foo', 'f', null, 'Some description');
+        $option2 = new InputOption('foo', '', null, 'Some description');
+        $this->assertFalse($option->equals($option2));
+
+        $option = new InputOption('foo', 'f', null, 'Some description');
+        $option2 = new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, 'Some description');
+        $this->assertFalse($option->equals($option2));
+    }
+}
diff --git a/lib/symfony/console/Tests/Input/InputTest.php b/lib/symfony/console/Tests/Input/InputTest.php
new file mode 100644
index 000000000..060b750f4
--- /dev/null
+++ b/lib/symfony/console/Tests/Input/InputTest.php
@@ -0,0 +1,137 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Input;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+class InputTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name')]));
+        $this->assertEquals('foo', $input->getArgument('name'), '->__construct() takes a InputDefinition as an argument');
+    }
+
+    public function testOptions()
+    {
+        $input = new ArrayInput(['--name' => 'foo'], new InputDefinition([new InputOption('name')]));
+        $this->assertEquals('foo', $input->getOption('name'), '->getOption() returns the value for the given option');
+
+        $input->setOption('name', 'bar');
+        $this->assertEquals('bar', $input->getOption('name'), '->setOption() sets the value for a given option');
+        $this->assertEquals(['name' => 'bar'], $input->getOptions(), '->getOptions() returns all option values');
+
+        $input = new ArrayInput(['--name' => 'foo'], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
+        $this->assertEquals('default', $input->getOption('bar'), '->getOption() returns the default value for optional options');
+        $this->assertEquals(['name' => 'foo', 'bar' => 'default'], $input->getOptions(), '->getOptions() returns all option values, even optional ones');
+
+        $input = new ArrayInput(['--name' => 'foo', '--bar' => ''], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
+        $this->assertEquals('', $input->getOption('bar'), '->getOption() returns null for options explicitly passed without value (or an empty value)');
+        $this->assertEquals(['name' => 'foo', 'bar' => ''], $input->getOptions(), '->getOptions() returns all option values.');
+
+        $input = new ArrayInput(['--name' => 'foo', '--bar' => null], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
+        $this->assertNull($input->getOption('bar'), '->getOption() returns null for options explicitly passed without value (or an empty value)');
+        $this->assertEquals(['name' => 'foo', 'bar' => null], $input->getOptions(), '->getOptions() returns all option values');
+    }
+
+    public function testSetInvalidOption()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "foo" option does not exist.');
+        $input = new ArrayInput(['--name' => 'foo'], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
+        $input->setOption('foo', 'bar');
+    }
+
+    public function testGetInvalidOption()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "foo" option does not exist.');
+        $input = new ArrayInput(['--name' => 'foo'], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
+        $input->getOption('foo');
+    }
+
+    public function testArguments()
+    {
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name')]));
+        $this->assertEquals('foo', $input->getArgument('name'), '->getArgument() returns the value for the given argument');
+
+        $input->setArgument('name', 'bar');
+        $this->assertEquals('bar', $input->getArgument('name'), '->setArgument() sets the value for a given argument');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->getArguments() returns all argument values');
+
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default')]));
+        $this->assertEquals('default', $input->getArgument('bar'), '->getArgument() returns the default value for optional arguments');
+        $this->assertEquals(['name' => 'foo', 'bar' => 'default'], $input->getArguments(), '->getArguments() returns all argument values, even optional ones');
+    }
+
+    public function testSetInvalidArgument()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "foo" argument does not exist.');
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default')]));
+        $input->setArgument('foo', 'bar');
+    }
+
+    public function testGetInvalidArgument()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "foo" argument does not exist.');
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default')]));
+        $input->getArgument('foo');
+    }
+
+    public function testValidateWithMissingArguments()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Not enough arguments (missing: "name").');
+        $input = new ArrayInput([]);
+        $input->bind(new InputDefinition([new InputArgument('name', InputArgument::REQUIRED)]));
+        $input->validate();
+    }
+
+    public function testValidateWithMissingRequiredArguments()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Not enough arguments (missing: "name").');
+        $input = new ArrayInput(['bar' => 'baz']);
+        $input->bind(new InputDefinition([new InputArgument('name', InputArgument::REQUIRED), new InputArgument('bar', InputArgument::OPTIONAL)]));
+        $input->validate();
+    }
+
+    public function testValidate()
+    {
+        $input = new ArrayInput(['name' => 'foo']);
+        $input->bind(new InputDefinition([new InputArgument('name', InputArgument::REQUIRED)]));
+
+        $this->assertNull($input->validate());
+    }
+
+    public function testSetGetInteractive()
+    {
+        $input = new ArrayInput([]);
+        $this->assertTrue($input->isInteractive(), '->isInteractive() returns whether the input should be interactive or not');
+        $input->setInteractive(false);
+        $this->assertFalse($input->isInteractive(), '->setInteractive() changes the interactive flag');
+    }
+
+    public function testSetGetStream()
+    {
+        $input = new ArrayInput([]);
+        $stream = fopen('php://memory', 'r+', false);
+        $input->setStream($stream);
+        $this->assertSame($stream, $input->getStream());
+    }
+}
diff --git a/lib/symfony/console/Tests/Input/StringInputTest.php b/lib/symfony/console/Tests/Input/StringInputTest.php
new file mode 100644
index 000000000..7f2189452
--- /dev/null
+++ b/lib/symfony/console/Tests/Input/StringInputTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Input;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\StringInput;
+
+class StringInputTest extends TestCase
+{
+    /**
+     * @dataProvider getTokenizeData
+     */
+    public function testTokenize($input, $tokens, $message)
+    {
+        $input = new StringInput($input);
+        $r = new \ReflectionClass('Symfony\Component\Console\Input\ArgvInput');
+        $p = $r->getProperty('tokens');
+        $p->setAccessible(true);
+        $this->assertEquals($tokens, $p->getValue($input), $message);
+    }
+
+    public function testInputOptionWithGivenString()
+    {
+        $definition = new InputDefinition(
+            [new InputOption('foo', null, InputOption::VALUE_REQUIRED)]
+        );
+
+        // call to bind
+        $input = new StringInput('--foo=bar');
+        $input->bind($definition);
+        $this->assertEquals('bar', $input->getOption('foo'));
+    }
+
+    public function getTokenizeData()
+    {
+        return [
+            ['', [], '->tokenize() parses an empty string'],
+            ['foo', ['foo'], '->tokenize() parses arguments'],
+            ['  foo  bar  ', ['foo', 'bar'], '->tokenize() ignores whitespaces between arguments'],
+            ['"quoted"', ['quoted'], '->tokenize() parses quoted arguments'],
+            ["'quoted'", ['quoted'], '->tokenize() parses quoted arguments'],
+            ["'a\rb\nc\td'", ["a\rb\nc\td"], '->tokenize() parses whitespace chars in strings'],
+            ["'a'\r'b'\n'c'\t'd'", ['a', 'b', 'c', 'd'], '->tokenize() parses whitespace chars between args as spaces'],
+            ['\"quoted\"', ['"quoted"'], '->tokenize() parses escaped-quoted arguments'],
+            ["\'quoted\'", ['\'quoted\''], '->tokenize() parses escaped-quoted arguments'],
+            ['-a', ['-a'], '->tokenize() parses short options'],
+            ['-azc', ['-azc'], '->tokenize() parses aggregated short options'],
+            ['-awithavalue', ['-awithavalue'], '->tokenize() parses short options with a value'],
+            ['-a"foo bar"', ['-afoo bar'], '->tokenize() parses short options with a value'],
+            ['-a"foo bar""foo bar"', ['-afoo barfoo bar'], '->tokenize() parses short options with a value'],
+            ['-a\'foo bar\'', ['-afoo bar'], '->tokenize() parses short options with a value'],
+            ['-a\'foo bar\'\'foo bar\'', ['-afoo barfoo bar'], '->tokenize() parses short options with a value'],
+            ['-a\'foo bar\'"foo bar"', ['-afoo barfoo bar'], '->tokenize() parses short options with a value'],
+            ['--long-option', ['--long-option'], '->tokenize() parses long options'],
+            ['--long-option=foo', ['--long-option=foo'], '->tokenize() parses long options with a value'],
+            ['--long-option="foo bar"', ['--long-option=foo bar'], '->tokenize() parses long options with a value'],
+            ['--long-option="foo bar""another"', ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],
+            ['--long-option=\'foo bar\'', ['--long-option=foo bar'], '->tokenize() parses long options with a value'],
+            ["--long-option='foo bar''another'", ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],
+            ["--long-option='foo bar'\"another\"", ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],
+            ['foo -a -ffoo --long bar', ['foo', '-a', '-ffoo', '--long', 'bar'], '->tokenize() parses when several arguments and options'],
+        ];
+    }
+
+    public function testToString()
+    {
+        $input = new StringInput('-f foo');
+        $this->assertEquals('-f foo', (string) $input);
+
+        $input = new StringInput('-f --bar=foo "a b c d"');
+        $this->assertEquals('-f --bar=foo '.escapeshellarg('a b c d'), (string) $input);
+
+        $input = new StringInput('-f --bar=foo \'a b c d\' '."'A\nB\\'C'");
+        $this->assertEquals('-f --bar=foo '.escapeshellarg('a b c d').' '.escapeshellarg("A\nB'C"), (string) $input);
+    }
+}
diff --git a/lib/symfony/console/Tests/Logger/ConsoleLoggerTest.php b/lib/symfony/console/Tests/Logger/ConsoleLoggerTest.php
new file mode 100644
index 000000000..f1bbb61c5
--- /dev/null
+++ b/lib/symfony/console/Tests/Logger/ConsoleLoggerTest.php
@@ -0,0 +1,213 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Logger;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Symfony\Component\Console\Logger\ConsoleLogger;
+use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tests\Fixtures\DummyOutput;
+
+/**
+ * Console logger test.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class ConsoleLoggerTest extends TestCase
+{
+    /**
+     * @var DummyOutput
+     */
+    protected $output;
+
+    /**
+     * @return LoggerInterface
+     */
+    public function getLogger()
+    {
+        $this->output = new DummyOutput(OutputInterface::VERBOSITY_VERBOSE);
+
+        return new ConsoleLogger($this->output, [
+            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_NORMAL,
+            LogLevel::INFO => OutputInterface::VERBOSITY_NORMAL,
+            LogLevel::DEBUG => OutputInterface::VERBOSITY_NORMAL,
+        ]);
+    }
+
+    /**
+     * Return the log messages in order.
+     *
+     * @return string[]
+     */
+    public function getLogs()
+    {
+        return $this->output->getLogs();
+    }
+
+    /**
+     * @dataProvider provideOutputMappingParams
+     */
+    public function testOutputMapping($logLevel, $outputVerbosity, $isOutput, $addVerbosityLevelMap = [])
+    {
+        $out = new BufferedOutput($outputVerbosity);
+        $logger = new ConsoleLogger($out, $addVerbosityLevelMap);
+        $logger->log($logLevel, 'foo bar');
+        $logs = $out->fetch();
+        $this->assertEquals($isOutput ? "[$logLevel] foo bar".PHP_EOL : '', $logs);
+    }
+
+    public function provideOutputMappingParams()
+    {
+        $quietMap = [LogLevel::EMERGENCY => OutputInterface::VERBOSITY_QUIET];
+
+        return [
+            [LogLevel::EMERGENCY, OutputInterface::VERBOSITY_NORMAL, true],
+            [LogLevel::WARNING, OutputInterface::VERBOSITY_NORMAL, true],
+            [LogLevel::INFO, OutputInterface::VERBOSITY_NORMAL, false],
+            [LogLevel::DEBUG, OutputInterface::VERBOSITY_NORMAL, false],
+            [LogLevel::INFO, OutputInterface::VERBOSITY_VERBOSE, false],
+            [LogLevel::INFO, OutputInterface::VERBOSITY_VERY_VERBOSE, true],
+            [LogLevel::DEBUG, OutputInterface::VERBOSITY_VERY_VERBOSE, false],
+            [LogLevel::DEBUG, OutputInterface::VERBOSITY_DEBUG, true],
+            [LogLevel::ALERT, OutputInterface::VERBOSITY_QUIET, false],
+            [LogLevel::EMERGENCY, OutputInterface::VERBOSITY_QUIET, false],
+            [LogLevel::ALERT, OutputInterface::VERBOSITY_QUIET, false, $quietMap],
+            [LogLevel::EMERGENCY, OutputInterface::VERBOSITY_QUIET, true, $quietMap],
+        ];
+    }
+
+    public function testHasErrored()
+    {
+        $logger = new ConsoleLogger(new BufferedOutput());
+
+        $this->assertFalse($logger->hasErrored());
+
+        $logger->warning('foo');
+        $this->assertFalse($logger->hasErrored());
+
+        $logger->error('bar');
+        $this->assertTrue($logger->hasErrored());
+    }
+
+    public function testImplements()
+    {
+        $this->assertInstanceOf('Psr\Log\LoggerInterface', $this->getLogger());
+    }
+
+    /**
+     * @dataProvider provideLevelsAndMessages
+     */
+    public function testLogsAtAllLevels($level, $message)
+    {
+        $logger = $this->getLogger();
+        $logger->{$level}($message, ['user' => 'Bob']);
+        $logger->log($level, $message, ['user' => 'Bob']);
+
+        $expected = [
+            $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 [
+            LogLevel::EMERGENCY => [LogLevel::EMERGENCY, 'message of level emergency with context: {user}'],
+            LogLevel::ALERT => [LogLevel::ALERT, 'message of level alert with context: {user}'],
+            LogLevel::CRITICAL => [LogLevel::CRITICAL, 'message of level critical with context: {user}'],
+            LogLevel::ERROR => [LogLevel::ERROR, 'message of level error with context: {user}'],
+            LogLevel::WARNING => [LogLevel::WARNING, 'message of level warning with context: {user}'],
+            LogLevel::NOTICE => [LogLevel::NOTICE, 'message of level notice with context: {user}'],
+            LogLevel::INFO => [LogLevel::INFO, 'message of level info with context: {user}'],
+            LogLevel::DEBUG => [LogLevel::DEBUG, 'message of level debug with context: {user}'],
+        ];
+    }
+
+    public function testThrowsOnInvalidLevel()
+    {
+        $this->expectException('Psr\Log\InvalidArgumentException');
+        $logger = $this->getLogger();
+        $logger->log('invalid level', 'Foo');
+    }
+
+    public function testContextReplacement()
+    {
+        $logger = $this->getLogger();
+        $logger->info('{Message {nothing} {user} {foo.bar} a}', ['user' => 'Bob', 'foo.bar' => 'Bar']);
+
+        $expected = ['info {Message {nothing} Bob Bar a}'];
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testObjectCastToString()
+    {
+        if (method_exists($this, 'createPartialMock')) {
+            $dummy = $this->createPartialMock('Symfony\Component\Console\Tests\Logger\DummyTest', ['__toString']);
+        } else {
+            $dummy = $this->createPartialMock('Symfony\Component\Console\Tests\Logger\DummyTest', ['__toString']);
+        }
+        $dummy->method('__toString')->willReturn('DUMMY');
+
+        $this->getLogger()->warning($dummy);
+
+        $expected = ['warning DUMMY'];
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testContextCanContainAnything()
+    {
+        $context = [
+            'bool' => true,
+            'null' => null,
+            'string' => 'Foo',
+            'int' => 0,
+            'float' => 0.5,
+            'nested' => ['with object' => new DummyTest()],
+            'object' => new \DateTime(),
+            'resource' => fopen('php://memory', 'r'),
+        ];
+
+        $this->getLogger()->warning('Crazy context data', $context);
+
+        $expected = ['warning Crazy context data'];
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
+    {
+        $logger = $this->getLogger();
+        $logger->warning('Random message', ['exception' => 'oops']);
+        $logger->critical('Uncaught Exception!', ['exception' => new \LogicException('Fail')]);
+
+        $expected = [
+            'warning Random message',
+            'critical Uncaught Exception!',
+        ];
+        $this->assertEquals($expected, $this->getLogs());
+    }
+}
+
+class DummyTest
+{
+    public function __toString()
+    {
+    }
+}
diff --git a/lib/symfony/console/Tests/Output/ConsoleOutputTest.php b/lib/symfony/console/Tests/Output/ConsoleOutputTest.php
new file mode 100644
index 000000000..db39a02b8
--- /dev/null
+++ b/lib/symfony/console/Tests/Output/ConsoleOutputTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Output;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\Output;
+
+class ConsoleOutputTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $output = new ConsoleOutput(Output::VERBOSITY_QUIET, true);
+        $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');
+        $this->assertSame($output->getFormatter(), $output->getErrorOutput()->getFormatter(), '__construct() takes a formatter or null as the third argument');
+    }
+
+    public function testSetFormatter()
+    {
+        $output = new ConsoleOutput();
+        $outputFormatter = new OutputFormatter();
+        $output->setFormatter($outputFormatter);
+        $this->assertSame($outputFormatter, $output->getFormatter());
+    }
+
+    public function testSetVerbosity()
+    {
+        $output = new ConsoleOutput();
+        $output->setVerbosity(Output::VERBOSITY_VERBOSE);
+        $this->assertSame(Output::VERBOSITY_VERBOSE, $output->getVerbosity());
+    }
+}
diff --git a/lib/symfony/console/Tests/Output/NullOutputTest.php b/lib/symfony/console/Tests/Output/NullOutputTest.php
new file mode 100644
index 000000000..b7ff4be31
--- /dev/null
+++ b/lib/symfony/console/Tests/Output/NullOutputTest.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Output;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class NullOutputTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $output = new NullOutput();
+
+        ob_start();
+        $output->write('foo');
+        $buffer = ob_get_clean();
+
+        $this->assertSame('', $buffer, '->write() does nothing (at least nothing is printed)');
+        $this->assertFalse($output->isDecorated(), '->isDecorated() returns false');
+    }
+
+    public function testVerbosity()
+    {
+        $output = new NullOutput();
+        $this->assertSame(OutputInterface::VERBOSITY_QUIET, $output->getVerbosity(), '->getVerbosity() returns VERBOSITY_QUIET for NullOutput by default');
+
+        $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
+        $this->assertSame(OutputInterface::VERBOSITY_QUIET, $output->getVerbosity(), '->getVerbosity() always returns VERBOSITY_QUIET for NullOutput');
+    }
+
+    public function testSetFormatter()
+    {
+        $output = new NullOutput();
+        $outputFormatter = new OutputFormatter();
+        $output->setFormatter($outputFormatter);
+        $this->assertNotSame($outputFormatter, $output->getFormatter());
+    }
+
+    public function testSetVerbosity()
+    {
+        $output = new NullOutput();
+        $output->setVerbosity(Output::VERBOSITY_NORMAL);
+        $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity());
+    }
+
+    public function testSetDecorated()
+    {
+        $output = new NullOutput();
+        $output->setDecorated(true);
+        $this->assertFalse($output->isDecorated());
+    }
+
+    public function testIsQuiet()
+    {
+        $output = new NullOutput();
+        $this->assertTrue($output->isQuiet());
+    }
+
+    public function testIsVerbose()
+    {
+        $output = new NullOutput();
+        $this->assertFalse($output->isVerbose());
+    }
+
+    public function testIsVeryVerbose()
+    {
+        $output = new NullOutput();
+        $this->assertFalse($output->isVeryVerbose());
+    }
+
+    public function testIsDebug()
+    {
+        $output = new NullOutput();
+        $this->assertFalse($output->isDebug());
+    }
+}
diff --git a/lib/symfony/console/Tests/Output/OutputTest.php b/lib/symfony/console/Tests/Output/OutputTest.php
new file mode 100644
index 000000000..58659f285
--- /dev/null
+++ b/lib/symfony/console/Tests/Output/OutputTest.php
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Output;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Output\Output;
+
+class OutputTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $output = new TestOutput(Output::VERBOSITY_QUIET, true);
+        $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');
+        $this->assertTrue($output->isDecorated(), '__construct() takes the decorated flag as its second argument');
+    }
+
+    public function testSetIsDecorated()
+    {
+        $output = new TestOutput();
+        $output->setDecorated(true);
+        $this->assertTrue($output->isDecorated(), 'setDecorated() sets the decorated flag');
+    }
+
+    public function testSetGetVerbosity()
+    {
+        $output = new TestOutput();
+        $output->setVerbosity(Output::VERBOSITY_QUIET);
+        $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '->setVerbosity() sets the verbosity');
+
+        $this->assertTrue($output->isQuiet());
+        $this->assertFalse($output->isVerbose());
+        $this->assertFalse($output->isVeryVerbose());
+        $this->assertFalse($output->isDebug());
+
+        $output->setVerbosity(Output::VERBOSITY_NORMAL);
+        $this->assertFalse($output->isQuiet());
+        $this->assertFalse($output->isVerbose());
+        $this->assertFalse($output->isVeryVerbose());
+        $this->assertFalse($output->isDebug());
+
+        $output->setVerbosity(Output::VERBOSITY_VERBOSE);
+        $this->assertFalse($output->isQuiet());
+        $this->assertTrue($output->isVerbose());
+        $this->assertFalse($output->isVeryVerbose());
+        $this->assertFalse($output->isDebug());
+
+        $output->setVerbosity(Output::VERBOSITY_VERY_VERBOSE);
+        $this->assertFalse($output->isQuiet());
+        $this->assertTrue($output->isVerbose());
+        $this->assertTrue($output->isVeryVerbose());
+        $this->assertFalse($output->isDebug());
+
+        $output->setVerbosity(Output::VERBOSITY_DEBUG);
+        $this->assertFalse($output->isQuiet());
+        $this->assertTrue($output->isVerbose());
+        $this->assertTrue($output->isVeryVerbose());
+        $this->assertTrue($output->isDebug());
+    }
+
+    public function testWriteWithVerbosityQuiet()
+    {
+        $output = new TestOutput(Output::VERBOSITY_QUIET);
+        $output->writeln('foo');
+        $this->assertEquals('', $output->output, '->writeln() outputs nothing if verbosity is set to VERBOSITY_QUIET');
+    }
+
+    public function testWriteAnArrayOfMessages()
+    {
+        $output = new TestOutput();
+        $output->writeln(['foo', 'bar']);
+        $this->assertEquals("foo\nbar\n", $output->output, '->writeln() can take an array of messages to output');
+    }
+
+    /**
+     * @dataProvider provideWriteArguments
+     */
+    public function testWriteRawMessage($message, $type, $expectedOutput)
+    {
+        $output = new TestOutput();
+        $output->writeln($message, $type);
+        $this->assertEquals($expectedOutput, $output->output);
+    }
+
+    public function provideWriteArguments()
+    {
+        return [
+            ['<info>foo</info>', Output::OUTPUT_RAW, "<info>foo</info>\n"],
+            ['<info>foo</info>', Output::OUTPUT_PLAIN, "foo\n"],
+        ];
+    }
+
+    public function testWriteWithDecorationTurnedOff()
+    {
+        $output = new TestOutput();
+        $output->setDecorated(false);
+        $output->writeln('<info>foo</info>');
+        $this->assertEquals("foo\n", $output->output, '->writeln() strips decoration tags if decoration is set to false');
+    }
+
+    public function testWriteDecoratedMessage()
+    {
+        $fooStyle = new OutputFormatterStyle('yellow', 'red', ['blink']);
+        $output = new TestOutput();
+        $output->getFormatter()->setStyle('FOO', $fooStyle);
+        $output->setDecorated(true);
+        $output->writeln('<foo>foo</foo>');
+        $this->assertEquals("\033[33;41;5mfoo\033[39;49;25m\n", $output->output, '->writeln() decorates the output');
+    }
+
+    public function testWriteWithInvalidStyle()
+    {
+        $output = new TestOutput();
+
+        $output->clear();
+        $output->write('<bar>foo</bar>');
+        $this->assertEquals('<bar>foo</bar>', $output->output, '->write() do nothing when a style does not exist');
+
+        $output->clear();
+        $output->writeln('<bar>foo</bar>');
+        $this->assertEquals("<bar>foo</bar>\n", $output->output, '->writeln() do nothing when a style does not exist');
+    }
+
+    /**
+     * @dataProvider verbosityProvider
+     */
+    public function testWriteWithVerbosityOption($verbosity, $expected, $msg)
+    {
+        $output = new TestOutput();
+
+        $output->setVerbosity($verbosity);
+        $output->clear();
+        $output->write('1', false);
+        $output->write('2', false, Output::VERBOSITY_QUIET);
+        $output->write('3', false, Output::VERBOSITY_NORMAL);
+        $output->write('4', false, Output::VERBOSITY_VERBOSE);
+        $output->write('5', false, Output::VERBOSITY_VERY_VERBOSE);
+        $output->write('6', false, Output::VERBOSITY_DEBUG);
+        $this->assertEquals($expected, $output->output, $msg);
+    }
+
+    public function verbosityProvider()
+    {
+        return [
+            [Output::VERBOSITY_QUIET, '2', '->write() in QUIET mode only outputs when an explicit QUIET verbosity is passed'],
+            [Output::VERBOSITY_NORMAL, '123', '->write() in NORMAL mode outputs anything below an explicit VERBOSE verbosity'],
+            [Output::VERBOSITY_VERBOSE, '1234', '->write() in VERBOSE mode outputs anything below an explicit VERY_VERBOSE verbosity'],
+            [Output::VERBOSITY_VERY_VERBOSE, '12345', '->write() in VERY_VERBOSE mode outputs anything below an explicit DEBUG verbosity'],
+            [Output::VERBOSITY_DEBUG, '123456', '->write() in DEBUG mode outputs everything'],
+        ];
+    }
+}
+
+class TestOutput extends Output
+{
+    public $output = '';
+
+    public function clear()
+    {
+        $this->output = '';
+    }
+
+    protected function doWrite($message, $newline)
+    {
+        $this->output .= $message.($newline ? "\n" : '');
+    }
+}
diff --git a/lib/symfony/console/Tests/Output/StreamOutputTest.php b/lib/symfony/console/Tests/Output/StreamOutputTest.php
new file mode 100644
index 000000000..d843fa4a4
--- /dev/null
+++ b/lib/symfony/console/Tests/Output/StreamOutputTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Output;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Output\StreamOutput;
+
+class StreamOutputTest extends TestCase
+{
+    protected $stream;
+
+    protected function setUp()
+    {
+        $this->stream = fopen('php://memory', 'a', false);
+    }
+
+    protected function tearDown()
+    {
+        $this->stream = null;
+    }
+
+    public function testConstructor()
+    {
+        $output = new StreamOutput($this->stream, Output::VERBOSITY_QUIET, true);
+        $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');
+        $this->assertTrue($output->isDecorated(), '__construct() takes the decorated flag as its second argument');
+    }
+
+    public function testStreamIsRequired()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The StreamOutput class needs a stream as its first argument.');
+        new StreamOutput('foo');
+    }
+
+    public function testGetStream()
+    {
+        $output = new StreamOutput($this->stream);
+        $this->assertEquals($this->stream, $output->getStream(), '->getStream() returns the current stream');
+    }
+
+    public function testDoWrite()
+    {
+        $output = new StreamOutput($this->stream);
+        $output->writeln('foo');
+        rewind($output->getStream());
+        $this->assertEquals('foo'.PHP_EOL, stream_get_contents($output->getStream()), '->doWrite() writes to the stream');
+    }
+}
diff --git a/lib/symfony/console/Tests/Question/ChoiceQuestionTest.php b/lib/symfony/console/Tests/Question/ChoiceQuestionTest.php
new file mode 100644
index 000000000..5ec7a9cac
--- /dev/null
+++ b/lib/symfony/console/Tests/Question/ChoiceQuestionTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Question;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+
+class ChoiceQuestionTest extends TestCase
+{
+    /**
+     * @dataProvider selectUseCases
+     */
+    public function testSelectUseCases($multiSelect, $answers, $expected, $message)
+    {
+        $question = new ChoiceQuestion('A question', [
+            'First response',
+            'Second response',
+            'Third response',
+            'Fourth response',
+        ]);
+
+        $question->setMultiselect($multiSelect);
+
+        foreach ($answers as $answer) {
+            $validator = $question->getValidator();
+            $actual = $validator($answer);
+
+            $this->assertEquals($actual, $expected, $message);
+        }
+    }
+
+    public function selectUseCases()
+    {
+        return [
+            [
+                false,
+                ['First response', 'First response ', ' First response', ' First response '],
+                'First response',
+                'When passed single answer on singleSelect, the defaultValidator must return this answer as a string',
+            ],
+            [
+                true,
+                ['First response', 'First response ', ' First response', ' First response '],
+                ['First response'],
+                'When passed single answer on MultiSelect, the defaultValidator must return this answer as an array',
+            ],
+            [
+                true,
+                ['First response,Second response', ' First response , Second response '],
+                ['First response', 'Second response'],
+                'When passed multiple answers on MultiSelect, the defaultValidator must return these answers as an array',
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/console/Tests/Question/ConfirmationQuestionTest.php b/lib/symfony/console/Tests/Question/ConfirmationQuestionTest.php
new file mode 100644
index 000000000..83899772a
--- /dev/null
+++ b/lib/symfony/console/Tests/Question/ConfirmationQuestionTest.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Question;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class ConfirmationQuestionTest extends TestCase
+{
+    /**
+     * @dataProvider normalizerUsecases
+     */
+    public function testDefaultRegexUsecases($default, $answers, $expected, $message)
+    {
+        $sut = new ConfirmationQuestion('A question', $default);
+
+        foreach ($answers as $answer) {
+            $normalizer = $sut->getNormalizer();
+            $actual = $normalizer($answer);
+            $this->assertEquals($expected, $actual, sprintf($message, $answer));
+        }
+    }
+
+    public function normalizerUsecases()
+    {
+        return [
+            [
+                true,
+                ['y', 'Y', 'yes', 'YES', 'yEs', ''],
+                true,
+                'When default is true, the normalizer must return true for "%s"',
+            ],
+            [
+                true,
+                ['n', 'N', 'no', 'NO', 'nO', 'foo', '1', '0'],
+                false,
+                'When default is true, the normalizer must return false for "%s"',
+            ],
+            [
+                false,
+                ['y', 'Y', 'yes', 'YES', 'yEs'],
+                true,
+                'When default is false, the normalizer must return true for "%s"',
+            ],
+            [
+                false,
+                ['n', 'N', 'no', 'NO', 'nO', 'foo', '1', '0', ''],
+                false,
+                'When default is false, the normalizer must return false for "%s"',
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/console/Tests/Style/SymfonyStyleTest.php b/lib/symfony/console/Tests/Style/SymfonyStyleTest.php
new file mode 100644
index 000000000..88d00c8a9
--- /dev/null
+++ b/lib/symfony/console/Tests/Style/SymfonyStyleTest.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Style;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class SymfonyStyleTest extends TestCase
+{
+    /** @var Command */
+    protected $command;
+    /** @var CommandTester */
+    protected $tester;
+    private $colSize;
+
+    protected function setUp()
+    {
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS=121');
+        $this->command = new Command('sfstyle');
+        $this->tester = new CommandTester($this->command);
+    }
+
+    protected function tearDown()
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+        $this->command = null;
+        $this->tester = null;
+    }
+
+    /**
+     * @dataProvider inputCommandToOutputFilesProvider
+     */
+    public function testOutputs($inputCommandFilepath, $outputFilepath)
+    {
+        $code = require $inputCommandFilepath;
+        $this->command->setCode($code);
+        $this->tester->execute([], ['interactive' => false, 'decorated' => false]);
+        $this->assertStringEqualsFile($outputFilepath, $this->tester->getDisplay(true));
+    }
+
+    /**
+     * @dataProvider inputInteractiveCommandToOutputFilesProvider
+     */
+    public function testInteractiveOutputs($inputCommandFilepath, $outputFilepath)
+    {
+        $code = require $inputCommandFilepath;
+        $this->command->setCode($code);
+        $this->tester->execute([], ['interactive' => true, 'decorated' => false]);
+        $this->assertStringEqualsFile($outputFilepath, $this->tester->getDisplay(true));
+    }
+
+    public function inputInteractiveCommandToOutputFilesProvider()
+    {
+        $baseDir = __DIR__.'/../Fixtures/Style/SymfonyStyle';
+
+        return array_map(null, glob($baseDir.'/command/interactive_command_*.php'), glob($baseDir.'/output/interactive_output_*.txt'));
+    }
+
+    public function inputCommandToOutputFilesProvider()
+    {
+        $baseDir = __DIR__.'/../Fixtures/Style/SymfonyStyle';
+
+        return array_map(null, glob($baseDir.'/command/command_*.php'), glob($baseDir.'/output/output_*.txt'));
+    }
+
+    public function testGetErrorStyle()
+    {
+        $input = $this->getMockBuilder(InputInterface::class)->getMock();
+
+        $errorOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
+        $errorOutput
+            ->method('getFormatter')
+            ->willReturn(new OutputFormatter());
+        $errorOutput
+            ->expects($this->once())
+            ->method('write');
+
+        $output = $this->getMockBuilder(ConsoleOutputInterface::class)->getMock();
+        $output
+            ->method('getFormatter')
+            ->willReturn(new OutputFormatter());
+        $output
+            ->expects($this->once())
+            ->method('getErrorOutput')
+            ->willReturn($errorOutput);
+
+        $io = new SymfonyStyle($input, $output);
+        $io->getErrorStyle()->write('');
+    }
+
+    public function testGetErrorStyleUsesTheCurrentOutputIfNoErrorOutputIsAvailable()
+    {
+        $output = $this->getMockBuilder(OutputInterface::class)->getMock();
+        $output
+            ->method('getFormatter')
+            ->willReturn(new OutputFormatter());
+
+        $style = new SymfonyStyle($this->getMockBuilder(InputInterface::class)->getMock(), $output);
+
+        $this->assertInstanceOf(SymfonyStyle::class, $style->getErrorStyle());
+    }
+}
diff --git a/lib/symfony/console/Tests/TerminalTest.php b/lib/symfony/console/Tests/TerminalTest.php
new file mode 100644
index 000000000..546d2214c
--- /dev/null
+++ b/lib/symfony/console/Tests/TerminalTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Terminal;
+
+class TerminalTest extends TestCase
+{
+    private $colSize;
+    private $lineSize;
+    private $ansiCon;
+
+    protected function setUp()
+    {
+        $this->colSize = getenv('COLUMNS');
+        $this->lineSize = getenv('LINES');
+        $this->ansiCon = getenv('ANSICON');
+        $this->resetStatics();
+    }
+
+    protected function tearDown()
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+        putenv($this->lineSize ? 'LINES' : 'LINES='.$this->lineSize);
+        putenv($this->ansiCon ? 'ANSICON='.$this->ansiCon : 'ANSICON');
+        $this->resetStatics();
+    }
+
+    private function resetStatics()
+    {
+        foreach (['height', 'width', 'stty'] as $name) {
+            $property = new \ReflectionProperty(Terminal::class, $name);
+            $property->setAccessible(true);
+            $property->setValue(null);
+        }
+    }
+
+    public function test()
+    {
+        putenv('COLUMNS=100');
+        putenv('LINES=50');
+        $terminal = new Terminal();
+        $this->assertSame(100, $terminal->getWidth());
+        $this->assertSame(50, $terminal->getHeight());
+
+        putenv('COLUMNS=120');
+        putenv('LINES=60');
+        $terminal = new Terminal();
+        $this->assertSame(120, $terminal->getWidth());
+        $this->assertSame(60, $terminal->getHeight());
+    }
+
+    public function test_zero_values()
+    {
+        putenv('COLUMNS=0');
+        putenv('LINES=0');
+
+        $terminal = new Terminal();
+
+        $this->assertSame(0, $terminal->getWidth());
+        $this->assertSame(0, $terminal->getHeight());
+    }
+
+    public function testSttyOnWindows()
+    {
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Must be on windows');
+        }
+
+        $sttyString = exec('(stty -a | grep columns) 2>&1', $output, $exitcode);
+        if (0 !== $exitcode) {
+            $this->markTestSkipped('Must have stty support');
+        }
+
+        $matches = [];
+        if (0 === preg_match('/columns.(\d+)/i', $sttyString, $matches)) {
+            $this->fail('Could not determine existing stty columns');
+        }
+
+        putenv('COLUMNS');
+        putenv('LINES');
+        putenv('ANSICON');
+
+        $terminal = new Terminal();
+        $this->assertSame((int) $matches[1], $terminal->getWidth());
+    }
+}
diff --git a/lib/symfony/console/Tests/Tester/ApplicationTesterTest.php b/lib/symfony/console/Tests/Tester/ApplicationTesterTest.php
new file mode 100644
index 000000000..74c356200
--- /dev/null
+++ b/lib/symfony/console/Tests/Tester/ApplicationTesterTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Tester;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Tester\ApplicationTester;
+
+class ApplicationTesterTest extends TestCase
+{
+    protected $application;
+    protected $tester;
+
+    protected function setUp()
+    {
+        $this->application = new Application();
+        $this->application->setAutoExit(false);
+        $this->application->register('foo')
+            ->addArgument('foo')
+            ->setCode(function ($input, $output) { $output->writeln('foo'); })
+        ;
+
+        $this->tester = new ApplicationTester($this->application);
+        $this->tester->run(['command' => 'foo', 'foo' => 'bar'], ['interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
+    }
+
+    protected function tearDown()
+    {
+        $this->application = null;
+        $this->tester = null;
+    }
+
+    public function testRun()
+    {
+        $this->assertFalse($this->tester->getInput()->isInteractive(), '->execute() takes an interactive option');
+        $this->assertFalse($this->tester->getOutput()->isDecorated(), '->execute() takes a decorated option');
+        $this->assertEquals(Output::VERBOSITY_VERBOSE, $this->tester->getOutput()->getVerbosity(), '->execute() takes a verbosity option');
+    }
+
+    public function testGetInput()
+    {
+        $this->assertEquals('bar', $this->tester->getInput()->getArgument('foo'), '->getInput() returns the current input instance');
+    }
+
+    public function testGetOutput()
+    {
+        rewind($this->tester->getOutput()->getStream());
+        $this->assertEquals('foo'.PHP_EOL, stream_get_contents($this->tester->getOutput()->getStream()), '->getOutput() returns the current output instance');
+    }
+
+    public function testGetDisplay()
+    {
+        $this->assertEquals('foo'.PHP_EOL, $this->tester->getDisplay(), '->getDisplay() returns the display of the last execution');
+    }
+
+    public function testGetStatusCode()
+    {
+        $this->assertSame(0, $this->tester->getStatusCode(), '->getStatusCode() returns the status code');
+    }
+}
diff --git a/lib/symfony/console/Tests/Tester/CommandTesterTest.php b/lib/symfony/console/Tests/Tester/CommandTesterTest.php
new file mode 100644
index 000000000..1fa829236
--- /dev/null
+++ b/lib/symfony/console/Tests/Tester/CommandTesterTest.php
@@ -0,0 +1,212 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Tester;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class CommandTesterTest extends TestCase
+{
+    protected $command;
+    protected $tester;
+
+    protected function setUp()
+    {
+        $this->command = new Command('foo');
+        $this->command->addArgument('command');
+        $this->command->addArgument('foo');
+        $this->command->setCode(function ($input, $output) { $output->writeln('foo'); });
+
+        $this->tester = new CommandTester($this->command);
+        $this->tester->execute(['foo' => 'bar'], ['interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
+    }
+
+    protected function tearDown()
+    {
+        $this->command = null;
+        $this->tester = null;
+    }
+
+    public function testExecute()
+    {
+        $this->assertFalse($this->tester->getInput()->isInteractive(), '->execute() takes an interactive option');
+        $this->assertFalse($this->tester->getOutput()->isDecorated(), '->execute() takes a decorated option');
+        $this->assertEquals(Output::VERBOSITY_VERBOSE, $this->tester->getOutput()->getVerbosity(), '->execute() takes a verbosity option');
+    }
+
+    public function testGetInput()
+    {
+        $this->assertEquals('bar', $this->tester->getInput()->getArgument('foo'), '->getInput() returns the current input instance');
+    }
+
+    public function testGetOutput()
+    {
+        rewind($this->tester->getOutput()->getStream());
+        $this->assertEquals('foo'.PHP_EOL, stream_get_contents($this->tester->getOutput()->getStream()), '->getOutput() returns the current output instance');
+    }
+
+    public function testGetDisplay()
+    {
+        $this->assertEquals('foo'.PHP_EOL, $this->tester->getDisplay(), '->getDisplay() returns the display of the last execution');
+    }
+
+    public function testGetStatusCode()
+    {
+        $this->assertSame(0, $this->tester->getStatusCode(), '->getStatusCode() returns the status code');
+    }
+
+    public function testCommandFromApplication()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+
+        $command = new Command('foo');
+        $command->setCode(function ($input, $output) { $output->writeln('foo'); });
+
+        $application->add($command);
+
+        $tester = new CommandTester($application->find('foo'));
+
+        // check that there is no need to pass the command name here
+        $this->assertEquals(0, $tester->execute([]));
+    }
+
+    public function testCommandWithInputs()
+    {
+        $questions = [
+            'What\'s your name?',
+            'How are you?',
+            'Where do you come from?',
+        ];
+
+        $command = new Command('foo');
+        $command->setHelperSet(new HelperSet([new QuestionHelper()]));
+        $command->setCode(function ($input, $output) use ($questions, $command) {
+            $helper = $command->getHelper('question');
+            $helper->ask($input, $output, new Question($questions[0]));
+            $helper->ask($input, $output, new Question($questions[1]));
+            $helper->ask($input, $output, new Question($questions[2]));
+        });
+
+        $tester = new CommandTester($command);
+        $tester->setInputs(['Bobby', 'Fine', 'France']);
+        $tester->execute([]);
+
+        $this->assertEquals(0, $tester->getStatusCode());
+        $this->assertEquals(implode('', $questions), $tester->getDisplay(true));
+    }
+
+    public function testCommandWithDefaultInputs()
+    {
+        $questions = [
+            'What\'s your name?',
+            'How are you?',
+            'Where do you come from?',
+        ];
+
+        $command = new Command('foo');
+        $command->setHelperSet(new HelperSet([new QuestionHelper()]));
+        $command->setCode(function ($input, $output) use ($questions, $command) {
+            $helper = $command->getHelper('question');
+            $helper->ask($input, $output, new Question($questions[0], 'Bobby'));
+            $helper->ask($input, $output, new Question($questions[1], 'Fine'));
+            $helper->ask($input, $output, new Question($questions[2], 'France'));
+        });
+
+        $tester = new CommandTester($command);
+        $tester->setInputs(['', '', '']);
+        $tester->execute([]);
+
+        $this->assertEquals(0, $tester->getStatusCode());
+        $this->assertEquals(implode('', $questions), $tester->getDisplay(true));
+    }
+
+    public function testCommandWithWrongInputsNumber()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Aborted.');
+        $questions = [
+            'What\'s your name?',
+            'How are you?',
+            'Where do you come from?',
+        ];
+
+        $command = new Command('foo');
+        $command->setHelperSet(new HelperSet([new QuestionHelper()]));
+        $command->setCode(function ($input, $output) use ($questions, $command) {
+            $helper = $command->getHelper('question');
+            $helper->ask($input, $output, new ChoiceQuestion('choice', ['a', 'b']));
+            $helper->ask($input, $output, new Question($questions[0]));
+            $helper->ask($input, $output, new Question($questions[1]));
+            $helper->ask($input, $output, new Question($questions[2]));
+        });
+
+        $tester = new CommandTester($command);
+        $tester->setInputs(['a', 'Bobby', 'Fine']);
+        $tester->execute([]);
+    }
+
+    public function testCommandWithQuestionsButNoInputs()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Aborted.');
+        $questions = [
+            'What\'s your name?',
+            'How are you?',
+            'Where do you come from?',
+        ];
+
+        $command = new Command('foo');
+        $command->setHelperSet(new HelperSet([new QuestionHelper()]));
+        $command->setCode(function ($input, $output) use ($questions, $command) {
+            $helper = $command->getHelper('question');
+            $helper->ask($input, $output, new ChoiceQuestion('choice', ['a', 'b']));
+            $helper->ask($input, $output, new Question($questions[0]));
+            $helper->ask($input, $output, new Question($questions[1]));
+            $helper->ask($input, $output, new Question($questions[2]));
+        });
+
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+    }
+
+    public function testSymfonyStyleCommandWithInputs()
+    {
+        $questions = [
+            'What\'s your name?',
+            'How are you?',
+            'Where do you come from?',
+        ];
+
+        $command = new Command('foo');
+        $command->setCode(function ($input, $output) use ($questions) {
+            $io = new SymfonyStyle($input, $output);
+            $io->ask($questions[0]);
+            $io->ask($questions[1]);
+            $io->ask($questions[2]);
+        });
+
+        $tester = new CommandTester($command);
+        $tester->setInputs(['Bobby', 'Fine', 'France']);
+        $tester->execute([]);
+
+        $this->assertEquals(0, $tester->getStatusCode());
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/CssSelectorConverterTest.php b/lib/symfony/css-selector/Tests/CssSelectorConverterTest.php
new file mode 100644
index 000000000..82e527c62
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/CssSelectorConverterTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\CssSelectorConverter;
+
+class CssSelectorConverterTest extends TestCase
+{
+    public function testCssToXPath()
+    {
+        $converter = new CssSelectorConverter();
+
+        $this->assertEquals('descendant-or-self::*', $converter->toXPath(''));
+        $this->assertEquals('descendant-or-self::h1', $converter->toXPath('h1'));
+        $this->assertEquals("descendant-or-self::h1[@id = 'foo']", $converter->toXPath('h1#foo'));
+        $this->assertEquals("descendant-or-self::h1[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]", $converter->toXPath('h1.foo'));
+        $this->assertEquals('descendant-or-self::foo:h1', $converter->toXPath('foo|h1'));
+        $this->assertEquals('descendant-or-self::h1', $converter->toXPath('H1'));
+    }
+
+    public function testCssToXPathXml()
+    {
+        $converter = new CssSelectorConverter(false);
+
+        $this->assertEquals('descendant-or-self::H1', $converter->toXPath('H1'));
+    }
+
+    public function testParseExceptions()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\ParseException');
+        $this->expectExceptionMessage('Expected identifier, but <eof at 3> found.');
+        $converter = new CssSelectorConverter();
+        $converter->toXPath('h1:');
+    }
+
+    /** @dataProvider getCssToXPathWithoutPrefixTestData */
+    public function testCssToXPathWithoutPrefix($css, $xpath)
+    {
+        $converter = new CssSelectorConverter();
+
+        $this->assertEquals($xpath, $converter->toXPath($css, ''), '->parse() parses an input string and returns a node');
+    }
+
+    public function getCssToXPathWithoutPrefixTestData()
+    {
+        return [
+            ['h1', 'h1'],
+            ['foo|h1', 'foo:h1'],
+            ['h1, h2, h3', 'h1 | h2 | h3'],
+            ['h1:nth-child(3n+1)', "*/*[(name() = 'h1') and (position() - 1 >= 0 and (position() - 1) mod 3 = 0)]"],
+            ['h1 > p', 'h1/p'],
+            ['h1#foo', "h1[@id = 'foo']"],
+            ['h1.foo', "h1[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"],
+            ['h1[class*="foo bar"]', "h1[@class and contains(@class, 'foo bar')]"],
+            ['h1[foo|class*="foo bar"]', "h1[@foo:class and contains(@foo:class, 'foo bar')]"],
+            ['h1[class]', 'h1[@class]'],
+            ['h1 .foo', "h1/descendant-or-self::*/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"],
+            ['h1 #foo', "h1/descendant-or-self::*/*[@id = 'foo']"],
+            ['h1 [class*=foo]', "h1/descendant-or-self::*/*[@class and contains(@class, 'foo')]"],
+            ['div>.foo', "div/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"],
+            ['div > .foo', "div/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/AbstractNodeTest.php b/lib/symfony/css-selector/Tests/Node/AbstractNodeTest.php
new file mode 100644
index 000000000..595551338
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/AbstractNodeTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Node\NodeInterface;
+
+abstract class AbstractNodeTest extends TestCase
+{
+    /** @dataProvider getToStringConversionTestData */
+    public function testToStringConversion(NodeInterface $node, $representation)
+    {
+        $this->assertEquals($representation, (string) $node);
+    }
+
+    /** @dataProvider getSpecificityValueTestData */
+    public function testSpecificityValue(NodeInterface $node, $value)
+    {
+        $this->assertEquals($value, $node->getSpecificity()->getValue());
+    }
+
+    abstract public function getToStringConversionTestData();
+
+    abstract public function getSpecificityValueTestData();
+}
diff --git a/lib/symfony/css-selector/Tests/Node/AttributeNodeTest.php b/lib/symfony/css-selector/Tests/Node/AttributeNodeTest.php
new file mode 100644
index 000000000..4d6007406
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/AttributeNodeTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\AttributeNode;
+use Symfony\Component\CssSelector\Node\ElementNode;
+
+class AttributeNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new AttributeNode(new ElementNode(), null, 'attribute', 'exists', null), 'Attribute[Element[*][attribute]]'],
+            [new AttributeNode(new ElementNode(), null, 'attribute', '$=', 'value'), "Attribute[Element[*][attribute $= 'value']]"],
+            [new AttributeNode(new ElementNode(), 'namespace', 'attribute', '$=', 'value'), "Attribute[Element[*][namespace|attribute $= 'value']]"],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new AttributeNode(new ElementNode(), null, 'attribute', 'exists', null), 10],
+            [new AttributeNode(new ElementNode(null, 'element'), null, 'attribute', 'exists', null), 11],
+            [new AttributeNode(new ElementNode(), null, 'attribute', '$=', 'value'), 10],
+            [new AttributeNode(new ElementNode(), 'namespace', 'attribute', '$=', 'value'), 10],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/ClassNodeTest.php b/lib/symfony/css-selector/Tests/Node/ClassNodeTest.php
new file mode 100644
index 000000000..aa80c9279
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/ClassNodeTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\ClassNode;
+use Symfony\Component\CssSelector\Node\ElementNode;
+
+class ClassNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new ClassNode(new ElementNode(), 'class'), 'Class[Element[*].class]'],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new ClassNode(new ElementNode(), 'class'), 10],
+            [new ClassNode(new ElementNode(null, 'element'), 'class'), 11],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/CombinedSelectorNodeTest.php b/lib/symfony/css-selector/Tests/Node/CombinedSelectorNodeTest.php
new file mode 100644
index 000000000..435eaa6aa
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/CombinedSelectorNodeTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\CombinedSelectorNode;
+use Symfony\Component\CssSelector\Node\ElementNode;
+
+class CombinedSelectorNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new CombinedSelectorNode(new ElementNode(), '>', new ElementNode()), 'CombinedSelector[Element[*] > Element[*]]'],
+            [new CombinedSelectorNode(new ElementNode(), ' ', new ElementNode()), 'CombinedSelector[Element[*] <followed> Element[*]]'],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new CombinedSelectorNode(new ElementNode(), '>', new ElementNode()), 0],
+            [new CombinedSelectorNode(new ElementNode(null, 'element'), '>', new ElementNode()), 1],
+            [new CombinedSelectorNode(new ElementNode(null, 'element'), '>', new ElementNode(null, 'element')), 2],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/ElementNodeTest.php b/lib/symfony/css-selector/Tests/Node/ElementNodeTest.php
new file mode 100644
index 000000000..e0797ff09
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/ElementNodeTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\ElementNode;
+
+class ElementNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new ElementNode(), 'Element[*]'],
+            [new ElementNode(null, 'element'), 'Element[element]'],
+            [new ElementNode('namespace', 'element'), 'Element[namespace|element]'],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new ElementNode(), 0],
+            [new ElementNode(null, 'element'), 1],
+            [new ElementNode('namespace', 'element'), 1],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/FunctionNodeTest.php b/lib/symfony/css-selector/Tests/Node/FunctionNodeTest.php
new file mode 100644
index 000000000..0932393e1
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/FunctionNodeTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\FunctionNode;
+use Symfony\Component\CssSelector\Parser\Token;
+
+class FunctionNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new FunctionNode(new ElementNode(), 'function'), 'Function[Element[*]:function()]'],
+            [new FunctionNode(new ElementNode(), 'function', [
+                new Token(Token::TYPE_IDENTIFIER, 'value', 0),
+            ]), "Function[Element[*]:function(['value'])]"],
+            [new FunctionNode(new ElementNode(), 'function', [
+                new Token(Token::TYPE_STRING, 'value1', 0),
+                new Token(Token::TYPE_NUMBER, 'value2', 0),
+            ]), "Function[Element[*]:function(['value1', 'value2'])]"],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new FunctionNode(new ElementNode(), 'function'), 10],
+            [new FunctionNode(new ElementNode(), 'function', [
+                new Token(Token::TYPE_IDENTIFIER, 'value', 0),
+            ]), 10],
+            [new FunctionNode(new ElementNode(), 'function', [
+                new Token(Token::TYPE_STRING, 'value1', 0),
+                new Token(Token::TYPE_NUMBER, 'value2', 0),
+            ]), 10],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/HashNodeTest.php b/lib/symfony/css-selector/Tests/Node/HashNodeTest.php
new file mode 100644
index 000000000..ad6765b86
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/HashNodeTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\HashNode;
+
+class HashNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new HashNode(new ElementNode(), 'id'), 'Hash[Element[*]#id]'],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new HashNode(new ElementNode(), 'id'), 100],
+            [new HashNode(new ElementNode(null, 'id'), 'class'), 101],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/NegationNodeTest.php b/lib/symfony/css-selector/Tests/Node/NegationNodeTest.php
new file mode 100644
index 000000000..90b684cee
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/NegationNodeTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\ClassNode;
+use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\NegationNode;
+
+class NegationNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new NegationNode(new ElementNode(), new ClassNode(new ElementNode(), 'class')), 'Negation[Element[*]:not(Class[Element[*].class])]'],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new NegationNode(new ElementNode(), new ClassNode(new ElementNode(), 'class')), 10],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/PseudoNodeTest.php b/lib/symfony/css-selector/Tests/Node/PseudoNodeTest.php
new file mode 100644
index 000000000..4e78776c0
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/PseudoNodeTest.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\PseudoNode;
+
+class PseudoNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new PseudoNode(new ElementNode(), 'pseudo'), 'Pseudo[Element[*]:pseudo]'],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new PseudoNode(new ElementNode(), 'pseudo'), 10],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/SelectorNodeTest.php b/lib/symfony/css-selector/Tests/Node/SelectorNodeTest.php
new file mode 100644
index 000000000..85e3bdac3
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/SelectorNodeTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\SelectorNode;
+
+class SelectorNodeTest extends AbstractNodeTest
+{
+    public function getToStringConversionTestData()
+    {
+        return [
+            [new SelectorNode(new ElementNode()), 'Selector[Element[*]]'],
+            [new SelectorNode(new ElementNode(), 'pseudo'), 'Selector[Element[*]::pseudo]'],
+        ];
+    }
+
+    public function getSpecificityValueTestData()
+    {
+        return [
+            [new SelectorNode(new ElementNode()), 0],
+            [new SelectorNode(new ElementNode(), 'pseudo'), 1],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Node/SpecificityTest.php b/lib/symfony/css-selector/Tests/Node/SpecificityTest.php
new file mode 100644
index 000000000..bf48d49ff
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Node/SpecificityTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Node;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Node\Specificity;
+
+class SpecificityTest extends TestCase
+{
+    /** @dataProvider getValueTestData */
+    public function testValue(Specificity $specificity, $value)
+    {
+        $this->assertEquals($value, $specificity->getValue());
+    }
+
+    /** @dataProvider getValueTestData */
+    public function testPlusValue(Specificity $specificity, $value)
+    {
+        $this->assertEquals($value + 123, $specificity->plus(new Specificity(1, 2, 3))->getValue());
+    }
+
+    public function getValueTestData()
+    {
+        return [
+            [new Specificity(0, 0, 0), 0],
+            [new Specificity(0, 0, 2), 2],
+            [new Specificity(0, 3, 0), 30],
+            [new Specificity(4, 0, 0), 400],
+            [new Specificity(4, 3, 2), 432],
+        ];
+    }
+
+    /** @dataProvider getCompareTestData */
+    public function testCompareTo(Specificity $a, Specificity $b, $result)
+    {
+        $this->assertEquals($result, $a->compareTo($b));
+    }
+
+    public function getCompareTestData()
+    {
+        return [
+            [new Specificity(0, 0, 0), new Specificity(0, 0, 0), 0],
+            [new Specificity(0, 0, 1), new Specificity(0, 0, 1), 0],
+            [new Specificity(0, 0, 2), new Specificity(0, 0, 1), 1],
+            [new Specificity(0, 0, 2), new Specificity(0, 0, 3), -1],
+            [new Specificity(0, 4, 0), new Specificity(0, 4, 0), 0],
+            [new Specificity(0, 6, 0), new Specificity(0, 5, 11), 1],
+            [new Specificity(0, 7, 0), new Specificity(0, 8, 0), -1],
+            [new Specificity(9, 0, 0), new Specificity(9, 0, 0), 0],
+            [new Specificity(11, 0, 0), new Specificity(10, 11, 0), 1],
+            [new Specificity(12, 11, 0), new Specificity(13, 0, 0), -1],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Handler/AbstractHandlerTest.php b/lib/symfony/css-selector/Tests/Parser/Handler/AbstractHandlerTest.php
new file mode 100644
index 000000000..aaed55c20
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Handler/AbstractHandlerTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Parser\Reader;
+use Symfony\Component\CssSelector\Parser\Token;
+use Symfony\Component\CssSelector\Parser\TokenStream;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+abstract class AbstractHandlerTest extends TestCase
+{
+    /** @dataProvider getHandleValueTestData */
+    public function testHandleValue($value, Token $expectedToken, $remainingContent)
+    {
+        $reader = new Reader($value);
+        $stream = new TokenStream();
+
+        $this->assertTrue($this->generateHandler()->handle($reader, $stream));
+        $this->assertEquals($expectedToken, $stream->getNext());
+        $this->assertRemainingContent($reader, $remainingContent);
+    }
+
+    /** @dataProvider getDontHandleValueTestData */
+    public function testDontHandleValue($value)
+    {
+        $reader = new Reader($value);
+        $stream = new TokenStream();
+
+        $this->assertFalse($this->generateHandler()->handle($reader, $stream));
+        $this->assertStreamEmpty($stream);
+        $this->assertRemainingContent($reader, $value);
+    }
+
+    abstract public function getHandleValueTestData();
+
+    abstract public function getDontHandleValueTestData();
+
+    abstract protected function generateHandler();
+
+    protected function assertStreamEmpty(TokenStream $stream)
+    {
+        $property = new \ReflectionProperty($stream, 'tokens');
+        $property->setAccessible(true);
+
+        $this->assertEquals([], $property->getValue($stream));
+    }
+
+    protected function assertRemainingContent(Reader $reader, $remainingContent)
+    {
+        if ('' === $remainingContent) {
+            $this->assertEquals(0, $reader->getRemainingLength());
+            $this->assertTrue($reader->isEOF());
+        } else {
+            $this->assertEquals(\strlen($remainingContent), $reader->getRemainingLength());
+            $this->assertEquals(0, $reader->getOffset($remainingContent));
+        }
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Handler/CommentHandlerTest.php b/lib/symfony/css-selector/Tests/Parser/Handler/CommentHandlerTest.php
new file mode 100644
index 000000000..de400478d
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Handler/CommentHandlerTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Handler;
+
+use Symfony\Component\CssSelector\Parser\Handler\CommentHandler;
+use Symfony\Component\CssSelector\Parser\Reader;
+use Symfony\Component\CssSelector\Parser\Token;
+use Symfony\Component\CssSelector\Parser\TokenStream;
+
+class CommentHandlerTest extends AbstractHandlerTest
+{
+    /** @dataProvider getHandleValueTestData */
+    public function testHandleValue($value, Token $unusedArgument, $remainingContent)
+    {
+        $reader = new Reader($value);
+        $stream = new TokenStream();
+
+        $this->assertTrue($this->generateHandler()->handle($reader, $stream));
+        // comments are ignored (not pushed as token in stream)
+        $this->assertStreamEmpty($stream);
+        $this->assertRemainingContent($reader, $remainingContent);
+    }
+
+    public function getHandleValueTestData()
+    {
+        return [
+            // 2nd argument only exists for inherited method compatibility
+            ['/* comment */', new Token(null, null, null), ''],
+            ['/* comment */foo', new Token(null, null, null), 'foo'],
+        ];
+    }
+
+    public function getDontHandleValueTestData()
+    {
+        return [
+            ['>'],
+            ['+'],
+            [' '],
+        ];
+    }
+
+    protected function generateHandler()
+    {
+        return new CommentHandler();
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Handler/HashHandlerTest.php b/lib/symfony/css-selector/Tests/Parser/Handler/HashHandlerTest.php
new file mode 100644
index 000000000..9444f5106
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Handler/HashHandlerTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Handler;
+
+use Symfony\Component\CssSelector\Parser\Handler\HashHandler;
+use Symfony\Component\CssSelector\Parser\Token;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
+
+class HashHandlerTest extends AbstractHandlerTest
+{
+    public function getHandleValueTestData()
+    {
+        return [
+            ['#id', new Token(Token::TYPE_HASH, 'id', 0), ''],
+            ['#123', new Token(Token::TYPE_HASH, '123', 0), ''],
+
+            ['#id.class', new Token(Token::TYPE_HASH, 'id', 0), '.class'],
+            ['#id element', new Token(Token::TYPE_HASH, 'id', 0), ' element'],
+        ];
+    }
+
+    public function getDontHandleValueTestData()
+    {
+        return [
+            ['id'],
+            ['123'],
+            ['<'],
+            ['<'],
+            ['#'],
+        ];
+    }
+
+    protected function generateHandler()
+    {
+        $patterns = new TokenizerPatterns();
+
+        return new HashHandler($patterns, new TokenizerEscaping($patterns));
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Handler/IdentifierHandlerTest.php b/lib/symfony/css-selector/Tests/Parser/Handler/IdentifierHandlerTest.php
new file mode 100644
index 000000000..c54ba537b
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Handler/IdentifierHandlerTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Handler;
+
+use Symfony\Component\CssSelector\Parser\Handler\IdentifierHandler;
+use Symfony\Component\CssSelector\Parser\Token;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
+
+class IdentifierHandlerTest extends AbstractHandlerTest
+{
+    public function getHandleValueTestData()
+    {
+        return [
+            ['foo', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), ''],
+            ['foo|bar', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '|bar'],
+            ['foo.class', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '.class'],
+            ['foo[attr]', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '[attr]'],
+            ['foo bar', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), ' bar'],
+        ];
+    }
+
+    public function getDontHandleValueTestData()
+    {
+        return [
+            ['>'],
+            ['+'],
+            [' '],
+            ['*|foo'],
+            ['/* comment */'],
+        ];
+    }
+
+    protected function generateHandler()
+    {
+        $patterns = new TokenizerPatterns();
+
+        return new IdentifierHandler($patterns, new TokenizerEscaping($patterns));
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Handler/NumberHandlerTest.php b/lib/symfony/css-selector/Tests/Parser/Handler/NumberHandlerTest.php
new file mode 100644
index 000000000..b43d36942
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Handler/NumberHandlerTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Handler;
+
+use Symfony\Component\CssSelector\Parser\Handler\NumberHandler;
+use Symfony\Component\CssSelector\Parser\Token;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
+
+class NumberHandlerTest extends AbstractHandlerTest
+{
+    public function getHandleValueTestData()
+    {
+        return [
+            ['12', new Token(Token::TYPE_NUMBER, '12', 0), ''],
+            ['12.34', new Token(Token::TYPE_NUMBER, '12.34', 0), ''],
+            ['+12.34', new Token(Token::TYPE_NUMBER, '+12.34', 0), ''],
+            ['-12.34', new Token(Token::TYPE_NUMBER, '-12.34', 0), ''],
+
+            ['12 arg', new Token(Token::TYPE_NUMBER, '12', 0), ' arg'],
+            ['12]', new Token(Token::TYPE_NUMBER, '12', 0), ']'],
+        ];
+    }
+
+    public function getDontHandleValueTestData()
+    {
+        return [
+            ['hello'],
+            ['>'],
+            ['+'],
+            [' '],
+            ['/* comment */'],
+        ];
+    }
+
+    protected function generateHandler()
+    {
+        $patterns = new TokenizerPatterns();
+
+        return new NumberHandler($patterns);
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Handler/StringHandlerTest.php b/lib/symfony/css-selector/Tests/Parser/Handler/StringHandlerTest.php
new file mode 100644
index 000000000..baa72735f
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Handler/StringHandlerTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Handler;
+
+use Symfony\Component\CssSelector\Parser\Handler\StringHandler;
+use Symfony\Component\CssSelector\Parser\Token;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
+
+class StringHandlerTest extends AbstractHandlerTest
+{
+    public function getHandleValueTestData()
+    {
+        return [
+            ['"hello"', new Token(Token::TYPE_STRING, 'hello', 1), ''],
+            ['"1"', new Token(Token::TYPE_STRING, '1', 1), ''],
+            ['" "', new Token(Token::TYPE_STRING, ' ', 1), ''],
+            ['""', new Token(Token::TYPE_STRING, '', 1), ''],
+            ["'hello'", new Token(Token::TYPE_STRING, 'hello', 1), ''],
+
+            ["'foo'bar", new Token(Token::TYPE_STRING, 'foo', 1), 'bar'],
+        ];
+    }
+
+    public function getDontHandleValueTestData()
+    {
+        return [
+            ['hello'],
+            ['>'],
+            ['1'],
+            [' '],
+        ];
+    }
+
+    protected function generateHandler()
+    {
+        $patterns = new TokenizerPatterns();
+
+        return new StringHandler($patterns, new TokenizerEscaping($patterns));
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Handler/WhitespaceHandlerTest.php b/lib/symfony/css-selector/Tests/Parser/Handler/WhitespaceHandlerTest.php
new file mode 100644
index 000000000..67509ef13
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Handler/WhitespaceHandlerTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Handler;
+
+use Symfony\Component\CssSelector\Parser\Handler\WhitespaceHandler;
+use Symfony\Component\CssSelector\Parser\Token;
+
+class WhitespaceHandlerTest extends AbstractHandlerTest
+{
+    public function getHandleValueTestData()
+    {
+        return [
+            [' ', new Token(Token::TYPE_WHITESPACE, ' ', 0), ''],
+            ["\n", new Token(Token::TYPE_WHITESPACE, "\n", 0), ''],
+            ["\t", new Token(Token::TYPE_WHITESPACE, "\t", 0), ''],
+
+            [' foo', new Token(Token::TYPE_WHITESPACE, ' ', 0), 'foo'],
+            [' .foo', new Token(Token::TYPE_WHITESPACE, ' ', 0), '.foo'],
+        ];
+    }
+
+    public function getDontHandleValueTestData()
+    {
+        return [
+            ['>'],
+            ['1'],
+            ['a'],
+        ];
+    }
+
+    protected function generateHandler()
+    {
+        return new WhitespaceHandler();
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/ParserTest.php b/lib/symfony/css-selector/Tests/Parser/ParserTest.php
new file mode 100644
index 000000000..f63a15e0a
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/ParserTest.php
@@ -0,0 +1,253 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
+use Symfony\Component\CssSelector\Node\FunctionNode;
+use Symfony\Component\CssSelector\Node\SelectorNode;
+use Symfony\Component\CssSelector\Parser\Parser;
+use Symfony\Component\CssSelector\Parser\Token;
+
+class ParserTest extends TestCase
+{
+    /** @dataProvider getParserTestData */
+    public function testParser($source, $representation)
+    {
+        $parser = new Parser();
+
+        $this->assertEquals($representation, array_map(function (SelectorNode $node) {
+            return (string) $node->getTree();
+        }, $parser->parse($source)));
+    }
+
+    /** @dataProvider getParserExceptionTestData */
+    public function testParserException($source, $message)
+    {
+        $parser = new Parser();
+
+        try {
+            $parser->parse($source);
+            $this->fail('Parser should throw a SyntaxErrorException.');
+        } catch (SyntaxErrorException $e) {
+            $this->assertEquals($message, $e->getMessage());
+        }
+    }
+
+    /** @dataProvider getPseudoElementsTestData */
+    public function testPseudoElements($source, $element, $pseudo)
+    {
+        $parser = new Parser();
+        $selectors = $parser->parse($source);
+        $this->assertCount(1, $selectors);
+
+        /** @var SelectorNode $selector */
+        $selector = $selectors[0];
+        $this->assertEquals($element, (string) $selector->getTree());
+        $this->assertEquals($pseudo, (string) $selector->getPseudoElement());
+    }
+
+    /** @dataProvider getSpecificityTestData */
+    public function testSpecificity($source, $value)
+    {
+        $parser = new Parser();
+        $selectors = $parser->parse($source);
+        $this->assertCount(1, $selectors);
+
+        /** @var SelectorNode $selector */
+        $selector = $selectors[0];
+        $this->assertEquals($value, $selector->getSpecificity()->getValue());
+    }
+
+    /** @dataProvider getParseSeriesTestData */
+    public function testParseSeries($series, $a, $b)
+    {
+        $parser = new Parser();
+        $selectors = $parser->parse(sprintf(':nth-child(%s)', $series));
+        $this->assertCount(1, $selectors);
+
+        /** @var FunctionNode $function */
+        $function = $selectors[0]->getTree();
+        $this->assertEquals([$a, $b], Parser::parseSeries($function->getArguments()));
+    }
+
+    /** @dataProvider getParseSeriesExceptionTestData */
+    public function testParseSeriesException($series)
+    {
+        $parser = new Parser();
+        $selectors = $parser->parse(sprintf(':nth-child(%s)', $series));
+        $this->assertCount(1, $selectors);
+
+        /** @var FunctionNode $function */
+        $function = $selectors[0]->getTree();
+        $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
+        Parser::parseSeries($function->getArguments());
+    }
+
+    public function getParserTestData()
+    {
+        return [
+            ['*', ['Element[*]']],
+            ['*|*', ['Element[*]']],
+            ['*|foo', ['Element[foo]']],
+            ['foo|*', ['Element[foo|*]']],
+            ['foo|bar', ['Element[foo|bar]']],
+            ['#foo#bar', ['Hash[Hash[Element[*]#foo]#bar]']],
+            ['div>.foo', ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ['div> .foo', ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ['div >.foo', ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ['div > .foo', ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ["div \n>  \t \t .foo", ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ['td.foo,.bar', ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ['td.foo, .bar', ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ["td.foo\t\r\n\f ,\t\r\n\f .bar", ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ['td.foo,.bar', ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ['td.foo, .bar', ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ["td.foo\t\r\n\f ,\t\r\n\f .bar", ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ['div, td.foo, div.bar span', ['Element[div]', 'Class[Element[td].foo]', 'CombinedSelector[Class[Element[div].bar] <followed> Element[span]]']],
+            ['div > p', ['CombinedSelector[Element[div] > Element[p]]']],
+            ['td:first', ['Pseudo[Element[td]:first]']],
+            ['td :first', ['CombinedSelector[Element[td] <followed> Pseudo[Element[*]:first]]']],
+            ['a[name]', ['Attribute[Element[a][name]]']],
+            ["a[ name\t]", ['Attribute[Element[a][name]]']],
+            ['a [name]', ['CombinedSelector[Element[a] <followed> Attribute[Element[*][name]]]']],
+            ['[name="foo"]', ["Attribute[Element[*][name = 'foo']]"]],
+            ["[name='foo[1]']", ["Attribute[Element[*][name = 'foo[1]']]"]],
+            ["[name='foo[0][bar]']", ["Attribute[Element[*][name = 'foo[0][bar]']]"]],
+            ['a[rel="include"]', ["Attribute[Element[a][rel = 'include']]"]],
+            ['a[rel = include]', ["Attribute[Element[a][rel = 'include']]"]],
+            ["a[hreflang |= 'en']", ["Attribute[Element[a][hreflang |= 'en']]"]],
+            ['a[hreflang|=en]', ["Attribute[Element[a][hreflang |= 'en']]"]],
+            ['div:nth-child(10)', ["Function[Element[div]:nth-child(['10'])]"]],
+            [':nth-child(2n+2)', ["Function[Element[*]:nth-child(['2', 'n', '+2'])]"]],
+            ['div:nth-of-type(10)', ["Function[Element[div]:nth-of-type(['10'])]"]],
+            ['div div:nth-of-type(10) .aclass', ["CombinedSelector[CombinedSelector[Element[div] <followed> Function[Element[div]:nth-of-type(['10'])]] <followed> Class[Element[*].aclass]]"]],
+            ['label:only', ['Pseudo[Element[label]:only]']],
+            ['a:lang(fr)', ["Function[Element[a]:lang(['fr'])]"]],
+            ['div:contains("foo")', ["Function[Element[div]:contains(['foo'])]"]],
+            ['div#foobar', ['Hash[Element[div]#foobar]']],
+            ['div:not(div.foo)', ['Negation[Element[div]:not(Class[Element[div].foo])]']],
+            ['td ~ th', ['CombinedSelector[Element[td] ~ Element[th]]']],
+            ['.foo[data-bar][data-baz=0]', ["Attribute[Attribute[Class[Element[*].foo][data-bar]][data-baz = '0']]"]],
+        ];
+    }
+
+    public function getParserExceptionTestData()
+    {
+        return [
+            ['attributes(href)/html/body/a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '(', 10))->getMessage()],
+            ['attributes(href)', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '(', 10))->getMessage()],
+            ['html/body/a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '/', 4))->getMessage()],
+            [' ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 1))->getMessage()],
+            ['div, ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 5))->getMessage()],
+            [' , div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, ',', 1))->getMessage()],
+            ['p, , div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, ',', 3))->getMessage()],
+            ['div > ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 6))->getMessage()],
+            ['  > div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '>', 2))->getMessage()],
+            ['foo|#bar', SyntaxErrorException::unexpectedToken('identifier or "*"', new Token(Token::TYPE_HASH, 'bar', 4))->getMessage()],
+            ['#.foo', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '#', 0))->getMessage()],
+            ['.#foo', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_HASH, 'foo', 1))->getMessage()],
+            [':#foo', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_HASH, 'foo', 1))->getMessage()],
+            ['[*]', SyntaxErrorException::unexpectedToken('"|"', new Token(Token::TYPE_DELIMITER, ']', 2))->getMessage()],
+            ['[foo|]', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_DELIMITER, ']', 5))->getMessage()],
+            ['[#]', SyntaxErrorException::unexpectedToken('identifier or "*"', new Token(Token::TYPE_DELIMITER, '#', 1))->getMessage()],
+            ['[foo=#]', SyntaxErrorException::unexpectedToken('string or identifier', new Token(Token::TYPE_DELIMITER, '#', 5))->getMessage()],
+            [':nth-child()', SyntaxErrorException::unexpectedToken('at least one argument', new Token(Token::TYPE_DELIMITER, ')', 11))->getMessage()],
+            ['[href]a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_IDENTIFIER, 'a', 6))->getMessage()],
+            ['[rel:stylesheet]', SyntaxErrorException::unexpectedToken('operator', new Token(Token::TYPE_DELIMITER, ':', 4))->getMessage()],
+            ['[rel=stylesheet', SyntaxErrorException::unexpectedToken('"]"', new Token(Token::TYPE_FILE_END, '', 15))->getMessage()],
+            [':lang(fr', SyntaxErrorException::unexpectedToken('an argument', new Token(Token::TYPE_FILE_END, '', 8))->getMessage()],
+            [':contains("foo', SyntaxErrorException::unclosedString(10)->getMessage()],
+            ['foo!', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '!', 3))->getMessage()],
+        ];
+    }
+
+    public function getPseudoElementsTestData()
+    {
+        return [
+            ['foo', 'Element[foo]', ''],
+            ['*', 'Element[*]', ''],
+            [':empty', 'Pseudo[Element[*]:empty]', ''],
+            [':BEfore', 'Element[*]', 'before'],
+            [':aftER', 'Element[*]', 'after'],
+            [':First-Line', 'Element[*]', 'first-line'],
+            [':First-Letter', 'Element[*]', 'first-letter'],
+            ['::befoRE', 'Element[*]', 'before'],
+            ['::AFter', 'Element[*]', 'after'],
+            ['::firsT-linE', 'Element[*]', 'first-line'],
+            ['::firsT-letteR', 'Element[*]', 'first-letter'],
+            ['::Selection', 'Element[*]', 'selection'],
+            ['foo:after', 'Element[foo]', 'after'],
+            ['foo::selection', 'Element[foo]', 'selection'],
+            ['lorem#ipsum ~ a#b.c[href]:empty::selection', 'CombinedSelector[Hash[Element[lorem]#ipsum] ~ Pseudo[Attribute[Class[Hash[Element[a]#b].c][href]]:empty]]', 'selection'],
+            ['video::-webkit-media-controls', 'Element[video]', '-webkit-media-controls'],
+        ];
+    }
+
+    public function getSpecificityTestData()
+    {
+        return [
+            ['*', 0],
+            [' foo', 1],
+            [':empty ', 10],
+            [':before', 1],
+            ['*:before', 1],
+            [':nth-child(2)', 10],
+            ['.bar', 10],
+            ['[baz]', 10],
+            ['[baz="4"]', 10],
+            ['[baz^="4"]', 10],
+            ['#lipsum', 100],
+            [':not(*)', 0],
+            [':not(foo)', 1],
+            [':not(.foo)', 10],
+            [':not([foo])', 10],
+            [':not(:empty)', 10],
+            [':not(#foo)', 100],
+            ['foo:empty', 11],
+            ['foo:before', 2],
+            ['foo::before', 2],
+            ['foo:empty::before', 12],
+            ['#lorem + foo#ipsum:first-child > bar:first-line', 213],
+        ];
+    }
+
+    public function getParseSeriesTestData()
+    {
+        return [
+            ['1n+3', 1, 3],
+            ['1n +3', 1, 3],
+            ['1n + 3', 1, 3],
+            ['1n+ 3', 1, 3],
+            ['1n-3', 1, -3],
+            ['1n -3', 1, -3],
+            ['1n - 3', 1, -3],
+            ['1n- 3', 1, -3],
+            ['n-5', 1, -5],
+            ['odd', 2, 1],
+            ['even', 2, 0],
+            ['3n', 3, 0],
+            ['n', 1, 0],
+            ['+n', 1, 0],
+            ['-n', -1, 0],
+            ['5', 0, 5],
+        ];
+    }
+
+    public function getParseSeriesExceptionTestData()
+    {
+        return [
+            ['foo'],
+            ['n+'],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/ReaderTest.php b/lib/symfony/css-selector/Tests/Parser/ReaderTest.php
new file mode 100644
index 000000000..ff9ea9097
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/ReaderTest.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Parser\Reader;
+
+class ReaderTest extends TestCase
+{
+    public function testIsEOF()
+    {
+        $reader = new Reader('');
+        $this->assertTrue($reader->isEOF());
+
+        $reader = new Reader('hello');
+        $this->assertFalse($reader->isEOF());
+
+        $this->assignPosition($reader, 2);
+        $this->assertFalse($reader->isEOF());
+
+        $this->assignPosition($reader, 5);
+        $this->assertTrue($reader->isEOF());
+    }
+
+    public function testGetRemainingLength()
+    {
+        $reader = new Reader('hello');
+        $this->assertEquals(5, $reader->getRemainingLength());
+
+        $this->assignPosition($reader, 2);
+        $this->assertEquals(3, $reader->getRemainingLength());
+
+        $this->assignPosition($reader, 5);
+        $this->assertEquals(0, $reader->getRemainingLength());
+    }
+
+    public function testGetSubstring()
+    {
+        $reader = new Reader('hello');
+        $this->assertEquals('he', $reader->getSubstring(2));
+        $this->assertEquals('el', $reader->getSubstring(2, 1));
+
+        $this->assignPosition($reader, 2);
+        $this->assertEquals('ll', $reader->getSubstring(2));
+        $this->assertEquals('lo', $reader->getSubstring(2, 1));
+    }
+
+    public function testGetOffset()
+    {
+        $reader = new Reader('hello');
+        $this->assertEquals(2, $reader->getOffset('ll'));
+        $this->assertFalse($reader->getOffset('w'));
+
+        $this->assignPosition($reader, 2);
+        $this->assertEquals(0, $reader->getOffset('ll'));
+        $this->assertFalse($reader->getOffset('he'));
+    }
+
+    public function testFindPattern()
+    {
+        $reader = new Reader('hello');
+
+        $this->assertFalse($reader->findPattern('/world/'));
+        $this->assertEquals(['hello', 'h'], $reader->findPattern('/^([a-z]).*/'));
+
+        $this->assignPosition($reader, 2);
+        $this->assertFalse($reader->findPattern('/^h.*/'));
+        $this->assertEquals(['llo'], $reader->findPattern('/^llo$/'));
+    }
+
+    public function testMoveForward()
+    {
+        $reader = new Reader('hello');
+        $this->assertEquals(0, $reader->getPosition());
+
+        $reader->moveForward(2);
+        $this->assertEquals(2, $reader->getPosition());
+    }
+
+    public function testToEnd()
+    {
+        $reader = new Reader('hello');
+        $reader->moveToEnd();
+        $this->assertTrue($reader->isEOF());
+    }
+
+    private function assignPosition(Reader $reader, $value)
+    {
+        $position = new \ReflectionProperty($reader, 'position');
+        $position->setAccessible(true);
+        $position->setValue($reader, $value);
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Shortcut/ClassParserTest.php b/lib/symfony/css-selector/Tests/Parser/Shortcut/ClassParserTest.php
new file mode 100644
index 000000000..29d9d5f16
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Shortcut/ClassParserTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Shortcut;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Node\SelectorNode;
+use Symfony\Component\CssSelector\Parser\Shortcut\ClassParser;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+class ClassParserTest extends TestCase
+{
+    /** @dataProvider getParseTestData */
+    public function testParse($source, $representation)
+    {
+        $parser = new ClassParser();
+        $selectors = $parser->parse($source);
+        $this->assertCount(1, $selectors);
+
+        /** @var SelectorNode $selector */
+        $selector = $selectors[0];
+        $this->assertEquals($representation, (string) $selector->getTree());
+    }
+
+    public function getParseTestData()
+    {
+        return [
+            ['.testclass', 'Class[Element[*].testclass]'],
+            ['testel.testclass', 'Class[Element[testel].testclass]'],
+            ['testns|.testclass', 'Class[Element[testns|*].testclass]'],
+            ['testns|*.testclass', 'Class[Element[testns|*].testclass]'],
+            ['testns|testel.testclass', 'Class[Element[testns|testel].testclass]'],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Shortcut/ElementParserTest.php b/lib/symfony/css-selector/Tests/Parser/Shortcut/ElementParserTest.php
new file mode 100644
index 000000000..79cc22703
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Shortcut/ElementParserTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Shortcut;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Node\SelectorNode;
+use Symfony\Component\CssSelector\Parser\Shortcut\ElementParser;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+class ElementParserTest extends TestCase
+{
+    /** @dataProvider getParseTestData */
+    public function testParse($source, $representation)
+    {
+        $parser = new ElementParser();
+        $selectors = $parser->parse($source);
+        $this->assertCount(1, $selectors);
+
+        /** @var SelectorNode $selector */
+        $selector = $selectors[0];
+        $this->assertEquals($representation, (string) $selector->getTree());
+    }
+
+    public function getParseTestData()
+    {
+        return [
+            ['*', 'Element[*]'],
+            ['testel', 'Element[testel]'],
+            ['testns|*', 'Element[testns|*]'],
+            ['testns|testel', 'Element[testns|testel]'],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Shortcut/EmptyStringParserTest.php b/lib/symfony/css-selector/Tests/Parser/Shortcut/EmptyStringParserTest.php
new file mode 100644
index 000000000..1cf742cf2
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Shortcut/EmptyStringParserTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Shortcut;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Node\SelectorNode;
+use Symfony\Component\CssSelector\Parser\Shortcut\EmptyStringParser;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+class EmptyStringParserTest extends TestCase
+{
+    public function testParse()
+    {
+        $parser = new EmptyStringParser();
+        $selectors = $parser->parse('');
+        $this->assertCount(1, $selectors);
+
+        /** @var SelectorNode $selector */
+        $selector = $selectors[0];
+        $this->assertEquals('Element[*]', (string) $selector->getTree());
+
+        $selectors = $parser->parse('this will produce an empty array');
+        $this->assertCount(0, $selectors);
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/Shortcut/HashParserTest.php b/lib/symfony/css-selector/Tests/Parser/Shortcut/HashParserTest.php
new file mode 100644
index 000000000..a7c79d69a
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/Shortcut/HashParserTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser\Shortcut;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Node\SelectorNode;
+use Symfony\Component\CssSelector\Parser\Shortcut\HashParser;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+class HashParserTest extends TestCase
+{
+    /** @dataProvider getParseTestData */
+    public function testParse($source, $representation)
+    {
+        $parser = new HashParser();
+        $selectors = $parser->parse($source);
+        $this->assertCount(1, $selectors);
+
+        /** @var SelectorNode $selector */
+        $selector = $selectors[0];
+        $this->assertEquals($representation, (string) $selector->getTree());
+    }
+
+    public function getParseTestData()
+    {
+        return [
+            ['#testid', 'Hash[Element[*]#testid]'],
+            ['testel#testid', 'Hash[Element[testel]#testid]'],
+            ['testns|#testid', 'Hash[Element[testns|*]#testid]'],
+            ['testns|*#testid', 'Hash[Element[testns|*]#testid]'],
+            ['testns|testel#testid', 'Hash[Element[testns|testel]#testid]'],
+        ];
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/Parser/TokenStreamTest.php b/lib/symfony/css-selector/Tests/Parser/TokenStreamTest.php
new file mode 100644
index 000000000..fb47625a8
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/Parser/TokenStreamTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Parser;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Parser\Token;
+use Symfony\Component\CssSelector\Parser\TokenStream;
+
+class TokenStreamTest extends TestCase
+{
+    public function testGetNext()
+    {
+        $stream = new TokenStream();
+        $stream->push($t1 = new Token(Token::TYPE_IDENTIFIER, 'h1', 0));
+        $stream->push($t2 = new Token(Token::TYPE_DELIMITER, '.', 2));
+        $stream->push($t3 = new Token(Token::TYPE_IDENTIFIER, 'title', 3));
+
+        $this->assertSame($t1, $stream->getNext());
+        $this->assertSame($t2, $stream->getNext());
+        $this->assertSame($t3, $stream->getNext());
+    }
+
+    public function testGetPeek()
+    {
+        $stream = new TokenStream();
+        $stream->push($t1 = new Token(Token::TYPE_IDENTIFIER, 'h1', 0));
+        $stream->push($t2 = new Token(Token::TYPE_DELIMITER, '.', 2));
+        $stream->push($t3 = new Token(Token::TYPE_IDENTIFIER, 'title', 3));
+
+        $this->assertSame($t1, $stream->getPeek());
+        $this->assertSame($t1, $stream->getNext());
+        $this->assertSame($t2, $stream->getPeek());
+        $this->assertSame($t2, $stream->getPeek());
+        $this->assertSame($t2, $stream->getNext());
+    }
+
+    public function testGetNextIdentifier()
+    {
+        $stream = new TokenStream();
+        $stream->push(new Token(Token::TYPE_IDENTIFIER, 'h1', 0));
+
+        $this->assertEquals('h1', $stream->getNextIdentifier());
+    }
+
+    public function testFailToGetNextIdentifier()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
+
+        $stream = new TokenStream();
+        $stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));
+        $stream->getNextIdentifier();
+    }
+
+    public function testGetNextIdentifierOrStar()
+    {
+        $stream = new TokenStream();
+
+        $stream->push(new Token(Token::TYPE_IDENTIFIER, 'h1', 0));
+        $this->assertEquals('h1', $stream->getNextIdentifierOrStar());
+
+        $stream->push(new Token(Token::TYPE_DELIMITER, '*', 0));
+        $this->assertNull($stream->getNextIdentifierOrStar());
+    }
+
+    public function testFailToGetNextIdentifierOrStar()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
+
+        $stream = new TokenStream();
+        $stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));
+        $stream->getNextIdentifierOrStar();
+    }
+
+    public function testSkipWhitespace()
+    {
+        $stream = new TokenStream();
+        $stream->push($t1 = new Token(Token::TYPE_IDENTIFIER, 'h1', 0));
+        $stream->push($t2 = new Token(Token::TYPE_WHITESPACE, ' ', 2));
+        $stream->push($t3 = new Token(Token::TYPE_IDENTIFIER, 'h1', 3));
+
+        $stream->skipWhitespace();
+        $this->assertSame($t1, $stream->getNext());
+
+        $stream->skipWhitespace();
+        $this->assertSame($t3, $stream->getNext());
+    }
+}
diff --git a/lib/symfony/css-selector/Tests/XPath/Fixtures/ids.html b/lib/symfony/css-selector/Tests/XPath/Fixtures/ids.html
new file mode 100644
index 000000000..5799fad25
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/XPath/Fixtures/ids.html
@@ -0,0 +1,48 @@
+<html id="html"><head>
+  <link id="link-href" href="foo" />
+  <link id="link-nohref" />
+</head><body>
+<div id="outer-div">
+ <a id="name-anchor" name="foo"></a>
+ <a id="tag-anchor" rel="tag" href="http://localhost/foo">link</a>
+ <a id="nofollow-anchor" rel="nofollow" href="https://example.org">
+    link</a>
+ <ol id="first-ol" class="a b c">
+   <li id="first-li">content</li>
+   <li id="second-li" lang="En-us">
+     <div id="li-div">
+     </div>
+   </li>
+   <li id="third-li" class="ab c"></li>
+   <li id="fourth-li" class="ab
+c"></li>
+   <li id="fifth-li"></li>
+   <li id="sixth-li"></li>
+   <li id="seventh-li">  </li>
+ </ol>
+ <p id="paragraph">
+   <b id="p-b">hi</b> <em id="p-em">there</em>
+   <b id="p-b2">guy</b>
+   <input type="checkbox" id="checkbox-unchecked" />
+   <input type="checkbox" id="checkbox-disabled" disabled="" />
+   <input type="text" id="text-checked" checked="checked" />
+   <input type="hidden" />
+   <input type="hidden" disabled="disabled" />
+   <input type="checkbox" id="checkbox-checked" checked="checked" />
+   <input type="checkbox" id="checkbox-disabled-checked"
+          disabled="disabled" checked="checked" />
+   <fieldset id="fieldset" disabled="disabled">
+     <input type="checkbox" id="checkbox-fieldset-disabled" />
+     <input type="hidden" />
+   </fieldset>
+ </p>
+ <ol id="second-ol">
+ </ol>
+ <map name="dummymap">
+   <area shape="circle" coords="200,250,25" href="foo.html" id="area-href" />
+   <area shape="default" id="area-nohref" />
+ </map>
+</div>
+<div id="foobar-div" foobar="ab bc
+cde"><span id="foobar-span"></span></div>
+</body></html>
diff --git a/lib/symfony/css-selector/Tests/XPath/Fixtures/lang.xml b/lib/symfony/css-selector/Tests/XPath/Fixtures/lang.xml
new file mode 100644
index 000000000..14f8dbed6
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/XPath/Fixtures/lang.xml
@@ -0,0 +1,11 @@
+<test>
+  <a id="first" xml:lang="en">a</a>
+  <b id="second" xml:lang="en-US">b</b>
+  <c id="third" xml:lang="en-Nz">c</c>
+  <d id="fourth" xml:lang="En-us">d</d>
+  <e id="fifth" xml:lang="fr">e</e>
+  <f id="sixth" xml:lang="ru">f</f>
+  <g id="seventh" xml:lang="de">
+    <h id="eighth" xml:lang="zh"/>
+  </g>
+</test>
diff --git a/lib/symfony/css-selector/Tests/XPath/Fixtures/shakespear.html b/lib/symfony/css-selector/Tests/XPath/Fixtures/shakespear.html
new file mode 100644
index 000000000..15d1ad33a
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/XPath/Fixtures/shakespear.html
@@ -0,0 +1,308 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" debug="true">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+</head>
+<body>
+	<div id="test">
+	<div class="dialog">
+	<h2>As You Like It</h2>
+	<div id="playwright">
+	  by William Shakespeare
+	</div>
+	<div class="dialog scene thirdClass" id="scene1">
+	  <h3>ACT I, SCENE III. A room in the palace.</h3>
+	  <div class="dialog">
+	  <div class="direction">Enter CELIA and ROSALIND</div>
+	  </div>
+	  <div id="speech1" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.1">Why, cousin! why, Rosalind! Cupid have mercy! not a word?</div>
+	  </div>
+	  <div id="speech2" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.2">Not one to throw at a dog.</div>
+	  </div>
+	  <div id="speech3" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.3">No, thy words are too precious to be cast away upon</div>
+	  <div id="scene1.3.4">curs; throw some of them at me; come, lame me with reasons.</div>
+	  </div>
+	  <div id="speech4" class="character">ROSALIND</div>
+	  <div id="speech5" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.8">But is all this for your father?</div>
+	  </div>
+	  <div class="dialog">
+	  <div id="scene1.3.5">Then there were two cousins laid up; when the one</div>
+	  <div id="scene1.3.6">should be lamed with reasons and the other mad</div>
+	  <div id="scene1.3.7">without any.</div>
+	  </div>
+	  <div id="speech6" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.9">No, some of it is for my child's father. O, how</div>
+	  <div id="scene1.3.10">full of briers is this working-day world!</div>
+	  </div>
+	  <div id="speech7" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.11">They are but burs, cousin, thrown upon thee in</div>
+	  <div id="scene1.3.12">holiday foolery: if we walk not in the trodden</div>
+	  <div id="scene1.3.13">paths our very petticoats will catch them.</div>
+	  </div>
+	  <div id="speech8" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.14">I could shake them off my coat: these burs are in my heart.</div>
+	  </div>
+	  <div id="speech9" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.15">Hem them away.</div>
+	  </div>
+	  <div id="speech10" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.16">I would try, if I could cry 'hem' and have him.</div>
+	  </div>
+	  <div id="speech11" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.17">Come, come, wrestle with thy affections.</div>
+	  </div>
+	  <div id="speech12" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.18">O, they take the part of a better wrestler than myself!</div>
+	  </div>
+	  <div id="speech13" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.19">O, a good wish upon you! you will try in time, in</div>
+	  <div id="scene1.3.20">despite of a fall. But, turning these jests out of</div>
+	  <div id="scene1.3.21">service, let us talk in good earnest: is it</div>
+	  <div id="scene1.3.22">possible, on such a sudden, you should fall into so</div>
+	  <div id="scene1.3.23">strong a liking with old Sir Rowland's youngest son?</div>
+	  </div>
+	  <div id="speech14" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.24">The duke my father loved his father dearly.</div>
+	  </div>
+	  <div id="speech15" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.25">Doth it therefore ensue that you should love his son</div>
+	  <div id="scene1.3.26">dearly? By this kind of chase, I should hate him,</div>
+	  <div id="scene1.3.27">for my father hated his father dearly; yet I hate</div>
+	  <div id="scene1.3.28">not Orlando.</div>
+	  </div>
+	  <div id="speech16" class="character">ROSALIND</div>
+	  <div title="wtf" class="dialog">
+	  <div id="scene1.3.29">No, faith, hate him not, for my sake.</div>
+	  </div>
+	  <div id="speech17" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.30">Why should I not? doth he not deserve well?</div>
+	  </div>
+	  <div id="speech18" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.31">Let me love him for that, and do you love him</div>
+	  <div id="scene1.3.32">because I do. Look, here comes the duke.</div>
+	  </div>
+	  <div id="speech19" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.33">With his eyes full of anger.</div>
+	  <div class="direction">Enter DUKE FREDERICK, with Lords</div>
+	  </div>
+	  <div id="speech20" class="character">DUKE FREDERICK</div>
+	  <div class="dialog">
+	  <div id="scene1.3.34">Mistress, dispatch you with your safest haste</div>
+	  <div id="scene1.3.35">And get you from our court.</div>
+	  </div>
+	  <div id="speech21" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.36">Me, uncle?</div>
+	  </div>
+	  <div id="speech22" class="character">DUKE FREDERICK</div>
+	  <div class="dialog">
+	  <div id="scene1.3.37">You, cousin</div>
+	  <div id="scene1.3.38">Within these ten days if that thou be'st found</div>
+	  <div id="scene1.3.39">So near our public court as twenty miles,</div>
+	  <div id="scene1.3.40">Thou diest for it.</div>
+	  </div>
+	  <div id="speech23" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.41">                  I do beseech your grace,</div>
+	  <div id="scene1.3.42">Let me the knowledge of my fault bear with me:</div>
+	  <div id="scene1.3.43">If with myself I hold intelligence</div>
+	  <div id="scene1.3.44">Or have acquaintance with mine own desires,</div>
+	  <div id="scene1.3.45">If that I do not dream or be not frantic,--</div>
+	  <div id="scene1.3.46">As I do trust I am not--then, dear uncle,</div>
+	  <div id="scene1.3.47">Never so much as in a thought unborn</div>
+	  <div id="scene1.3.48">Did I offend your highness.</div>
+	  </div>
+	  <div id="speech24" class="character">DUKE FREDERICK</div>
+	  <div class="dialog">
+	  <div id="scene1.3.49">Thus do all traitors:</div>
+	  <div id="scene1.3.50">If their purgation did consist in words,</div>
+	  <div id="scene1.3.51">They are as innocent as grace itself:</div>
+	  <div id="scene1.3.52">Let it suffice thee that I trust thee not.</div>
+	  </div>
+	  <div id="speech25" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.53">Yet your mistrust cannot make me a traitor:</div>
+	  <div id="scene1.3.54">Tell me whereon the likelihood depends.</div>
+	  </div>
+	  <div id="speech26" class="character">DUKE FREDERICK</div>
+	  <div class="dialog">
+	  <div id="scene1.3.55">Thou art thy father's daughter; there's enough.</div>
+	  </div>
+	  <div id="speech27" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.56">So was I when your highness took his dukedom;</div>
+	  <div id="scene1.3.57">So was I when your highness banish'd him:</div>
+	  <div id="scene1.3.58">Treason is not inherited, my lord;</div>
+	  <div id="scene1.3.59">Or, if we did derive it from our friends,</div>
+	  <div id="scene1.3.60">What's that to me? my father was no traitor:</div>
+	  <div id="scene1.3.61">Then, good my liege, mistake me not so much</div>
+	  <div id="scene1.3.62">To think my poverty is treacherous.</div>
+	  </div>
+	  <div id="speech28" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.63">Dear sovereign, hear me speak.</div>
+	  </div>
+	  <div id="speech29" class="character">DUKE FREDERICK</div>
+	  <div class="dialog">
+	  <div id="scene1.3.64">Ay, Celia; we stay'd her for your sake,</div>
+	  <div id="scene1.3.65">Else had she with her father ranged along.</div>
+	  </div>
+	  <div id="speech30" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.66">I did not then entreat to have her stay;</div>
+	  <div id="scene1.3.67">It was your pleasure and your own remorse:</div>
+	  <div id="scene1.3.68">I was too young that time to value her;</div>
+	  <div id="scene1.3.69">But now I know her: if she be a traitor,</div>
+	  <div id="scene1.3.70">Why so am I; we still have slept together,</div>
+	  <div id="scene1.3.71">Rose at an instant, learn'd, play'd, eat together,</div>
+	  <div id="scene1.3.72">And wheresoever we went, like Juno's swans,</div>
+	  <div id="scene1.3.73">Still we went coupled and inseparable.</div>
+	  </div>
+	  <div id="speech31" class="character">DUKE FREDERICK</div>
+	  <div class="dialog">
+	  <div id="scene1.3.74">She is too subtle for thee; and her smoothness,</div>
+	  <div id="scene1.3.75">Her very silence and her patience</div>
+	  <div id="scene1.3.76">Speak to the people, and they pity her.</div>
+	  <div id="scene1.3.77">Thou art a fool: she robs thee of thy name;</div>
+	  <div id="scene1.3.78">And thou wilt show more bright and seem more virtuous</div>
+	  <div id="scene1.3.79">When she is gone. Then open not thy lips:</div>
+	  <div id="scene1.3.80">Firm and irrevocable is my doom</div>
+	  <div id="scene1.3.81">Which I have pass'd upon her; she is banish'd.</div>
+	  </div>
+	  <div id="speech32" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.82">Pronounce that sentence then on me, my liege:</div>
+	  <div id="scene1.3.83">I cannot live out of her company.</div>
+	  </div>
+	  <div id="speech33" class="character">DUKE FREDERICK</div>
+	  <div class="dialog">
+	  <div id="scene1.3.84">You are a fool. You, niece, provide yourself:</div>
+	  <div id="scene1.3.85">If you outstay the time, upon mine honour,</div>
+	  <div id="scene1.3.86">And in the greatness of my word, you die.</div>
+	  <div class="direction">Exeunt DUKE FREDERICK and Lords</div>
+	  </div>
+	  <div id="speech34" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.87">O my poor Rosalind, whither wilt thou go?</div>
+	  <div id="scene1.3.88">Wilt thou change fathers? I will give thee mine.</div>
+	  <div id="scene1.3.89">I charge thee, be not thou more grieved than I am.</div>
+	  </div>
+	  <div id="speech35" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.90">I have more cause.</div>
+	  </div>
+	  <div id="speech36" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.91">                  Thou hast not, cousin;</div>
+	  <div id="scene1.3.92">Prithee be cheerful: know'st thou not, the duke</div>
+	  <div id="scene1.3.93">Hath banish'd me, his daughter?</div>
+	  </div>
+	  <div id="speech37" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.94">That he hath not.</div>
+	  </div>
+	  <div id="speech38" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.95">No, hath not? Rosalind lacks then the love</div>
+	  <div id="scene1.3.96">Which teacheth thee that thou and I am one:</div>
+	  <div id="scene1.3.97">Shall we be sunder'd? shall we part, sweet girl?</div>
+	  <div id="scene1.3.98">No: let my father seek another heir.</div>
+	  <div id="scene1.3.99">Therefore devise with me how we may fly,</div>
+	  <div id="scene1.3.100">Whither to go and what to bear with us;</div>
+	  <div id="scene1.3.101">And do not seek to take your change upon you,</div>
+	  <div id="scene1.3.102">To bear your griefs yourself and leave me out;</div>
+	  <div id="scene1.3.103">For, by this heaven, now at our sorrows pale,</div>
+	  <div id="scene1.3.104">Say what thou canst, I'll go along with thee.</div>
+	  </div>
+	  <div id="speech39" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.105">Why, whither shall we go?</div>
+	  </div>
+	  <div id="speech40" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.106">To seek my uncle in the forest of Arden.</div>
+	  </div>
+	  <div id="speech41" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.107">Alas, what danger will it be to us,</div>
+	  <div id="scene1.3.108">Maids as we are, to travel forth so far!</div>
+	  <div id="scene1.3.109">Beauty provoketh thieves sooner than gold.</div>
+	  </div>
+	  <div id="speech42" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.110">I'll put myself in poor and mean attire</div>
+	  <div id="scene1.3.111">And with a kind of umber smirch my face;</div>
+	  <div id="scene1.3.112">The like do you: so shall we pass along</div>
+	  <div id="scene1.3.113">And never stir assailants.</div>
+	  </div>
+	  <div id="speech43" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.114">Were it not better,</div>
+	  <div id="scene1.3.115">Because that I am more than common tall,</div>
+	  <div id="scene1.3.116">That I did suit me all points like a man?</div>
+	  <div id="scene1.3.117">A gallant curtle-axe upon my thigh,</div>
+	  <div id="scene1.3.118">A boar-spear in my hand; and--in my heart</div>
+	  <div id="scene1.3.119">Lie there what hidden woman's fear there will--</div>
+	  <div id="scene1.3.120">We'll have a swashing and a martial outside,</div>
+	  <div id="scene1.3.121">As many other mannish cowards have</div>
+	  <div id="scene1.3.122">That do outface it with their semblances.</div>
+	  </div>
+	  <div id="speech44" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.123">What shall I call thee when thou art a man?</div>
+	  </div>
+	  <div id="speech45" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.124">I'll have no worse a name than Jove's own page;</div>
+	  <div id="scene1.3.125">And therefore look you call me Ganymede.</div>
+	  <div id="scene1.3.126">But what will you be call'd?</div>
+	  </div>
+	  <div id="speech46" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.127">Something that hath a reference to my state</div>
+	  <div id="scene1.3.128">No longer Celia, but Aliena.</div>
+	  </div>
+	  <div id="speech47" class="character">ROSALIND</div>
+	  <div class="dialog">
+	  <div id="scene1.3.129">But, cousin, what if we assay'd to steal</div>
+	  <div id="scene1.3.130">The clownish fool out of your father's court?</div>
+	  <div id="scene1.3.131">Would he not be a comfort to our travel?</div>
+	  </div>
+	  <div id="speech48" class="character">CELIA</div>
+	  <div class="dialog">
+	  <div id="scene1.3.132">He'll go along o'er the wide world with me;</div>
+	  <div id="scene1.3.133">Leave me alone to woo him. Let's away,</div>
+	  <div id="scene1.3.134">And get our jewels and our wealth together,</div>
+	  <div id="scene1.3.135">Devise the fittest time and safest way</div>
+	  <div id="scene1.3.136">To hide us from pursuit that will be made</div>
+	  <div id="scene1.3.137">After my flight. Now go we in content</div>
+	  <div id="scene1.3.138">To liberty and not to banishment.</div>
+	  <div class="direction">Exeunt</div>
+	  </div>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/lib/symfony/css-selector/Tests/XPath/TranslatorTest.php b/lib/symfony/css-selector/Tests/XPath/TranslatorTest.php
new file mode 100644
index 000000000..a718fbd6f
--- /dev/null
+++ b/lib/symfony/css-selector/Tests/XPath/TranslatorTest.php
@@ -0,0 +1,413 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\XPath;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\FunctionNode;
+use Symfony\Component\CssSelector\Parser\Parser;
+use Symfony\Component\CssSelector\XPath\Extension\HtmlExtension;
+use Symfony\Component\CssSelector\XPath\Translator;
+use Symfony\Component\CssSelector\XPath\XPathExpr;
+
+class TranslatorTest extends TestCase
+{
+    /** @dataProvider getXpathLiteralTestData */
+    public function testXpathLiteral($value, $literal)
+    {
+        $this->assertEquals($literal, Translator::getXpathLiteral($value));
+    }
+
+    /** @dataProvider getCssToXPathTestData */
+    public function testCssToXPath($css, $xpath)
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $this->assertEquals($xpath, $translator->cssToXPath($css, ''));
+    }
+
+    public function testCssToXPathPseudoElement()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $translator->cssToXPath('e::first-line');
+    }
+
+    public function testGetExtensionNotExistsExtension()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $translator->getExtension('fake');
+    }
+
+    public function testAddCombinationNotExistsExtension()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $parser = new Parser();
+        $xpath = $parser->parse('*')[0];
+        $combinedXpath = $parser->parse('*')[0];
+        $translator->addCombination('fake', $xpath, $combinedXpath);
+    }
+
+    public function testAddFunctionNotExistsFunction()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $xpath = new XPathExpr();
+        $function = new FunctionNode(new ElementNode(), 'fake');
+        $translator->addFunction($xpath, $function);
+    }
+
+    public function testAddPseudoClassNotExistsClass()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $xpath = new XPathExpr();
+        $translator->addPseudoClass($xpath, 'fake');
+    }
+
+    public function testAddAttributeMatchingClassNotExistsClass()
+    {
+        $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $xpath = new XPathExpr();
+        $translator->addAttributeMatching($xpath, '', '', '');
+    }
+
+    /** @dataProvider getXmlLangTestData */
+    public function testXmlLang($css, array $elementsId)
+    {
+        $translator = new Translator();
+        $document = new \SimpleXMLElement(file_get_contents(__DIR__.'/Fixtures/lang.xml'));
+        $elements = $document->xpath($translator->cssToXPath($css));
+        $this->assertCount(\count($elementsId), $elements);
+        foreach ($elements as $element) {
+            $this->assertContains((string) $element->attributes()->id, $elementsId);
+        }
+    }
+
+    /** @dataProvider getHtmlIdsTestData */
+    public function testHtmlIds($css, array $elementsId)
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $document = new \DOMDocument();
+        $document->strictErrorChecking = false;
+        $internalErrors = libxml_use_internal_errors(true);
+        $document->loadHTMLFile(__DIR__.'/Fixtures/ids.html');
+        $document = simplexml_import_dom($document);
+        $elements = $document->xpath($translator->cssToXPath($css));
+        $this->assertCount(\count($elementsId), $elementsId);
+        foreach ($elements as $element) {
+            if (null !== $element->attributes()->id) {
+                $this->assertContains((string) $element->attributes()->id, $elementsId);
+            }
+        }
+        libxml_clear_errors();
+        libxml_use_internal_errors($internalErrors);
+    }
+
+    /** @dataProvider getHtmlShakespearTestData */
+    public function testHtmlShakespear($css, $count)
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $document = new \DOMDocument();
+        $document->strictErrorChecking = false;
+        $document->loadHTMLFile(__DIR__.'/Fixtures/shakespear.html');
+        $document = simplexml_import_dom($document);
+        $bodies = $document->xpath('//body');
+        $elements = $bodies[0]->xpath($translator->cssToXPath($css));
+        $this->assertCount($count, $elements);
+    }
+
+    public function testOnlyOfTypeFindsSingleChildrenOfGivenType()
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $document = new \DOMDocument();
+        $document->loadHTML(<<<'HTML'
+<html>
+  <body>
+    <p>
+      <span>A</span>
+    </p>
+    <p>
+      <span>B</span>
+      <span>C</span>
+    </p>
+  </body>
+</html>
+HTML
+);
+
+        $xpath = new \DOMXPath($document);
+        $nodeList = $xpath->query($translator->cssToXPath('span:only-of-type'));
+
+        $this->assertSame(1, $nodeList->length);
+        $this->assertSame('A', $nodeList->item(0)->textContent);
+    }
+
+    public function getXpathLiteralTestData()
+    {
+        return [
+            ['foo', "'foo'"],
+            ["foo's bar", '"foo\'s bar"'],
+            ["foo's \"middle\" bar", 'concat(\'foo\', "\'", \'s "middle" bar\')'],
+            ["foo's 'middle' \"bar\"", 'concat(\'foo\', "\'", \'s \', "\'", \'middle\', "\'", \' "bar"\')'],
+        ];
+    }
+
+    public function getCssToXPathTestData()
+    {
+        return [
+            ['*', '*'],
+            ['e', 'e'],
+            ['*|e', 'e'],
+            ['e|f', 'e:f'],
+            ['e[foo]', 'e[@foo]'],
+            ['e[foo|bar]', 'e[@foo:bar]'],
+            ['e[foo="bar"]', "e[@foo = 'bar']"],
+            ['e[foo~="bar"]', "e[@foo and contains(concat(' ', normalize-space(@foo), ' '), ' bar ')]"],
+            ['e[foo^="bar"]', "e[@foo and starts-with(@foo, 'bar')]"],
+            ['e[foo$="bar"]', "e[@foo and substring(@foo, string-length(@foo)-2) = 'bar']"],
+            ['e[foo*="bar"]', "e[@foo and contains(@foo, 'bar')]"],
+            ['e[foo!="bar"]', "e[not(@foo) or @foo != 'bar']"],
+            ['e[foo!="bar"][foo!="baz"]', "e[(not(@foo) or @foo != 'bar') and (not(@foo) or @foo != 'baz')]"],
+            ['e[hreflang|="en"]', "e[@hreflang and (@hreflang = 'en' or starts-with(@hreflang, 'en-'))]"],
+            ['e:nth-child(1)', "*/*[(name() = 'e') and (position() = 1)]"],
+            ['e:nth-last-child(1)', "*/*[(name() = 'e') and (position() = last() - 0)]"],
+            ['e:nth-last-child(2n+2)', "*/*[(name() = 'e') and (last() - position() - 1 >= 0 and (last() - position() - 1) mod 2 = 0)]"],
+            ['e:nth-of-type(1)', '*/e[position() = 1]'],
+            ['e:nth-last-of-type(1)', '*/e[position() = last() - 0]'],
+            ['div e:nth-last-of-type(1) .aclass', "div/descendant-or-self::*/e[position() = last() - 0]/descendant-or-self::*/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' aclass ')]"],
+            ['e:first-child', "*/*[(name() = 'e') and (position() = 1)]"],
+            ['e:last-child', "*/*[(name() = 'e') and (position() = last())]"],
+            ['e:first-of-type', '*/e[position() = 1]'],
+            ['e:last-of-type', '*/e[position() = last()]'],
+            ['e:only-child', "*/*[(name() = 'e') and (last() = 1)]"],
+            ['e:only-of-type', 'e[count(preceding-sibling::e)=0 and count(following-sibling::e)=0]'],
+            ['e:empty', 'e[not(*) and not(string-length())]'],
+            ['e:EmPTY', 'e[not(*) and not(string-length())]'],
+            ['e:root', 'e[not(parent::*)]'],
+            ['e:hover', 'e[0]'],
+            ['e:contains("foo")', "e[contains(string(.), 'foo')]"],
+            ['e:ConTains(foo)', "e[contains(string(.), 'foo')]"],
+            ['e.warning', "e[@class and contains(concat(' ', normalize-space(@class), ' '), ' warning ')]"],
+            ['e#myid', "e[@id = 'myid']"],
+            ['e:not(:nth-child(odd))', 'e[not(position() - 1 >= 0 and (position() - 1) mod 2 = 0)]'],
+            ['e:nOT(*)', 'e[0]'],
+            ['e f', 'e/descendant-or-self::*/f'],
+            ['e > f', 'e/f'],
+            ['e + f', "e/following-sibling::*[(name() = 'f') and (position() = 1)]"],
+            ['e ~ f', 'e/following-sibling::f'],
+            ['div#container p', "div[@id = 'container']/descendant-or-self::*/p"],
+        ];
+    }
+
+    public function getXmlLangTestData()
+    {
+        return [
+            [':lang("EN")', ['first', 'second', 'third', 'fourth']],
+            [':lang("en-us")', ['second', 'fourth']],
+            [':lang(en-nz)', ['third']],
+            [':lang(fr)', ['fifth']],
+            [':lang(ru)', ['sixth']],
+            [":lang('ZH')", ['eighth']],
+            [':lang(de) :lang(zh)', ['eighth']],
+            [':lang(en), :lang(zh)', ['first', 'second', 'third', 'fourth', 'eighth']],
+            [':lang(es)', []],
+        ];
+    }
+
+    public function getHtmlIdsTestData()
+    {
+        return [
+            ['div', ['outer-div', 'li-div', 'foobar-div']],
+            ['DIV', ['outer-div', 'li-div', 'foobar-div']],  // case-insensitive in HTML
+            ['div div', ['li-div']],
+            ['div, div div', ['outer-div', 'li-div', 'foobar-div']],
+            ['a[name]', ['name-anchor']],
+            ['a[NAme]', ['name-anchor']], // case-insensitive in HTML:
+            ['a[rel]', ['tag-anchor', 'nofollow-anchor']],
+            ['a[rel="tag"]', ['tag-anchor']],
+            ['a[href*="localhost"]', ['tag-anchor']],
+            ['a[href*=""]', []],
+            ['a[href^="http"]', ['tag-anchor', 'nofollow-anchor']],
+            ['a[href^="http:"]', ['tag-anchor']],
+            ['a[href^=""]', []],
+            ['a[href$="org"]', ['nofollow-anchor']],
+            ['a[href$=""]', []],
+            ['div[foobar~="bc"]', ['foobar-div']],
+            ['div[foobar~="cde"]', ['foobar-div']],
+            ['[foobar~="ab bc"]', ['foobar-div']],
+            ['[foobar~=""]', []],
+            ['[foobar~=" \t"]', []],
+            ['div[foobar~="cd"]', []],
+            ['*[lang|="En"]', ['second-li']],
+            ['[lang|="En-us"]', ['second-li']],
+            // Attribute values are case sensitive
+            ['*[lang|="en"]', []],
+            ['[lang|="en-US"]', []],
+            ['*[lang|="e"]', []],
+            // ... :lang() is not.
+            [':lang("EN")', ['second-li', 'li-div']],
+            ['*:lang(en-US)', ['second-li', 'li-div']],
+            [':lang("e")', []],
+            ['li:nth-child(3)', ['third-li']],
+            ['li:nth-child(10)', []],
+            ['li:nth-child(2n)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-child(even)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-child(2n+0)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-child(+2n+1)', ['first-li', 'third-li', 'fifth-li', 'seventh-li']],
+            ['li:nth-child(odd)', ['first-li', 'third-li', 'fifth-li', 'seventh-li']],
+            ['li:nth-child(2n+4)', ['fourth-li', 'sixth-li']],
+            ['li:nth-child(3n+1)', ['first-li', 'fourth-li', 'seventh-li']],
+            ['li:nth-child(n)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-child(n-1)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-child(n+1)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-child(n+3)', ['third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-child(-n)', []],
+            ['li:nth-child(-n-1)', []],
+            ['li:nth-child(-n+1)', ['first-li']],
+            ['li:nth-child(-n+3)', ['first-li', 'second-li', 'third-li']],
+            ['li:nth-last-child(0)', []],
+            ['li:nth-last-child(2n)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-last-child(even)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-last-child(2n+2)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-last-child(n)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-last-child(n-1)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-last-child(n-3)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-last-child(n+1)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-last-child(n+3)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li']],
+            ['li:nth-last-child(-n)', []],
+            ['li:nth-last-child(-n-1)', []],
+            ['li:nth-last-child(-n+1)', ['seventh-li']],
+            ['li:nth-last-child(-n+3)', ['fifth-li', 'sixth-li', 'seventh-li']],
+            ['ol:first-of-type', ['first-ol']],
+            ['ol:nth-child(1)', ['first-ol']],
+            ['ol:nth-of-type(2)', ['second-ol']],
+            ['ol:nth-last-of-type(1)', ['second-ol']],
+            ['span:only-child', ['foobar-span']],
+            ['li div:only-child', ['li-div']],
+            ['div *:only-child', ['li-div', 'foobar-span']],
+            ['p:only-of-type', ['paragraph']],
+            ['a:empty', ['name-anchor']],
+            ['a:EMpty', ['name-anchor']],
+            ['li:empty', ['third-li', 'fourth-li', 'fifth-li', 'sixth-li']],
+            [':root', ['html']],
+            ['html:root', ['html']],
+            ['li:root', []],
+            ['* :root', []],
+            ['*:contains("link")', ['html', 'outer-div', 'tag-anchor', 'nofollow-anchor']],
+            [':CONtains("link")', ['html', 'outer-div', 'tag-anchor', 'nofollow-anchor']],
+            ['*:contains("LInk")', []],  // case sensitive
+            ['*:contains("e")', ['html', 'nil', 'outer-div', 'first-ol', 'first-li', 'paragraph', 'p-em']],
+            ['*:contains("E")', []],  // case-sensitive
+            ['.a', ['first-ol']],
+            ['.b', ['first-ol']],
+            ['*.a', ['first-ol']],
+            ['ol.a', ['first-ol']],
+            ['.c', ['first-ol', 'third-li', 'fourth-li']],
+            ['*.c', ['first-ol', 'third-li', 'fourth-li']],
+            ['ol *.c', ['third-li', 'fourth-li']],
+            ['ol li.c', ['third-li', 'fourth-li']],
+            ['li ~ li.c', ['third-li', 'fourth-li']],
+            ['ol > li.c', ['third-li', 'fourth-li']],
+            ['#first-li', ['first-li']],
+            ['li#first-li', ['first-li']],
+            ['*#first-li', ['first-li']],
+            ['li div', ['li-div']],
+            ['li > div', ['li-div']],
+            ['div div', ['li-div']],
+            ['div > div', []],
+            ['div>.c', ['first-ol']],
+            ['div > .c', ['first-ol']],
+            ['div + div', ['foobar-div']],
+            ['a ~ a', ['tag-anchor', 'nofollow-anchor']],
+            ['a[rel="tag"] ~ a', ['nofollow-anchor']],
+            ['ol#first-ol li:last-child', ['seventh-li']],
+            ['ol#first-ol *:last-child', ['li-div', 'seventh-li']],
+            ['#outer-div:first-child', ['outer-div']],
+            ['#outer-div :first-child', ['name-anchor', 'first-li', 'li-div', 'p-b', 'checkbox-fieldset-disabled', 'area-href']],
+            ['a[href]', ['tag-anchor', 'nofollow-anchor']],
+            [':not(*)', []],
+            ['a:not([href])', ['name-anchor']],
+            ['ol :Not(li[class])', ['first-li', 'second-li', 'li-div', 'fifth-li', 'sixth-li', 'seventh-li']],
+            // HTML-specific
+            [':link', ['link-href', 'tag-anchor', 'nofollow-anchor', 'area-href']],
+            [':visited', []],
+            [':enabled', ['link-href', 'tag-anchor', 'nofollow-anchor', 'checkbox-unchecked', 'text-checked', 'checkbox-checked', 'area-href']],
+            [':disabled', ['checkbox-disabled', 'checkbox-disabled-checked', 'fieldset', 'checkbox-fieldset-disabled']],
+            [':checked', ['checkbox-checked', 'checkbox-disabled-checked']],
+        ];
+    }
+
+    public function getHtmlShakespearTestData()
+    {
+        return [
+            ['*', 246],
+            ['div:contains(CELIA)', 26],
+            ['div:only-child', 22], // ?
+            ['div:nth-child(even)', 106],
+            ['div:nth-child(2n)', 106],
+            ['div:nth-child(odd)', 137],
+            ['div:nth-child(2n+1)', 137],
+            ['div:nth-child(n)', 243],
+            ['div:last-child', 53],
+            ['div:first-child', 51],
+            ['div > div', 242],
+            ['div + div', 190],
+            ['div ~ div', 190],
+            ['body', 1],
+            ['body div', 243],
+            ['div', 243],
+            ['div div', 242],
+            ['div div div', 241],
+            ['div, div, div', 243],
+            ['div, a, span', 243],
+            ['.dialog', 51],
+            ['div.dialog', 51],
+            ['div .dialog', 51],
+            ['div.character, div.dialog', 99],
+            ['div.direction.dialog', 0],
+            ['div.dialog.direction', 0],
+            ['div.dialog.scene', 1],
+            ['div.scene.scene', 1],
+            ['div.scene .scene', 0],
+            ['div.direction .dialog ', 0],
+            ['div .dialog .direction', 4],
+            ['div.dialog .dialog .direction', 4],
+            ['#speech5', 1],
+            ['div#speech5', 1],
+            ['div #speech5', 1],
+            ['div.scene div.dialog', 49],
+            ['div#scene1 div.dialog div', 142],
+            ['#scene1 #speech1', 1],
+            ['div[class]', 103],
+            ['div[class=dialog]', 50],
+            ['div[class^=dia]', 51],
+            ['div[class$=log]', 50],
+            ['div[class*=sce]', 1],
+            ['div[class|=dialog]', 50], // ? Seems right
+            ['div[class!=madeup]', 243], // ? Seems right
+            ['div[class~=dialog]', 51], // ? Seems right
+        ];
+    }
+}
diff --git a/lib/symfony/debug/Resources/ext/tests/001.phpt b/lib/symfony/debug/Resources/ext/tests/001.phpt
new file mode 100644
index 000000000..86a9427c7
--- /dev/null
+++ b/lib/symfony/debug/Resources/ext/tests/001.phpt
@@ -0,0 +1,155 @@
+--TEST--
+Test symfony_zval_info API
+--SKIPIF--
+<?php if (!extension_loaded('symfony_debug')) {
+    echo 'skip';
+} ?>
+--FILE--
+<?php
+
+$int = 42;
+$float = 42.42;
+$str = 'foobar';
+$object = new StdClass();
+$array = ['foo', 'bar'];
+$resource = tmpfile();
+$null = null;
+$bool = true;
+
+$anotherint = 42;
+$refcount2 = &$anotherint;
+
+$var = [
+    '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/lib/symfony/debug/Resources/ext/tests/002.phpt b/lib/symfony/debug/Resources/ext/tests/002.phpt
new file mode 100644
index 000000000..afc7bb490
--- /dev/null
+++ b/lib/symfony/debug/Resources/ext/tests/002.phpt
@@ -0,0 +1,65 @@
+--TEST--
+Test symfony_debug_backtrace in case of fatal error
+--SKIPIF--
+<?php if (!extension_loaded('symfony_debug')) {
+    echo '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/lib/symfony/debug/Resources/ext/tests/002_1.phpt b/lib/symfony/debug/Resources/ext/tests/002_1.phpt
new file mode 100644
index 000000000..86de3e177
--- /dev/null
+++ b/lib/symfony/debug/Resources/ext/tests/002_1.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Test symfony_debug_backtrace in case of non fatal error
+--SKIPIF--
+<?php if (!extension_loaded('symfony_debug')) {
+    echo '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/lib/symfony/debug/Resources/ext/tests/003.phpt b/lib/symfony/debug/Resources/ext/tests/003.phpt
new file mode 100644
index 000000000..4e7645031
--- /dev/null
+++ b/lib/symfony/debug/Resources/ext/tests/003.phpt
@@ -0,0 +1,87 @@
+--TEST--
+Test ErrorHandler in case of fatal error
+--SKIPIF--
+<?php if (!extension_loaded('symfony_debug')) {
+    echo '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/lib/symfony/debug/Tests/DebugClassLoaderTest.php b/lib/symfony/debug/Tests/DebugClassLoaderTest.php
new file mode 100644
index 000000000..0388acba0
--- /dev/null
+++ b/lib/symfony/debug/Tests/DebugClassLoaderTest.php
@@ -0,0 +1,445 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\DebugClassLoader;
+use Symfony\Component\Debug\ErrorHandler;
+
+class DebugClassLoaderTest extends TestCase
+{
+    /**
+     * @var int Error reporting level before running tests
+     */
+    private $errorReporting;
+
+    private $loader;
+
+    protected function setUp()
+    {
+        $this->errorReporting = error_reporting(E_ALL);
+        $this->loader = new ClassLoader();
+        spl_autoload_register([$this->loader, 'loadClass'], true, true);
+        DebugClassLoader::enable();
+    }
+
+    protected function tearDown()
+    {
+        DebugClassLoader::disable();
+        spl_autoload_unregister([$this->loader, 'loadClass']);
+        error_reporting($this->errorReporting);
+    }
+
+    public function testIdempotence()
+    {
+        DebugClassLoader::enable();
+
+        $functions = spl_autoload_functions();
+        foreach ($functions as $function) {
+            if (\is_array($function) && $function[0] instanceof DebugClassLoader) {
+                $reflClass = new \ReflectionClass($function[0]);
+                $reflProp = $reflClass->getProperty('classLoader');
+                $reflProp->setAccessible(true);
+
+                $this->assertNotInstanceOf('Symfony\Component\Debug\DebugClassLoader', $reflProp->getValue($function[0]));
+
+                return;
+            }
+        }
+
+        $this->fail('DebugClassLoader did not register');
+    }
+
+    public function testThrowingClass()
+    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('boo');
+        try {
+            class_exists(__NAMESPACE__.'\Fixtures\Throwing');
+            $this->fail('Exception expected');
+        } catch (\Exception $e) {
+            $this->assertSame('boo', $e->getMessage());
+        }
+
+        // the second call also should throw
+        class_exists(__NAMESPACE__.'\Fixtures\Throwing');
+    }
+
+    public function testUnsilencing()
+    {
+        if (\PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('PHP7 throws exceptions, unsilencing is not required anymore.');
+        }
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM is not handled in this test case.');
+        }
+
+        ob_start();
+
+        $this->iniSet('log_errors', 0);
+        $this->iniSet('display_errors', 1);
+
+        // See below: this will fail with parse error
+        // but this should not be @-silenced.
+        @class_exists(__NAMESPACE__.'\TestingUnsilencing', true);
+
+        $output = ob_get_clean();
+
+        $this->assertStringMatchesFormat('%aParse error%a', $output);
+    }
+
+    public function testStacking()
+    {
+        // the ContextErrorException must not be loaded to test the workaround
+        // for https://bugs.php.net/65322.
+        if (class_exists('Symfony\Component\Debug\Exception\ContextErrorException', false)) {
+            $this->markTestSkipped('The ContextErrorException class is already loaded.');
+        }
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM is not handled in this test case.');
+        }
+
+        ErrorHandler::register();
+
+        try {
+            // Trigger autoloading + E_STRICT at compile time
+            // which in turn triggers $errorHandler->handle()
+            // that again triggers autoloading for ContextErrorException.
+            // Error stacking works around the bug above and everything is fine.
+
+            eval('
+                namespace '.__NAMESPACE__.';
+                class ChildTestingStacking extends TestingStacking { function foo($bar) {} }
+            ');
+            $this->fail('ContextErrorException expected');
+        } catch (\ErrorException $exception) {
+            // if an exception is thrown, the test passed
+            $this->assertStringStartsWith(__FILE__, $exception->getFile());
+            if (\PHP_VERSION_ID < 70000) {
+                $this->assertRegExp('/^Runtime Notice: Declaration/', $exception->getMessage());
+                $this->assertEquals(E_STRICT, $exception->getSeverity());
+            } else {
+                $this->assertRegExp('/^Warning: Declaration/', $exception->getMessage());
+                $this->assertEquals(E_WARNING, $exception->getSeverity());
+            }
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    public function testNameCaseMismatch()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Case mismatch between loaded and declared class names');
+        class_exists(__NAMESPACE__.'\TestingCaseMismatch', true);
+    }
+
+    public function testFileCaseMismatch()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Case mismatch between class and real file names');
+        if (!file_exists(__DIR__.'/Fixtures/CaseMismatch.php')) {
+            $this->markTestSkipped('Can only be run on case insensitive filesystems');
+        }
+
+        class_exists(__NAMESPACE__.'\Fixtures\CaseMismatch', true);
+    }
+
+    public function testPsr4CaseMismatch()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Case mismatch between loaded and declared class names');
+        class_exists(__NAMESPACE__.'\Fixtures\Psr4CaseMismatch', true);
+    }
+
+    public function testNotPsr0()
+    {
+        $this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\NotPSR0', true));
+    }
+
+    public function testNotPsr0Bis()
+    {
+        $this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\NotPSR0bis', true));
+    }
+
+    public function testClassAlias()
+    {
+        $this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\ClassAlias', true));
+    }
+
+    /**
+     * @dataProvider provideDeprecatedSuper
+     */
+    public function testDeprecatedSuper($class, $super, $type)
+    {
+        set_error_handler(function () { return false; });
+        $e = error_reporting(0);
+        @trigger_error('', E_USER_DEPRECATED);
+
+        class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $lastError = error_get_last();
+        unset($lastError['file'], $lastError['line']);
+
+        $xError = [
+            'type' => E_USER_DEPRECATED,
+            'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice.',
+        ];
+
+        $this->assertSame($xError, $lastError);
+    }
+
+    public function provideDeprecatedSuper()
+    {
+        return [
+            ['DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'],
+            ['DeprecatedParentClass', 'DeprecatedClass', 'extends'],
+        ];
+    }
+
+    public function testInterfaceExtendsDeprecatedInterface()
+    {
+        set_error_handler(function () { return false; });
+        $e = error_reporting(0);
+        trigger_error('', E_USER_NOTICE);
+
+        class_exists('Test\\'.__NAMESPACE__.'\\NonDeprecatedInterfaceClass', true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $lastError = error_get_last();
+        unset($lastError['file'], $lastError['line']);
+
+        $xError = [
+            'type' => E_USER_NOTICE,
+            'message' => '',
+        ];
+
+        $this->assertSame($xError, $lastError);
+    }
+
+    public function testDeprecatedSuperInSameNamespace()
+    {
+        set_error_handler(function () { return false; });
+        $e = error_reporting(0);
+        trigger_error('', E_USER_NOTICE);
+
+        class_exists('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent', true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $lastError = error_get_last();
+        unset($lastError['file'], $lastError['line']);
+
+        $xError = [
+            'type' => E_USER_NOTICE,
+            'message' => '',
+        ];
+
+        $this->assertSame($xError, $lastError);
+    }
+
+    public function testReservedForPhp7()
+    {
+        if (\PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('PHP7 already prevents using reserved names.');
+        }
+
+        set_error_handler(function () { return false; });
+        $e = error_reporting(0);
+        trigger_error('', E_USER_NOTICE);
+
+        class_exists('Test\\'.__NAMESPACE__.'\\Float', true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $lastError = error_get_last();
+        unset($lastError['file'], $lastError['line']);
+
+        $xError = [
+            'type' => E_USER_DEPRECATED,
+            'message' => 'The "Test\Symfony\Component\Debug\Tests\Float" class uses the reserved name "Float", it will break on PHP 7 and higher',
+        ];
+
+        $this->assertSame($xError, $lastError);
+    }
+
+    public function testExtendedFinalClass()
+    {
+        $deprecations = [];
+        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
+        $e = error_reporting(E_USER_DEPRECATED);
+
+        require __DIR__.'/Fixtures/FinalClasses.php';
+
+        $i = 1;
+        while (class_exists($finalClass = __NAMESPACE__.'\\Fixtures\\FinalClass'.$i++, false)) {
+            spl_autoload_call($finalClass);
+            class_exists('Test\\'.__NAMESPACE__.'\\Extends'.substr($finalClass, strrpos($finalClass, '\\') + 1), true);
+        }
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $this->assertSame([
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass1" class is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass1".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass2" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass2".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass3" class is considered final comment with @@@ and ***. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass3".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass4" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass4".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass5" class is considered final multiline comment. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass5".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass6" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass6".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass7" class is considered final another multiline comment... It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass7".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass8" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass8".',
+        ], $deprecations);
+    }
+
+    public function testExtendedFinalMethod()
+    {
+        $deprecations = [];
+        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
+        $e = error_reporting(E_USER_DEPRECATED);
+
+        class_exists(__NAMESPACE__.'\\Fixtures\\ExtendedFinalMethod', true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $xError = [
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
+        ];
+
+        $this->assertSame($xError, $deprecations);
+    }
+
+    public function testExtendedDeprecatedMethodDoesntTriggerAnyNotice()
+    {
+        set_error_handler(function () { return false; });
+        $e = error_reporting(0);
+        trigger_error('', E_USER_NOTICE);
+
+        class_exists('Test\\'.__NAMESPACE__.'\\ExtendsAnnotatedClass', true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $lastError = error_get_last();
+        unset($lastError['file'], $lastError['line']);
+
+        $this->assertSame(['type' => E_USER_NOTICE, 'message' => ''], $lastError);
+    }
+
+    public function testInternalsUse()
+    {
+        $deprecations = [];
+        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
+        $e = error_reporting(E_USER_DEPRECATED);
+
+        class_exists('Test\\'.__NAMESPACE__.'\\ExtendsInternals', true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $this->assertSame($deprecations, [
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalInterface" interface is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass" class is considered internal since version 3.4. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalTrait" trait is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass::internalMethod()" method is considered internal since version 3.4. It may change without further notice. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
+        ]);
+    }
+
+    public function testUseTraitWithInternalMethod()
+    {
+        $deprecations = [];
+        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
+        $e = error_reporting(E_USER_DEPRECATED);
+
+        class_exists('Test\\'.__NAMESPACE__.'\\UseTraitWithInternalMethod', true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $this->assertSame([], $deprecations);
+    }
+
+    public function testEvaluatedCode()
+    {
+        $this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\DefinitionInEvaluatedCode', true));
+    }
+}
+
+class ClassLoader
+{
+    public function loadClass($class)
+    {
+    }
+
+    public function getClassMap()
+    {
+        return [__NAMESPACE__.'\Fixtures\NotPSR0bis' => __DIR__.'/Fixtures/notPsr0Bis.php'];
+    }
+
+    public function findFile($class)
+    {
+        $fixtureDir = __DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
+
+        if (__NAMESPACE__.'\TestingUnsilencing' === $class) {
+            eval('-- parse error --');
+        } elseif (__NAMESPACE__.'\TestingStacking' === $class) {
+            eval('namespace '.__NAMESPACE__.'; class TestingStacking { function foo() {} }');
+        } elseif (__NAMESPACE__.'\TestingCaseMismatch' === $class) {
+            eval('namespace '.__NAMESPACE__.'; class TestingCaseMisMatch {}');
+        } elseif (__NAMESPACE__.'\Fixtures\Psr4CaseMismatch' === $class) {
+            return $fixtureDir.'psr4'.\DIRECTORY_SEPARATOR.'Psr4CaseMismatch.php';
+        } elseif (__NAMESPACE__.'\Fixtures\NotPSR0' === $class) {
+            return $fixtureDir.'reallyNotPsr0.php';
+        } elseif (__NAMESPACE__.'\Fixtures\NotPSR0bis' === $class) {
+            return $fixtureDir.'notPsr0Bis.php';
+        } elseif ('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent' === $class) {
+            eval('namespace Symfony\Bridge\Debug\Tests\Fixtures; class ExtendsDeprecatedParent extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
+        } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedParentClass' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedParentClass extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
+        } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedInterfaceClass' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\DeprecatedInterface {}');
+        } elseif ('Test\\'.__NAMESPACE__.'\NonDeprecatedInterfaceClass' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class NonDeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\NonDeprecatedInterface {}');
+        } elseif ('Test\\'.__NAMESPACE__.'\Float' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class Float {}');
+        } elseif (0 === strpos($class, 'Test\\'.__NAMESPACE__.'\ExtendsFinalClass')) {
+            $classShortName = substr($class, strrpos($class, '\\') + 1);
+            eval('namespace Test\\'.__NAMESPACE__.'; class '.$classShortName.' extends \\'.__NAMESPACE__.'\Fixtures\\'.substr($classShortName, 7).' {}');
+        } elseif ('Test\\'.__NAMESPACE__.'\ExtendsAnnotatedClass' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsAnnotatedClass extends \\'.__NAMESPACE__.'\Fixtures\AnnotatedClass {
+                public function deprecatedMethod() { }
+            }');
+        } elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternals' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternals extends ExtendsInternalsParent {
+                use \\'.__NAMESPACE__.'\Fixtures\InternalTrait;
+
+                public function internalMethod() { }
+            }');
+        } elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternalsParent' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternalsParent extends \\'.__NAMESPACE__.'\Fixtures\InternalClass implements \\'.__NAMESPACE__.'\Fixtures\InternalInterface { }');
+        } elseif ('Test\\'.__NAMESPACE__.'\UseTraitWithInternalMethod' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class UseTraitWithInternalMethod { use \\'.__NAMESPACE__.'\Fixtures\TraitWithInternalMethod; }');
+        }
+
+        return null;
+    }
+}
diff --git a/lib/symfony/debug/Tests/ErrorHandlerTest.php b/lib/symfony/debug/Tests/ErrorHandlerTest.php
new file mode 100644
index 000000000..2cf75a0e8
--- /dev/null
+++ b/lib/symfony/debug/Tests/ErrorHandlerTest.php
@@ -0,0 +1,646 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LogLevel;
+use Psr\Log\NullLogger;
+use Symfony\Component\Debug\BufferingLogger;
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\Debug\Exception\SilencedErrorContext;
+use Symfony\Component\Debug\Tests\Fixtures\ErrorHandlerThatUsesThePreviousOne;
+use Symfony\Component\Debug\Tests\Fixtures\LoggerThatSetAnErrorHandler;
+
+/**
+ * ErrorHandlerTest.
+ *
+ * @author Robert Schönthal <seroscho@googlemail.com>
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ErrorHandlerTest extends TestCase
+{
+    public function testRegister()
+    {
+        $handler = ErrorHandler::register();
+
+        try {
+            $this->assertInstanceOf('Symfony\Component\Debug\ErrorHandler', $handler);
+            $this->assertSame($handler, ErrorHandler::register());
+
+            $newHandler = new ErrorHandler();
+
+            $this->assertSame($handler, ErrorHandler::register($newHandler, false));
+            $h = set_error_handler('var_dump');
+            restore_error_handler();
+            $this->assertSame([$handler, 'handleError'], $h);
+
+            try {
+                $this->assertSame($newHandler, ErrorHandler::register($newHandler, true));
+                $h = set_error_handler('var_dump');
+                restore_error_handler();
+                $this->assertSame([$newHandler, 'handleError'], $h);
+            } catch (\Exception $e) {
+            }
+
+            restore_error_handler();
+            restore_exception_handler();
+
+            if (isset($e)) {
+                throw $e;
+            }
+        } catch (\Exception $e) {
+        }
+
+        restore_error_handler();
+        restore_exception_handler();
+
+        if (isset($e)) {
+            throw $e;
+        }
+    }
+
+    public function testErrorGetLast()
+    {
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $handler = ErrorHandler::register();
+        $handler->setDefaultLogger($logger);
+        $handler->screamAt(E_ALL);
+
+        try {
+            @trigger_error('Hello', E_USER_WARNING);
+            $expected = [
+                'type' => E_USER_WARNING,
+                'message' => 'Hello',
+                'file' => __FILE__,
+                'line' => __LINE__ - 5,
+            ];
+            $this->assertSame($expected, error_get_last());
+        } catch (\Exception $e) {
+            restore_error_handler();
+            restore_exception_handler();
+
+            throw $e;
+        }
+    }
+
+    public function testNotice()
+    {
+        ErrorHandler::register();
+
+        try {
+            self::triggerNotice($this);
+            $this->fail('ErrorException expected');
+        } catch (\ErrorException $exception) {
+            // if an exception is thrown, the test passed
+            $this->assertEquals(E_NOTICE, $exception->getSeverity());
+            $this->assertEquals(__FILE__, $exception->getFile());
+            $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
+
+            $trace = $exception->getTrace();
+
+            $this->assertEquals(__FILE__, $trace[0]['file']);
+            $this->assertEquals(__CLASS__, $trace[0]['class']);
+            $this->assertEquals('triggerNotice', $trace[0]['function']);
+            $this->assertEquals('::', $trace[0]['type']);
+
+            $this->assertEquals(__FILE__, $trace[0]['file']);
+            $this->assertEquals(__CLASS__, $trace[1]['class']);
+            $this->assertEquals(__FUNCTION__, $trace[1]['function']);
+            $this->assertEquals('->', $trace[1]['type']);
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    // dummy function to test trace in error handler.
+    private static function triggerNotice($that)
+    {
+        $that->assertSame('', $foo.$foo.$bar);
+    }
+
+    public function testConstruct()
+    {
+        try {
+            $handler = ErrorHandler::register();
+            $handler->throwAt(3, true);
+            $this->assertEquals(3 | E_RECOVERABLE_ERROR | E_USER_ERROR, $handler->throwAt(0));
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    public function testDefaultLogger()
+    {
+        try {
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $handler = ErrorHandler::register();
+
+            $handler->setDefaultLogger($logger, E_NOTICE);
+            $handler->setDefaultLogger($logger, [E_USER_NOTICE => LogLevel::CRITICAL]);
+
+            $loggers = [
+                E_DEPRECATED => [null, LogLevel::INFO],
+                E_USER_DEPRECATED => [null, LogLevel::INFO],
+                E_NOTICE => [$logger, LogLevel::WARNING],
+                E_USER_NOTICE => [$logger, LogLevel::CRITICAL],
+                E_STRICT => [null, LogLevel::WARNING],
+                E_WARNING => [null, LogLevel::WARNING],
+                E_USER_WARNING => [null, LogLevel::WARNING],
+                E_COMPILE_WARNING => [null, LogLevel::WARNING],
+                E_CORE_WARNING => [null, LogLevel::WARNING],
+                E_USER_ERROR => [null, LogLevel::CRITICAL],
+                E_RECOVERABLE_ERROR => [null, LogLevel::CRITICAL],
+                E_COMPILE_ERROR => [null, LogLevel::CRITICAL],
+                E_PARSE => [null, LogLevel::CRITICAL],
+                E_ERROR => [null, LogLevel::CRITICAL],
+                E_CORE_ERROR => [null, LogLevel::CRITICAL],
+            ];
+            $this->assertSame($loggers, $handler->setLoggers([]));
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    public function testHandleError()
+    {
+        try {
+            $handler = ErrorHandler::register();
+            $handler->throwAt(0, true);
+            $this->assertFalse($handler->handleError(0, 'foo', 'foo.php', 12, []));
+
+            restore_error_handler();
+            restore_exception_handler();
+
+            $handler = ErrorHandler::register();
+            $handler->throwAt(3, true);
+            $this->assertFalse($handler->handleError(4, 'foo', 'foo.php', 12, []));
+
+            restore_error_handler();
+            restore_exception_handler();
+
+            $handler = ErrorHandler::register();
+            $handler->throwAt(3, true);
+            try {
+                $handler->handleError(4, 'foo', 'foo.php', 12, []);
+            } catch (\ErrorException $e) {
+                $this->assertSame('Parse Error: foo', $e->getMessage());
+                $this->assertSame(4, $e->getSeverity());
+                $this->assertSame('foo.php', $e->getFile());
+                $this->assertSame(12, $e->getLine());
+            }
+
+            restore_error_handler();
+            restore_exception_handler();
+
+            $handler = ErrorHandler::register();
+            $handler->throwAt(E_USER_DEPRECATED, true);
+            $this->assertFalse($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, []));
+
+            restore_error_handler();
+            restore_exception_handler();
+
+            $handler = ErrorHandler::register();
+            $handler->throwAt(E_DEPRECATED, true);
+            $this->assertFalse($handler->handleError(E_DEPRECATED, 'foo', 'foo.php', 12, []));
+
+            restore_error_handler();
+            restore_exception_handler();
+
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+
+            $warnArgCheck = function ($logLevel, $message, $context) {
+                $this->assertEquals('info', $logLevel);
+                $this->assertEquals('User Deprecated: foo', $message);
+                $this->assertArrayHasKey('exception', $context);
+                $exception = $context['exception'];
+                $this->assertInstanceOf(\ErrorException::class, $exception);
+                $this->assertSame('User Deprecated: foo', $exception->getMessage());
+                $this->assertSame(E_USER_DEPRECATED, $exception->getSeverity());
+            };
+
+            $logger
+                ->expects($this->once())
+                ->method('log')
+                ->willReturnCallback($warnArgCheck)
+            ;
+
+            $handler = ErrorHandler::register();
+            $handler->setDefaultLogger($logger, E_USER_DEPRECATED);
+            $this->assertTrue($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, []));
+
+            restore_error_handler();
+            restore_exception_handler();
+
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+
+            $line = null;
+            $logArgCheck = function ($level, $message, $context) use (&$line) {
+                $this->assertEquals('Notice: Undefined variable: undefVar', $message);
+                $this->assertArrayHasKey('exception', $context);
+                $exception = $context['exception'];
+                $this->assertInstanceOf(SilencedErrorContext::class, $exception);
+                $this->assertSame(E_NOTICE, $exception->getSeverity());
+                $this->assertSame(__FILE__, $exception->getFile());
+                $this->assertSame($line, $exception->getLine());
+                $this->assertNotEmpty($exception->getTrace());
+                $this->assertSame(1, $exception->count);
+            };
+
+            $logger
+                ->expects($this->once())
+                ->method('log')
+                ->willReturnCallback($logArgCheck)
+            ;
+
+            $handler = ErrorHandler::register();
+            $handler->setDefaultLogger($logger, E_NOTICE);
+            $handler->screamAt(E_NOTICE);
+            unset($undefVar);
+            $line = __LINE__ + 1;
+            @$undefVar++;
+
+            restore_error_handler();
+            restore_exception_handler();
+        } catch (\Exception $e) {
+            restore_error_handler();
+            restore_exception_handler();
+
+            throw $e;
+        }
+    }
+
+    public function testHandleUserError()
+    {
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('PHP 7.4 allows __toString to throw exceptions');
+        }
+
+        try {
+            $handler = ErrorHandler::register();
+            $handler->throwAt(0, true);
+
+            $e = null;
+            $x = new \Exception('Foo');
+
+            try {
+                $f = new Fixtures\ToStringThrower($x);
+                $f .= ''; // Trigger $f->__toString()
+            } catch (\Exception $e) {
+            }
+
+            $this->assertSame($x, $e);
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    public function testHandleDeprecation()
+    {
+        $logArgCheck = function ($level, $message, $context) {
+            $this->assertEquals(LogLevel::INFO, $level);
+            $this->assertArrayHasKey('exception', $context);
+            $exception = $context['exception'];
+            $this->assertInstanceOf(\ErrorException::class, $exception);
+            $this->assertSame('User Deprecated: Foo deprecation', $exception->getMessage());
+        };
+
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $logger
+            ->expects($this->once())
+            ->method('log')
+            ->willReturnCallback($logArgCheck)
+        ;
+
+        $handler = new ErrorHandler();
+        $handler->setDefaultLogger($logger);
+        @$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, []);
+
+        restore_error_handler();
+    }
+
+    /**
+     * @group no-hhvm
+     */
+    public function testHandleException()
+    {
+        try {
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $handler = ErrorHandler::register();
+
+            $exception = new \Exception('foo');
+
+            $logArgCheck = function ($level, $message, $context) {
+                $this->assertSame('Uncaught Exception: foo', $message);
+                $this->assertArrayHasKey('exception', $context);
+                $this->assertInstanceOf(\Exception::class, $context['exception']);
+            };
+
+            $logger
+                ->expects($this->exactly(2))
+                ->method('log')
+                ->willReturnCallback($logArgCheck)
+            ;
+
+            $handler->setDefaultLogger($logger, E_ERROR);
+
+            try {
+                $handler->handleException($exception);
+                $this->fail('Exception expected');
+            } catch (\Exception $e) {
+                $this->assertSame($exception, $e);
+            }
+
+            $handler->setExceptionHandler(function ($e) use ($exception) {
+                $this->assertSame($exception, $e);
+            });
+
+            $handler->handleException($exception);
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testErrorStacking()
+    {
+        try {
+            $handler = ErrorHandler::register();
+            $handler->screamAt(E_USER_WARNING);
+
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+
+            $logger
+                ->expects($this->exactly(2))
+                ->method('log')
+                ->withConsecutive(
+                    [$this->equalTo(LogLevel::WARNING), $this->equalTo('Dummy log')],
+                    [$this->equalTo(LogLevel::DEBUG), $this->equalTo('User Warning: Silenced warning')]
+                )
+            ;
+
+            $handler->setDefaultLogger($logger, [E_USER_WARNING => LogLevel::WARNING]);
+
+            ErrorHandler::stackErrors();
+            @trigger_error('Silenced warning', E_USER_WARNING);
+            $logger->log(LogLevel::WARNING, 'Dummy log');
+            ErrorHandler::unstackErrors();
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    public function testBootstrappingLogger()
+    {
+        $bootLogger = new BufferingLogger();
+        $handler = new ErrorHandler($bootLogger);
+
+        $loggers = [
+            E_DEPRECATED => [$bootLogger, LogLevel::INFO],
+            E_USER_DEPRECATED => [$bootLogger, LogLevel::INFO],
+            E_NOTICE => [$bootLogger, LogLevel::WARNING],
+            E_USER_NOTICE => [$bootLogger, LogLevel::WARNING],
+            E_STRICT => [$bootLogger, LogLevel::WARNING],
+            E_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_USER_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_COMPILE_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_CORE_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_USER_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_RECOVERABLE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_COMPILE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_PARSE => [$bootLogger, LogLevel::CRITICAL],
+            E_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_CORE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+        ];
+
+        $this->assertSame($loggers, $handler->setLoggers([]));
+
+        $handler->handleError(E_DEPRECATED, 'Foo message', __FILE__, 123, []);
+
+        $logs = $bootLogger->cleanLogs();
+
+        $this->assertCount(1, $logs);
+        $log = $logs[0];
+        $this->assertSame('info', $log[0]);
+        $this->assertSame('Deprecated: Foo message', $log[1]);
+        $this->assertArrayHasKey('exception', $log[2]);
+        $exception = $log[2]['exception'];
+        $this->assertInstanceOf(\ErrorException::class, $exception);
+        $this->assertSame('Deprecated: Foo message', $exception->getMessage());
+        $this->assertSame(__FILE__, $exception->getFile());
+        $this->assertSame(123, $exception->getLine());
+        $this->assertSame(E_DEPRECATED, $exception->getSeverity());
+
+        $bootLogger->log(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);
+
+        $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $mockLogger->expects($this->once())
+            ->method('log')
+            ->with(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);
+
+        $handler->setLoggers([E_DEPRECATED => [$mockLogger, LogLevel::WARNING]]);
+    }
+
+    /**
+     * @group no-hhvm
+     */
+    public function testSettingLoggerWhenExceptionIsBuffered()
+    {
+        $bootLogger = new BufferingLogger();
+        $handler = new ErrorHandler($bootLogger);
+
+        $exception = new \Exception('Foo message');
+
+        $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $mockLogger->expects($this->once())
+            ->method('log')
+            ->with(LogLevel::CRITICAL, 'Uncaught Exception: Foo message', ['exception' => $exception]);
+
+        $handler->setExceptionHandler(function () use ($handler, $mockLogger) {
+            $handler->setDefaultLogger($mockLogger);
+        });
+
+        $handler->handleException($exception);
+    }
+
+    /**
+     * @group no-hhvm
+     */
+    public function testHandleFatalError()
+    {
+        try {
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $handler = ErrorHandler::register();
+
+            $error = [
+                'type' => E_PARSE,
+                'message' => 'foo',
+                'file' => 'bar',
+                'line' => 123,
+            ];
+
+            $logArgCheck = function ($level, $message, $context) {
+                $this->assertEquals('Fatal Parse Error: foo', $message);
+                $this->assertArrayHasKey('exception', $context);
+                $this->assertInstanceOf(\Exception::class, $context['exception']);
+            };
+
+            $logger
+                ->expects($this->once())
+                ->method('log')
+                ->willReturnCallback($logArgCheck)
+            ;
+
+            $handler->setDefaultLogger($logger, E_PARSE);
+
+            $handler->handleFatalError($error);
+
+            restore_error_handler();
+            restore_exception_handler();
+        } catch (\Exception $e) {
+            restore_error_handler();
+            restore_exception_handler();
+
+            throw $e;
+        }
+    }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testHandleErrorException()
+    {
+        $exception = new \Error("Class 'IReallyReallyDoNotExistAnywhereInTheRepositoryISwear' not found");
+
+        $handler = new ErrorHandler();
+        $handler->setExceptionHandler(function () use (&$args) {
+            $args = \func_get_args();
+        });
+
+        $handler->handleException($exception);
+
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $args[0]);
+        $this->assertStringStartsWith("Attempted to load class \"IReallyReallyDoNotExistAnywhereInTheRepositoryISwear\" from the global namespace.\nDid you forget a \"use\" statement", $args[0]->getMessage());
+    }
+
+    /**
+     * @group no-hhvm
+     */
+    public function testHandleFatalErrorOnHHVM()
+    {
+        try {
+            $handler = ErrorHandler::register();
+
+            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $logger
+                ->expects($this->once())
+                ->method('log')
+                ->with(
+                    $this->equalTo(LogLevel::CRITICAL),
+                    $this->equalTo('Fatal Error: foo')
+                )
+            ;
+
+            $handler->setDefaultLogger($logger, E_ERROR);
+
+            $error = [
+                'type' => E_ERROR + 0x1000000, // This error level is used by HHVM for fatal errors
+                'message' => 'foo',
+                'file' => 'bar',
+                'line' => 123,
+                'context' => [123],
+                'backtrace' => [456],
+            ];
+
+            \call_user_func_array([$handler, 'handleError'], $error);
+            $handler->handleFatalError($error);
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    /**
+     * @group no-hhvm
+     */
+    public function testCustomExceptionHandler()
+    {
+        $this->expectException('Exception');
+        $handler = new ErrorHandler();
+        $handler->setExceptionHandler(function ($e) use ($handler) {
+            $handler->handleException($e);
+        });
+
+        $handler->handleException(new \Exception());
+    }
+
+    /**
+     * @dataProvider errorHandlerWhenLoggingProvider
+     */
+    public function testErrorHandlerWhenLogging($previousHandlerWasDefined, $loggerSetsAnotherHandler, $nextHandlerIsDefined)
+    {
+        try {
+            if ($previousHandlerWasDefined) {
+                set_error_handler('count');
+            }
+
+            $logger = $loggerSetsAnotherHandler ? new LoggerThatSetAnErrorHandler() : new NullLogger();
+
+            $handler = ErrorHandler::register();
+            $handler->setDefaultLogger($logger);
+
+            if ($nextHandlerIsDefined) {
+                $handler = ErrorHandlerThatUsesThePreviousOne::register();
+            }
+
+            @trigger_error('foo', E_USER_DEPRECATED);
+            @trigger_error('bar', E_USER_DEPRECATED);
+
+            $this->assertSame([$handler, 'handleError'], set_error_handler('var_dump'));
+
+            if ($logger instanceof LoggerThatSetAnErrorHandler) {
+                $this->assertCount(2, $logger->cleanLogs());
+            }
+
+            restore_error_handler();
+
+            if ($previousHandlerWasDefined) {
+                restore_error_handler();
+            }
+
+            if ($nextHandlerIsDefined) {
+                restore_error_handler();
+            }
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
+    }
+
+    public function errorHandlerWhenLoggingProvider()
+    {
+        foreach ([false, true] as $previousHandlerWasDefined) {
+            foreach ([false, true] as $loggerSetsAnotherHandler) {
+                foreach ([false, true] as $nextHandlerIsDefined) {
+                    yield [$previousHandlerWasDefined, $loggerSetsAnotherHandler, $nextHandlerIsDefined];
+                }
+            }
+        }
+    }
+}
diff --git a/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php b/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php
new file mode 100644
index 000000000..0290b05ba
--- /dev/null
+++ b/lib/symfony/debug/Tests/Exception/FlattenExceptionTest.php
@@ -0,0 +1,302 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Exception;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\Exception\FlattenException;
+use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+use Symfony\Component\HttpKernel\Exception\GoneHttpException;
+use Symfony\Component\HttpKernel\Exception\LengthRequiredHttpException;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\PreconditionFailedHttpException;
+use Symfony\Component\HttpKernel\Exception\PreconditionRequiredHttpException;
+use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
+use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
+use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException;
+
+class FlattenExceptionTest extends TestCase
+{
+    public function testStatusCode()
+    {
+        $flattened = FlattenException::create(new \RuntimeException(), 403);
+        $this->assertEquals('403', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new \RuntimeException());
+        $this->assertEquals('500', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new NotFoundHttpException());
+        $this->assertEquals('404', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new UnauthorizedHttpException('Basic realm="My Realm"'));
+        $this->assertEquals('401', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new BadRequestHttpException());
+        $this->assertEquals('400', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new NotAcceptableHttpException());
+        $this->assertEquals('406', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new ConflictHttpException());
+        $this->assertEquals('409', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new MethodNotAllowedHttpException(['POST']));
+        $this->assertEquals('405', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new AccessDeniedHttpException());
+        $this->assertEquals('403', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new GoneHttpException());
+        $this->assertEquals('410', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new LengthRequiredHttpException());
+        $this->assertEquals('411', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new PreconditionFailedHttpException());
+        $this->assertEquals('412', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new PreconditionRequiredHttpException());
+        $this->assertEquals('428', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new ServiceUnavailableHttpException());
+        $this->assertEquals('503', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new TooManyRequestsHttpException());
+        $this->assertEquals('429', $flattened->getStatusCode());
+
+        $flattened = FlattenException::create(new UnsupportedMediaTypeHttpException());
+        $this->assertEquals('415', $flattened->getStatusCode());
+
+        if (class_exists(SuspiciousOperationException::class)) {
+            $flattened = FlattenException::create(new SuspiciousOperationException());
+            $this->assertEquals('400', $flattened->getStatusCode());
+        }
+    }
+
+    public function testHeadersForHttpException()
+    {
+        $flattened = FlattenException::create(new MethodNotAllowedHttpException(['POST']));
+        $this->assertEquals(['Allow' => 'POST'], $flattened->getHeaders());
+
+        $flattened = FlattenException::create(new UnauthorizedHttpException('Basic realm="My Realm"'));
+        $this->assertEquals(['WWW-Authenticate' => 'Basic realm="My Realm"'], $flattened->getHeaders());
+
+        $flattened = FlattenException::create(new ServiceUnavailableHttpException('Fri, 31 Dec 1999 23:59:59 GMT'));
+        $this->assertEquals(['Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'], $flattened->getHeaders());
+
+        $flattened = FlattenException::create(new ServiceUnavailableHttpException(120));
+        $this->assertEquals(['Retry-After' => 120], $flattened->getHeaders());
+
+        $flattened = FlattenException::create(new TooManyRequestsHttpException('Fri, 31 Dec 1999 23:59:59 GMT'));
+        $this->assertEquals(['Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'], $flattened->getHeaders());
+
+        $flattened = FlattenException::create(new TooManyRequestsHttpException(120));
+        $this->assertEquals(['Retry-After' => 120], $flattened->getHeaders());
+    }
+
+    /**
+     * @dataProvider flattenDataProvider
+     */
+    public function testFlattenHttpException(\Exception $exception)
+    {
+        $flattened = FlattenException::create($exception);
+        $flattened2 = FlattenException::create($exception);
+
+        $flattened->setPrevious($flattened2);
+
+        $this->assertEquals($exception->getMessage(), $flattened->getMessage(), 'The message is copied from the original exception.');
+        $this->assertEquals($exception->getCode(), $flattened->getCode(), 'The code is copied from the original exception.');
+        $this->assertInstanceOf($flattened->getClass(), $exception, 'The class is set to the class of the original exception');
+    }
+
+    /**
+     * @dataProvider flattenDataProvider
+     */
+    public function testPrevious(\Exception $exception)
+    {
+        $flattened = FlattenException::create($exception);
+        $flattened2 = FlattenException::create($exception);
+
+        $flattened->setPrevious($flattened2);
+
+        $this->assertSame($flattened2, $flattened->getPrevious());
+
+        $this->assertSame([$flattened2], $flattened->getAllPrevious());
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testPreviousError()
+    {
+        $exception = new \Exception('test', 123, new \ParseError('Oh noes!', 42));
+
+        $flattened = FlattenException::create($exception)->getPrevious();
+
+        $this->assertEquals($flattened->getMessage(), 'Parse error: Oh noes!', 'The message is copied from the original exception.');
+        $this->assertEquals($flattened->getCode(), 42, 'The code is copied from the original exception.');
+        $this->assertEquals($flattened->getClass(), 'Symfony\Component\Debug\Exception\FatalThrowableError', 'The class is set to the class of the original exception');
+    }
+
+    /**
+     * @dataProvider flattenDataProvider
+     */
+    public function testLine(\Exception $exception)
+    {
+        $flattened = FlattenException::create($exception);
+        $this->assertSame($exception->getLine(), $flattened->getLine());
+    }
+
+    /**
+     * @dataProvider flattenDataProvider
+     */
+    public function testFile(\Exception $exception)
+    {
+        $flattened = FlattenException::create($exception);
+        $this->assertSame($exception->getFile(), $flattened->getFile());
+    }
+
+    /**
+     * @dataProvider flattenDataProvider
+     */
+    public function testToArray(\Exception $exception)
+    {
+        $flattened = FlattenException::create($exception);
+        $flattened->setTrace([], 'foo.php', 123);
+
+        $this->assertEquals([
+            [
+                'message' => 'test',
+                'class' => 'Exception',
+                'trace' => [[
+                    'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '', 'file' => 'foo.php', 'line' => 123,
+                    'args' => [],
+                ]],
+            ],
+        ], $flattened->toArray());
+    }
+
+    public function flattenDataProvider()
+    {
+        return [
+            [new \Exception('test', 123)],
+        ];
+    }
+
+    public function testArguments()
+    {
+        $dh = opendir(__DIR__);
+        $fh = tmpfile();
+
+        $incomplete = unserialize('O:14:"BogusTestClass":0:{}');
+
+        $exception = $this->createException([
+            (object) ['foo' => 1],
+            new NotFoundHttpException(),
+            $incomplete,
+            $dh,
+            $fh,
+            function () {},
+            [1, 2],
+            ['foo' => 123],
+            null,
+            true,
+            false,
+            0,
+            0.0,
+            '0',
+            '',
+            INF,
+            NAN,
+        ]);
+
+        $flattened = FlattenException::create($exception);
+        $trace = $flattened->getTrace();
+        $args = $trace[1]['args'];
+        $array = $args[0][1];
+
+        closedir($dh);
+        fclose($fh);
+
+        $i = 0;
+        $this->assertSame(['object', 'stdClass'], $array[$i++]);
+        $this->assertSame(['object', 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException'], $array[$i++]);
+        $this->assertSame(['incomplete-object', 'BogusTestClass'], $array[$i++]);
+        $this->assertSame(['resource', \defined('HHVM_VERSION') ? 'Directory' : 'stream'], $array[$i++]);
+        $this->assertSame(['resource', 'stream'], $array[$i++]);
+
+        $args = $array[$i++];
+        $this->assertSame($args[0], 'object');
+        $this->assertTrue('Closure' === $args[1] || is_subclass_of($args[1], '\Closure'), 'Expect object class name to be Closure or a subclass of Closure.');
+
+        $this->assertSame(['array', [['integer', 1], ['integer', 2]]], $array[$i++]);
+        $this->assertSame(['array', ['foo' => ['integer', 123]]], $array[$i++]);
+        $this->assertSame(['null', null], $array[$i++]);
+        $this->assertSame(['boolean', true], $array[$i++]);
+        $this->assertSame(['boolean', false], $array[$i++]);
+        $this->assertSame(['integer', 0], $array[$i++]);
+        $this->assertSame(['float', 0.0], $array[$i++]);
+        $this->assertSame(['string', '0'], $array[$i++]);
+        $this->assertSame(['string', ''], $array[$i++]);
+        $this->assertSame(['float', INF], $array[$i++]);
+
+        // assertEquals() does not like NAN values.
+        $this->assertEquals($array[$i][0], 'float');
+        $this->assertNan($array[$i][1]);
+    }
+
+    public function testRecursionInArguments()
+    {
+        $a = null;
+        $a = ['foo', [2, &$a]];
+        $exception = $this->createException($a);
+
+        $flattened = FlattenException::create($exception);
+        $trace = $flattened->getTrace();
+        $this->assertStringContainsString('*DEEP NESTED ARRAY*', serialize($trace));
+    }
+
+    public function testTooBigArray()
+    {
+        $a = [];
+        for ($i = 0; $i < 20; ++$i) {
+            for ($j = 0; $j < 50; ++$j) {
+                for ($k = 0; $k < 10; ++$k) {
+                    $a[$i][$j][$k] = 'value';
+                }
+            }
+        }
+        $a[20] = 'value';
+        $a[21] = 'value1';
+        $exception = $this->createException($a);
+
+        $flattened = FlattenException::create($exception);
+        $trace = $flattened->getTrace();
+
+        $this->assertSame($trace[1]['args'][0], ['array', ['array', '*SKIPPED over 10000 entries*']]);
+
+        $serializeTrace = serialize($trace);
+
+        $this->assertStringContainsString('*SKIPPED over 10000 entries*', $serializeTrace);
+        $this->assertStringNotContainsString('*value1*', $serializeTrace);
+    }
+
+    private function createException($foo)
+    {
+        return new \Exception();
+    }
+}
diff --git a/lib/symfony/debug/Tests/ExceptionHandlerTest.php b/lib/symfony/debug/Tests/ExceptionHandlerTest.php
new file mode 100644
index 000000000..7a029e06f
--- /dev/null
+++ b/lib/symfony/debug/Tests/ExceptionHandlerTest.php
@@ -0,0 +1,163 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\Exception\OutOfMemoryException;
+use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+require_once __DIR__.'/HeaderMock.php';
+
+class ExceptionHandlerTest extends TestCase
+{
+    protected function setUp()
+    {
+        testHeader();
+    }
+
+    protected function tearDown()
+    {
+        testHeader();
+    }
+
+    public function testDebug()
+    {
+        $handler = new ExceptionHandler(false);
+
+        ob_start();
+        $handler->sendPhpResponse(new \RuntimeException('Foo'));
+        $response = ob_get_clean();
+
+        $this->assertStringContainsString('Whoops, looks like something went wrong.', $response);
+        $this->assertStringNotContainsString('<div class="trace trace-as-html">', $response);
+
+        $handler = new ExceptionHandler(true);
+
+        ob_start();
+        $handler->sendPhpResponse(new \RuntimeException('Foo'));
+        $response = ob_get_clean();
+
+        $this->assertStringContainsString('Whoops, looks like something went wrong.', $response);
+        $this->assertStringContainsString('<div class="trace trace-as-html">', $response);
+    }
+
+    public function testStatusCode()
+    {
+        $handler = new ExceptionHandler(false, 'iso8859-1');
+
+        ob_start();
+        $handler->sendPhpResponse(new NotFoundHttpException('Foo'));
+        $response = ob_get_clean();
+
+        $this->assertStringContainsString('Sorry, the page you are looking for could not be found.', $response);
+
+        $expectedHeaders = [
+            ['HTTP/1.0 404', true, null],
+            ['Content-Type: text/html; charset=iso8859-1', true, null],
+        ];
+
+        $this->assertSame($expectedHeaders, testHeader());
+    }
+
+    public function testHeaders()
+    {
+        $handler = new ExceptionHandler(false, 'iso8859-1');
+
+        ob_start();
+        $handler->sendPhpResponse(new MethodNotAllowedHttpException(['POST']));
+        ob_get_clean();
+
+        $expectedHeaders = [
+            ['HTTP/1.0 405', true, null],
+            ['Allow: POST', false, null],
+            ['Content-Type: text/html; charset=iso8859-1', true, null],
+        ];
+
+        $this->assertSame($expectedHeaders, testHeader());
+    }
+
+    public function testNestedExceptions()
+    {
+        $handler = new ExceptionHandler(true);
+        ob_start();
+        $handler->sendPhpResponse(new \RuntimeException('Foo', 0, new \RuntimeException('Bar')));
+        $response = ob_get_clean();
+
+        $this->assertStringMatchesFormat('%A<p class="break-long-words trace-message">Foo</p>%A<p class="break-long-words trace-message">Bar</p>%A', $response);
+    }
+
+    public function testHandle()
+    {
+        $handler = new ExceptionHandler(true);
+        ob_start();
+
+        $handler->handle(new \Exception('foo'));
+
+        $this->assertThatTheExceptionWasOutput(ob_get_clean(), \Exception::class, 'Exception', 'foo');
+    }
+
+    public function testHandleWithACustomHandlerThatOutputsSomething()
+    {
+        $handler = new ExceptionHandler(true);
+        ob_start();
+        $handler->setHandler(function () {
+            echo 'ccc';
+        });
+
+        $handler->handle(new \Exception());
+        ob_end_flush(); // Necessary because of this PHP bug : https://bugs.php.net/76563
+        $this->assertSame('ccc', ob_get_clean());
+    }
+
+    public function testHandleWithACustomHandlerThatOutputsNothing()
+    {
+        $handler = new ExceptionHandler(true);
+        $handler->setHandler(function () {});
+
+        $handler->handle(new \Exception('ccc'));
+
+        $this->assertThatTheExceptionWasOutput(ob_get_clean(), \Exception::class, 'Exception', 'ccc');
+    }
+
+    public function testHandleWithACustomHandlerThatFails()
+    {
+        $handler = new ExceptionHandler(true);
+        $handler->setHandler(function () {
+            throw new \RuntimeException();
+        });
+
+        $handler->handle(new \Exception('ccc'));
+
+        $this->assertThatTheExceptionWasOutput(ob_get_clean(), \Exception::class, 'Exception', 'ccc');
+    }
+
+    public function testHandleOutOfMemoryException()
+    {
+        $handler = new ExceptionHandler(true);
+        ob_start();
+        $handler->setHandler(function () {
+            $this->fail('OutOfMemoryException should bypass the handler');
+        });
+
+        $handler->handle(new OutOfMemoryException('foo', 0, E_ERROR, __FILE__, __LINE__));
+
+        $this->assertThatTheExceptionWasOutput(ob_get_clean(), OutOfMemoryException::class, 'OutOfMemoryException', 'foo');
+    }
+
+    private function assertThatTheExceptionWasOutput($content, $expectedClass, $expectedTitle, $expectedMessage)
+    {
+        $this->assertStringContainsString(sprintf('<span class="exception_title"><abbr title="%s">%s</abbr></span>', $expectedClass, $expectedTitle), $content);
+        $this->assertStringContainsString(sprintf('<p class="break-long-words trace-message">%s</p>', $expectedMessage), $content);
+    }
+}
diff --git a/lib/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/lib/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
new file mode 100644
index 000000000..9a56b3b4e
--- /dev/null
+++ b/lib/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -0,0 +1,180 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\FatalErrorHandler;
+
+use Composer\Autoload\ClassLoader as ComposerClassLoader;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\DebugClassLoader;
+use Symfony\Component\Debug\Exception\FatalErrorException;
+use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
+
+class ClassNotFoundFatalErrorHandlerTest extends TestCase
+{
+    public static function setUpBeforeClass()
+    {
+        foreach (spl_autoload_functions() as $function) {
+            if (!\is_array($function)) {
+                continue;
+            }
+
+            // get class loaders wrapped by DebugClassLoader
+            if ($function[0] instanceof DebugClassLoader) {
+                $function = $function[0]->getClassLoader();
+            }
+
+            if ($function[0] instanceof ComposerClassLoader) {
+                $function[0]->add('Symfony_Component_Debug_Tests_Fixtures', \dirname(\dirname(\dirname(\dirname(\dirname(__DIR__))))));
+                break;
+            }
+        }
+    }
+
+    /**
+     * @dataProvider provideClassNotFoundData
+     */
+    public function testHandleClassNotFound($error, $translatedMessage, $autoloader = null)
+    {
+        if ($autoloader) {
+            // Unregister all autoloaders to ensure the custom provided
+            // autoloader is the only one to be used during the test run.
+            $autoloaders = spl_autoload_functions();
+            array_map('spl_autoload_unregister', $autoloaders);
+            spl_autoload_register($autoloader);
+        }
+
+        $handler = new ClassNotFoundFatalErrorHandler();
+
+        $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
+
+        if ($autoloader) {
+            spl_autoload_unregister($autoloader);
+            array_map('spl_autoload_register', $autoloaders);
+        }
+
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
+        $this->assertRegExp($translatedMessage, $exception->getMessage());
+        $this->assertSame($error['type'], $exception->getSeverity());
+        $this->assertSame($error['file'], $exception->getFile());
+        $this->assertSame($error['line'], $exception->getLine());
+    }
+
+    public function provideClassNotFoundData()
+    {
+        $autoloader = new ComposerClassLoader();
+        $autoloader->add('Symfony\Component\Debug\Exception\\', realpath(__DIR__.'/../../Exception'));
+        $autoloader->add('Symfony_Component_Debug_Tests_Fixtures', realpath(__DIR__.'/../../Tests/Fixtures'));
+
+        $debugClassLoader = new DebugClassLoader([$autoloader, 'loadClass']);
+
+        return [
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Class \'WhizBangFactory\' not found',
+                ],
+                "/^Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement\?$/",
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Class \'Foo\\Bar\\WhizBangFactory\' not found',
+                ],
+                "/^Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for another namespace\?$/",
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Class \'UndefinedFunctionException\' not found',
+                ],
+                "/^Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for .*\"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
+                [$debugClassLoader, 'loadClass'],
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Class \'PEARClass\' not found',
+                ],
+                "/^Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"\?$/",
+                [$debugClassLoader, 'loadClass'],
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
+                ],
+                "/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for .*\"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
+                [$debugClassLoader, 'loadClass'],
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
+                ],
+                "/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for \"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
+                [$autoloader, 'loadClass'],
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
+                ],
+                "/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for \"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?/",
+                [$debugClassLoader, 'loadClass'],
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
+                ],
+                "/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for another namespace\?$/",
+                function ($className) { /* do nothing here */ },
+            ],
+        ];
+    }
+
+    public function testCannotRedeclareClass()
+    {
+        if (!file_exists(__DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP')) {
+            $this->markTestSkipped('Can only be run on case insensitive filesystems');
+        }
+
+        require_once __DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP';
+
+        $error = [
+            'type' => 1,
+            'line' => 12,
+            'file' => 'foo.php',
+            'message' => 'Class \'Foo\\Bar\\RequiredTwice\' not found',
+        ];
+
+        $handler = new ClassNotFoundFatalErrorHandler();
+        $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
+
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
+    }
+}
diff --git a/lib/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/lib/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
new file mode 100644
index 000000000..2de44a25e
--- /dev/null
+++ b/lib/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\FatalErrorHandler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\Exception\FatalErrorException;
+use Symfony\Component\Debug\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
+
+class UndefinedFunctionFatalErrorHandlerTest extends TestCase
+{
+    /**
+     * @dataProvider provideUndefinedFunctionData
+     */
+    public function testUndefinedFunction($error, $translatedMessage)
+    {
+        $handler = new UndefinedFunctionFatalErrorHandler();
+        $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
+
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
+        // class names are case insensitive and PHP/HHVM do not return the same
+        $this->assertSame(strtolower($translatedMessage), strtolower($exception->getMessage()));
+        $this->assertSame($error['type'], $exception->getSeverity());
+        $this->assertSame($error['file'], $exception->getFile());
+        $this->assertSame($error['line'], $exception->getLine());
+    }
+
+    public function provideUndefinedFunctionData()
+    {
+        return [
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined function test_namespaced_function()',
+                ],
+                "Attempted to call function \"test_namespaced_function\" from the global namespace.\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined function Foo\\Bar\\Baz\\test_namespaced_function()',
+                ],
+                "Attempted to call function \"test_namespaced_function\" from namespace \"Foo\\Bar\\Baz\".\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined function foo()',
+                ],
+                'Attempted to call function "foo" from the global namespace.',
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined function Foo\\Bar\\Baz\\foo()',
+                ],
+                'Attempted to call function "foo" from namespace "Foo\Bar\Baz".',
+            ],
+        ];
+    }
+}
+
+function test_namespaced_function()
+{
+}
diff --git a/lib/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/lib/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
new file mode 100644
index 000000000..268a84135
--- /dev/null
+++ b/lib/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\FatalErrorHandler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\Exception\FatalErrorException;
+use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
+
+class UndefinedMethodFatalErrorHandlerTest extends TestCase
+{
+    /**
+     * @dataProvider provideUndefinedMethodData
+     */
+    public function testUndefinedMethod($error, $translatedMessage)
+    {
+        $handler = new UndefinedMethodFatalErrorHandler();
+        $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
+
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedMethodException', $exception);
+        $this->assertSame($translatedMessage, $exception->getMessage());
+        $this->assertSame($error['type'], $exception->getSeverity());
+        $this->assertSame($error['file'], $exception->getFile());
+        $this->assertSame($error['line'], $exception->getLine());
+    }
+
+    public function provideUndefinedMethodData()
+    {
+        return [
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined method SplObjectStorage::what()',
+                ],
+                'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined method SplObjectStorage::walid()',
+                ],
+                "Attempted to call an undefined method named \"walid\" of class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
+            ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined method SplObjectStorage::offsetFet()',
+                ],
+                "Attempted to call an undefined method named \"offsetFet\" of class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
+            ],
+            [
+                [
+                    'type' => 1,
+                    'message' => 'Call to undefined method class@anonymous::test()',
+                    'file' => '/home/possum/work/symfony/test.php',
+                    'line' => 11,
+                ],
+                'Attempted to call an undefined method named "test" of class "class@anonymous".',
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/AnnotatedClass.php b/lib/symfony/debug/Tests/Fixtures/AnnotatedClass.php
new file mode 100644
index 000000000..dff9517d0
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/AnnotatedClass.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class AnnotatedClass
+{
+    /**
+     * @deprecated since version 3.4.
+     */
+    public function deprecatedMethod()
+    {
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/ClassAlias.php b/lib/symfony/debug/Tests/Fixtures/ClassAlias.php
new file mode 100644
index 000000000..9d6dbaa71
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/ClassAlias.php
@@ -0,0 +1,3 @@
+<?php
+
+class_alias('Symfony\Component\Debug\Tests\Fixtures\NotPSR0bis', 'Symfony\Component\Debug\Tests\Fixtures\ClassAlias');
diff --git a/lib/symfony/debug/Tests/Fixtures/DefinitionInEvaluatedCode.php b/lib/symfony/debug/Tests/Fixtures/DefinitionInEvaluatedCode.php
new file mode 100644
index 000000000..ff6976e0f
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/DefinitionInEvaluatedCode.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+eval('
+    namespace Symfony\Component\Debug\Tests\Fixtures;
+
+    class DefinitionInEvaluatedCode
+    {
+    }
+');
diff --git a/lib/symfony/debug/Tests/Fixtures/DeprecatedClass.php b/lib/symfony/debug/Tests/Fixtures/DeprecatedClass.php
new file mode 100644
index 000000000..51fde5af8
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/DeprecatedClass.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @deprecated but this is a test
+ *             deprecation notice
+ * @foobar
+ */
+class DeprecatedClass
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/DeprecatedInterface.php b/lib/symfony/debug/Tests/Fixtures/DeprecatedInterface.php
new file mode 100644
index 000000000..6bab62f95
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/DeprecatedInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @deprecated but this is a test
+ *             deprecation notice
+ * @foobar
+ */
+interface DeprecatedInterface
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php b/lib/symfony/debug/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php
new file mode 100644
index 000000000..d449c40cc
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class ErrorHandlerThatUsesThePreviousOne
+{
+    private static $previous;
+
+    public static function register()
+    {
+        $handler = new static();
+
+        self::$previous = set_error_handler([$handler, 'handleError']);
+
+        return $handler;
+    }
+
+    public function handleError($type, $message, $file, $line, $context)
+    {
+        return \call_user_func(self::$previous, $type, $message, $file, $line, $context);
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/ExtendedFinalMethod.php b/lib/symfony/debug/Tests/Fixtures/ExtendedFinalMethod.php
new file mode 100644
index 000000000..050d19ff5
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/ExtendedFinalMethod.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class ExtendedFinalMethod extends FinalMethod
+{
+    use FinalMethod2Trait;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function finalMethod()
+    {
+    }
+
+    public function anotherMethod()
+    {
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/FinalClasses.php b/lib/symfony/debug/Tests/Fixtures/FinalClasses.php
new file mode 100644
index 000000000..4c2b0aaf3
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/FinalClasses.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @final since version 3.3.
+ */
+class FinalClass1
+{
+    // simple comment
+}
+
+/**
+ * @final
+ */
+class FinalClass2
+{
+    // no comment
+}
+
+/**
+ * @final comment with @@@ and ***
+ *
+ * @author John Doe
+ */
+class FinalClass3
+{
+    // with comment and a tag after
+}
+
+/**
+ * @final
+ *
+ * @author John Doe
+ */
+class FinalClass4
+{
+    // without comment and a tag after
+}
+
+/**
+ * @author John Doe
+ *
+ *
+ * @final multiline
+ * comment
+ */
+class FinalClass5
+{
+    // with comment and a tag before
+}
+
+/**
+ * @author John Doe
+ *
+ * @final
+ */
+class FinalClass6
+{
+    // without comment and a tag before
+}
+
+/**
+ * @author John Doe
+ *
+ * @final another
+ *        multiline comment...
+ *
+ * @return string
+ */
+class FinalClass7
+{
+    // with comment and a tag before and after
+}
+
+/**
+ * @author John Doe
+ * @final
+ *
+ * @return string
+ */
+class FinalClass8
+{
+    // without comment and a tag before and after
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/FinalMethod.php b/lib/symfony/debug/Tests/Fixtures/FinalMethod.php
new file mode 100644
index 000000000..595dd0a88
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/FinalMethod.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class FinalMethod
+{
+    /**
+     * @final since version 3.3.
+     */
+    public function finalMethod()
+    {
+    }
+
+    /**
+     * @final
+     *
+     * @return int
+     */
+    public function finalMethod2()
+    {
+    }
+
+    public function anotherMethod()
+    {
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/FinalMethod2Trait.php b/lib/symfony/debug/Tests/Fixtures/FinalMethod2Trait.php
new file mode 100644
index 000000000..8547f3afe
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/FinalMethod2Trait.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+trait FinalMethod2Trait
+{
+    public function finalMethod2()
+    {
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/InternalClass.php b/lib/symfony/debug/Tests/Fixtures/InternalClass.php
new file mode 100644
index 000000000..119842c26
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/InternalClass.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @internal since version 3.4.
+ */
+class InternalClass
+{
+    use InternalTrait2;
+
+    public function usedInInternalClass()
+    {
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/InternalInterface.php b/lib/symfony/debug/Tests/Fixtures/InternalInterface.php
new file mode 100644
index 000000000..dd79f501e
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/InternalInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @internal
+ */
+interface InternalInterface
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/InternalTrait.php b/lib/symfony/debug/Tests/Fixtures/InternalTrait.php
new file mode 100644
index 000000000..7bb4635cc
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/InternalTrait.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @internal
+ */
+trait InternalTrait
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/InternalTrait2.php b/lib/symfony/debug/Tests/Fixtures/InternalTrait2.php
new file mode 100644
index 000000000..05f18e83e
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/InternalTrait2.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @internal
+ */
+trait InternalTrait2
+{
+    /**
+     * @internal since version 3.4
+     */
+    public function internalMethod()
+    {
+    }
+
+    /**
+     * @internal but should not trigger a deprecation
+     */
+    public function usedInInternalClass()
+    {
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/LoggerThatSetAnErrorHandler.php b/lib/symfony/debug/Tests/Fixtures/LoggerThatSetAnErrorHandler.php
new file mode 100644
index 000000000..dd8563627
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/LoggerThatSetAnErrorHandler.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+use Symfony\Component\Debug\BufferingLogger;
+
+class LoggerThatSetAnErrorHandler extends BufferingLogger
+{
+    public function log($level, $message, array $context = [])
+    {
+        set_error_handler('is_string');
+        parent::log($level, $message, $context);
+        restore_error_handler();
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/NonDeprecatedInterface.php b/lib/symfony/debug/Tests/Fixtures/NonDeprecatedInterface.php
new file mode 100644
index 000000000..a4179a577
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/NonDeprecatedInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+interface NonDeprecatedInterface extends DeprecatedInterface
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/PEARClass.php b/lib/symfony/debug/Tests/Fixtures/PEARClass.php
new file mode 100644
index 000000000..39f228182
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/PEARClass.php
@@ -0,0 +1,5 @@
+<?php
+
+class Symfony_Component_Debug_Tests_Fixtures_PEARClass
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/Throwing.php b/lib/symfony/debug/Tests/Fixtures/Throwing.php
new file mode 100644
index 000000000..21e0aba17
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/Throwing.php
@@ -0,0 +1,3 @@
+<?php
+
+throw new \Exception('boo');
diff --git a/lib/symfony/debug/Tests/Fixtures/ToStringThrower.php b/lib/symfony/debug/Tests/Fixtures/ToStringThrower.php
new file mode 100644
index 000000000..24ac8926d
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/ToStringThrower.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class ToStringThrower
+{
+    private $exception;
+
+    public function __construct(\Exception $e)
+    {
+        $this->exception = $e;
+    }
+
+    public function __toString()
+    {
+        try {
+            throw $this->exception;
+        } catch (\Exception $e) {
+            // Using user_error() here is on purpose so we do not forget
+            // that this alias also should work alongside with trigger_error().
+            return trigger_error($e, E_USER_ERROR);
+        }
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/TraitWithInternalMethod.php b/lib/symfony/debug/Tests/Fixtures/TraitWithInternalMethod.php
new file mode 100644
index 000000000..4c3dae37a
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/TraitWithInternalMethod.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+trait TraitWithInternalMethod
+{
+    /**
+     * @internal
+     */
+    public function foo()
+    {
+    }
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/casemismatch.php b/lib/symfony/debug/Tests/Fixtures/casemismatch.php
new file mode 100644
index 000000000..691d660fd
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/casemismatch.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class CaseMismatch
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/notPsr0Bis.php b/lib/symfony/debug/Tests/Fixtures/notPsr0Bis.php
new file mode 100644
index 000000000..4cf526719
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/notPsr0Bis.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class NotPSR0bis
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php b/lib/symfony/debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php
new file mode 100644
index 000000000..ec48dd22b
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class PSR4CaseMismatch
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures/reallyNotPsr0.php b/lib/symfony/debug/Tests/Fixtures/reallyNotPsr0.php
new file mode 100644
index 000000000..8554725aa
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures/reallyNotPsr0.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+class NotPSR0
+{
+}
diff --git a/lib/symfony/debug/Tests/Fixtures2/RequiredTwice.php b/lib/symfony/debug/Tests/Fixtures2/RequiredTwice.php
new file mode 100644
index 000000000..604bc37ff
--- /dev/null
+++ b/lib/symfony/debug/Tests/Fixtures2/RequiredTwice.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures2;
+
+class RequiredTwice
+{
+}
diff --git a/lib/symfony/debug/Tests/HeaderMock.php b/lib/symfony/debug/Tests/HeaderMock.php
new file mode 100644
index 000000000..d7564db48
--- /dev/null
+++ b/lib/symfony/debug/Tests/HeaderMock.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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;
+
+function headers_sent()
+{
+    return false;
+}
+
+function header($str, $replace = true, $status = null)
+{
+    Tests\testHeader($str, $replace, $status);
+}
+
+namespace Symfony\Component\Debug\Tests;
+
+function testHeader()
+{
+    static $headers = [];
+
+    if (!$h = \func_get_args()) {
+        $h = $headers;
+        $headers = [];
+
+        return $h;
+    }
+
+    $headers[] = \func_get_args();
+}
diff --git a/lib/symfony/debug/Tests/phpt/debug_class_loader.phpt b/lib/symfony/debug/Tests/phpt/debug_class_loader.phpt
new file mode 100644
index 000000000..26b3abf4d
--- /dev/null
+++ b/lib/symfony/debug/Tests/phpt/debug_class_loader.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Test DebugClassLoader with previously loaded parents
+--FILE--
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+use Symfony\Component\Debug\DebugClassLoader;
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+class_exists(FinalMethod::class);
+
+set_error_handler(function ($type, $msg) { echo $msg, "\n"; });
+
+DebugClassLoader::enable();
+
+class_exists(ExtendedFinalMethod::class);
+
+?>
+--EXPECTF--
+The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
+The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
diff --git a/lib/symfony/debug/Tests/phpt/decorate_exception_hander.phpt b/lib/symfony/debug/Tests/phpt/decorate_exception_hander.phpt
new file mode 100644
index 000000000..9cd44388c
--- /dev/null
+++ b/lib/symfony/debug/Tests/phpt/decorate_exception_hander.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Test catching fatal errors when handlers are nested
+--INI--
+display_errors=0
+--FILE--
+<?php
+
+namespace Symfony\Component\Debug;
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+set_error_handler('var_dump');
+set_exception_handler('var_dump');
+
+ErrorHandler::register(null, false);
+
+if (true) {
+    class foo extends missing
+    {
+    }
+}
+
+?>
+--EXPECTF--
+object(Symfony\Component\Debug\Exception\ClassNotFoundException)#%d (8) {
+  ["message":protected]=>
+  string(131) "Attempted to load class "missing" from namespace "Symfony\Component\Debug".
+Did you forget a "use" statement for another namespace?"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(0)
+  ["file":protected]=>
+  string(%d) "%s"
+  ["line":protected]=>
+  int(%d)
+  ["trace":"Exception":private]=>
+  array(%d) {%A}
+  ["previous":"Exception":private]=>
+  NULL
+  ["severity":protected]=>
+  int(1)
+}
diff --git a/lib/symfony/debug/Tests/phpt/exception_rethrown.phpt b/lib/symfony/debug/Tests/phpt/exception_rethrown.phpt
new file mode 100644
index 000000000..b743d93ad
--- /dev/null
+++ b/lib/symfony/debug/Tests/phpt/exception_rethrown.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Test rethrowing in custom exception handler
+--FILE--
+<?php
+
+namespace Symfony\Component\Debug;
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+if (true) {
+    class TestLogger extends \Psr\Log\AbstractLogger
+    {
+        public function log($level, $message, array $context = [])
+        {
+            echo $message, "\n";
+        }
+    }
+}
+
+set_exception_handler(function ($e) { echo 123; throw $e; });
+ErrorHandler::register()->setDefaultLogger(new TestLogger());
+ini_set('display_errors', 1);
+
+throw new \Exception('foo');
+?>
+--EXPECTF--
+Uncaught Exception: foo
+123
+Fatal error: Uncaught %s:25
+Stack trace:
+%a
diff --git a/lib/symfony/debug/Tests/phpt/fatal_with_nested_handlers.phpt b/lib/symfony/debug/Tests/phpt/fatal_with_nested_handlers.phpt
new file mode 100644
index 000000000..b3f0e0eb0
--- /dev/null
+++ b/lib/symfony/debug/Tests/phpt/fatal_with_nested_handlers.phpt
@@ -0,0 +1,42 @@
+--TEST--
+Test catching fatal errors when handlers are nested
+--FILE--
+<?php
+
+namespace Symfony\Component\Debug;
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+Debug::enable();
+ini_set('display_errors', 0);
+
+$eHandler = set_error_handler('var_dump');
+$xHandler = set_exception_handler('var_dump');
+
+var_dump([
+    $eHandler[0] === $xHandler[0] ? 'Error and exception handlers do match' : 'Error and exception handlers are different',
+]);
+
+$eHandler[0]->setExceptionHandler('print_r');
+
+if (true) {
+    class Broken implements \Serializable
+    {
+    }
+}
+
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  string(37) "Error and exception handlers do match"
+}
+object(Symfony\Component\Debug\Exception\FatalErrorException)#%d (%d) {
+  ["message":protected]=>
+  string(199) "Error: Class Symfony\Component\Debug\Broken contains 2 abstract methods and must therefore be declared abstract or implement the remaining methods (Serializable::serialize, Serializable::unserialize)"
+%a
+}
diff --git a/lib/symfony/dependency-injection/Tests/Argument/RewindableGeneratorTest.php b/lib/symfony/dependency-injection/Tests/Argument/RewindableGeneratorTest.php
new file mode 100644
index 000000000..31e3f11fe
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Argument/RewindableGeneratorTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Argument;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+class RewindableGeneratorTest extends TestCase
+{
+    public function testImplementsCountable()
+    {
+        $this->assertInstanceOf(\Countable::class, new RewindableGenerator(function () {
+            yield 1;
+        }, 1));
+    }
+
+    public function testCountUsesProvidedValue()
+    {
+        $generator = new RewindableGenerator(function () {
+            yield 1;
+        }, 3);
+
+        $this->assertCount(3, $generator);
+    }
+
+    public function testCountUsesProvidedValueAsCallback()
+    {
+        $called = 0;
+        $generator = new RewindableGenerator(function () {
+            yield 1;
+        }, function () use (&$called) {
+            ++$called;
+
+            return 3;
+        });
+
+        $this->assertSame(0, $called, 'Count callback is called lazily');
+        $this->assertCount(3, $generator);
+
+        \count($generator);
+
+        $this->assertSame(1, $called, 'Count callback is called only once');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ChildDefinitionTest.php b/lib/symfony/dependency-injection/Tests/ChildDefinitionTest.php
new file mode 100644
index 000000000..509174839
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ChildDefinitionTest.php
@@ -0,0 +1,149 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
+
+class ChildDefinitionTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $def = new ChildDefinition('foo');
+
+        $this->assertSame('foo', $def->getParent());
+        $this->assertSame([], $def->getChanges());
+    }
+
+    /**
+     * @dataProvider getPropertyTests
+     */
+    public function testSetProperty($property, $changeKey)
+    {
+        $def = new ChildDefinition('foo');
+
+        $getter = 'get'.ucfirst($property);
+        $setter = 'set'.ucfirst($property);
+
+        $this->assertNull($def->$getter());
+        $this->assertSame($def, $def->$setter('foo'));
+        $this->assertSame('foo', $def->$getter());
+        $this->assertSame([$changeKey => true], $def->getChanges());
+    }
+
+    public function getPropertyTests()
+    {
+        return [
+            ['class', 'class'],
+            ['factory', 'factory'],
+            ['configurator', 'configurator'],
+            ['file', 'file'],
+        ];
+    }
+
+    public function testSetPublic()
+    {
+        $def = new ChildDefinition('foo');
+
+        $this->assertTrue($def->isPublic());
+        $this->assertSame($def, $def->setPublic(false));
+        $this->assertFalse($def->isPublic());
+        $this->assertSame(['public' => true], $def->getChanges());
+    }
+
+    public function testSetLazy()
+    {
+        $def = new ChildDefinition('foo');
+
+        $this->assertFalse($def->isLazy());
+        $this->assertSame($def, $def->setLazy(false));
+        $this->assertFalse($def->isLazy());
+        $this->assertSame(['lazy' => true], $def->getChanges());
+    }
+
+    public function testSetAutowired()
+    {
+        $def = new ChildDefinition('foo');
+
+        $this->assertFalse($def->isAutowired());
+        $this->assertSame($def, $def->setAutowired(true));
+        $this->assertTrue($def->isAutowired());
+        $this->assertSame(['autowired' => true], $def->getChanges());
+    }
+
+    public function testSetArgument()
+    {
+        $def = new ChildDefinition('foo');
+
+        $this->assertSame([], $def->getArguments());
+        $this->assertSame($def, $def->replaceArgument(0, 'foo'));
+        $this->assertSame(['index_0' => 'foo'], $def->getArguments());
+    }
+
+    public function testReplaceArgumentShouldRequireIntegerIndex()
+    {
+        $this->expectException('InvalidArgumentException');
+        $def = new ChildDefinition('foo');
+
+        $def->replaceArgument('0', 'foo');
+    }
+
+    public function testReplaceArgument()
+    {
+        $def = new ChildDefinition('foo');
+
+        $def->setArguments([0 => 'foo', 1 => 'bar']);
+        $this->assertSame('foo', $def->getArgument(0));
+        $this->assertSame('bar', $def->getArgument(1));
+
+        $this->assertSame($def, $def->replaceArgument(1, 'baz'));
+        $this->assertSame('foo', $def->getArgument(0));
+        $this->assertSame('baz', $def->getArgument(1));
+
+        $this->assertSame([0 => 'foo', 1 => 'bar', 'index_1' => 'baz'], $def->getArguments());
+
+        $this->assertSame($def, $def->replaceArgument('$bar', 'val'));
+        $this->assertSame('val', $def->getArgument('$bar'));
+        $this->assertSame([0 => 'foo', 1 => 'bar', 'index_1' => 'baz', '$bar' => 'val'], $def->getArguments());
+    }
+
+    public function testGetArgumentShouldCheckBounds()
+    {
+        $this->expectException('OutOfBoundsException');
+        $def = new ChildDefinition('foo');
+
+        $def->setArguments([0 => 'foo']);
+        $def->replaceArgument(0, 'foo');
+
+        $def->getArgument(1);
+    }
+
+    public function testDefinitionDecoratorAliasExistsForBackwardsCompatibility()
+    {
+        $this->assertInstanceOf(ChildDefinition::class, new DefinitionDecorator('foo'));
+    }
+
+    public function testCannotCallSetAutoconfigured()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\BadMethodCallException');
+        $def = new ChildDefinition('foo');
+        $def->setAutoconfigured(true);
+    }
+
+    public function testCannotCallSetInstanceofConditionals()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\BadMethodCallException');
+        $def = new ChildDefinition('foo');
+        $def->setInstanceofConditionals(['Foo' => new ChildDefinition('')]);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
new file mode 100644
index 000000000..66b6e19cc
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
@@ -0,0 +1,215 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
+use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class AnalyzeServiceReferencesPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a')
+            ->addArgument($ref1 = new Reference('b'))
+        ;
+
+        $container
+            ->register('b')
+            ->addMethodCall('setA', [$ref2 = new Reference('a')])
+        ;
+
+        $container
+            ->register('c')
+            ->addArgument($ref3 = new Reference('a'))
+            ->addArgument($ref4 = new Reference('b'))
+        ;
+
+        $container
+            ->register('d')
+            ->setProperty('foo', $ref5 = new Reference('b'))
+        ;
+
+        $container
+            ->register('e')
+            ->setConfigurator([$ref6 = new Reference('b'), 'methodName'])
+        ;
+
+        $graph = $this->process($container);
+
+        $this->assertCount(4, $edges = $graph->getNode('b')->getInEdges());
+
+        $this->assertSame($ref1, $edges[0]->getValue());
+        $this->assertSame($ref4, $edges[1]->getValue());
+        $this->assertSame($ref5, $edges[2]->getValue());
+        $this->assertSame($ref6, $edges[3]->getValue());
+    }
+
+    public function testProcessMarksEdgesLazyWhenReferencedServiceIsLazy()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a')
+            ->setLazy(true)
+            ->addArgument($ref1 = new Reference('b'))
+        ;
+
+        $container
+            ->register('b')
+            ->addArgument($ref2 = new Reference('a'))
+        ;
+
+        $graph = $this->process($container);
+
+        $this->assertCount(1, $graph->getNode('b')->getInEdges());
+        $this->assertCount(1, $edges = $graph->getNode('a')->getInEdges());
+
+        $this->assertSame($ref2, $edges[0]->getValue());
+        $this->assertTrue($edges[0]->isLazy());
+    }
+
+    public function testProcessMarksEdgesLazyWhenReferencedFromIteratorArgument()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a');
+        $container->register('b');
+
+        $container
+            ->register('c')
+            ->addArgument($ref1 = new Reference('a'))
+            ->addArgument(new IteratorArgument([$ref2 = new Reference('b')]))
+        ;
+
+        $graph = $this->process($container);
+
+        $this->assertCount(1, $graph->getNode('a')->getInEdges());
+        $this->assertCount(1, $graph->getNode('b')->getInEdges());
+        $this->assertCount(2, $edges = $graph->getNode('c')->getOutEdges());
+
+        $this->assertSame($ref1, $edges[0]->getValue());
+        $this->assertFalse($edges[0]->isLazy());
+        $this->assertSame($ref2, $edges[1]->getValue());
+        $this->assertTrue($edges[1]->isLazy());
+    }
+
+    public function testProcessDetectsReferencesFromInlinedDefinitions()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a')
+        ;
+
+        $container
+            ->register('b')
+            ->addArgument(new Definition(null, [$ref = new Reference('a')]))
+        ;
+
+        $graph = $this->process($container);
+
+        $this->assertCount(1, $refs = $graph->getNode('a')->getInEdges());
+        $this->assertSame($ref, $refs[0]->getValue());
+    }
+
+    public function testProcessDetectsReferencesFromIteratorArguments()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a')
+        ;
+
+        $container
+            ->register('b')
+            ->addArgument(new IteratorArgument([$ref = new Reference('a')]))
+        ;
+
+        $graph = $this->process($container);
+
+        $this->assertCount(1, $refs = $graph->getNode('a')->getInEdges());
+        $this->assertSame($ref, $refs[0]->getValue());
+    }
+
+    public function testProcessDetectsReferencesFromInlinedFactoryDefinitions()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a')
+        ;
+
+        $factory = new Definition();
+        $factory->setFactory([new Reference('a'), 'a']);
+
+        $container
+            ->register('b')
+            ->addArgument($factory)
+        ;
+
+        $graph = $this->process($container);
+
+        $this->assertTrue($graph->hasNode('a'));
+        $this->assertCount(1, $refs = $graph->getNode('a')->getInEdges());
+    }
+
+    public function testProcessDoesNotSaveDuplicateReferences()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a')
+        ;
+        $container
+            ->register('b')
+            ->addArgument(new Definition(null, [$ref1 = new Reference('a')]))
+            ->addArgument(new Definition(null, [$ref2 = new Reference('a')]))
+        ;
+
+        $graph = $this->process($container);
+
+        $this->assertCount(2, $graph->getNode('a')->getInEdges());
+    }
+
+    public function testProcessDetectsFactoryReferences()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('foo', 'stdClass')
+            ->setFactory(['stdClass', 'getInstance']);
+
+        $container
+            ->register('bar', 'stdClass')
+            ->setFactory([new Reference('foo'), 'getInstance']);
+
+        $graph = $this->process($container);
+
+        $this->assertTrue($graph->hasNode('foo'));
+        $this->assertCount(1, $graph->getNode('foo')->getInEdges());
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new RepeatedPass([new AnalyzeServiceReferencesPass()]);
+        $pass->process($container);
+
+        return $container->getCompiler()->getServiceReferenceGraph();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/AutoAliasServicePassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/AutoAliasServicePassTest.php
new file mode 100644
index 000000000..4e17778f8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/AutoAliasServicePassTest.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\AutoAliasServicePass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class AutoAliasServicePassTest extends TestCase
+{
+    public function testProcessWithMissingParameter()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException');
+        $container = new ContainerBuilder();
+
+        $container->register('example')
+            ->addTag('auto_alias', ['format' => '%non_existing%.example']);
+
+        $pass = new AutoAliasServicePass();
+        $pass->process($container);
+    }
+
+    public function testProcessWithMissingFormat()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $container = new ContainerBuilder();
+
+        $container->register('example')
+            ->addTag('auto_alias', []);
+        $container->setParameter('existing', 'mysql');
+
+        $pass = new AutoAliasServicePass();
+        $pass->process($container);
+    }
+
+    public function testProcessWithNonExistingAlias()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
+            ->addTag('auto_alias', ['format' => '%existing%.example']);
+        $container->setParameter('existing', 'mysql');
+
+        $pass = new AutoAliasServicePass();
+        $pass->process($container);
+
+        $this->assertEquals('Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault', $container->getDefinition('example')->getClass());
+    }
+
+    public function testProcessWithExistingAlias()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
+            ->addTag('auto_alias', ['format' => '%existing%.example']);
+
+        $container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
+        $container->setParameter('existing', 'mysql');
+
+        $pass = new AutoAliasServicePass();
+        $pass->process($container);
+
+        $this->assertTrue($container->hasAlias('example'));
+        $this->assertEquals('mysql.example', $container->getAlias('example'));
+        $this->assertSame('Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql', $container->getDefinition('mysql.example')->getClass());
+    }
+
+    public function testProcessWithManualAlias()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
+            ->addTag('auto_alias', ['format' => '%existing%.example']);
+
+        $container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
+        $container->register('mariadb.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMariaDb');
+        $container->setAlias('example', 'mariadb.example');
+        $container->setParameter('existing', 'mysql');
+
+        $pass = new AutoAliasServicePass();
+        $pass->process($container);
+
+        $this->assertTrue($container->hasAlias('example'));
+        $this->assertEquals('mariadb.example', $container->getAlias('example'));
+        $this->assertSame('Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMariaDb', $container->getDefinition('mariadb.example')->getClass());
+    }
+}
+
+class ServiceClassDefault
+{
+}
+
+class ServiceClassMysql extends ServiceClassDefault
+{
+}
+
+class ServiceClassMariaDb extends ServiceClassMysql
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/AutowireExceptionPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/AutowireExceptionPassTest.php
new file mode 100644
index 000000000..c5ba149ae
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/AutowireExceptionPassTest.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\AutowireExceptionPass;
+use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
+use Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
+
+/**
+ * @group legacy
+ */
+class AutowireExceptionPassTest extends TestCase
+{
+    public function testThrowsException()
+    {
+        $autowirePass = $this->getMockBuilder(AutowirePass::class)
+            ->getMock();
+
+        $autowireException = new AutowiringFailedException('foo_service_id', 'An autowiring exception message');
+        $autowirePass->expects($this->any())
+            ->method('getAutowiringExceptions')
+            ->willReturn([$autowireException]);
+
+        $inlinePass = $this->getMockBuilder(InlineServiceDefinitionsPass::class)
+            ->getMock();
+        $inlinePass->expects($this->any())
+            ->method('getInlinedServiceIds')
+            ->willReturn([]);
+
+        $container = new ContainerBuilder();
+        $container->register('foo_service_id');
+
+        $pass = new AutowireExceptionPass($autowirePass, $inlinePass);
+
+        try {
+            $pass->process($container);
+            $this->fail('->process() should throw the exception if the service id exists');
+        } catch (\Exception $e) {
+            $this->assertSame($autowireException, $e);
+        }
+    }
+
+    public function testThrowExceptionIfServiceInlined()
+    {
+        $autowirePass = $this->getMockBuilder(AutowirePass::class)
+            ->getMock();
+
+        $autowireException = new AutowiringFailedException('a_service', 'An autowiring exception message');
+        $autowirePass->expects($this->any())
+            ->method('getAutowiringExceptions')
+            ->willReturn([$autowireException]);
+
+        $inlinePass = $this->getMockBuilder(InlineServiceDefinitionsPass::class)
+            ->getMock();
+        $inlinePass->expects($this->any())
+            ->method('getInlinedServiceIds')
+            ->willReturn([
+                // a_service inlined into b_service
+                'a_service' => ['b_service'],
+                // b_service inlined into c_service
+                'b_service' => ['c_service'],
+            ]);
+
+        $container = new ContainerBuilder();
+        // ONLY register c_service in the final container
+        $container->register('c_service', 'stdClass');
+
+        $pass = new AutowireExceptionPass($autowirePass, $inlinePass);
+
+        try {
+            $pass->process($container);
+            $this->fail('->process() should throw the exception if the service id exists');
+        } catch (\Exception $e) {
+            $this->assertSame($autowireException, $e);
+        }
+    }
+
+    public function testDoNotThrowExceptionIfServiceInlinedButRemoved()
+    {
+        $autowirePass = $this->getMockBuilder(AutowirePass::class)
+            ->getMock();
+
+        $autowireException = new AutowiringFailedException('a_service', 'An autowiring exception message');
+        $autowirePass->expects($this->any())
+            ->method('getAutowiringExceptions')
+            ->willReturn([$autowireException]);
+
+        $inlinePass = $this->getMockBuilder(InlineServiceDefinitionsPass::class)
+            ->getMock();
+        $inlinePass->expects($this->any())
+            ->method('getInlinedServiceIds')
+            ->willReturn([
+                // a_service inlined into b_service
+                'a_service' => ['b_service'],
+                // b_service inlined into c_service
+                'b_service' => ['c_service'],
+            ]);
+
+        // do NOT register c_service in the container
+        $container = new ContainerBuilder();
+
+        $pass = new AutowireExceptionPass($autowirePass, $inlinePass);
+
+        $pass->process($container);
+        // mark the test as passed
+        $this->assertTrue(true);
+    }
+
+    public function testNoExceptionIfServiceRemoved()
+    {
+        $autowirePass = $this->getMockBuilder(AutowirePass::class)
+            ->getMock();
+
+        $autowireException = new AutowiringFailedException('non_existent_service');
+        $autowirePass->expects($this->any())
+            ->method('getAutowiringExceptions')
+            ->willReturn([$autowireException]);
+
+        $inlinePass = $this->getMockBuilder(InlineServiceDefinitionsPass::class)
+            ->getMock();
+        $inlinePass->expects($this->any())
+            ->method('getInlinedServiceIds')
+            ->willReturn([]);
+
+        $container = new ContainerBuilder();
+
+        $pass = new AutowireExceptionPass($autowirePass, $inlinePass);
+
+        $pass->process($container);
+        // mark the test as passed
+        $this->assertTrue(true);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
new file mode 100644
index 000000000..c5bcc660a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
@@ -0,0 +1,916 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
+use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
+use Symfony\Component\DependencyInjection\TypedReference;
+
+require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class AutowirePassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(Foo::class);
+        $barDefinition = $container->register('bar', __NAMESPACE__.'\Bar');
+        $barDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertCount(1, $container->getDefinition('bar')->getArguments());
+        $this->assertEquals(Foo::class, (string) $container->getDefinition('bar')->getArgument(0));
+    }
+
+    /**
+     * @requires PHP 5.6
+     */
+    public function testProcessVariadic()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+        $definition = $container->register('fooVariadic', FooVariadic::class);
+        $definition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertCount(1, $container->getDefinition('fooVariadic')->getArguments());
+        $this->assertEquals(Foo::class, (string) $container->getDefinition('fooVariadic')->getArgument(0));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Autowiring services based on the types they implement is deprecated since Symfony 3.3 and won't be supported in version 4.0. You should alias the "Symfony\Component\DependencyInjection\Tests\Compiler\B" service to "Symfony\Component\DependencyInjection\Tests\Compiler\A" instead.
+     * @expectedExceptionInSymfony4 \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessageInSymfony4 Cannot autowire service "c": argument "$a" of method "Symfony\Component\DependencyInjection\Tests\Compiler\C::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\A" but no such service exists. You should maybe alias this class to the existing "Symfony\Component\DependencyInjection\Tests\Compiler\B" service.
+     */
+    public function testProcessAutowireParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(B::class);
+        $cDefinition = $container->register('c', __NAMESPACE__.'\C');
+        $cDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertCount(1, $container->getDefinition('c')->getArguments());
+        $this->assertEquals(B::class, (string) $container->getDefinition('c')->getArgument(0));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Autowiring services based on the types they implement is deprecated since Symfony 3.3 and won't be supported in version 4.0. Try changing the type-hint for argument "$a" of method "Symfony\Component\DependencyInjection\Tests\Compiler\C::__construct()" to "Symfony\Component\DependencyInjection\Tests\Compiler\AInterface" instead.
+     * @expectedExceptionInSymfony4 \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessageInSymfony4 Cannot autowire service "c": argument "$a" of method "Symfony\Component\DependencyInjection\Tests\Compiler\C::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\A" but no such service exists. You should maybe alias this class to the existing "Symfony\Component\DependencyInjection\Tests\Compiler\B" service.
+     */
+    public function testProcessLegacyAutowireWithAvailableInterface()
+    {
+        $container = new ContainerBuilder();
+
+        $container->setAlias(AInterface::class, B::class);
+        $container->register(B::class);
+        $cDefinition = $container->register('c', __NAMESPACE__.'\C');
+        $cDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertCount(1, $container->getDefinition('c')->getArguments());
+        $this->assertEquals(B::class, (string) $container->getDefinition('c')->getArgument(0));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Autowiring services based on the types they implement is deprecated since Symfony 3.3 and won't be supported in version 4.0. You should alias the "Symfony\Component\DependencyInjection\Tests\Compiler\F" service to "Symfony\Component\DependencyInjection\Tests\Compiler\DInterface" instead.
+     * @expectedExceptionInSymfony4 \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessageInSymfony4 Cannot autowire service "g": argument "$d" of method "Symfony\Component\DependencyInjection\Tests\Compiler\G::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\DInterface" but no such service exists. You should maybe alias this interface to the existing "Symfony\Component\DependencyInjection\Tests\Compiler\F" service.
+     */
+    public function testProcessAutowireInterface()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(F::class);
+        $gDefinition = $container->register('g', __NAMESPACE__.'\G');
+        $gDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertCount(3, $container->getDefinition('g')->getArguments());
+        $this->assertEquals(F::class, (string) $container->getDefinition('g')->getArgument(0));
+        $this->assertEquals(F::class, (string) $container->getDefinition('g')->getArgument(1));
+        $this->assertEquals(F::class, (string) $container->getDefinition('g')->getArgument(2));
+    }
+
+    public function testCompleteExistingDefinition()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('b', __NAMESPACE__.'\B');
+        $container->register(DInterface::class, F::class);
+        $hDefinition = $container->register('h', __NAMESPACE__.'\H')->addArgument(new Reference('b'));
+        $hDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertCount(2, $container->getDefinition('h')->getArguments());
+        $this->assertEquals('b', (string) $container->getDefinition('h')->getArgument(0));
+        $this->assertEquals(DInterface::class, (string) $container->getDefinition('h')->getArgument(1));
+    }
+
+    public function testCompleteExistingDefinitionWithNotDefinedArguments()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(B::class);
+        $container->register(DInterface::class, F::class);
+        $hDefinition = $container->register('h', __NAMESPACE__.'\H')->addArgument('')->addArgument('');
+        $hDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertCount(2, $container->getDefinition('h')->getArguments());
+        $this->assertEquals(B::class, (string) $container->getDefinition('h')->getArgument(0));
+        $this->assertEquals(DInterface::class, (string) $container->getDefinition('h')->getArgument(1));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testExceptionsAreStored()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('c1', __NAMESPACE__.'\CollisionA');
+        $container->register('c2', __NAMESPACE__.'\CollisionB');
+        $container->register('c3', __NAMESPACE__.'\CollisionB');
+        $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass(false);
+        $pass->process($container);
+        $this->assertCount(1, $pass->getAutowiringExceptions());
+    }
+
+    public function testPrivateConstructorThrowsAutowireException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Invalid service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.');
+        $container = new ContainerBuilder();
+
+        $container->autowire('private_service', __NAMESPACE__.'\PrivateConstructor');
+
+        $pass = new AutowirePass(true);
+        $pass->process($container);
+    }
+
+    public function testTypeCollision()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2", "c3".');
+        $container = new ContainerBuilder();
+
+        $container->register('c1', __NAMESPACE__.'\CollisionA');
+        $container->register('c2', __NAMESPACE__.'\CollisionB');
+        $container->register('c3', __NAMESPACE__.'\CollisionB');
+        $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    public function testTypeNotGuessable()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgument::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".');
+        $container = new ContainerBuilder();
+
+        $container->register('a1', __NAMESPACE__.'\Foo');
+        $container->register('a2', __NAMESPACE__.'\Foo');
+        $aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    public function testTypeNotGuessableWithSubclass()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgumentForSubclass::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\A" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".');
+        $container = new ContainerBuilder();
+
+        $container->register('a1', __NAMESPACE__.'\B');
+        $container->register('a2', __NAMESPACE__.'\B');
+        $aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgumentForSubclass');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    public function testTypeNotGuessableNoServicesFound()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists.');
+        $container = new ContainerBuilder();
+
+        $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    public function testTypeNotGuessableWithTypeSet()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('a1', __NAMESPACE__.'\Foo');
+        $container->register('a2', __NAMESPACE__.'\Foo');
+        $container->register(Foo::class, Foo::class);
+        $aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertCount(1, $container->getDefinition('a')->getArguments());
+        $this->assertEquals(Foo::class, (string) $container->getDefinition('a')->getArgument(0));
+    }
+
+    public function testWithTypeSet()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('c1', __NAMESPACE__.'\CollisionA');
+        $container->register('c2', __NAMESPACE__.'\CollisionB');
+        $container->setAlias(CollisionInterface::class, 'c2');
+        $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertCount(1, $container->getDefinition('a')->getArguments());
+        $this->assertEquals(CollisionInterface::class, (string) $container->getDefinition('a')->getArgument(0));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Relying on service auto-registration for type "Symfony\Component\DependencyInjection\Tests\Compiler\Lille" is deprecated since Symfony 3.4 and won't be supported in 4.0. Create a service named "Symfony\Component\DependencyInjection\Tests\Compiler\Lille" instead.
+     * @expectedDeprecation Relying on service auto-registration for type "Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas" is deprecated since Symfony 3.4 and won't be supported in 4.0. Create a service named "Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas" instead.
+     */
+    public function testCreateDefinition()
+    {
+        $container = new ContainerBuilder();
+
+        $coopTilleulsDefinition = $container->register('coop_tilleuls', __NAMESPACE__.'\LesTilleuls');
+        $coopTilleulsDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertCount(2, $container->getDefinition('coop_tilleuls')->getArguments());
+        $this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));
+        $this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));
+
+        $dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
+        $this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
+        $this->assertFalse($dunglasDefinition->isPublic());
+        $this->assertCount(1, $dunglasDefinition->getArguments());
+        $this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille', $dunglasDefinition->getArgument(0));
+
+        $lilleDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille');
+        $this->assertEquals(__NAMESPACE__.'\Lille', $lilleDefinition->getClass());
+    }
+
+    public function testResolveParameter()
+    {
+        $container = new ContainerBuilder();
+
+        $container->setParameter('class_name', Bar::class);
+        $container->register(Foo::class);
+        $barDefinition = $container->register('bar', '%class_name%');
+        $barDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertEquals(Foo::class, $container->getDefinition('bar')->getArgument(0));
+    }
+
+    public function testOptionalParameter()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(A::class);
+        $container->register(Foo::class);
+        $optDefinition = $container->register('opt', __NAMESPACE__.'\OptionalParameter');
+        $optDefinition->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('opt');
+        $this->assertNull($definition->getArgument(0));
+        $this->assertEquals(A::class, $definition->getArgument(1));
+        $this->assertEquals(Foo::class, $definition->getArgument(2));
+    }
+
+    public function testDontTriggerAutowiring()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(Foo::class);
+        $container->register('bar', __NAMESPACE__.'\Bar');
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertCount(0, $container->getDefinition('bar')->getArguments());
+    }
+
+    public function testClassNotFoundThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$r" of method "Symfony\Component\DependencyInjection\Tests\Compiler\BadTypeHintedArgument::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.');
+        $container = new ContainerBuilder();
+
+        $aDefinition = $container->register('a', __NAMESPACE__.'\BadTypeHintedArgument');
+        $aDefinition->setAutowired(true);
+
+        $container->register(Dunglas::class, Dunglas::class);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    public function testParentClassNotFoundThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessageRegExp('{^Cannot autowire service "a": argument "\$r" of method "(Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Compiler\\\\)BadParentTypeHintedArgument::__construct\(\)" has type "\1OptionalServiceClass" but this class is missing a parent class \(Class "?Symfony\\\\Bug\\\\NotExistClass"? not found}');
+
+        $container = new ContainerBuilder();
+
+        $aDefinition = $container->register('a', __NAMESPACE__.'\BadParentTypeHintedArgument');
+        $aDefinition->setAutowired(true);
+
+        $container->register(Dunglas::class, Dunglas::class);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Autowiring services based on the types they implement is deprecated since Symfony 3.3 and won't be supported in version 4.0. You should rename (or alias) the "foo" service to "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" instead.
+     * @expectedExceptionInSymfony4 \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
+     * @expectedExceptionMessageInSymfony4 Cannot autowire service "bar": argument "$foo" of method "Symfony\Component\DependencyInjection\Tests\Compiler\Bar::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" but this service is abstract. You should maybe alias this class to the existing "foo" service.
+     */
+    public function testDontUseAbstractServices()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(Foo::class)->setAbstract(true);
+        $container->register('foo', __NAMESPACE__.'\Foo');
+        $container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
+    public function testSomeSpecificArgumentsAreSet()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', Foo::class);
+        $container->register(A::class);
+        $container->register(Dunglas::class);
+        $container->register('multiple', __NAMESPACE__.'\MultipleArguments')
+            ->setAutowired(true)
+            // set the 2nd (index 1) argument only: autowire the first and third
+            // args are: A, Foo, Dunglas
+            ->setArguments([
+                1 => new Reference('foo'),
+                3 => ['bar'],
+            ]);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('multiple');
+        $this->assertEquals(
+            [
+                new TypedReference(A::class, A::class, MultipleArguments::class),
+                new Reference('foo'),
+                new TypedReference(Dunglas::class, Dunglas::class, MultipleArguments::class),
+                ['bar'],
+            ],
+            $definition->getArguments()
+        );
+    }
+
+    public function testScalarArgsCannotBeAutowired()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "arg_no_type_hint": argument "$bar" of method "Symfony\Component\DependencyInjection\Tests\Compiler\MultipleArguments::__construct()" is type-hinted "array", you should configure its value explicitly.');
+        $container = new ContainerBuilder();
+
+        $container->register(A::class);
+        $container->register(Dunglas::class);
+        $container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
+            ->setArguments([1 => 'foo'])
+            ->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
+    public function testNoTypeArgsCannotBeAutowired()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "arg_no_type_hint": argument "$foo" of method "Symfony\Component\DependencyInjection\Tests\Compiler\MultipleArguments::__construct()" has no type-hint, you should configure its value explicitly.');
+        $container = new ContainerBuilder();
+
+        $container->register(A::class);
+        $container->register(Dunglas::class);
+        $container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
+            ->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
+    public function testOptionalScalarNotReallyOptionalUsesDefaultValue()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(A::class);
+        $container->register(Lille::class);
+        $definition = $container->register('not_really_optional_scalar', __NAMESPACE__.'\MultipleArgumentsOptionalScalarNotReallyOptional')
+            ->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertSame('default_val', $definition->getArgument(1));
+    }
+
+    public function testOptionalScalarArgsDontMessUpOrder()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(A::class);
+        $container->register(Lille::class);
+        $container->register('with_optional_scalar', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
+            ->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('with_optional_scalar');
+        $this->assertEquals(
+            [
+                new TypedReference(A::class, A::class, MultipleArgumentsOptionalScalar::class),
+                // use the default value
+                'default_val',
+                new TypedReference(Lille::class, Lille::class),
+            ],
+            $definition->getArguments()
+        );
+    }
+
+    public function testOptionalScalarArgsNotPassedIfLast()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(A::class);
+        $container->register(Lille::class);
+        $container->register('with_optional_scalar_last', __NAMESPACE__.'\MultipleArgumentsOptionalScalarLast')
+            ->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('with_optional_scalar_last');
+        $this->assertEquals(
+            [
+                new TypedReference(A::class, A::class, MultipleArgumentsOptionalScalarLast::class),
+                new TypedReference(Lille::class, Lille::class, MultipleArgumentsOptionalScalarLast::class),
+            ],
+            $definition->getArguments()
+        );
+    }
+
+    public function testOptionalArgsNoRequiredForCoreClasses()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', \SplFileObject::class)
+            ->addArgument('foo.txt')
+            ->setAutowired(true);
+
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('foo');
+        $this->assertEquals(
+            ['foo.txt'],
+            $definition->getArguments()
+        );
+    }
+
+    public function testSetterInjection()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+        $container->register(A::class);
+        $container->register(CollisionA::class);
+        $container->register(CollisionB::class);
+
+        // manually configure *one* call, to override autowiring
+        $container
+            ->register('setter_injection', SetterInjection::class)
+            ->setAutowired(true)
+            ->addMethodCall('setWithCallsConfigured', ['manual_arg1', 'manual_arg2'])
+        ;
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
+
+        $this->assertEquals(
+            ['setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'],
+            array_column($methodCalls, 0)
+        );
+
+        // test setWithCallsConfigured args
+        $this->assertEquals(
+            ['manual_arg1', 'manual_arg2'],
+            $methodCalls[0][1]
+        );
+        // test setFoo args
+        $this->assertEquals(
+            [new TypedReference(Foo::class, Foo::class, SetterInjection::class)],
+            $methodCalls[1][1]
+        );
+    }
+
+    public function testWithNonExistingSetterAndAutowiring()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass": method "setLogger()" does not exist.');
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(CaseSensitiveClass::class, CaseSensitiveClass::class)->setAutowired(true);
+        $definition->addMethodCall('setLogger');
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
+    public function testExplicitMethodInjection()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+        $container->register(A::class);
+        $container->register(CollisionA::class);
+        $container->register(CollisionB::class);
+
+        $container
+            ->register('setter_injection', SetterInjection::class)
+            ->setAutowired(true)
+            ->addMethodCall('notASetter', [])
+        ;
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
+
+        $this->assertEquals(
+            ['notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured', 'setChildMethodWithoutDocBlock'],
+            array_column($methodCalls, 0)
+        );
+        $this->assertEquals(
+            [new TypedReference(A::class, A::class, SetterInjection::class)],
+            $methodCalls[0][1]
+        );
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Relying on service auto-registration for type "Symfony\Component\DependencyInjection\Tests\Compiler\A" is deprecated since Symfony 3.4 and won't be supported in 4.0. Create a service named "Symfony\Component\DependencyInjection\Tests\Compiler\A" instead.
+     */
+    public function testTypedReference()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('bar', Bar::class)
+            ->setProperty('a', [new TypedReference(A::class, A::class, Bar::class)])
+        ;
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertSame(A::class, $container->getDefinition('autowired.'.A::class)->getClass());
+    }
+
+    /**
+     * @dataProvider getCreateResourceTests
+     * @group legacy
+     */
+    public function testCreateResourceForClass($className, $isEqual)
+    {
+        $startingResource = AutowirePass::createResourceForClass(
+            new \ReflectionClass(__NAMESPACE__.'\ClassForResource')
+        );
+        $newResource = AutowirePass::createResourceForClass(
+            new \ReflectionClass(__NAMESPACE__.'\\'.$className)
+        );
+
+        // hack so the objects don't differ by the class name
+        $startingReflObject = new \ReflectionObject($startingResource);
+        $reflProp = $startingReflObject->getProperty('class');
+        $reflProp->setAccessible(true);
+        $reflProp->setValue($startingResource, __NAMESPACE__.'\\'.$className);
+
+        if ($isEqual) {
+            $this->assertEquals($startingResource, $newResource);
+        } else {
+            $this->assertNotEquals($startingResource, $newResource);
+        }
+    }
+
+    public function getCreateResourceTests()
+    {
+        return [
+            ['IdenticalClassResource', true],
+            ['ClassChangedConstructorArgs', false],
+        ];
+    }
+
+    public function testIgnoreServiceWithClassNotExisting()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('class_not_exist', __NAMESPACE__.'\OptionalServiceClass');
+
+        $barDefinition = $container->register('bar', __NAMESPACE__.'\Bar');
+        $barDefinition->setAutowired(true);
+
+        $container->register(Foo::class, Foo::class);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertTrue($container->hasDefinition('bar'));
+    }
+
+    public function testSetterInjectionCollisionThrowsException()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('c1', CollisionA::class);
+        $container->register('c2', CollisionB::class);
+        $aDefinition = $container->register('setter_injection_collision', SetterInjectionCollision::class);
+        $aDefinition->setAutowired(true);
+
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $pass = new AutowirePass();
+
+        try {
+            $pass->process($container);
+        } catch (AutowiringFailedException $e) {
+        }
+
+        $this->assertNotNull($e);
+        $this->assertSame('Cannot autowire service "setter_injection_collision": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollision::setMultipleInstancesForOneArg()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2".', $e->getMessage());
+    }
+
+    public function testInterfaceWithNoImplementationSuggestToWriteOne()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "my_service": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\K::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" but no such service exists. Did you create a class that implements this interface?');
+        $container = new ContainerBuilder();
+
+        $aDefinition = $container->register('my_service', K::class);
+        $aDefinition->setAutowired(true);
+
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Autowiring services based on the types they implement is deprecated since Symfony 3.3 and won't be supported in version 4.0. You should rename (or alias) the "foo" service to "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" instead.
+     * @expectedExceptionInSymfony4 \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
+     * @expectedExceptionMessageInSymfony4 Cannot autowire service "bar": argument "$foo" of method "Symfony\Component\DependencyInjection\Tests\Compiler\Bar::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" but no such service exists. You should maybe alias this class to the existing "foo" service.
+     */
+    public function testProcessDoesNotTriggerDeprecations()
+    {
+        $container = new ContainerBuilder();
+        $container->register('deprecated', 'Symfony\Component\DependencyInjection\Tests\Fixtures\DeprecatedClass')->setDeprecated(true);
+        $container->register('foo', __NAMESPACE__.'\Foo');
+        $container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertTrue($container->hasDefinition('deprecated'));
+        $this->assertTrue($container->hasDefinition('foo'));
+        $this->assertTrue($container->hasDefinition('bar'));
+    }
+
+    public function testEmptyStringIsKept()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(A::class);
+        $container->register(Lille::class);
+        $container->register('foo', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
+            ->setAutowired(true)
+            ->setArguments(['', '']);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertEquals([new TypedReference(A::class, A::class, MultipleArgumentsOptionalScalar::class), '', new TypedReference(Lille::class, Lille::class)], $container->getDefinition('foo')->getArguments());
+    }
+
+    public function testWithFactory()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(Foo::class);
+        $definition = $container->register('a', A::class)
+            ->setFactory([A::class, 'create'])
+            ->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $this->assertEquals([new TypedReference(Foo::class, Foo::class, A::class)], $definition->getArguments());
+    }
+
+    /**
+     * @dataProvider provideNotWireableCalls
+     */
+    public function testNotWireableCalls($method, $expectedMsg)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $container = new ContainerBuilder();
+
+        $foo = $container->register('foo', NotWireable::class)->setAutowired(true)
+            ->addMethodCall('setBar', [])
+            ->addMethodCall('setOptionalNotAutowireable', [])
+            ->addMethodCall('setOptionalNoTypeHint', [])
+            ->addMethodCall('setOptionalArgNoAutowireable', [])
+        ;
+
+        if ($method) {
+            $foo->addMethodCall($method, []);
+        }
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage($expectedMsg);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new AutowirePass())->process($container);
+    }
+
+    public function provideNotWireableCalls()
+    {
+        return [
+            ['setNotAutowireable', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setNotAutowireable()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.'],
+            ['setDifferentNamespace', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setDifferentNamespace()" references class "stdClass" but no such service exists. It cannot be auto-registered because it is from a different root namespace.'],
+            [null, 'Invalid service "foo": method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setProtectedMethod()" must be public.'],
+        ];
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Autowiring services based on the types they implement is deprecated since Symfony 3.3 and won't be supported in version 4.0. Try changing the type-hint for argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" to "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" instead.
+     * @expectedExceptionInSymfony4 \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
+     * @expectedExceptionMessageInSymfony4 Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. Try changing the type-hint to "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" instead.
+     */
+    public function testByIdAlternative()
+    {
+        $container = new ContainerBuilder();
+
+        $container->setAlias(IInterface::class, 'i');
+        $container->register('i', I::class);
+        $container->register('j', J::class)
+            ->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Autowiring services based on the types they implement is deprecated since Symfony 3.3 and won't be supported in version 4.0. Try changing the type-hint for "Symfony\Component\DependencyInjection\Tests\Compiler\A" in "Symfony\Component\DependencyInjection\Tests\Compiler\Bar" to "Symfony\Component\DependencyInjection\Tests\Compiler\AInterface" instead.
+     */
+    public function testTypedReferenceDeprecationNotice()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('aClass', A::class);
+        $container->setAlias(AInterface::class, 'aClass');
+        $container
+            ->register('bar', Bar::class)
+            ->setProperty('a', [new TypedReference(A::class, A::class, Bar::class)])
+        ;
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    public function testExceptionWhenAliasExists()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. Try changing the type-hint to "Symfony\Component\DependencyInjection\Tests\Compiler\IInterface" instead.');
+        $container = new ContainerBuilder();
+
+        // multiple I services... but there *is* IInterface available
+        $container->setAlias(IInterface::class, 'i');
+        $container->register('i', I::class);
+        $container->register('i2', I::class);
+        // J type-hints against I concretely
+        $container->register('j', J::class)
+            ->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    public function testExceptionWhenAliasDoesNotExist()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "j": argument "$i" of method "Symfony\Component\DependencyInjection\Tests\Compiler\J::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\I" but no such service exists. You should maybe alias this class to one of these existing services: "i", "i2".');
+
+        $container = new ContainerBuilder();
+
+        // multiple I instances... but no IInterface alias
+        $container->register('i', I::class);
+        $container->register('i2', I::class);
+        // J type-hints against I concretely
+        $container->register('j', J::class)
+            ->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
+    public function testInlineServicesAreNotCandidates()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Fixtures/xml')));
+        $loader->load('services_inline_not_candidate.xml');
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertSame([], $container->getDefinition('autowired')->getArguments());
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/AutowireRequiredMethodsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
new file mode 100644
index 000000000..644b32d20
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
+
+class AutowireRequiredMethodsPassTest extends TestCase
+{
+    public function testSetterInjection()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+        $container->register(A::class);
+        $container->register(CollisionA::class);
+        $container->register(CollisionB::class);
+
+        // manually configure *one* call, to override autowiring
+        $container
+            ->register('setter_injection', SetterInjection::class)
+            ->setAutowired(true)
+            ->addMethodCall('setWithCallsConfigured', ['manual_arg1', 'manual_arg2']);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
+
+        $this->assertEquals(
+            ['setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'],
+            array_column($methodCalls, 0)
+        );
+
+        // test setWithCallsConfigured args
+        $this->assertEquals(
+            ['manual_arg1', 'manual_arg2'],
+            $methodCalls[0][1]
+        );
+        // test setFoo args
+        $this->assertEquals([], $methodCalls[1][1]);
+    }
+
+    public function testExplicitMethodInjection()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+        $container->register(A::class);
+        $container->register(CollisionA::class);
+        $container->register(CollisionB::class);
+
+        $container
+            ->register('setter_injection', SetterInjection::class)
+            ->setAutowired(true)
+            ->addMethodCall('notASetter', []);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
+
+        $this->assertEquals(
+            ['notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured', 'setChildMethodWithoutDocBlock'],
+            array_column($methodCalls, 0)
+        );
+        $this->assertEquals([], $methodCalls[0][1]);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckArgumentsValidityPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckArgumentsValidityPassTest.php
new file mode 100644
index 000000000..9554c23bb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckArgumentsValidityPassTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\CheckArgumentsValidityPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class CheckArgumentsValidityPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $definition = $container->register('foo');
+        $definition->setArguments([null, 1, 'a']);
+        $definition->setMethodCalls([
+            ['bar', ['a', 'b']],
+            ['baz', ['c', 'd']],
+        ]);
+
+        $pass = new CheckArgumentsValidityPass();
+        $pass->process($container);
+
+        $this->assertEquals([null, 1, 'a'], $container->getDefinition('foo')->getArguments());
+        $this->assertEquals([
+            ['bar', ['a', 'b']],
+            ['baz', ['c', 'd']],
+        ], $container->getDefinition('foo')->getMethodCalls());
+    }
+
+    /**
+     * @dataProvider definitionProvider
+     */
+    public function testException(array $arguments, array $methodCalls)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $container = new ContainerBuilder();
+        $definition = $container->register('foo');
+        $definition->setArguments($arguments);
+        $definition->setMethodCalls($methodCalls);
+
+        $pass = new CheckArgumentsValidityPass();
+        $pass->process($container);
+    }
+
+    public function definitionProvider()
+    {
+        return [
+            [[null, 'a' => 'a'], []],
+            [[1 => 1], []],
+            [[], [['baz', [null, 'a' => 'a']]]],
+            [[], [['baz', [1 => 1]]]],
+        ];
+    }
+
+    public function testNoException()
+    {
+        $container = new ContainerBuilder();
+        $definition = $container->register('foo');
+        $definition->setArguments([null, 'a' => 'a']);
+
+        $pass = new CheckArgumentsValidityPass(false);
+        $pass->process($container);
+        $this->assertCount(1, $definition->getErrors());
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckCircularReferencesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckCircularReferencesPassTest.php
new file mode 100644
index 000000000..8d501368e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckCircularReferencesPassTest.php
@@ -0,0 +1,146 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
+use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
+use Symfony\Component\DependencyInjection\Compiler\Compiler;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class CheckCircularReferencesPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $container = new ContainerBuilder();
+        $container->register('a')->addArgument(new Reference('b'));
+        $container->register('b')->addArgument(new Reference('a'));
+
+        $this->process($container);
+    }
+
+    public function testProcessWithAliases()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $container = new ContainerBuilder();
+        $container->register('a')->addArgument(new Reference('b'));
+        $container->setAlias('b', 'c');
+        $container->setAlias('c', 'a');
+
+        $this->process($container);
+    }
+
+    public function testProcessWithFactory()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a', 'stdClass')
+            ->setFactory([new Reference('b'), 'getInstance']);
+
+        $container
+            ->register('b', 'stdClass')
+            ->setFactory([new Reference('a'), 'getInstance']);
+
+        $this->process($container);
+    }
+
+    public function testProcessDetectsIndirectCircularReference()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $container = new ContainerBuilder();
+        $container->register('a')->addArgument(new Reference('b'));
+        $container->register('b')->addArgument(new Reference('c'));
+        $container->register('c')->addArgument(new Reference('a'));
+
+        $this->process($container);
+    }
+
+    public function testProcessDetectsIndirectCircularReferenceWithFactory()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $container = new ContainerBuilder();
+
+        $container->register('a')->addArgument(new Reference('b'));
+
+        $container
+            ->register('b', 'stdClass')
+            ->setFactory([new Reference('c'), 'getInstance']);
+
+        $container->register('c')->addArgument(new Reference('a'));
+
+        $this->process($container);
+    }
+
+    public function testDeepCircularReference()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $container = new ContainerBuilder();
+        $container->register('a')->addArgument(new Reference('b'));
+        $container->register('b')->addArgument(new Reference('c'));
+        $container->register('c')->addArgument(new Reference('b'));
+
+        $this->process($container);
+    }
+
+    public function testProcessIgnoresMethodCalls()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a')->addArgument(new Reference('b'));
+        $container->register('b')->addMethodCall('setA', [new Reference('a')]);
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
+    public function testProcessIgnoresLazyServices()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a')->setLazy(true)->addArgument(new Reference('b'));
+        $container->register('b')->addArgument(new Reference('a'));
+
+        $this->process($container);
+
+        // just make sure that a lazily loaded service does not trigger a CircularReferenceException
+        $this->addToAssertionCount(1);
+    }
+
+    public function testProcessIgnoresIteratorArguments()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a')->addArgument(new Reference('b'));
+        $container->register('b')->addArgument(new IteratorArgument([new Reference('a')]));
+
+        $this->process($container);
+
+        // just make sure that an IteratorArgument does not trigger a CircularReferenceException
+        $this->addToAssertionCount(1);
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $compiler = new Compiler();
+        $passConfig = $compiler->getPassConfig();
+        $passConfig->setOptimizationPasses([
+            new AnalyzeServiceReferencesPass(true),
+            new CheckCircularReferencesPass(),
+        ]);
+        $passConfig->setRemovingPasses([]);
+
+        $compiler->compile($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
new file mode 100644
index 000000000..6caa38c7b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\CheckDefinitionValidityPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class CheckDefinitionValidityPassTest extends TestCase
+{
+    public function testProcessDetectsSyntheticNonPublicDefinitions()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $container = new ContainerBuilder();
+        $container->register('a')->setSynthetic(true)->setPublic(false);
+
+        $this->process($container);
+    }
+
+    public function testProcessDetectsNonSyntheticNonAbstractDefinitionWithoutClass()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $container = new ContainerBuilder();
+        $container->register('a')->setSynthetic(false)->setAbstract(false);
+
+        $this->process($container);
+    }
+
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a', 'class');
+        $container->register('b', 'class')->setSynthetic(true)->setPublic(true);
+        $container->register('c', 'class')->setAbstract(true);
+        $container->register('d', 'class')->setSynthetic(true);
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
+    public function testValidTags()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a', 'class')->addTag('foo', ['bar' => 'baz']);
+        $container->register('b', 'class')->addTag('foo', ['bar' => null]);
+        $container->register('c', 'class')->addTag('foo', ['bar' => 1]);
+        $container->register('d', 'class')->addTag('foo', ['bar' => 1.1]);
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
+    public function testInvalidTags()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $container = new ContainerBuilder();
+        $container->register('a', 'class')->addTag('foo', ['bar' => ['baz' => 'baz']]);
+
+        $this->process($container);
+    }
+
+    public function testDynamicPublicServiceName()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\EnvParameterException');
+        $container = new ContainerBuilder();
+        $env = $container->getParameterBag()->get('env(BAR)');
+        $container->register("foo.$env", 'class')->setPublic(true);
+
+        $this->process($container);
+    }
+
+    public function testDynamicPublicAliasName()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\EnvParameterException');
+        $container = new ContainerBuilder();
+        $env = $container->getParameterBag()->get('env(BAR)');
+        $container->setAlias("foo.$env", 'class')->setPublic(true);
+
+        $this->process($container);
+    }
+
+    public function testDynamicPrivateName()
+    {
+        $container = new ContainerBuilder();
+        $env = $container->getParameterBag()->get('env(BAR)');
+        $container->register("foo.$env", 'class');
+        $container->setAlias("bar.$env", 'class');
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new CheckDefinitionValidityPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
new file mode 100644
index 000000000..c4f331b18
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Compiler\CheckExceptionOnInvalidReferenceBehaviorPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class CheckExceptionOnInvalidReferenceBehaviorPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a', '\stdClass')
+            ->addArgument(new Reference('b'))
+        ;
+        $container->register('b', '\stdClass');
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
+    public function testProcessThrowsExceptionOnInvalidReference()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('a', '\stdClass')
+            ->addArgument(new Reference('b'))
+        ;
+
+        $this->process($container);
+    }
+
+    public function testProcessThrowsExceptionOnInvalidReferenceFromInlinedDefinition()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $container = new ContainerBuilder();
+
+        $def = new Definition();
+        $def->addArgument(new Reference('b'));
+
+        $container
+            ->register('a', '\stdClass')
+            ->addArgument($def)
+        ;
+
+        $this->process($container);
+    }
+
+    public function testProcessDefinitionWithBindings()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('b')
+            ->setBindings([new BoundArgument(new Reference('a'))])
+        ;
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
+    private function process(ContainerBuilder $container)
+    {
+        $pass = new CheckExceptionOnInvalidReferenceBehaviorPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/CheckReferenceValidityPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/CheckReferenceValidityPassTest.php
new file mode 100644
index 000000000..85a8a40f1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/CheckReferenceValidityPassTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\CheckReferenceValidityPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class CheckReferenceValidityPassTest extends TestCase
+{
+    public function testProcessDetectsReferenceToAbstractDefinition()
+    {
+        $this->expectException('RuntimeException');
+        $container = new ContainerBuilder();
+
+        $container->register('a')->setAbstract(true);
+        $container->register('b')->addArgument(new Reference('a'));
+
+        $this->process($container);
+    }
+
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a')->addArgument(new Reference('b'));
+        $container->register('b');
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new CheckReferenceValidityPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/DecoratorServicePassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/DecoratorServicePassTest.php
new file mode 100644
index 000000000..29fc5cc57
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/DecoratorServicePassTest.php
@@ -0,0 +1,199 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Compiler\DecoratorServicePass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class DecoratorServicePassTest extends TestCase
+{
+    public function testProcessWithoutAlias()
+    {
+        $container = new ContainerBuilder();
+        $fooDefinition = $container
+            ->register('foo')
+            ->setPublic(false)
+        ;
+        $fooExtendedDefinition = $container
+            ->register('foo.extended')
+            ->setPublic(true)
+            ->setDecoratedService('foo')
+        ;
+        $barDefinition = $container
+            ->register('bar')
+            ->setPublic(true)
+        ;
+        $barExtendedDefinition = $container
+            ->register('bar.extended')
+            ->setPublic(true)
+            ->setDecoratedService('bar', 'bar.yoo')
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals('foo.extended', $container->getAlias('foo'));
+        $this->assertFalse($container->getAlias('foo')->isPublic());
+
+        $this->assertEquals('bar.extended', $container->getAlias('bar'));
+        $this->assertTrue($container->getAlias('bar')->isPublic());
+
+        $this->assertSame($fooDefinition, $container->getDefinition('foo.extended.inner'));
+        $this->assertFalse($container->getDefinition('foo.extended.inner')->isPublic());
+
+        $this->assertSame($barDefinition, $container->getDefinition('bar.yoo'));
+        $this->assertFalse($container->getDefinition('bar.yoo')->isPublic());
+
+        $this->assertNull($fooExtendedDefinition->getDecoratedService());
+        $this->assertNull($barExtendedDefinition->getDecoratedService());
+    }
+
+    public function testProcessWithAlias()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(true)
+        ;
+        $container->setAlias('foo.alias', new Alias('foo', false));
+        $fooExtendedDefinition = $container
+            ->register('foo.extended')
+            ->setPublic(true)
+            ->setDecoratedService('foo.alias')
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals('foo.extended', $container->getAlias('foo.alias'));
+        $this->assertFalse($container->getAlias('foo.alias')->isPublic());
+
+        $this->assertEquals('foo', $container->getAlias('foo.extended.inner'));
+        $this->assertFalse($container->getAlias('foo.extended.inner')->isPublic());
+
+        $this->assertNull($fooExtendedDefinition->getDecoratedService());
+    }
+
+    public function testProcessWithPriority()
+    {
+        $container = new ContainerBuilder();
+        $fooDefinition = $container
+            ->register('foo')
+            ->setPublic(false)
+        ;
+        $barDefinition = $container
+            ->register('bar')
+            ->setPublic(true)
+            ->setDecoratedService('foo')
+        ;
+        $bazDefinition = $container
+            ->register('baz')
+            ->setPublic(true)
+            ->setDecoratedService('foo', null, 5)
+        ;
+        $quxDefinition = $container
+            ->register('qux')
+            ->setPublic(true)
+            ->setDecoratedService('foo', null, 3)
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals('bar', $container->getAlias('foo'));
+        $this->assertFalse($container->getAlias('foo')->isPublic());
+
+        $this->assertSame($fooDefinition, $container->getDefinition('baz.inner'));
+        $this->assertFalse($container->getDefinition('baz.inner')->isPublic());
+
+        $this->assertEquals('qux', $container->getAlias('bar.inner'));
+        $this->assertFalse($container->getAlias('bar.inner')->isPublic());
+
+        $this->assertEquals('baz', $container->getAlias('qux.inner'));
+        $this->assertFalse($container->getAlias('qux.inner')->isPublic());
+
+        $this->assertNull($barDefinition->getDecoratedService());
+        $this->assertNull($bazDefinition->getDecoratedService());
+        $this->assertNull($quxDefinition->getDecoratedService());
+    }
+
+    public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setTags(['bar' => ['attr' => 'baz']])
+        ;
+        $container
+            ->register('baz')
+            ->setTags(['foobar' => ['attr' => 'bar']])
+            ->setDecoratedService('foo')
+        ;
+
+        $this->process($container);
+
+        $this->assertEmpty($container->getDefinition('baz.inner')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testProcessMergesAutowiringTypesInDecoratingDefinitionAndRemoveThemFromDecoratedDefinition()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addAutowiringType('Bar')
+        ;
+
+        $container
+            ->register('child')
+            ->setDecoratedService('parent')
+            ->addAutowiringType('Foo')
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals(['Bar', 'Foo'], $container->getDefinition('child')->getAutowiringTypes());
+        $this->assertEmpty($container->getDefinition('child.inner')->getAutowiringTypes());
+    }
+
+    public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitionMultipleTimes()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(true)
+            ->setTags(['bar' => ['attr' => 'baz']])
+        ;
+        $container
+            ->register('deco1')
+            ->setDecoratedService('foo', null, 50)
+        ;
+        $container
+            ->register('deco2')
+            ->setDecoratedService('foo', null, 2)
+        ;
+
+        $this->process($container);
+
+        $this->assertEmpty($container->getDefinition('deco1')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz']], $container->getDefinition('deco2')->getTags());
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $repeatedPass = new DecoratorServicePass();
+        $repeatedPass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/DefinitionErrorExceptionPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
new file mode 100644
index 000000000..273261976
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\DefinitionErrorExceptionPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+class DefinitionErrorExceptionPassTest extends TestCase
+{
+    public function testThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Things went wrong!');
+        $container = new ContainerBuilder();
+        $def = new Definition();
+        $def->addError('Things went wrong!');
+        $def->addError('Now something else!');
+        $container->register('foo_service_id')
+            ->setArguments([
+                $def,
+            ]);
+
+        $pass = new DefinitionErrorExceptionPass();
+        $pass->process($container);
+    }
+
+    public function testNoExceptionThrown()
+    {
+        $container = new ContainerBuilder();
+        $def = new Definition();
+        $container->register('foo_service_id')
+            ->setArguments([
+                $def,
+            ]);
+
+        $pass = new DefinitionErrorExceptionPass();
+        $pass->process($container);
+        $this->assertSame($def, $container->getDefinition('foo_service_id')->getArgument(0));
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ExtensionCompilerPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ExtensionCompilerPassTest.php
new file mode 100644
index 000000000..810fbe48a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ExtensionCompilerPassTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+
+/**
+ * @author Wouter J <wouter@wouterj.nl>
+ */
+class ExtensionCompilerPassTest extends TestCase
+{
+    private $container;
+    private $pass;
+
+    protected function setUp()
+    {
+        $this->container = new ContainerBuilder();
+        $this->pass = new ExtensionCompilerPass();
+    }
+
+    public function testProcess()
+    {
+        $extension1 = new CompilerPassExtension('extension1');
+        $extension2 = new DummyExtension('extension2');
+        $extension3 = new DummyExtension('extension3');
+        $extension4 = new CompilerPassExtension('extension4');
+
+        $this->container->registerExtension($extension1);
+        $this->container->registerExtension($extension2);
+        $this->container->registerExtension($extension3);
+        $this->container->registerExtension($extension4);
+
+        $this->pass->process($this->container);
+
+        $this->assertTrue($this->container->hasDefinition('extension1'));
+        $this->assertFalse($this->container->hasDefinition('extension2'));
+        $this->assertFalse($this->container->hasDefinition('extension3'));
+        $this->assertTrue($this->container->hasDefinition('extension4'));
+    }
+}
+
+class DummyExtension extends Extension
+{
+    private $alias;
+
+    public function __construct($alias)
+    {
+        $this->alias = $alias;
+    }
+
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
+    public function load(array $configs, ContainerBuilder $container)
+    {
+    }
+
+    public function process(ContainerBuilder $container)
+    {
+        $container->register($this->alias);
+    }
+}
+
+class CompilerPassExtension extends DummyExtension implements CompilerPassInterface
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/FactoryReturnTypePassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/FactoryReturnTypePassTest.php
new file mode 100644
index 000000000..87f07c700
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/FactoryReturnTypePassTest.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\FactoryReturnTypePass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\factoryFunction;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryParent;
+
+/**
+ * @author Guilhem N. <egetick@gmail.com>
+ *
+ * @group legacy
+ */
+class FactoryReturnTypePassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $factory = $container->register('factory');
+        $factory->setFactory([FactoryDummy::class, 'createFactory']);
+
+        $container->setAlias('alias_factory', 'factory');
+
+        $foo = $container->register('foo');
+        $foo->setFactory([new Reference('alias_factory'), 'create']);
+
+        $bar = $container->register('bar', __CLASS__);
+        $bar->setFactory([new Reference('factory'), 'create']);
+
+        $pass = new FactoryReturnTypePass();
+        $pass->process($container);
+
+        if (method_exists(\ReflectionMethod::class, 'getReturnType')) {
+            $this->assertEquals(FactoryDummy::class, $factory->getClass());
+            $this->assertEquals(\stdClass::class, $foo->getClass());
+        } else {
+            $this->assertNull($factory->getClass());
+            $this->assertNull($foo->getClass());
+        }
+        $this->assertEquals(__CLASS__, $bar->getClass());
+    }
+
+    /**
+     * @dataProvider returnTypesProvider
+     */
+    public function testReturnTypes($factory, $returnType, $hhvmSupport = true)
+    {
+        if (!$hhvmSupport && \defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Scalar typehints not supported by hhvm.');
+        }
+
+        $container = new ContainerBuilder();
+
+        $service = $container->register('service');
+        $service->setFactory($factory);
+
+        $pass = new FactoryReturnTypePass();
+        $pass->process($container);
+
+        if (method_exists(\ReflectionMethod::class, 'getReturnType')) {
+            $this->assertEquals($returnType, $service->getClass());
+        } else {
+            $this->assertNull($service->getClass());
+        }
+    }
+
+    public function returnTypesProvider()
+    {
+        return [
+            // must be loaded before the function as they are in the same file
+            [[FactoryDummy::class, 'createBuiltin'], null, false],
+            [[FactoryDummy::class, 'createParent'], FactoryParent::class],
+            [[FactoryDummy::class, 'createSelf'], FactoryDummy::class],
+            [factoryFunction::class, FactoryDummy::class],
+        ];
+    }
+
+    public function testCircularReference()
+    {
+        $container = new ContainerBuilder();
+
+        $factory = $container->register('factory');
+        $factory->setFactory([new Reference('factory2'), 'createSelf']);
+
+        $factory2 = $container->register('factory2');
+        $factory2->setFactory([new Reference('factory'), 'create']);
+
+        $pass = new FactoryReturnTypePass();
+        $pass->process($container);
+
+        $this->assertNull($factory->getClass());
+        $this->assertNull($factory2->getClass());
+    }
+
+    /**
+     * @requires function ReflectionMethod::getReturnType
+     * @expectedDeprecation Relying on its factory's return-type to define the class of service "factory" is deprecated since Symfony 3.3 and won't work in 4.0. Set the "class" attribute to "Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryDummy" on the service definition instead.
+     */
+    public function testCompile()
+    {
+        $container = new ContainerBuilder();
+
+        $factory = $container->register('factory');
+        $factory->setFactory([FactoryDummy::class, 'createFactory']);
+        $container->compile();
+
+        $this->assertEquals(FactoryDummy::class, $container->getDefinition('factory')->getClass());
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/InlineServiceDefinitionsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
new file mode 100644
index 000000000..d98db6406
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
@@ -0,0 +1,358 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
+use Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class InlineServiceDefinitionsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('inlinable.service')
+            ->setPublic(false)
+        ;
+
+        $container
+            ->register('service')
+            ->setArguments([new Reference('inlinable.service')])
+        ;
+
+        $this->process($container);
+
+        $arguments = $container->getDefinition('service')->getArguments();
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $arguments[0]);
+        $this->assertSame($container->getDefinition('inlinable.service'), $arguments[0]);
+    }
+
+    public function testProcessDoesNotInlinesWhenAliasedServiceIsShared()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(false)
+        ;
+        $container->setAlias('moo', 'foo');
+
+        $container
+            ->register('service')
+            ->setArguments([$ref = new Reference('foo')])
+        ;
+
+        $this->process($container);
+
+        $arguments = $container->getDefinition('service')->getArguments();
+        $this->assertSame($ref, $arguments[0]);
+    }
+
+    public function testProcessDoesInlineNonSharedService()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setShared(false)
+        ;
+        $container
+            ->register('bar')
+            ->setPublic(false)
+            ->setShared(false)
+        ;
+        $container->setAlias('moo', 'bar');
+
+        $container
+            ->register('service')
+            ->setArguments([new Reference('foo'), $ref = new Reference('moo'), new Reference('bar')])
+        ;
+
+        $this->process($container);
+
+        $arguments = $container->getDefinition('service')->getArguments();
+        $this->assertEquals($container->getDefinition('foo'), $arguments[0]);
+        $this->assertNotSame($container->getDefinition('foo'), $arguments[0]);
+        $this->assertSame($ref, $arguments[1]);
+        $this->assertEquals($container->getDefinition('bar'), $arguments[2]);
+        $this->assertNotSame($container->getDefinition('bar'), $arguments[2]);
+    }
+
+    public function testProcessDoesNotInlineMixedServicesLoop()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->addArgument(new Reference('bar'))
+            ->setShared(false)
+        ;
+        $container
+            ->register('bar')
+            ->setPublic(false)
+            ->addMethodCall('setFoo', [new Reference('foo')])
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals(new Reference('bar'), $container->getDefinition('foo')->getArgument(0));
+    }
+
+    public function testProcessThrowsOnNonSharedLoops()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $this->expectExceptionMessage('Circular reference detected for service "bar", path: "bar -> foo -> bar".');
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->addArgument(new Reference('bar'))
+            ->setShared(false)
+        ;
+        $container
+            ->register('bar')
+            ->setShared(false)
+            ->addMethodCall('setFoo', [new Reference('foo')])
+        ;
+
+        $this->process($container);
+    }
+
+    public function testProcessNestedNonSharedServices()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->addArgument(new Reference('bar1'))
+            ->addArgument(new Reference('bar2'))
+        ;
+        $container
+            ->register('bar1')
+            ->setShared(false)
+            ->addArgument(new Reference('baz'))
+        ;
+        $container
+            ->register('bar2')
+            ->setShared(false)
+            ->addArgument(new Reference('baz'))
+        ;
+        $container
+            ->register('baz')
+            ->setShared(false)
+        ;
+
+        $this->process($container);
+
+        $baz1 = $container->getDefinition('foo')->getArgument(0)->getArgument(0);
+        $baz2 = $container->getDefinition('foo')->getArgument(1)->getArgument(0);
+
+        $this->assertEquals($container->getDefinition('baz'), $baz1);
+        $this->assertEquals($container->getDefinition('baz'), $baz2);
+        $this->assertNotSame($baz1, $baz2);
+    }
+
+    public function testProcessInlinesIfMultipleReferencesButAllFromTheSameDefinition()
+    {
+        $container = new ContainerBuilder();
+
+        $a = $container->register('a')->setPublic(false);
+        $b = $container
+            ->register('b')
+            ->addArgument(new Reference('a'))
+            ->addArgument(new Definition(null, [new Reference('a')]))
+        ;
+
+        $this->process($container);
+
+        $arguments = $b->getArguments();
+        $this->assertSame($a, $arguments[0]);
+
+        $inlinedArguments = $arguments[1]->getArguments();
+        $this->assertSame($a, $inlinedArguments[0]);
+    }
+
+    public function testProcessInlinesPrivateFactoryReference()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('a')->setPublic(false);
+        $b = $container
+            ->register('b')
+            ->setPublic(false)
+            ->setFactory([new Reference('a'), 'a'])
+        ;
+
+        $container
+            ->register('foo')
+            ->setArguments([
+                $ref = new Reference('b'),
+            ]);
+
+        $this->process($container);
+
+        $inlinedArguments = $container->getDefinition('foo')->getArguments();
+        $this->assertSame($b, $inlinedArguments[0]);
+    }
+
+    public function testProcessDoesNotInlinePrivateFactoryIfReferencedMultipleTimesWithinTheSameDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('a')
+        ;
+        $container
+            ->register('b')
+            ->setPublic(false)
+            ->setFactory([new Reference('a'), 'a'])
+        ;
+
+        $container
+            ->register('foo')
+            ->setArguments([
+                    $ref1 = new Reference('b'),
+                    $ref2 = new Reference('b'),
+                ])
+        ;
+        $this->process($container);
+
+        $args = $container->getDefinition('foo')->getArguments();
+        $this->assertSame($ref1, $args[0]);
+        $this->assertSame($ref2, $args[1]);
+    }
+
+    public function testProcessDoesNotInlineReferenceWhenUsedByInlineFactory()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('a')
+        ;
+        $container
+            ->register('b')
+            ->setPublic(false)
+            ->setFactory([new Reference('a'), 'a'])
+        ;
+
+        $inlineFactory = new Definition();
+        $inlineFactory->setPublic(false);
+        $inlineFactory->setFactory([new Reference('b'), 'b']);
+
+        $container
+            ->register('foo')
+            ->setArguments([
+                    $ref = new Reference('b'),
+                    $inlineFactory,
+                ])
+        ;
+        $this->process($container);
+
+        $args = $container->getDefinition('foo')->getArguments();
+        $this->assertSame($ref, $args[0]);
+    }
+
+    public function testProcessDoesNotInlineWhenServiceIsPrivateButLazy()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(false)
+            ->setLazy(true)
+        ;
+
+        $container
+            ->register('service')
+            ->setArguments([$ref = new Reference('foo')])
+        ;
+
+        $this->process($container);
+
+        $arguments = $container->getDefinition('service')->getArguments();
+        $this->assertSame($ref, $arguments[0]);
+    }
+
+    public function testProcessDoesNotInlineWhenServiceReferencesItself()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(false)
+            ->addMethodCall('foo', [$ref = new Reference('foo')])
+        ;
+
+        $this->process($container);
+
+        $calls = $container->getDefinition('foo')->getMethodCalls();
+        $this->assertSame($ref, $calls[0][1][0]);
+    }
+
+    public function testProcessDoesNotSetLazyArgumentValuesAfterInlining()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('inline')
+            ->setShared(false)
+        ;
+        $container
+            ->register('service-closure')
+            ->setArguments([new ServiceClosureArgument(new Reference('inline'))])
+        ;
+        $container
+            ->register('iterator')
+            ->setArguments([new IteratorArgument([new Reference('inline')])])
+        ;
+
+        $this->process($container);
+
+        $values = $container->getDefinition('service-closure')->getArgument(0)->getValues();
+        $this->assertInstanceOf(Reference::class, $values[0]);
+        $this->assertSame('inline', (string) $values[0]);
+
+        $values = $container->getDefinition('iterator')->getArgument(0)->getValues();
+        $this->assertInstanceOf(Reference::class, $values[0]);
+        $this->assertSame('inline', (string) $values[0]);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetInlinedServiceIdData()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('inlinable.service')
+            ->setPublic(false)
+        ;
+        $container
+            ->register('non_inlinable.service')
+            ->setPublic(true)
+        ;
+
+        $container
+            ->register('other_service')
+            ->setArguments([new Reference('inlinable.service')])
+        ;
+
+        $inlinePass = new InlineServiceDefinitionsPass();
+        $repeatedPass = new RepeatedPass([new AnalyzeServiceReferencesPass(), $inlinePass]);
+        $repeatedPass->process($container);
+
+        $this->assertEquals(['inlinable.service' => ['other_service']], $inlinePass->getInlinedServiceIds());
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $repeatedPass = new RepeatedPass([new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()]);
+        $repeatedPass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/IntegrationTest.php b/lib/symfony/dependency-injection/Tests/Compiler/IntegrationTest.php
new file mode 100644
index 000000000..348d1d7f5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/IntegrationTest.php
@@ -0,0 +1,252 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+
+/**
+ * This class tests the integration of the different compiler passes.
+ */
+class IntegrationTest extends TestCase
+{
+    /**
+     * This tests that dependencies are correctly processed.
+     *
+     * We're checking that:
+     *
+     *   * A is public, B/C are private
+     *   * A -> C
+     *   * B -> C
+     */
+    public function testProcessRemovesAndInlinesRecursively()
+    {
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+
+        $a = $container
+            ->register('a', '\stdClass')
+            ->addArgument(new Reference('c'))
+        ;
+
+        $container
+            ->register('b', '\stdClass')
+            ->addArgument(new Reference('c'))
+            ->setPublic(false)
+        ;
+
+        $c = $container
+            ->register('c', '\stdClass')
+            ->setPublic(false)
+        ;
+
+        $container->compile();
+
+        $this->assertTrue($container->hasDefinition('a'));
+        $arguments = $a->getArguments();
+        $this->assertSame($c, $arguments[0]);
+        $this->assertFalse($container->hasDefinition('b'));
+        $this->assertFalse($container->hasDefinition('c'));
+    }
+
+    public function testProcessInlinesReferencesToAliases()
+    {
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+
+        $a = $container
+            ->register('a', '\stdClass')
+            ->addArgument(new Reference('b'))
+        ;
+
+        $container->setAlias('b', new Alias('c', false));
+
+        $c = $container
+            ->register('c', '\stdClass')
+            ->setPublic(false)
+        ;
+
+        $container->compile();
+
+        $this->assertTrue($container->hasDefinition('a'));
+        $arguments = $a->getArguments();
+        $this->assertSame($c, $arguments[0]);
+        $this->assertFalse($container->hasAlias('b'));
+        $this->assertFalse($container->hasDefinition('c'));
+    }
+
+    public function testProcessInlinesWhenThereAreMultipleReferencesButFromTheSameDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+
+        $container
+            ->register('a', '\stdClass')
+            ->addArgument(new Reference('b'))
+            ->addMethodCall('setC', [new Reference('c')])
+        ;
+
+        $container
+            ->register('b', '\stdClass')
+            ->addArgument(new Reference('c'))
+            ->setPublic(false)
+        ;
+
+        $container
+            ->register('c', '\stdClass')
+            ->setPublic(false)
+        ;
+
+        $container->compile();
+
+        $this->assertTrue($container->hasDefinition('a'));
+        $this->assertFalse($container->hasDefinition('b'));
+        $this->assertFalse($container->hasDefinition('c'), 'Service C was not inlined.');
+    }
+
+    public function testCanDecorateServiceSubscriber()
+    {
+        $container = new ContainerBuilder();
+        $container->register(ServiceSubscriberStub::class)
+            ->addTag('container.service_subscriber')
+            ->setPublic(true);
+
+        $container->register(DecoratedServiceSubscriber::class)
+            ->setDecoratedService(ServiceSubscriberStub::class);
+
+        $container->compile();
+
+        $this->assertInstanceOf(DecoratedServiceSubscriber::class, $container->get(ServiceSubscriberStub::class));
+    }
+
+    /**
+     * @dataProvider getYamlCompileTests
+     */
+    public function testYamlContainerCompiles($directory, $actualServiceId, $expectedServiceId, ContainerBuilder $mainContainer = null)
+    {
+        // allow a container to be passed in, which might have autoconfigure settings
+        $container = $mainContainer ?: new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Fixtures/yaml/integration/'.$directory));
+        $loader->load('main.yml');
+        $container->compile();
+        $actualService = $container->getDefinition($actualServiceId);
+
+        // create a fresh ContainerBuilder, to avoid autoconfigure stuff
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Fixtures/yaml/integration/'.$directory));
+        $loader->load('expected.yml');
+        $container->compile();
+        $expectedService = $container->getDefinition($expectedServiceId);
+
+        // reset changes, we don't care if these differ
+        $actualService->setChanges([]);
+        $expectedService->setChanges([]);
+
+        $this->assertEquals($expectedService, $actualService);
+    }
+
+    public function getYamlCompileTests()
+    {
+        $container = new ContainerBuilder();
+        $container->registerForAutoconfiguration(IntegrationTestStub::class);
+        yield [
+            'autoconfigure_child_not_applied',
+            'child_service',
+            'child_service_expected',
+            $container,
+        ];
+
+        $container = new ContainerBuilder();
+        $container->registerForAutoconfiguration(IntegrationTestStub::class);
+        yield [
+            'autoconfigure_parent_child',
+            'child_service',
+            'child_service_expected',
+            $container,
+        ];
+
+        $container = new ContainerBuilder();
+        $container->registerForAutoconfiguration(IntegrationTestStub::class)
+            ->addTag('from_autoconfigure');
+        yield [
+            'autoconfigure_parent_child_tags',
+            'child_service',
+            'child_service_expected',
+            $container,
+        ];
+
+        yield [
+            'child_parent',
+            'child_service',
+            'child_service_expected',
+        ];
+
+        yield [
+            'defaults_child_tags',
+            'child_service',
+            'child_service_expected',
+        ];
+
+        yield [
+            'defaults_instanceof_importance',
+            'main_service',
+            'main_service_expected',
+        ];
+
+        yield [
+            'defaults_parent_child',
+            'child_service',
+            'child_service_expected',
+        ];
+
+        yield [
+            'instanceof_parent_child',
+            'child_service',
+            'child_service_expected',
+        ];
+    }
+}
+
+class ServiceSubscriberStub implements ServiceSubscriberInterface
+{
+    public static function getSubscribedServices()
+    {
+        return [];
+    }
+}
+
+class DecoratedServiceSubscriber
+{
+}
+
+class IntegrationTestStub extends IntegrationTestStubParent
+{
+}
+
+class IntegrationTestStubParent
+{
+    public function enableSummer($enable)
+    {
+        // methods used in calls - added here to prevent errors for not existing
+    }
+
+    public function setSunshine($type)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/MergeExtensionConfigurationPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
new file mode 100644
index 000000000..13692657b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
@@ -0,0 +1,197 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\DependencyInjection\Compiler\MergeExtensionConfigurationContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\MergeExtensionConfigurationPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+class MergeExtensionConfigurationPassTest extends TestCase
+{
+    public function testExpressionLanguageProviderForwarding()
+    {
+        $tmpProviders = [];
+
+        $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface')->getMock();
+        $extension->expects($this->any())
+            ->method('getXsdValidationBasePath')
+            ->willReturn(false);
+        $extension->expects($this->any())
+            ->method('getNamespace')
+            ->willReturn('http://example.org/schema/dic/foo');
+        $extension->expects($this->any())
+            ->method('getAlias')
+            ->willReturn('foo');
+        $extension->expects($this->once())
+            ->method('load')
+            ->willReturnCallback(function (array $config, ContainerBuilder $container) use (&$tmpProviders) {
+                $tmpProviders = $container->getExpressionLanguageProviders();
+            });
+
+        $provider = $this->getMockBuilder('Symfony\\Component\\ExpressionLanguage\\ExpressionFunctionProviderInterface')->getMock();
+        $container = new ContainerBuilder(new ParameterBag());
+        $container->registerExtension($extension);
+        $container->prependExtensionConfig('foo', ['bar' => true]);
+        $container->addExpressionLanguageProvider($provider);
+
+        $pass = new MergeExtensionConfigurationPass();
+        $pass->process($container);
+
+        $this->assertEquals([$provider], $tmpProviders);
+    }
+
+    public function testExtensionLoadGetAMergeExtensionConfigurationContainerBuilderInstance()
+    {
+        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(['load'])->getMock();
+        $extension->expects($this->once())
+            ->method('load')
+            ->with($this->isType('array'), $this->isInstanceOf(MergeExtensionConfigurationContainerBuilder::class))
+        ;
+
+        $container = new ContainerBuilder(new ParameterBag());
+        $container->registerExtension($extension);
+        $container->prependExtensionConfig('foo', []);
+
+        $pass = new MergeExtensionConfigurationPass();
+        $pass->process($container);
+    }
+
+    public function testExtensionConfigurationIsTrackedByDefault()
+    {
+        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(['getConfiguration'])->getMock();
+        $extension->expects($this->exactly(2))
+            ->method('getConfiguration')
+            ->willReturn(new FooConfiguration());
+
+        $container = new ContainerBuilder(new ParameterBag());
+        $container->registerExtension($extension);
+        $container->prependExtensionConfig('foo', ['bar' => true]);
+
+        $pass = new MergeExtensionConfigurationPass();
+        $pass->process($container);
+
+        $this->assertContainsEquals(new FileResource(__FILE__), $container->getResources());
+    }
+
+    public function testOverriddenEnvsAreMerged()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new FooExtension());
+        $container->prependExtensionConfig('foo', ['bar' => '%env(FOO)%']);
+        $container->prependExtensionConfig('foo', ['bar' => '%env(BAR)%', 'baz' => '%env(BAZ)%']);
+
+        $pass = new MergeExtensionConfigurationPass();
+        $pass->process($container);
+
+        $this->assertSame(['BAZ', 'FOO'], array_keys($container->getParameterBag()->getEnvPlaceholders()));
+        $this->assertSame(['BAZ' => 1, 'FOO' => 0], $container->getEnvCounters());
+    }
+
+    public function testProcessedEnvsAreIncompatibleWithResolve()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Using a cast in "env(int:FOO)" is incompatible with resolution at compile time in "Symfony\Component\DependencyInjection\Tests\Compiler\BarExtension". The logic in the extension should be moved to a compiler pass, or an env parameter with no cast should be used instead.');
+        $container = new ContainerBuilder();
+        $container->registerExtension(new BarExtension());
+        $container->prependExtensionConfig('bar', []);
+
+        (new MergeExtensionConfigurationPass())->process($container);
+    }
+
+    public function testThrowingExtensionsGetMergedBag()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new ThrowingExtension());
+        $container->prependExtensionConfig('throwing', ['bar' => '%env(FOO)%']);
+
+        try {
+            $pass = new MergeExtensionConfigurationPass();
+            $pass->process($container);
+            $this->fail('An exception should have been thrown.');
+        } catch (\Exception $e) {
+        }
+
+        $this->assertSame(['FOO'], array_keys($container->getParameterBag()->getEnvPlaceholders()));
+    }
+}
+
+class FooConfiguration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('foo');
+        $rootNode
+            ->children()
+                ->scalarNode('bar')->end()
+                ->scalarNode('baz')->end()
+            ->end();
+
+        return $treeBuilder;
+    }
+}
+
+class FooExtension extends Extension
+{
+    public function getAlias()
+    {
+        return 'foo';
+    }
+
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new FooConfiguration();
+    }
+
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = $this->getConfiguration($configs, $container);
+        $config = $this->processConfiguration($configuration, $configs);
+
+        if (isset($config['baz'])) {
+            $container->getParameterBag()->get('env(BOZ)');
+            $container->resolveEnvPlaceholders($config['baz']);
+        }
+    }
+}
+
+class BarExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $container->resolveEnvPlaceholders('%env(int:FOO)%', true);
+    }
+}
+
+class ThrowingExtension extends Extension
+{
+    public function getAlias()
+    {
+        return 'throwing';
+    }
+
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new FooConfiguration();
+    }
+
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        throw new \Exception();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/OptionalServiceClass.php b/lib/symfony/dependency-injection/Tests/Compiler/OptionalServiceClass.php
new file mode 100644
index 000000000..7e9238f22
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/OptionalServiceClass.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use Symfony\Bug\NotExistClass;
+
+class OptionalServiceClass extends NotExistClass
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/PassConfigTest.php b/lib/symfony/dependency-injection/Tests/Compiler/PassConfigTest.php
new file mode 100644
index 000000000..9470e526f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/PassConfigTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+
+/**
+ * @author Guilhem N <egetick@gmail.com>
+ */
+class PassConfigTest extends TestCase
+{
+    public function testPassOrdering()
+    {
+        $config = new PassConfig();
+        $config->setBeforeOptimizationPasses([]);
+
+        $pass1 = $this->getMockBuilder(CompilerPassInterface::class)->getMock();
+        $config->addPass($pass1, PassConfig::TYPE_BEFORE_OPTIMIZATION, 10);
+
+        $pass2 = $this->getMockBuilder(CompilerPassInterface::class)->getMock();
+        $config->addPass($pass2, PassConfig::TYPE_BEFORE_OPTIMIZATION, 30);
+
+        $passes = $config->getBeforeOptimizationPasses();
+        $this->assertSame($pass2, $passes[0]);
+        $this->assertSame($pass1, $passes[1]);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/PriorityTaggedServiceTraitTest.php b/lib/symfony/dependency-injection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
new file mode 100644
index 000000000..57682b5da
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class PriorityTaggedServiceTraitTest extends TestCase
+{
+    public function testThatCacheWarmersAreProcessedInPriorityOrder()
+    {
+        $services = [
+            'my_service1' => ['my_custom_tag' => ['priority' => 100]],
+            'my_service2' => ['my_custom_tag' => ['priority' => 200]],
+            'my_service3' => ['my_custom_tag' => ['priority' => -501]],
+            'my_service4' => ['my_custom_tag' => []],
+            'my_service5' => ['my_custom_tag' => ['priority' => -1]],
+            'my_service6' => ['my_custom_tag' => ['priority' => -500]],
+            'my_service7' => ['my_custom_tag' => ['priority' => -499]],
+            'my_service8' => ['my_custom_tag' => ['priority' => 1]],
+            'my_service9' => ['my_custom_tag' => ['priority' => -2]],
+            'my_service10' => ['my_custom_tag' => ['priority' => -1000]],
+            'my_service11' => ['my_custom_tag' => ['priority' => -1001]],
+            'my_service12' => ['my_custom_tag' => ['priority' => -1002]],
+            'my_service13' => ['my_custom_tag' => ['priority' => -1003]],
+            'my_service14' => ['my_custom_tag' => ['priority' => -1000]],
+            'my_service15' => ['my_custom_tag' => ['priority' => 1]],
+            'my_service16' => ['my_custom_tag' => ['priority' => -1]],
+            'my_service17' => ['my_custom_tag' => ['priority' => 200]],
+            'my_service18' => ['my_custom_tag' => ['priority' => 100]],
+            'my_service19' => ['my_custom_tag' => []],
+        ];
+
+        $container = new ContainerBuilder();
+
+        foreach ($services as $id => $tags) {
+            $definition = $container->register($id);
+
+            foreach ($tags as $name => $attributes) {
+                $definition->addTag($name, $attributes);
+            }
+        }
+
+        $expected = [
+            new Reference('my_service2'),
+            new Reference('my_service17'),
+            new Reference('my_service1'),
+            new Reference('my_service18'),
+            new Reference('my_service8'),
+            new Reference('my_service15'),
+            new Reference('my_service4'),
+            new Reference('my_service19'),
+            new Reference('my_service5'),
+            new Reference('my_service16'),
+            new Reference('my_service9'),
+            new Reference('my_service7'),
+            new Reference('my_service6'),
+            new Reference('my_service3'),
+            new Reference('my_service10'),
+            new Reference('my_service14'),
+            new Reference('my_service11'),
+            new Reference('my_service12'),
+            new Reference('my_service13'),
+        ];
+
+        $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation();
+
+        $this->assertEquals($expected, $priorityTaggedServiceTraitImplementation->test('my_custom_tag', $container));
+    }
+}
+
+class PriorityTaggedServiceTraitImplementation
+{
+    use PriorityTaggedServiceTrait;
+
+    public function test($tagName, ContainerBuilder $container)
+    {
+        return $this->findAndSortTaggedServices($tagName, $container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
new file mode 100644
index 000000000..2c42ba0ce
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\RegisterEnvVarProcessorsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
+
+class RegisterEnvVarProcessorsPassTest extends TestCase
+{
+    public function testSimpleProcessor()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', SimpleProcessor::class)->addTag('container.env_var_processor');
+
+        (new RegisterEnvVarProcessorsPass())->process($container);
+
+        $this->assertTrue($container->has('container.env_var_processors_locator'));
+        $this->assertInstanceOf(SimpleProcessor::class, $container->get('container.env_var_processors_locator')->get('foo'));
+
+        $expected = [
+            'foo' => ['string'],
+            'base64' => ['string'],
+            'bool' => ['bool'],
+            'const' => ['bool', 'int', 'float', 'string', 'array'],
+            'file' => ['string'],
+            'float' => ['float'],
+            'int' => ['int'],
+            'json' => ['array'],
+            'resolve' => ['string'],
+            'string' => ['string'],
+        ];
+
+        $this->assertSame($expected, $container->getParameterBag()->getProvidedTypes());
+    }
+
+    public function testNoProcessor()
+    {
+        $container = new ContainerBuilder();
+
+        (new RegisterEnvVarProcessorsPass())->process($container);
+
+        $this->assertFalse($container->has('container.env_var_processors_locator'));
+    }
+
+    public function testBadProcessor()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid type "foo" returned by "Symfony\Component\DependencyInjection\Tests\Compiler\BadProcessor::getProvidedTypes()", expected one of "array", "bool", "float", "int", "string".');
+        $container = new ContainerBuilder();
+        $container->register('foo', BadProcessor::class)->addTag('container.env_var_processor');
+
+        (new RegisterEnvVarProcessorsPass())->process($container);
+    }
+}
+
+class SimpleProcessor implements EnvVarProcessorInterface
+{
+    public function getEnv($prefix, $name, \Closure $getEnv)
+    {
+        return $getEnv($name);
+    }
+
+    public static function getProvidedTypes()
+    {
+        return ['foo' => 'string'];
+    }
+}
+
+class BadProcessor extends SimpleProcessor
+{
+    public static function getProvidedTypes()
+    {
+        return ['foo' => 'string|foo'];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
new file mode 100644
index 000000000..a16bfc169
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Compiler\RegisterServiceSubscribersPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveServiceSubscribersPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber;
+use Symfony\Component\DependencyInjection\TypedReference;
+
+require_once __DIR__.'/../Fixtures/includes/classes.php';
+
+class RegisterServiceSubscribersPassTest extends TestCase
+{
+    public function testInvalidClass()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Service "foo" must implement interface "Symfony\Component\DependencyInjection\ServiceSubscriberInterface".');
+        $container = new ContainerBuilder();
+
+        $container->register('foo', CustomDefinition::class)
+            ->addTag('container.service_subscriber')
+        ;
+
+        (new RegisterServiceSubscribersPass())->process($container);
+        (new ResolveServiceSubscribersPass())->process($container);
+    }
+
+    public function testInvalidAttributes()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The "container.service_subscriber" tag accepts only the "key" and "id" attributes, "bar" given for service "foo".');
+        $container = new ContainerBuilder();
+
+        $container->register('foo', TestServiceSubscriber::class)
+            ->addTag('container.service_subscriber', ['bar' => '123'])
+        ;
+
+        (new RegisterServiceSubscribersPass())->process($container);
+        (new ResolveServiceSubscribersPass())->process($container);
+    }
+
+    public function testNoAttributes()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', TestServiceSubscriber::class)
+            ->addArgument(new Reference(PsrContainerInterface::class))
+            ->addTag('container.service_subscriber')
+        ;
+
+        (new RegisterServiceSubscribersPass())->process($container);
+        (new ResolveServiceSubscribersPass())->process($container);
+
+        $foo = $container->getDefinition('foo');
+        $locator = $container->getDefinition((string) $foo->getArgument(0));
+
+        $this->assertFalse($locator->isPublic());
+        $this->assertSame(ServiceLocator::class, $locator->getClass());
+
+        $expected = [
+            TestServiceSubscriber::class => new ServiceClosureArgument(new TypedReference(TestServiceSubscriber::class, TestServiceSubscriber::class, TestServiceSubscriber::class)),
+            CustomDefinition::class => new ServiceClosureArgument(new TypedReference(CustomDefinition::class, CustomDefinition::class, TestServiceSubscriber::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
+            'bar' => new ServiceClosureArgument(new TypedReference(CustomDefinition::class, CustomDefinition::class, TestServiceSubscriber::class)),
+            'baz' => new ServiceClosureArgument(new TypedReference(CustomDefinition::class, CustomDefinition::class, TestServiceSubscriber::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
+        ];
+
+        $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
+    }
+
+    public function testWithAttributes()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', TestServiceSubscriber::class)
+            ->setAutowired(true)
+            ->addArgument(new Reference(PsrContainerInterface::class))
+            ->addTag('container.service_subscriber', ['key' => 'bar', 'id' => 'bar'])
+            ->addTag('container.service_subscriber', ['key' => 'bar', 'id' => 'baz']) // should be ignored: the first wins
+        ;
+
+        (new RegisterServiceSubscribersPass())->process($container);
+        (new ResolveServiceSubscribersPass())->process($container);
+
+        $foo = $container->getDefinition('foo');
+        $locator = $container->getDefinition((string) $foo->getArgument(0));
+
+        $this->assertFalse($locator->isPublic());
+        $this->assertSame(ServiceLocator::class, $locator->getClass());
+
+        $expected = [
+            TestServiceSubscriber::class => new ServiceClosureArgument(new TypedReference(TestServiceSubscriber::class, TestServiceSubscriber::class, TestServiceSubscriber::class)),
+            CustomDefinition::class => new ServiceClosureArgument(new TypedReference(CustomDefinition::class, CustomDefinition::class, TestServiceSubscriber::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
+            'bar' => new ServiceClosureArgument(new TypedReference('bar', CustomDefinition::class, TestServiceSubscriber::class)),
+            'baz' => new ServiceClosureArgument(new TypedReference(CustomDefinition::class, CustomDefinition::class, TestServiceSubscriber::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
+        ];
+
+        $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
+    }
+
+    public function testExtraServiceSubscriber()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Service key "test" does not exist in the map returned by "Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber::getSubscribedServices()" for service "foo_service".');
+        $container = new ContainerBuilder();
+        $container->register('foo_service', TestServiceSubscriber::class)
+            ->setAutowired(true)
+            ->addArgument(new Reference(PsrContainerInterface::class))
+            ->addTag('container.service_subscriber', [
+                'key' => 'test',
+                'id' => TestServiceSubscriber::class,
+            ])
+        ;
+        $container->register(TestServiceSubscriber::class, TestServiceSubscriber::class);
+        $container->compile();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
new file mode 100644
index 000000000..1dfdd9dde
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
@@ -0,0 +1,137 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
+use Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class RemoveUnusedDefinitionsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(false)
+        ;
+        $container
+            ->register('bar')
+            ->setPublic(false)
+        ;
+        $container
+            ->register('moo')
+            ->setArguments([new Reference('bar')])
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->hasDefinition('foo'));
+        $this->assertTrue($container->hasDefinition('bar'));
+        $this->assertTrue($container->hasDefinition('moo'));
+    }
+
+    public function testProcessRemovesUnusedDefinitionsRecursively()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(false)
+        ;
+        $container
+            ->register('bar')
+            ->setArguments([new Reference('foo')])
+            ->setPublic(false)
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->hasDefinition('foo'));
+        $this->assertFalse($container->hasDefinition('bar'));
+    }
+
+    public function testProcessWorksWithInlinedDefinitions()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(false)
+        ;
+        $container
+            ->register('bar')
+            ->setArguments([new Definition(null, [new Reference('foo')])])
+        ;
+
+        $this->process($container);
+
+        $this->assertTrue($container->hasDefinition('foo'));
+        $this->assertTrue($container->hasDefinition('bar'));
+    }
+
+    public function testProcessWontRemovePrivateFactory()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('foo', 'stdClass')
+            ->setFactory(['stdClass', 'getInstance'])
+            ->setPublic(false);
+
+        $container
+            ->register('bar', 'stdClass')
+            ->setFactory([new Reference('foo'), 'getInstance'])
+            ->setPublic(false);
+
+        $container
+            ->register('foobar')
+            ->addArgument(new Reference('bar'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->hasDefinition('foo'));
+        $this->assertTrue($container->hasDefinition('bar'));
+        $this->assertTrue($container->hasDefinition('foobar'));
+    }
+
+    public function testProcessConsiderEnvVariablesAsUsedEvenInPrivateServices()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(FOOBAR)', 'test');
+        $container
+            ->register('foo')
+            ->setArguments(['%env(FOOBAR)%'])
+            ->setPublic(false)
+        ;
+
+        $resolvePass = new ResolveParameterPlaceHoldersPass();
+        $resolvePass->process($container);
+
+        $this->process($container);
+
+        $this->assertFalse($container->hasDefinition('foo'));
+
+        $envCounters = $container->getEnvCounters();
+        $this->assertArrayHasKey('FOOBAR', $envCounters);
+        $this->assertSame(1, $envCounters['FOOBAR']);
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $repeatedPass = new RepeatedPass([new AnalyzeServiceReferencesPass(), new RemoveUnusedDefinitionsPass()]);
+        $repeatedPass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
new file mode 100644
index 000000000..2f0a413ca
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+require_once __DIR__.'/../Fixtures/includes/foo.php';
+
+class ReplaceAliasByActualDefinitionPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $aDefinition = $container->register('a', '\stdClass');
+        $aDefinition->setFactory([new Reference('b'), 'createA']);
+
+        $bDefinition = new Definition('\stdClass');
+        $bDefinition->setPublic(false);
+        $container->setDefinition('b', $bDefinition);
+
+        $container->setAlias('a_alias', 'a');
+        $container->setAlias('b_alias', 'b');
+
+        $container->setAlias('container', 'service_container');
+
+        $this->process($container);
+
+        $this->assertTrue($container->has('a'), '->process() does nothing to public definitions.');
+        $this->assertTrue($container->hasAlias('a_alias'));
+        $this->assertFalse($container->has('b'), '->process() removes non-public definitions.');
+        $this->assertTrue(
+            $container->has('b_alias') && !$container->hasAlias('b_alias'),
+            '->process() replaces alias to actual.'
+        );
+
+        $this->assertTrue($container->has('container'));
+
+        $resolvedFactory = $aDefinition->getFactory();
+        $this->assertSame('b_alias', (string) $resolvedFactory[0]);
+    }
+
+    public function testProcessWithInvalidAlias()
+    {
+        $this->expectException('InvalidArgumentException');
+        $container = new ContainerBuilder();
+        $container->setAlias('a_alias', 'a');
+        $this->process($container);
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new ReplaceAliasByActualDefinitionPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
new file mode 100644
index 000000000..bfd3d6723
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -0,0 +1,152 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
+use Symfony\Component\DependencyInjection\Compiler\DefinitionErrorExceptionPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
+use Symfony\Component\DependencyInjection\TypedReference;
+
+require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
+
+class ResolveBindingsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $bindings = [CaseSensitiveClass::class => new BoundArgument(new Reference('foo'))];
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->setArguments([1 => '123']);
+        $definition->addMethodCall('setSensitiveClass');
+        $definition->setBindings($bindings);
+
+        $container->register('foo', CaseSensitiveClass::class)
+            ->setBindings($bindings);
+
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+
+        $this->assertEquals([new Reference('foo'), '123'], $definition->getArguments());
+        $this->assertEquals([['setSensitiveClass', [new Reference('foo')]]], $definition->getMethodCalls());
+    }
+
+    public function testUnusedBinding()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Unused binding "$quz" in service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy".');
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->setBindings(['$quz' => '123']);
+
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+    }
+
+    public function testMissingParent()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Unused binding "\$quz" in service [\s\S]+/');
+
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(ParentNotExists::class, ParentNotExists::class);
+        $definition->setBindings(['$quz' => '123']);
+
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+    }
+
+    public function testTypedReferenceSupport()
+    {
+        $container = new ContainerBuilder();
+
+        $bindings = [CaseSensitiveClass::class => new BoundArgument(new Reference('foo'))];
+
+        // Explicit service id
+        $definition1 = $container->register('def1', NamedArgumentsDummy::class);
+        $definition1->addArgument($typedRef = new TypedReference('bar', CaseSensitiveClass::class));
+        $definition1->setBindings($bindings);
+
+        $definition2 = $container->register('def2', NamedArgumentsDummy::class);
+        $definition2->addArgument(new TypedReference(CaseSensitiveClass::class, CaseSensitiveClass::class));
+        $definition2->setBindings($bindings);
+
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+
+        $this->assertEquals([$typedRef], $container->getDefinition('def1')->getArguments());
+        $this->assertEquals([new Reference('foo')], $container->getDefinition('def2')->getArguments());
+    }
+
+    public function testScalarSetter()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->autowire('foo', ScalarSetter::class);
+        $definition->setBindings(['$defaultLocale' => 'fr']);
+
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new ResolveBindingsPass())->process($container);
+
+        $this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
+    }
+
+    public function testWithNonExistingSetterAndBinding()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "setLogger()" does not exist.');
+        $container = new ContainerBuilder();
+
+        $bindings = [
+            '$c' => (new Definition('logger'))->setFactory('logger'),
+        ];
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->addMethodCall('setLogger');
+        $definition->setBindings($bindings);
+
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+    }
+
+    public function testSyntheticServiceWithBind()
+    {
+        $container = new ContainerBuilder();
+        $argument = new BoundArgument('bar');
+
+        $container->register('foo', 'stdClass')
+            ->addArgument(new Reference('synthetic.service'));
+
+        $container->register('synthetic.service')
+            ->setSynthetic(true)
+            ->setBindings(['$apiKey' => $argument]);
+
+        $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class)
+            ->setBindings(['$apiKey' => $argument]);
+
+        (new ResolveBindingsPass())->process($container);
+        (new DefinitionErrorExceptionPass())->process($container);
+
+        $this->assertSame([1 => 'bar'], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
new file mode 100644
index 000000000..eee4cf730
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -0,0 +1,449 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ResolveChildDefinitionsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->register('parent', 'foo')->setArguments(['moo', 'b'])->setProperty('foo', 'moo');
+        $container->setDefinition('child', new ChildDefinition('parent'))
+            ->replaceArgument(0, 'a')
+            ->setProperty('foo', 'bar')
+            ->setClass('bar')
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertNotInstanceOf(ChildDefinition::class, $def);
+        $this->assertEquals('bar', $def->getClass());
+        $this->assertEquals(['a', 'b'], $def->getArguments());
+        $this->assertEquals(['foo' => 'bar'], $def->getProperties());
+    }
+
+    public function testProcessAppendsMethodCallsAlways()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addMethodCall('foo', ['bar'])
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->addMethodCall('bar', ['foo'])
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertEquals([
+            ['foo', ['bar']],
+            ['bar', ['foo']],
+        ], $def->getMethodCalls());
+    }
+
+    public function testProcessDoesNotCopyAbstract()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setAbstract(true)
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertFalse($def->isAbstract());
+    }
+
+    public function testProcessDoesNotCopyShared()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setShared(false)
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertTrue($def->isShared());
+    }
+
+    public function testProcessDoesNotCopyTags()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addTag('foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertEquals([], $def->getTags());
+    }
+
+    public function testProcessDoesNotCopyDecoratedService()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setDecoratedService('foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertNull($def->getDecoratedService());
+    }
+
+    public function testProcessDoesNotDropShared()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->setShared(false)
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertFalse($def->isShared());
+    }
+
+    public function testProcessHandlesMultipleInheritance()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent', 'foo')
+            ->setArguments(['foo', 'bar', 'c'])
+        ;
+
+        $container
+            ->setDefinition('child2', new ChildDefinition('child1'))
+            ->replaceArgument(1, 'b')
+        ;
+
+        $container
+            ->setDefinition('child1', new ChildDefinition('parent'))
+            ->replaceArgument(0, 'a')
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child2');
+        $this->assertEquals(['a', 'b', 'c'], $def->getArguments());
+        $this->assertEquals('foo', $def->getClass());
+    }
+
+    public function testSetLazyOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass');
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setLazy(true)
+        ;
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
+    public function testSetLazyOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setLazy(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
+    public function testSetAutowiredOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutowired(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setAutowired(false)
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('child1')->isAutowired());
+    }
+
+    public function testSetAutowiredOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutowired(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isAutowired());
+    }
+
+    public function testDeepDefinitionsResolving()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'parentClass');
+        $container->register('sibling', 'siblingClass')
+            ->setConfigurator(new ChildDefinition('parent'), 'foo')
+            ->setFactory([new ChildDefinition('parent'), 'foo'])
+            ->addArgument(new ChildDefinition('parent'))
+            ->setProperty('prop', new ChildDefinition('parent'))
+            ->addMethodCall('meth', [new ChildDefinition('parent')])
+        ;
+
+        $this->process($container);
+
+        $configurator = $container->getDefinition('sibling')->getConfigurator();
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($configurator));
+        $this->assertSame('parentClass', $configurator->getClass());
+
+        $factory = $container->getDefinition('sibling')->getFactory();
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($factory[0]));
+        $this->assertSame('parentClass', $factory[0]->getClass());
+
+        $argument = $container->getDefinition('sibling')->getArgument(0);
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($argument));
+        $this->assertSame('parentClass', $argument->getClass());
+
+        $properties = $container->getDefinition('sibling')->getProperties();
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($properties['prop']));
+        $this->assertSame('parentClass', $properties['prop']->getClass());
+
+        $methodCalls = $container->getDefinition('sibling')->getMethodCalls();
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($methodCalls[0][1][0]));
+        $this->assertSame('parentClass', $methodCalls[0][1][0]->getClass());
+    }
+
+    public function testSetDecoratedServiceOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass');
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setDecoratedService('foo', 'foo_inner', 5)
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals(['foo', 'foo_inner', 5], $container->getDefinition('child1')->getDecoratedService());
+    }
+
+    public function testDecoratedServiceCopiesDeprecatedStatusFromParent()
+    {
+        $container = new ContainerBuilder();
+        $container->register('deprecated_parent')
+            ->setDeprecated(true)
+        ;
+
+        $container->setDefinition('decorated_deprecated_parent', new ChildDefinition('deprecated_parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('decorated_deprecated_parent')->isDeprecated());
+    }
+
+    public function testDecoratedServiceCanOverwriteDeprecatedParentStatus()
+    {
+        $container = new ContainerBuilder();
+        $container->register('deprecated_parent')
+            ->setDeprecated(true)
+        ;
+
+        $container->setDefinition('decorated_deprecated_parent', new ChildDefinition('deprecated_parent'))
+            ->setDeprecated(false)
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('decorated_deprecated_parent')->isDeprecated());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testProcessMergeAutowiringTypes()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addAutowiringType('Foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->addAutowiringType('Bar')
+        ;
+
+        $this->process($container);
+
+        $childDef = $container->getDefinition('child');
+        $this->assertEquals(['Foo', 'Bar'], $childDef->getAutowiringTypes());
+
+        $parentDef = $container->getDefinition('parent');
+        $this->assertSame(['Foo'], $parentDef->getAutowiringTypes());
+    }
+
+    public function testProcessResolvesAliases()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass');
+        $container->setAlias('parent_alias', 'parent');
+        $container->setDefinition('child', new ChildDefinition('parent_alias'));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame('ParentClass', $def->getClass());
+    }
+
+    public function testProcessSetsArguments()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass')->setArguments([0]);
+        $container->setDefinition('child', (new ChildDefinition('parent'))->setArguments([
+            1,
+            'index_0' => 2,
+            'foo' => 3,
+        ]));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame([2, 1, 'foo' => 3], $def->getArguments());
+    }
+
+    public function testBindings()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setBindings(['a' => '1', 'b' => '2'])
+        ;
+
+        $container->setDefinition('child', new ChildDefinition('parent'))
+            ->setBindings(['b' => 'B', 'c' => 'C'])
+        ;
+
+        $this->process($container);
+
+        $bindings = [];
+        foreach ($container->getDefinition('child')->getBindings() as $k => $v) {
+            $bindings[$k] = $v->getValues()[0];
+        }
+        $this->assertEquals(['b' => 'B', 'c' => 'C', 'a' => '1'], $bindings);
+    }
+
+    public function testSetAutoconfiguredOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutoconfigured(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('child1')->isAutoconfigured());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testAliasExistsForBackwardsCompatibility()
+    {
+        $this->assertInstanceOf(ResolveChildDefinitionsPass::class, new ResolveDefinitionTemplatesPass());
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new ResolveChildDefinitionsPass();
+        $pass->process($container);
+    }
+
+    public function testProcessDetectsChildDefinitionIndirectCircularReference()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $this->expectExceptionMessageRegExp('/^Circular reference detected for service "c", path: "c -> b -> a -> c"./');
+        $container = new ContainerBuilder();
+
+        $container->register('a');
+
+        $container->setDefinition('b', new ChildDefinition('a'));
+        $container->setDefinition('c', new ChildDefinition('b'));
+        $container->setDefinition('a', new ChildDefinition('c'));
+
+        $this->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveClassPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveClassPassTest.php
new file mode 100644
index 000000000..81e05fb28
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveClassPassTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
+
+class ResolveClassPassTest extends TestCase
+{
+    /**
+     * @dataProvider provideValidClassId
+     */
+    public function testResolveClassFromId($serviceId)
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register($serviceId);
+
+        (new ResolveClassPass())->process($container);
+
+        $this->assertSame($serviceId, $def->getClass());
+    }
+
+    public function provideValidClassId()
+    {
+        yield ['Acme\UnknownClass'];
+        yield [CaseSensitiveClass::class];
+    }
+
+    /**
+     * @dataProvider provideInvalidClassId
+     */
+    public function testWontResolveClassFromId($serviceId)
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register($serviceId);
+
+        (new ResolveClassPass())->process($container);
+
+        $this->assertNull($def->getClass());
+    }
+
+    public function provideInvalidClassId()
+    {
+        yield [\stdClass::class];
+        yield ['bar'];
+        yield ['\DateTime'];
+    }
+
+    public function testNonFqcnChildDefinition()
+    {
+        $container = new ContainerBuilder();
+        $parent = $container->register('App\Foo', null);
+        $child = $container->setDefinition('App\Foo.child', new ChildDefinition('App\Foo'));
+
+        (new ResolveClassPass())->process($container);
+
+        $this->assertSame('App\Foo', $parent->getClass());
+        $this->assertNull($child->getClass());
+    }
+
+    public function testClassFoundChildDefinition()
+    {
+        $container = new ContainerBuilder();
+        $parent = $container->register('App\Foo', null);
+        $child = $container->setDefinition(self::class, new ChildDefinition('App\Foo'));
+
+        (new ResolveClassPass())->process($container);
+
+        $this->assertSame('App\Foo', $parent->getClass());
+        $this->assertSame(self::class, $child->getClass());
+    }
+
+    public function testAmbiguousChildDefinition()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Service definition "App\Foo\Child" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.');
+        $container = new ContainerBuilder();
+        $container->register('App\Foo', null);
+        $container->setDefinition('App\Foo\Child', new ChildDefinition('App\Foo'));
+
+        (new ResolveClassPass())->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
new file mode 100644
index 000000000..407c803cb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
@@ -0,0 +1,407 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @group legacy
+ */
+class ResolveDefinitionTemplatesPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->register('parent', 'foo')->setArguments(['moo', 'b'])->setProperty('foo', 'moo');
+        $container->setDefinition('child', new ChildDefinition('parent'))
+            ->replaceArgument(0, 'a')
+            ->setProperty('foo', 'bar')
+            ->setClass('bar')
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertNotInstanceOf(ChildDefinition::class, $def);
+        $this->assertEquals('bar', $def->getClass());
+        $this->assertEquals(['a', 'b'], $def->getArguments());
+        $this->assertEquals(['foo' => 'bar'], $def->getProperties());
+    }
+
+    public function testProcessAppendsMethodCallsAlways()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addMethodCall('foo', ['bar'])
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->addMethodCall('bar', ['foo'])
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertEquals([
+            ['foo', ['bar']],
+            ['bar', ['foo']],
+        ], $def->getMethodCalls());
+    }
+
+    public function testProcessDoesNotCopyAbstract()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setAbstract(true)
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertFalse($def->isAbstract());
+    }
+
+    public function testProcessDoesNotCopyShared()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setShared(false)
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertTrue($def->isShared());
+    }
+
+    public function testProcessDoesNotCopyTags()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addTag('foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertEquals([], $def->getTags());
+    }
+
+    public function testProcessDoesNotCopyDecoratedService()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setDecoratedService('foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertNull($def->getDecoratedService());
+    }
+
+    public function testProcessDoesNotDropShared()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->setShared(false)
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertFalse($def->isShared());
+    }
+
+    public function testProcessHandlesMultipleInheritance()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent', 'foo')
+            ->setArguments(['foo', 'bar', 'c'])
+        ;
+
+        $container
+            ->setDefinition('child2', new ChildDefinition('child1'))
+            ->replaceArgument(1, 'b')
+        ;
+
+        $container
+            ->setDefinition('child1', new ChildDefinition('parent'))
+            ->replaceArgument(0, 'a')
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child2');
+        $this->assertEquals(['a', 'b', 'c'], $def->getArguments());
+        $this->assertEquals('foo', $def->getClass());
+    }
+
+    public function testSetLazyOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass');
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setLazy(true)
+        ;
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
+    public function testSetLazyOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setLazy(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
+    public function testSetAutowiredOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutowired(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setAutowired(false)
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('child1')->isAutowired());
+    }
+
+    public function testSetAutowiredOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutowired(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isAutowired());
+    }
+
+    public function testDeepDefinitionsResolving()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'parentClass');
+        $container->register('sibling', 'siblingClass')
+            ->setConfigurator(new ChildDefinition('parent'), 'foo')
+            ->setFactory([new ChildDefinition('parent'), 'foo'])
+            ->addArgument(new ChildDefinition('parent'))
+            ->setProperty('prop', new ChildDefinition('parent'))
+            ->addMethodCall('meth', [new ChildDefinition('parent')])
+        ;
+
+        $this->process($container);
+
+        $configurator = $container->getDefinition('sibling')->getConfigurator();
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $configurator);
+        $this->assertSame('parentClass', $configurator->getClass());
+
+        $factory = $container->getDefinition('sibling')->getFactory();
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $factory[0]);
+        $this->assertSame('parentClass', $factory[0]->getClass());
+
+        $argument = $container->getDefinition('sibling')->getArgument(0);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $argument);
+        $this->assertSame('parentClass', $argument->getClass());
+
+        $properties = $container->getDefinition('sibling')->getProperties();
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $properties['prop']);
+        $this->assertSame('parentClass', $properties['prop']->getClass());
+
+        $methodCalls = $container->getDefinition('sibling')->getMethodCalls();
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $methodCalls[0][1][0]);
+        $this->assertSame('parentClass', $methodCalls[0][1][0]->getClass());
+    }
+
+    public function testSetDecoratedServiceOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass');
+
+        $container->setDefinition('child1', new ChildDefinition('parent'))
+            ->setDecoratedService('foo', 'foo_inner', 5)
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals(['foo', 'foo_inner', 5], $container->getDefinition('child1')->getDecoratedService());
+    }
+
+    public function testDecoratedServiceCopiesDeprecatedStatusFromParent()
+    {
+        $container = new ContainerBuilder();
+        $container->register('deprecated_parent')
+            ->setDeprecated(true)
+        ;
+
+        $container->setDefinition('decorated_deprecated_parent', new ChildDefinition('deprecated_parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('decorated_deprecated_parent')->isDeprecated());
+    }
+
+    public function testDecoratedServiceCanOverwriteDeprecatedParentStatus()
+    {
+        $container = new ContainerBuilder();
+        $container->register('deprecated_parent')
+            ->setDeprecated(true)
+        ;
+
+        $container->setDefinition('decorated_deprecated_parent', new ChildDefinition('deprecated_parent'))
+            ->setDeprecated(false)
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('decorated_deprecated_parent')->isDeprecated());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testProcessMergeAutowiringTypes()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addAutowiringType('Foo')
+        ;
+
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->addAutowiringType('Bar')
+        ;
+
+        $this->process($container);
+
+        $childDef = $container->getDefinition('child');
+        $this->assertEquals(['Foo', 'Bar'], $childDef->getAutowiringTypes());
+
+        $parentDef = $container->getDefinition('parent');
+        $this->assertSame(['Foo'], $parentDef->getAutowiringTypes());
+    }
+
+    public function testProcessResolvesAliases()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass');
+        $container->setAlias('parent_alias', 'parent');
+        $container->setDefinition('child', new ChildDefinition('parent_alias'));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame('ParentClass', $def->getClass());
+    }
+
+    public function testProcessSetsArguments()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass')->setArguments([0]);
+        $container->setDefinition('child', (new ChildDefinition('parent'))->setArguments([
+            1,
+            'index_0' => 2,
+            'foo' => 3,
+        ]));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame([2, 1, 'foo' => 3], $def->getArguments());
+    }
+
+    public function testSetAutoconfiguredOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass')
+            ->setAutoconfigured(true)
+        ;
+
+        $container->setDefinition('child1', new ChildDefinition('parent'));
+
+        $this->process($container);
+
+        $this->assertFalse($container->getDefinition('child1')->isAutoconfigured());
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new ResolveDefinitionTemplatesPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveFactoryClassPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveFactoryClassPassTest.php
new file mode 100644
index 000000000..b87fb3db9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveFactoryClassPassTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\ResolveFactoryClassPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class ResolveFactoryClassPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $factory = $container->register('factory', 'Foo\Bar');
+        $factory->setFactory([null, 'create']);
+
+        $pass = new ResolveFactoryClassPass();
+        $pass->process($container);
+
+        $this->assertSame(['Foo\Bar', 'create'], $factory->getFactory());
+    }
+
+    public function testInlinedDefinitionFactoryIsProcessed()
+    {
+        $container = new ContainerBuilder();
+
+        $factory = $container->register('factory');
+        $factory->setFactory([(new Definition('Baz\Qux'))->setFactory([null, 'getInstance']), 'create']);
+
+        $pass = new ResolveFactoryClassPass();
+        $pass->process($container);
+
+        $this->assertSame(['Baz\Qux', 'getInstance'], $factory->getFactory()[0]->getFactory());
+    }
+
+    public function provideFulfilledFactories()
+    {
+        return [
+            [['Foo\Bar', 'create']],
+            [[new Reference('foo'), 'create']],
+            [[new Definition('Baz'), 'create']],
+        ];
+    }
+
+    /**
+     * @dataProvider provideFulfilledFactories
+     */
+    public function testIgnoresFulfilledFactories($factory)
+    {
+        $container = new ContainerBuilder();
+        $definition = new Definition();
+        $definition->setFactory($factory);
+
+        $container->setDefinition('factory', $definition);
+
+        $pass = new ResolveFactoryClassPass();
+        $pass->process($container);
+
+        $this->assertSame($factory, $container->getDefinition('factory')->getFactory());
+    }
+
+    public function testNotAnyClassThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The "factory" service is defined to be created by a factory, but is missing the factory class. Did you forget to define the factory or service class?');
+        $container = new ContainerBuilder();
+
+        $factory = $container->register('factory');
+        $factory->setFactory([null, 'create']);
+
+        $pass = new ResolveFactoryClassPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveHotPathPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveHotPathPassTest.php
new file mode 100644
index 000000000..a2fece058
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveHotPathPassTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\ResolveHotPathPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class ResolveHotPathPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo')
+            ->addTag('container.hot_path')
+            ->addArgument(new IteratorArgument([new Reference('lazy')]))
+            ->addArgument(new Reference('service_container'))
+            ->addArgument(new Definition('', [new Reference('bar')]))
+            ->addArgument(new Reference('baz', ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE))
+            ->addArgument(new Reference('missing'))
+        ;
+
+        $container->register('lazy');
+        $container->register('bar')
+            ->addArgument(new Reference('buz'))
+            ->addArgument(new Reference('deprec_ref_notag'));
+        $container->register('baz')
+            ->addArgument(new Reference('lazy'))
+            ->addArgument(new Reference('lazy'));
+        $container->register('buz');
+        $container->register('deprec_with_tag')->setDeprecated()->addTag('container.hot_path');
+        $container->register('deprec_ref_notag')->setDeprecated();
+
+        (new ResolveHotPathPass())->process($container);
+
+        $this->assertFalse($container->getDefinition('lazy')->hasTag('container.hot_path'));
+        $this->assertTrue($container->getDefinition('bar')->hasTag('container.hot_path'));
+        $this->assertTrue($container->getDefinition('buz')->hasTag('container.hot_path'));
+        $this->assertFalse($container->getDefinition('baz')->hasTag('container.hot_path'));
+        $this->assertFalse($container->getDefinition('service_container')->hasTag('container.hot_path'));
+        $this->assertFalse($container->getDefinition('deprec_with_tag')->hasTag('container.hot_path'));
+        $this->assertFalse($container->getDefinition('deprec_ref_notag')->hasTag('container.hot_path'));
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
new file mode 100644
index 000000000..83be84bd0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -0,0 +1,262 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveInstanceofConditionalsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ResolveInstanceofConditionalsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register('foo', self::class)->addTag('tag')->setAutowired(true)->setChanges([]);
+        $def->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))->setProperty('foo', 'bar')->addTag('baz', ['attr' => 123]),
+        ]);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+
+        $parent = 'instanceof.'.parent::class.'.0.foo';
+        $def = $container->getDefinition('foo');
+        $this->assertEmpty($def->getInstanceofConditionals());
+        $this->assertInstanceOf(ChildDefinition::class, $def);
+        $this->assertTrue($def->isAutowired());
+        $this->assertSame($parent, $def->getParent());
+        $this->assertSame(['tag' => [[]], 'baz' => [['attr' => 123]]], $def->getTags());
+
+        $parent = $container->getDefinition($parent);
+        $this->assertSame(['foo' => 'bar'], $parent->getProperties());
+        $this->assertSame([], $parent->getTags());
+    }
+
+    public function testProcessInheritance()
+    {
+        $container = new ContainerBuilder();
+
+        $def = $container
+            ->register('parent', parent::class)
+            ->addMethodCall('foo', ['foo']);
+        $def->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))->addMethodCall('foo', ['bar']),
+        ]);
+
+        $def = (new ChildDefinition('parent'))->setClass(self::class);
+        $container->setDefinition('child', $def);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
+
+        $expected = [
+            ['foo', ['bar']],
+            ['foo', ['foo']],
+        ];
+
+        $this->assertSame($expected, $container->getDefinition('parent')->getMethodCalls());
+        $this->assertSame($expected, $container->getDefinition('child')->getMethodCalls());
+    }
+
+    public function testProcessDoesReplaceShared()
+    {
+        $container = new ContainerBuilder();
+
+        $def = $container->register('foo', 'stdClass');
+        $def->setInstanceofConditionals([
+            'stdClass' => (new ChildDefinition(''))->setShared(false),
+        ]);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+
+        $def = $container->getDefinition('foo');
+        $this->assertFalse($def->isShared());
+    }
+
+    public function testProcessHandlesMultipleInheritance()
+    {
+        $container = new ContainerBuilder();
+
+        $def = $container->register('foo', self::class)->setShared(true);
+
+        $def->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))->setLazy(true)->setShared(false),
+            self::class => (new ChildDefinition(''))->setAutowired(true),
+        ]);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
+
+        $def = $container->getDefinition('foo');
+        $this->assertTrue($def->isAutowired());
+        $this->assertTrue($def->isLazy());
+        $this->assertTrue($def->isShared());
+    }
+
+    public function testProcessUsesAutoconfiguredInstanceof()
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register('normal_service', self::class);
+        $def->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))
+                ->addTag('local_instanceof_tag')
+                ->setFactory('locally_set_factory'),
+        ]);
+        $def->setAutoconfigured(true);
+        $container->registerForAutoconfiguration(parent::class)
+            ->addTag('autoconfigured_tag')
+            ->setAutowired(true)
+            ->setFactory('autoconfigured_factory');
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
+
+        $def = $container->getDefinition('normal_service');
+        // autowired thanks to the autoconfigured instanceof
+        $this->assertTrue($def->isAutowired());
+        // factory from the specific instanceof overrides global one
+        $this->assertEquals('locally_set_factory', $def->getFactory());
+        // tags are merged, the locally set one is first
+        $this->assertSame(['local_instanceof_tag' => [[]], 'autoconfigured_tag' => [[]]], $def->getTags());
+    }
+
+    public function testAutoconfigureInstanceofDoesNotDuplicateTags()
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register('normal_service', self::class);
+        $def
+            ->addTag('duplicated_tag')
+            ->addTag('duplicated_tag', ['and_attributes' => 1])
+        ;
+        $def->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))->addTag('duplicated_tag'),
+        ]);
+        $def->setAutoconfigured(true);
+        $container->registerForAutoconfiguration(parent::class)
+            ->addTag('duplicated_tag', ['and_attributes' => 1])
+        ;
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
+
+        $def = $container->getDefinition('normal_service');
+        $this->assertSame(['duplicated_tag' => [[], ['and_attributes' => 1]]], $def->getTags());
+    }
+
+    public function testProcessDoesNotUseAutoconfiguredInstanceofIfNotEnabled()
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register('normal_service', self::class);
+        $def->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))
+                ->addTag('foo_tag'),
+        ]);
+        $container->registerForAutoconfiguration(parent::class)
+            ->setAutowired(true);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
+
+        $def = $container->getDefinition('normal_service');
+        $this->assertFalse($def->isAutowired());
+    }
+
+    public function testBadInterfaceThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('"App\FakeInterface" is set as an "instanceof" conditional, but it does not exist.');
+        $container = new ContainerBuilder();
+        $def = $container->register('normal_service', self::class);
+        $def->setInstanceofConditionals([
+            'App\\FakeInterface' => (new ChildDefinition(''))
+                ->addTag('foo_tag'),
+        ]);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+    }
+
+    public function testBadInterfaceForAutomaticInstanceofIsOk()
+    {
+        $container = new ContainerBuilder();
+        $container->register('normal_service', self::class)
+            ->setAutoconfigured(true);
+        $container->registerForAutoconfiguration('App\\FakeInterface')
+            ->setAutowired(true);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+        $this->assertTrue($container->hasDefinition('normal_service'));
+    }
+
+    public function testProcessThrowsExceptionForAutoconfiguredCalls()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines method calls but these are not supported and should be removed\./');
+        $container = new ContainerBuilder();
+        $container->registerForAutoconfiguration(parent::class)
+            ->addMethodCall('setFoo');
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+    }
+
+    public function testProcessThrowsExceptionForArguments()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines arguments but these are not supported and should be removed\./');
+        $container = new ContainerBuilder();
+        $container->registerForAutoconfiguration(parent::class)
+            ->addArgument('bar');
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+    }
+
+    public function testMergeReset()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('bar', self::class)
+            ->addArgument('a')
+            ->addMethodCall('setB')
+            ->setDecoratedService('foo')
+            ->addTag('t')
+            ->setInstanceofConditionals([
+                parent::class => (new ChildDefinition(''))->addTag('bar'),
+            ])
+        ;
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+
+        $abstract = $container->getDefinition('abstract.instanceof.bar');
+
+        $this->assertEmpty($abstract->getArguments());
+        $this->assertEmpty($abstract->getMethodCalls());
+        $this->assertNull($abstract->getDecoratedService());
+        $this->assertEmpty($abstract->getTags());
+        $this->assertTrue($abstract->isAbstract());
+    }
+
+    public function testBindings()
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register('foo', self::class)->setBindings(['$toto' => 123]);
+        $def->setInstanceofConditionals([parent::class => new ChildDefinition('')]);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+
+        $bindings = $container->getDefinition('foo')->getBindings();
+        $this->assertSame(['$toto'], array_keys($bindings));
+        $this->assertInstanceOf(BoundArgument::class, $bindings['$toto']);
+        $this->assertSame(123, $bindings['$toto']->getValues()[0]);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveInvalidReferencesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveInvalidReferencesPassTest.php
new file mode 100644
index 000000000..817cc64ce
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveInvalidReferencesPassTest.php
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Compiler\ResolveInvalidReferencesPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Reference;
+
+class ResolveInvalidReferencesPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $def = $container
+            ->register('foo')
+            ->setArguments([
+                new Reference('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                new Reference('baz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
+            ])
+            ->addMethodCall('foo', [new Reference('moo', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
+        ;
+
+        $this->process($container);
+
+        $arguments = $def->getArguments();
+        $this->assertSame([null, null], $arguments);
+        $this->assertCount(0, $def->getMethodCalls());
+    }
+
+    public function testProcessIgnoreInvalidArgumentInCollectionArgument()
+    {
+        $container = new ContainerBuilder();
+        $container->register('baz');
+        $def = $container
+            ->register('foo')
+            ->setArguments([
+                [
+                    new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
+                    $baz = new Reference('baz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
+                    new Reference('moo', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                ],
+            ])
+        ;
+
+        $this->process($container);
+
+        $arguments = $def->getArguments();
+        $this->assertSame([$baz, null], $arguments[0]);
+    }
+
+    public function testProcessKeepMethodCallOnInvalidArgumentInCollectionArgument()
+    {
+        $container = new ContainerBuilder();
+        $container->register('baz');
+        $def = $container
+            ->register('foo')
+            ->addMethodCall('foo', [
+                [
+                    new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
+                    $baz = new Reference('baz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
+                    new Reference('moo', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                ],
+            ])
+        ;
+
+        $this->process($container);
+
+        $calls = $def->getMethodCalls();
+        $this->assertCount(1, $def->getMethodCalls());
+        $this->assertSame([$baz, null], $calls[0][1][0]);
+    }
+
+    public function testProcessIgnoreNonExistentServices()
+    {
+        $container = new ContainerBuilder();
+        $def = $container
+            ->register('foo')
+            ->setArguments([new Reference('bar')])
+        ;
+
+        $this->process($container);
+
+        $arguments = $def->getArguments();
+        $this->assertEquals('bar', (string) $arguments[0]);
+    }
+
+    public function testProcessRemovesPropertiesOnInvalid()
+    {
+        $container = new ContainerBuilder();
+        $def = $container
+            ->register('foo')
+            ->setProperty('foo', new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE))
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals([], $def->getProperties());
+    }
+
+    public function testProcessRemovesArgumentsOnInvalid()
+    {
+        $container = new ContainerBuilder();
+        $def = $container
+            ->register('foo')
+            ->addArgument([
+                [
+                    new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
+                    new ServiceClosureArgument(new Reference('baz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
+                ],
+            ])
+        ;
+
+        $this->process($container);
+
+        $this->assertSame([[[]]], $def->getArguments());
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new ResolveInvalidReferencesPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveNamedArgumentsPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
new file mode 100644
index 000000000..a10d226f1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\ResolveNamedArgumentsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryDummyWithoutReturnTypes;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\SimilarArgumentsDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class ResolveNamedArgumentsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->setArguments([
+            2 => 'http://api.example.com',
+            '$apiKey' => '123',
+            0 => new Reference('foo'),
+        ]);
+        $definition->addMethodCall('setApiKey', ['$apiKey' => '123']);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+
+        $this->assertEquals([0 => new Reference('foo'), 1 => '123', 2 => 'http://api.example.com'], $definition->getArguments());
+        $this->assertEquals([['setApiKey', ['123']]], $definition->getMethodCalls());
+    }
+
+    public function testWithFactory()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('factory', NoConstructor::class);
+        $definition = $container->register('foo', NoConstructor::class)
+            ->setFactory([new Reference('factory'), 'create'])
+            ->setArguments(['$apiKey' => '123']);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+
+        $this->assertSame([0 => '123'], $definition->getArguments());
+    }
+
+    public function testClassNull()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NamedArgumentsDummy::class);
+        $definition->setArguments(['$apiKey' => '123']);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+    }
+
+    public function testClassNotExist()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NotExist::class, NotExist::class);
+        $definition->setArguments(['$apiKey' => '123']);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+    }
+
+    public function testClassNoConstructor()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NoConstructor::class, NoConstructor::class);
+        $definition->setArguments(['$apiKey' => '123']);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+    }
+
+    public function testArgumentNotFound()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "__construct()" has no argument named "$notFound". Check your service definition.');
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->setArguments(['$notFound' => '123']);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+    }
+
+    public function testCorrectMethodReportedInException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1": method "Symfony\Component\DependencyInjection\Tests\Fixtures\FactoryDummyWithoutReturnTypes::createTestDefinition1()" has no argument named "$notFound". Check your service definition.');
+        $container = new ContainerBuilder();
+
+        $container->register(FactoryDummyWithoutReturnTypes::class, FactoryDummyWithoutReturnTypes::class);
+
+        $definition = $container->register(TestDefinition1::class, TestDefinition1::class);
+        $definition->setFactory([FactoryDummyWithoutReturnTypes::class, 'createTestDefinition1']);
+        $definition->setArguments(['$notFound' => '123']);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+    }
+
+    public function testTypedArgument()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
+        $definition->setArguments(['$apiKey' => '123', CaseSensitiveClass::class => new Reference('foo')]);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+
+        $this->assertEquals([new Reference('foo'), '123'], $definition->getArguments());
+    }
+
+    public function testResolvesMultipleArgumentsOfTheSameType()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(SimilarArgumentsDummy::class, SimilarArgumentsDummy::class);
+        $definition->setArguments([CaseSensitiveClass::class => new Reference('foo'), '$token' => 'qwerty']);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+
+        $this->assertEquals([new Reference('foo'), 'qwerty', new Reference('foo')], $definition->getArguments());
+    }
+
+    public function testResolvePrioritizeNamedOverType()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register(SimilarArgumentsDummy::class, SimilarArgumentsDummy::class);
+        $definition->setArguments([CaseSensitiveClass::class => new Reference('foo'), '$token' => 'qwerty', '$class1' => new Reference('bar')]);
+
+        $pass = new ResolveNamedArgumentsPass();
+        $pass->process($container);
+
+        $this->assertEquals([new Reference('bar'), 'qwerty', new Reference('foo')], $definition->getArguments());
+    }
+}
+
+class NoConstructor
+{
+    public static function create($apiKey)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
new file mode 100644
index 000000000..5aa647175
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ResolveParameterPlaceHoldersPassTest extends TestCase
+{
+    private $compilerPass;
+    private $container;
+    private $fooDefinition;
+
+    protected function setUp()
+    {
+        $this->compilerPass = new ResolveParameterPlaceHoldersPass();
+        $this->container = $this->createContainerBuilder();
+        $this->compilerPass->process($this->container);
+        $this->fooDefinition = $this->container->getDefinition('foo');
+    }
+
+    public function testClassParametersShouldBeResolved()
+    {
+        $this->assertSame('Foo', $this->fooDefinition->getClass());
+    }
+
+    public function testFactoryParametersShouldBeResolved()
+    {
+        $this->assertSame(['FooFactory', 'getFoo'], $this->fooDefinition->getFactory());
+    }
+
+    public function testArgumentParametersShouldBeResolved()
+    {
+        $this->assertSame(['bar', ['bar' => 'baz']], $this->fooDefinition->getArguments());
+    }
+
+    public function testMethodCallParametersShouldBeResolved()
+    {
+        $this->assertSame([['foobar', ['bar', ['bar' => 'baz']]]], $this->fooDefinition->getMethodCalls());
+    }
+
+    public function testPropertyParametersShouldBeResolved()
+    {
+        $this->assertSame(['bar' => 'baz'], $this->fooDefinition->getProperties());
+    }
+
+    public function testFileParametersShouldBeResolved()
+    {
+        $this->assertSame('foo.php', $this->fooDefinition->getFile());
+    }
+
+    public function testAliasParametersShouldBeResolved()
+    {
+        $this->assertSame('foo', $this->container->getAlias('bar')->__toString());
+    }
+
+    public function testBindingsShouldBeResolved()
+    {
+        list($boundValue) = $this->container->getDefinition('foo')->getBindings()['$baz']->getValues();
+
+        $this->assertSame($this->container->getParameterBag()->resolveValue('%env(BAZ)%'), $boundValue);
+    }
+
+    private function createContainerBuilder()
+    {
+        $containerBuilder = new ContainerBuilder();
+
+        $containerBuilder->setParameter('foo.class', 'Foo');
+        $containerBuilder->setParameter('foo.factory.class', 'FooFactory');
+        $containerBuilder->setParameter('foo.arg1', 'bar');
+        $containerBuilder->setParameter('foo.arg2', ['%foo.arg1%' => 'baz']);
+        $containerBuilder->setParameter('foo.method', 'foobar');
+        $containerBuilder->setParameter('foo.property.name', 'bar');
+        $containerBuilder->setParameter('foo.property.value', 'baz');
+        $containerBuilder->setParameter('foo.file', 'foo.php');
+        $containerBuilder->setParameter('alias.id', 'bar');
+
+        $fooDefinition = $containerBuilder->register('foo', '%foo.class%');
+        $fooDefinition->setFactory(['%foo.factory.class%', 'getFoo']);
+        $fooDefinition->setArguments(['%foo.arg1%', ['%foo.arg1%' => 'baz']]);
+        $fooDefinition->addMethodCall('%foo.method%', ['%foo.arg1%', '%foo.arg2%']);
+        $fooDefinition->setProperty('%foo.property.name%', '%foo.property.value%');
+        $fooDefinition->setFile('%foo.file%');
+        $fooDefinition->setBindings(['$baz' => '%env(BAZ)%']);
+
+        $containerBuilder->setAlias('%alias.id%', 'foo');
+
+        return $containerBuilder;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolvePrivatesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolvePrivatesPassTest.php
new file mode 100644
index 000000000..89af24f2c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolvePrivatesPassTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\ResolvePrivatesPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ResolvePrivatesPassTest extends TestCase
+{
+    public function testPrivateHasHigherPrecedenceThanPublic()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', 'stdClass')
+            ->setPublic(true)
+            ->setPrivate(true)
+        ;
+
+        $container->setAlias('bar', 'foo')
+            ->setPublic(false)
+            ->setPrivate(false)
+        ;
+
+        (new ResolvePrivatesPass())->process($container);
+
+        $this->assertFalse($container->getDefinition('foo')->isPublic());
+        $this->assertFalse($container->getAlias('bar')->isPublic());
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
new file mode 100644
index 000000000..2465bb7e3
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Compiler\ResolveReferencesToAliasesPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class ResolveReferencesToAliasesPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->setAlias('bar', 'foo');
+        $def = $container
+            ->register('moo')
+            ->setArguments([new Reference('bar')])
+        ;
+
+        $this->process($container);
+
+        $arguments = $def->getArguments();
+        $this->assertEquals('foo', (string) $arguments[0]);
+    }
+
+    public function testProcessRecursively()
+    {
+        $container = new ContainerBuilder();
+        $container->setAlias('bar', 'foo');
+        $container->setAlias('moo', 'bar');
+        $def = $container
+            ->register('foobar')
+            ->setArguments([new Reference('moo')])
+        ;
+
+        $this->process($container);
+
+        $arguments = $def->getArguments();
+        $this->assertEquals('foo', (string) $arguments[0]);
+    }
+
+    public function testAliasCircularReference()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $container = new ContainerBuilder();
+        $container->setAlias('bar', 'foo');
+        $container->setAlias('foo', 'bar');
+        $this->process($container);
+    }
+
+    public function testResolveFactory()
+    {
+        $container = new ContainerBuilder();
+        $container->register('factory', 'Factory');
+        $container->setAlias('factory_alias', new Alias('factory'));
+        $foo = new Definition();
+        $foo->setFactory([new Reference('factory_alias'), 'createFoo']);
+        $container->setDefinition('foo', $foo);
+        $bar = new Definition();
+        $bar->setFactory(['Factory', 'createFoo']);
+        $container->setDefinition('bar', $bar);
+
+        $this->process($container);
+
+        $resolvedFooFactory = $container->getDefinition('foo')->getFactory();
+        $resolvedBarFactory = $container->getDefinition('bar')->getFactory();
+
+        $this->assertSame('factory', (string) $resolvedFooFactory[0]);
+        $this->assertSame('Factory', (string) $resolvedBarFactory[0]);
+    }
+
+    protected function process(ContainerBuilder $container)
+    {
+        $pass = new ResolveReferencesToAliasesPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php
new file mode 100644
index 000000000..2322817e8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\ResolveTaggedIteratorArgumentPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @author Roland Franssen <franssen.roland@gmail.com>
+ */
+class ResolveTaggedIteratorArgumentPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a', 'stdClass')->addTag('foo');
+        $container->register('b', 'stdClass')->addTag('foo', ['priority' => 20]);
+        $container->register('c', 'stdClass')->addTag('foo', ['priority' => 10]);
+        $container->register('d', 'stdClass')->setProperty('foos', new TaggedIteratorArgument('foo'));
+
+        (new ResolveTaggedIteratorArgumentPass())->process($container);
+
+        $properties = $container->getDefinition('d')->getProperties();
+        $expected = new TaggedIteratorArgument('foo');
+        $expected->setValues([new Reference('b'), new Reference('c'), new Reference('a')]);
+        $this->assertEquals($expected, $properties['foos']);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Compiler/ServiceLocatorTagPassTest.php b/lib/symfony/dependency-injection/Tests/Compiler/ServiceLocatorTagPassTest.php
new file mode 100644
index 000000000..66af69b54
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Compiler/ServiceLocatorTagPassTest.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition2;
+
+require_once __DIR__.'/../Fixtures/includes/classes.php';
+
+class ServiceLocatorTagPassTest extends TestCase
+{
+    public function testNoServices()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid definition for service "foo": an array of references is expected as first argument when the "container.service_locator" tag is set.');
+        $container = new ContainerBuilder();
+
+        $container->register('foo', ServiceLocator::class)
+            ->addTag('container.service_locator')
+        ;
+
+        (new ServiceLocatorTagPass())->process($container);
+    }
+
+    public function testInvalidServices()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid definition for service "foo": an array of references is expected as first argument when the "container.service_locator" tag is set, "string" found for key "0".');
+        $container = new ContainerBuilder();
+
+        $container->register('foo', ServiceLocator::class)
+            ->setArguments([[
+                'dummy',
+            ]])
+            ->addTag('container.service_locator')
+        ;
+
+        (new ServiceLocatorTagPass())->process($container);
+    }
+
+    public function testProcessValue()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('bar', CustomDefinition::class);
+        $container->register('baz', CustomDefinition::class);
+
+        $container->register('foo', ServiceLocator::class)
+            ->setArguments([[
+                new Reference('bar'),
+                new Reference('baz'),
+                'some.service' => new Reference('bar'),
+            ]])
+            ->addTag('container.service_locator')
+        ;
+
+        (new ServiceLocatorTagPass())->process($container);
+
+        /** @var ServiceLocator $locator */
+        $locator = $container->get('foo');
+
+        $this->assertSame(CustomDefinition::class, \get_class($locator('bar')));
+        $this->assertSame(CustomDefinition::class, \get_class($locator('baz')));
+        $this->assertSame(CustomDefinition::class, \get_class($locator('some.service')));
+    }
+
+    public function testServiceWithKeyOverwritesPreviousInheritedKey()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('bar', TestDefinition1::class);
+        $container->register('baz', TestDefinition2::class);
+
+        $container->register('foo', ServiceLocator::class)
+            ->setArguments([[
+                new Reference('bar'),
+                'bar' => new Reference('baz'),
+            ]])
+            ->addTag('container.service_locator')
+        ;
+
+        (new ServiceLocatorTagPass())->process($container);
+
+        /** @var ServiceLocator $locator */
+        $locator = $container->get('foo');
+
+        $this->assertSame(TestDefinition2::class, \get_class($locator('bar')));
+    }
+
+    public function testInheritedKeyOverwritesPreviousServiceWithKey()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('bar', TestDefinition1::class);
+        $container->register('baz', TestDefinition2::class);
+
+        $container->register('foo', ServiceLocator::class)
+            ->setArguments([[
+                'bar' => new Reference('baz'),
+                new Reference('bar'),
+                16 => new Reference('baz'),
+            ]])
+            ->addTag('container.service_locator')
+        ;
+
+        (new ServiceLocatorTagPass())->process($container);
+
+        /** @var ServiceLocator $locator */
+        $locator = $container->get('foo');
+
+        $this->assertSame(TestDefinition1::class, \get_class($locator('bar')));
+        $this->assertSame(TestDefinition2::class, \get_class($locator(16)));
+    }
+
+    public function testBindingsAreCopied()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo')
+            ->setBindings(['foo' => 'foo']);
+
+        $locator = ServiceLocatorTagPass::register($container, ['foo' => new Reference('foo')], 'foo');
+        $locator = $container->getDefinition($locator);
+        $locator = $container->getDefinition($locator->getFactory()[0]);
+
+        $this->assertSame(['foo'], array_keys($locator->getBindings()));
+        $this->assertInstanceOf(BoundArgument::class, $locator->getBindings()['foo']);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Config/AutowireServiceResourceTest.php b/lib/symfony/dependency-injection/Tests/Config/AutowireServiceResourceTest.php
new file mode 100644
index 000000000..153e0807e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Config/AutowireServiceResourceTest.php
@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Config;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
+use Symfony\Component\DependencyInjection\Config\AutowireServiceResource;
+
+/**
+ * @group legacy
+ */
+class AutowireServiceResourceTest extends TestCase
+{
+    /**
+     * @var AutowireServiceResource
+     */
+    private $resource;
+    private $file;
+    private $class;
+    private $time;
+
+    protected function setUp()
+    {
+        $this->file = realpath(sys_get_temp_dir()).'/tmp.php';
+        $this->time = time();
+        touch($this->file, $this->time);
+
+        $this->class = __NAMESPACE__.'\Foo';
+        $this->resource = new AutowireServiceResource(
+            $this->class,
+            $this->file,
+            []
+        );
+    }
+
+    public function testToString()
+    {
+        $this->assertSame('service.autowire.'.$this->class, (string) $this->resource);
+    }
+
+    public function testSerializeUnserialize()
+    {
+        $unserialized = unserialize(serialize($this->resource));
+
+        $this->assertEquals($this->resource, $unserialized);
+    }
+
+    public function testIsFresh()
+    {
+        $this->assertTrue($this->resource->isFresh($this->time), '->isFresh() returns true if the resource has not changed in same second');
+        $this->assertTrue($this->resource->isFresh($this->time + 10), '->isFresh() returns true if the resource has not changed');
+        $this->assertFalse($this->resource->isFresh($this->time - 86400), '->isFresh() returns false if the resource has been updated');
+    }
+
+    public function testIsFreshForDeletedResources()
+    {
+        unlink($this->file);
+
+        $this->assertFalse($this->resource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the resource does not exist');
+    }
+
+    public function testIsNotFreshChangedResource()
+    {
+        $oldResource = new AutowireServiceResource(
+            $this->class,
+            $this->file,
+            ['will_be_different']
+        );
+
+        // test with a stale file *and* a resource that *will* be different than the actual
+        $this->assertFalse($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the constructor arguments have changed');
+    }
+
+    public function testIsFreshSameConstructorArgs()
+    {
+        $oldResource = AutowirePass::createResourceForClass(
+            new \ReflectionClass(__NAMESPACE__.'\Foo')
+        );
+
+        // test with a stale file *but* the resource will not be changed
+        $this->assertTrue($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the constructor arguments have changed');
+    }
+
+    public function testNotFreshIfClassNotFound()
+    {
+        $resource = new AutowireServiceResource(
+            'Some\Non\Existent\Class',
+            $this->file,
+            []
+        );
+
+        $this->assertFalse($resource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the class no longer exists');
+    }
+
+    protected function tearDown()
+    {
+        if (!file_exists($this->file)) {
+            return;
+        }
+
+        unlink($this->file);
+    }
+
+    private function getStaleFileTime()
+    {
+        return $this->time - 10;
+    }
+}
+
+class Foo
+{
+    public function __construct($foo)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceCheckerTest.php b/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceCheckerTest.php
new file mode 100644
index 000000000..51af451c1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceCheckerTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Config;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\ResourceCheckerInterface;
+use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
+use Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class ContainerParametersResourceCheckerTest extends TestCase
+{
+    /** @var ContainerParametersResource */
+    private $resource;
+
+    /** @var ResourceCheckerInterface */
+    private $resourceChecker;
+
+    /** @var ContainerInterface */
+    private $container;
+
+    protected function setUp()
+    {
+        $this->resource = new ContainerParametersResource(['locales' => ['fr', 'en'], 'default_locale' => 'fr']);
+        $this->container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+        $this->resourceChecker = new ContainerParametersResourceChecker($this->container);
+    }
+
+    public function testSupports()
+    {
+        $this->assertTrue($this->resourceChecker->supports($this->resource));
+    }
+
+    /**
+     * @dataProvider isFreshProvider
+     */
+    public function testIsFresh(callable $mockContainer, $expected)
+    {
+        $mockContainer($this->container);
+
+        $this->assertSame($expected, $this->resourceChecker->isFresh($this->resource, time()));
+    }
+
+    public function isFreshProvider()
+    {
+        yield 'not fresh on missing parameter' => [function (MockObject $container) {
+            $container->method('hasParameter')->with('locales')->willReturn(false);
+        }, false];
+
+        yield 'not fresh on different value' => [function (MockObject $container) {
+            $container->method('getParameter')->with('locales')->willReturn(['nl', 'es']);
+        }, false];
+
+        yield 'fresh on every identical parameters' => [function (MockObject $container) {
+            $container->expects($this->exactly(2))->method('hasParameter')->willReturn(true);
+            $container->expects($this->exactly(2))->method('getParameter')
+                ->withConsecutive(
+                    [$this->equalTo('locales')],
+                    [$this->equalTo('default_locale')]
+                )
+                ->willReturnMap([
+                    ['locales', ['fr', 'en']],
+                    ['default_locale', 'fr'],
+                ])
+            ;
+        }, true];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceTest.php b/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceTest.php
new file mode 100644
index 000000000..e177ac16b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Config/ContainerParametersResourceTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Config;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
+
+class ContainerParametersResourceTest extends TestCase
+{
+    /** @var ContainerParametersResource */
+    private $resource;
+
+    protected function setUp()
+    {
+        $this->resource = new ContainerParametersResource(['locales' => ['fr', 'en'], 'default_locale' => 'fr']);
+    }
+
+    public function testToString()
+    {
+        $this->assertSame('container_parameters_9893d3133814ab03cac3490f36dece77', (string) $this->resource);
+    }
+
+    public function testSerializeUnserialize()
+    {
+        $unserialized = unserialize(serialize($this->resource));
+
+        $this->assertEquals($this->resource, $unserialized);
+    }
+
+    public function testGetParameters()
+    {
+        $this->assertSame(['locales' => ['fr', 'en'], 'default_locale' => 'fr'], $this->resource->getParameters());
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ContainerBuilderTest.php b/lib/symfony/dependency-injection/Tests/ContainerBuilderTest.php
new file mode 100644
index 000000000..f2666ef96
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ContainerBuilderTest.php
@@ -0,0 +1,1536 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+require_once __DIR__.'/Fixtures/includes/classes.php';
+require_once __DIR__.'/Fixtures/includes/ProjectExtension.php';
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
+use Symfony\Component\Config\Resource\ComposerResource;
+use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Config\Resource\ResourceInterface;
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
+use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\ScalarFactory;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\SimilarArgumentsDummy;
+use Symfony\Component\DependencyInjection\TypedReference;
+use Symfony\Component\ExpressionLanguage\Expression;
+
+class ContainerBuilderTest extends TestCase
+{
+    public function testDefaultRegisteredDefinitions()
+    {
+        $builder = new ContainerBuilder();
+
+        $this->assertCount(1, $builder->getDefinitions());
+        $this->assertTrue($builder->hasDefinition('service_container'));
+
+        $definition = $builder->getDefinition('service_container');
+        $this->assertInstanceOf(Definition::class, $definition);
+        $this->assertTrue($definition->isSynthetic());
+        $this->assertSame(ContainerInterface::class, $definition->getClass());
+        $this->assertTrue($builder->hasAlias(PsrContainerInterface::class));
+        $this->assertTrue($builder->hasAlias(ContainerInterface::class));
+    }
+
+    public function testDefinitions()
+    {
+        $builder = new ContainerBuilder();
+        $definitions = [
+            'foo' => new Definition('Bar\FooClass'),
+            'bar' => new Definition('BarClass'),
+        ];
+        $builder->setDefinitions($definitions);
+        $this->assertEquals($definitions, $builder->getDefinitions(), '->setDefinitions() sets the service definitions');
+        $this->assertTrue($builder->hasDefinition('foo'), '->hasDefinition() returns true if a service definition exists');
+        $this->assertFalse($builder->hasDefinition('foobar'), '->hasDefinition() returns false if a service definition does not exist');
+
+        $builder->setDefinition('foobar', $foo = new Definition('FooBarClass'));
+        $this->assertEquals($foo, $builder->getDefinition('foobar'), '->getDefinition() returns a service definition if defined');
+        $this->assertSame($builder->setDefinition('foobar', $foo = new Definition('FooBarClass')), $foo, '->setDefinition() implements a fluid interface by returning the service reference');
+
+        $builder->addDefinitions($defs = ['foobar' => new Definition('FooBarClass')]);
+        $this->assertEquals(array_merge($definitions, $defs), $builder->getDefinitions(), '->addDefinitions() adds the service definitions');
+
+        try {
+            $builder->getDefinition('baz');
+            $this->fail('->getDefinition() throws a ServiceNotFoundException if the service definition does not exist');
+        } catch (ServiceNotFoundException $e) {
+            $this->assertEquals('You have requested a non-existent service "baz".', $e->getMessage(), '->getDefinition() throws a ServiceNotFoundException if the service definition does not exist');
+        }
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "deprecated_foo" service is deprecated. You should stop using it, as it will soon be removed.
+     */
+    public function testCreateDeprecatedService()
+    {
+        $definition = new Definition('stdClass');
+        $definition->setDeprecated(true);
+
+        $builder = new ContainerBuilder();
+        $builder->setDefinition('deprecated_foo', $definition);
+        $builder->get('deprecated_foo');
+    }
+
+    public function testRegister()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'Bar\FooClass');
+        $this->assertTrue($builder->hasDefinition('foo'), '->register() registers a new service definition');
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Definition', $builder->getDefinition('foo'), '->register() returns the newly created Definition instance');
+    }
+
+    public function testAutowire()
+    {
+        $builder = new ContainerBuilder();
+        $builder->autowire('foo', 'Bar\FooClass');
+
+        $this->assertTrue($builder->hasDefinition('foo'), '->autowire() registers a new service definition');
+        $this->assertTrue($builder->getDefinition('foo')->isAutowired(), '->autowire() creates autowired definitions');
+    }
+
+    public function testHas()
+    {
+        $builder = new ContainerBuilder();
+        $this->assertFalse($builder->has('foo'), '->has() returns false if the service does not exist');
+        $builder->register('foo', 'Bar\FooClass');
+        $this->assertTrue($builder->has('foo'), '->has() returns true if a service definition exists');
+        $builder->set('bar', new \stdClass());
+        $this->assertTrue($builder->has('bar'), '->has() returns true if a service exists');
+    }
+
+    public function testGetThrowsExceptionIfServiceDoesNotExist()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $this->expectExceptionMessage('You have requested a non-existent service "foo".');
+        $builder = new ContainerBuilder();
+        $builder->get('foo');
+    }
+
+    public function testGetReturnsNullIfServiceDoesNotExistAndInvalidReferenceIsUsed()
+    {
+        $builder = new ContainerBuilder();
+
+        $this->assertNull($builder->get('foo', ContainerInterface::NULL_ON_INVALID_REFERENCE), '->get() returns null if the service does not exist and NULL_ON_INVALID_REFERENCE is passed as a second argument');
+    }
+
+    public function testGetThrowsCircularReferenceExceptionIfServiceHasReferenceToItself()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $builder = new ContainerBuilder();
+        $builder->register('baz', 'stdClass')->setArguments([new Reference('baz')]);
+        $builder->get('baz');
+    }
+
+    public function testGetReturnsSameInstanceWhenServiceIsShared()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('bar', 'stdClass');
+
+        $this->assertTrue($builder->get('bar') === $builder->get('bar'), '->get() always returns the same instance if the service is shared');
+    }
+
+    public function testGetCreatesServiceBasedOnDefinition()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'stdClass');
+
+        $this->assertIsObject($builder->get('foo'), '->get() returns the service definition associated with the id');
+    }
+
+    public function testGetReturnsRegisteredService()
+    {
+        $builder = new ContainerBuilder();
+        $builder->set('bar', $bar = new \stdClass());
+
+        $this->assertSame($bar, $builder->get('bar'), '->get() returns the service associated with the id');
+    }
+
+    public function testRegisterDoesNotOverrideExistingService()
+    {
+        $builder = new ContainerBuilder();
+        $builder->set('bar', $bar = new \stdClass());
+        $builder->register('bar', 'stdClass');
+
+        $this->assertSame($bar, $builder->get('bar'), '->get() returns the service associated with the id even if a definition has been defined');
+    }
+
+    public function testNonSharedServicesReturnsDifferentInstances()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('bar', 'stdClass')->setShared(false);
+
+        $this->assertNotSame($builder->get('bar'), $builder->get('bar'));
+    }
+
+    /**
+     * @dataProvider provideBadId
+     */
+    public function testBadAliasId($id)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $builder = new ContainerBuilder();
+        $builder->setAlias($id, 'foo');
+    }
+
+    /**
+     * @dataProvider provideBadId
+     */
+    public function testBadDefinitionId($id)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $builder = new ContainerBuilder();
+        $builder->setDefinition($id, new Definition('Foo'));
+    }
+
+    public function provideBadId()
+    {
+        return [
+            [''],
+            ["\0"],
+            ["\r"],
+            ["\n"],
+            ["'"],
+            ['ab\\'],
+        ];
+    }
+
+    public function testGetUnsetLoadingServiceWhenCreateServiceThrowsAnException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('You have requested a synthetic service ("foo"). The DIC does not know how to construct this service.');
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'stdClass')->setSynthetic(true);
+
+        // we expect a RuntimeException here as foo is synthetic
+        try {
+            $builder->get('foo');
+        } catch (RuntimeException $e) {
+        }
+
+        // we must also have the same RuntimeException here
+        $builder->get('foo');
+    }
+
+    public function testGetServiceIds()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'stdClass');
+        $builder->bar = $bar = new \stdClass();
+        $builder->register('bar', 'stdClass');
+        $this->assertEquals(
+            [
+                'service_container',
+                'foo',
+                'bar',
+                'Psr\Container\ContainerInterface',
+                'Symfony\Component\DependencyInjection\ContainerInterface',
+            ],
+            $builder->getServiceIds(),
+            '->getServiceIds() returns all defined service ids'
+        );
+    }
+
+    public function testAliases()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'stdClass');
+        $builder->setAlias('bar', 'foo');
+        $this->assertTrue($builder->hasAlias('bar'), '->hasAlias() returns true if the alias exists');
+        $this->assertFalse($builder->hasAlias('foobar'), '->hasAlias() returns false if the alias does not exist');
+        $this->assertEquals('foo', (string) $builder->getAlias('bar'), '->getAlias() returns the aliased service');
+        $this->assertTrue($builder->has('bar'), '->setAlias() defines a new service');
+        $this->assertSame($builder->get('bar'), $builder->get('foo'), '->setAlias() creates a service that is an alias to another one');
+
+        try {
+            $builder->setAlias('foobar', 'foobar');
+            $this->fail('->setAlias() throws an InvalidArgumentException if the alias references itself');
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals('An alias can not reference itself, got a circular reference on "foobar".', $e->getMessage(), '->setAlias() throws an InvalidArgumentException if the alias references itself');
+        }
+
+        try {
+            $builder->getAlias('foobar');
+            $this->fail('->getAlias() throws an InvalidArgumentException if the alias does not exist');
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals('The service alias "foobar" does not exist.', $e->getMessage(), '->getAlias() throws an InvalidArgumentException if the alias does not exist');
+        }
+    }
+
+    public function testGetAliases()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setAlias('bar', 'foo');
+        $builder->setAlias('foobar', 'foo');
+        $builder->setAlias('moo', new Alias('foo', false));
+
+        $aliases = $builder->getAliases();
+        $this->assertEquals('foo', (string) $aliases['bar']);
+        $this->assertTrue($aliases['bar']->isPublic());
+        $this->assertEquals('foo', (string) $aliases['foobar']);
+        $this->assertEquals('foo', (string) $aliases['moo']);
+        $this->assertFalse($aliases['moo']->isPublic());
+
+        $builder->register('bar', 'stdClass');
+        $this->assertFalse($builder->hasAlias('bar'));
+
+        $builder->set('foobar', 'stdClass');
+        $builder->set('moo', 'stdClass');
+        $this->assertCount(2, $builder->getAliases(), '->getAliases() does not return aliased services that have been overridden');
+    }
+
+    public function testSetAliases()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setAliases(['bar' => 'foo', 'foobar' => 'foo']);
+
+        $aliases = $builder->getAliases();
+        $this->assertArrayHasKey('bar', $aliases);
+        $this->assertArrayHasKey('foobar', $aliases);
+    }
+
+    public function testAddAliases()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setAliases(['bar' => 'foo']);
+        $builder->addAliases(['foobar' => 'foo']);
+
+        $aliases = $builder->getAliases();
+        $this->assertArrayHasKey('bar', $aliases);
+        $this->assertArrayHasKey('foobar', $aliases);
+    }
+
+    public function testSetReplacesAlias()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setAlias('alias', 'aliased');
+        $builder->set('aliased', new \stdClass());
+
+        $builder->set('alias', $foo = new \stdClass());
+        $this->assertSame($foo, $builder->get('alias'), '->set() replaces an existing alias');
+    }
+
+    public function testAliasesKeepInvalidBehavior()
+    {
+        $builder = new ContainerBuilder();
+
+        $aliased = new Definition('stdClass');
+        $aliased->addMethodCall('setBar', [new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
+        $builder->setDefinition('aliased', $aliased);
+        $builder->setAlias('alias', 'aliased');
+
+        $this->assertEquals(new \stdClass(), $builder->get('alias'));
+    }
+
+    public function testAddGetCompilerPass()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setResourceTracking(false);
+        $defaultPasses = $builder->getCompiler()->getPassConfig()->getPasses();
+        $builder->addCompilerPass($pass1 = $this->getMockBuilder('Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface')->getMock(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -5);
+        $builder->addCompilerPass($pass2 = $this->getMockBuilder('Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface')->getMock(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 10);
+
+        $passes = $builder->getCompiler()->getPassConfig()->getPasses();
+        $this->assertCount(\count($passes) - 2, $defaultPasses);
+        // Pass 1 is executed later
+        $this->assertTrue(array_search($pass1, $passes, true) > array_search($pass2, $passes, true));
+    }
+
+    public function testCreateService()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo1', 'Bar\FooClass')->setFile(__DIR__.'/Fixtures/includes/foo.php');
+        $builder->register('foo2', 'Bar\FooClass')->setFile(__DIR__.'/Fixtures/includes/%file%.php');
+        $builder->setParameter('file', 'foo');
+        $this->assertInstanceOf('\Bar\FooClass', $builder->get('foo1'), '->createService() requires the file defined by the service definition');
+        $this->assertInstanceOf('\Bar\FooClass', $builder->get('foo2'), '->createService() replaces parameters in the file provided by the service definition');
+    }
+
+    public function testCreateProxyWithRealServiceInstantiator()
+    {
+        $builder = new ContainerBuilder();
+
+        $builder->register('foo1', 'Bar\FooClass')->setFile(__DIR__.'/Fixtures/includes/foo.php');
+        $builder->getDefinition('foo1')->setLazy(true);
+
+        $foo1 = $builder->get('foo1');
+
+        $this->assertSame($foo1, $builder->get('foo1'), 'The same proxy is retrieved on multiple subsequent calls');
+        $this->assertSame('Bar\FooClass', \get_class($foo1));
+    }
+
+    public function testCreateServiceClass()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo1', '%class%');
+        $builder->setParameter('class', 'stdClass');
+        $this->assertInstanceOf('\stdClass', $builder->get('foo1'), '->createService() replaces parameters in the class provided by the service definition');
+    }
+
+    public function testCreateServiceArguments()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('bar', 'stdClass');
+        $builder->register('foo1', 'Bar\FooClass')->addArgument(['foo' => '%value%', '%value%' => 'foo', new Reference('bar'), '%%unescape_it%%']);
+        $builder->setParameter('value', 'bar');
+        $this->assertEquals(['foo' => 'bar', 'bar' => 'foo', $builder->get('bar'), '%unescape_it%'], $builder->get('foo1')->arguments, '->createService() replaces parameters and service references in the arguments provided by the service definition');
+    }
+
+    public function testCreateServiceFactory()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'Bar\FooClass')->setFactory('Bar\FooClass::getInstance');
+        $builder->register('qux', 'Bar\FooClass')->setFactory(['Bar\FooClass', 'getInstance']);
+        $builder->register('bar', 'Bar\FooClass')->setFactory([new Definition('Bar\FooClass'), 'getInstance']);
+        $builder->register('baz', 'Bar\FooClass')->setFactory([new Reference('bar'), 'getInstance']);
+
+        $this->assertTrue($builder->get('foo')->called, '->createService() calls the factory method to create the service instance');
+        $this->assertTrue($builder->get('qux')->called, '->createService() calls the factory method to create the service instance');
+        $this->assertTrue($builder->get('bar')->called, '->createService() uses anonymous service as factory');
+        $this->assertTrue($builder->get('baz')->called, '->createService() uses another service as factory');
+    }
+
+    public function testCreateServiceMethodCalls()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('bar', 'stdClass');
+        $builder->register('foo1', 'Bar\FooClass')->addMethodCall('setBar', [['%value%', new Reference('bar')]]);
+        $builder->setParameter('value', 'bar');
+        $this->assertEquals(['bar', $builder->get('bar')], $builder->get('foo1')->bar, '->createService() replaces the values in the method calls arguments');
+    }
+
+    public function testCreateServiceMethodCallsWithEscapedParam()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('bar', 'stdClass');
+        $builder->register('foo1', 'Bar\FooClass')->addMethodCall('setBar', [['%%unescape_it%%']]);
+        $builder->setParameter('value', 'bar');
+        $this->assertEquals(['%unescape_it%'], $builder->get('foo1')->bar, '->createService() replaces the values in the method calls arguments');
+    }
+
+    public function testCreateServiceProperties()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('bar', 'stdClass');
+        $builder->register('foo1', 'Bar\FooClass')->setProperty('bar', ['%value%', new Reference('bar'), '%%unescape_it%%']);
+        $builder->setParameter('value', 'bar');
+        $this->assertEquals(['bar', $builder->get('bar'), '%unescape_it%'], $builder->get('foo1')->bar, '->createService() replaces the values in the properties');
+    }
+
+    public function testCreateServiceConfigurator()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo1', 'Bar\FooClass')->setConfigurator('sc_configure');
+        $builder->register('foo2', 'Bar\FooClass')->setConfigurator(['%class%', 'configureStatic']);
+        $builder->setParameter('class', 'BazClass');
+        $builder->register('baz', 'BazClass');
+        $builder->register('foo3', 'Bar\FooClass')->setConfigurator([new Reference('baz'), 'configure']);
+        $builder->register('foo4', 'Bar\FooClass')->setConfigurator([$builder->getDefinition('baz'), 'configure']);
+        $builder->register('foo5', 'Bar\FooClass')->setConfigurator('foo');
+
+        $this->assertTrue($builder->get('foo1')->configured, '->createService() calls the configurator');
+        $this->assertTrue($builder->get('foo2')->configured, '->createService() calls the configurator');
+        $this->assertTrue($builder->get('foo3')->configured, '->createService() calls the configurator');
+        $this->assertTrue($builder->get('foo4')->configured, '->createService() calls the configurator');
+
+        try {
+            $builder->get('foo5');
+            $this->fail('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals('The configure callable for class "Bar\FooClass" is not a callable.', $e->getMessage(), '->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
+        }
+    }
+
+    public function testCreateServiceWithIteratorArgument()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('bar', 'stdClass');
+        $builder
+            ->register('lazy_context', 'LazyContext')
+            ->setArguments([
+                new IteratorArgument(['k1' => new Reference('bar'), new Reference('invalid', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]),
+                new IteratorArgument([]),
+            ])
+        ;
+
+        $lazyContext = $builder->get('lazy_context');
+        $this->assertInstanceOf(RewindableGenerator::class, $lazyContext->lazyValues);
+        $this->assertInstanceOf(RewindableGenerator::class, $lazyContext->lazyEmptyValues);
+        $this->assertCount(1, $lazyContext->lazyValues);
+        $this->assertCount(0, $lazyContext->lazyEmptyValues);
+
+        $i = 0;
+        foreach ($lazyContext->lazyValues as $k => $v) {
+            ++$i;
+            $this->assertEquals('k1', $k);
+            $this->assertInstanceOf('\stdClass', $v);
+        }
+
+        // The second argument should have been ignored.
+        $this->assertEquals(1, $i);
+
+        $i = 0;
+        foreach ($lazyContext->lazyEmptyValues as $k => $v) {
+            ++$i;
+        }
+
+        $this->assertEquals(0, $i);
+    }
+
+    public function testCreateSyntheticService()
+    {
+        $this->expectException('RuntimeException');
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'Bar\FooClass')->setSynthetic(true);
+        $builder->get('foo');
+    }
+
+    public function testCreateServiceWithExpression()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setParameter('bar', 'bar');
+        $builder->register('bar', 'BarClass');
+        $builder->register('foo', 'Bar\FooClass')->addArgument(['foo' => new Expression('service("bar").foo ~ parameter("bar")')]);
+        $this->assertEquals('foobar', $builder->get('foo')->arguments['foo']);
+    }
+
+    public function testResolveServices()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'Bar\FooClass');
+        $this->assertEquals($builder->get('foo'), $builder->resolveServices(new Reference('foo')), '->resolveServices() resolves service references to service instances');
+        $this->assertEquals(['foo' => ['foo', $builder->get('foo')]], $builder->resolveServices(['foo' => ['foo', new Reference('foo')]]), '->resolveServices() resolves service references to service instances in nested arrays');
+        $this->assertEquals($builder->get('foo'), $builder->resolveServices(new Expression('service("foo")')), '->resolveServices() resolves expressions');
+    }
+
+    public function testResolveServicesWithDecoratedDefinition()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Constructing service "foo" from a parent definition is not supported at build time.');
+        $builder = new ContainerBuilder();
+        $builder->setDefinition('grandpa', new Definition('stdClass'));
+        $builder->setDefinition('parent', new ChildDefinition('grandpa'));
+        $builder->setDefinition('foo', new ChildDefinition('parent'));
+
+        $builder->get('foo');
+    }
+
+    public function testResolveServicesWithCustomDefinitionClass()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setDefinition('foo', new CustomDefinition('stdClass'));
+
+        $this->assertInstanceOf('stdClass', $builder->get('foo'));
+    }
+
+    public function testMerge()
+    {
+        $container = new ContainerBuilder(new ParameterBag(['bar' => 'foo']));
+        $container->setResourceTracking(false);
+        $config = new ContainerBuilder(new ParameterBag(['foo' => 'bar']));
+        $container->merge($config);
+        $this->assertEquals(['bar' => 'foo', 'foo' => 'bar'], $container->getParameterBag()->all(), '->merge() merges current parameters with the loaded ones');
+
+        $container = new ContainerBuilder(new ParameterBag(['bar' => 'foo']));
+        $container->setResourceTracking(false);
+        $config = new ContainerBuilder(new ParameterBag(['foo' => '%bar%']));
+        $container->merge($config);
+        $container->compile();
+        $this->assertEquals(['bar' => 'foo', 'foo' => 'foo'], $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
+
+        $container = new ContainerBuilder(new ParameterBag(['bar' => 'foo']));
+        $container->setResourceTracking(false);
+        $config = new ContainerBuilder(new ParameterBag(['foo' => '%bar%', 'baz' => '%foo%']));
+        $container->merge($config);
+        $container->compile();
+        $this->assertEquals(['bar' => 'foo', 'foo' => 'foo', 'baz' => 'foo'], $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
+
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->register('foo', 'Bar\FooClass');
+        $container->register('bar', 'BarClass');
+        $config = new ContainerBuilder();
+        $config->setDefinition('baz', new Definition('BazClass'));
+        $config->setAlias('alias_for_foo', 'foo');
+        $container->merge($config);
+        $this->assertEquals(['service_container', 'foo', 'bar', 'baz'], array_keys($container->getDefinitions()), '->merge() merges definitions already defined ones');
+
+        $aliases = $container->getAliases();
+        $this->assertArrayHasKey('alias_for_foo', $aliases);
+        $this->assertEquals('foo', (string) $aliases['alias_for_foo']);
+
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->register('foo', 'Bar\FooClass');
+        $config->setDefinition('foo', new Definition('BazClass'));
+        $container->merge($config);
+        $this->assertEquals('BazClass', $container->getDefinition('foo')->getClass(), '->merge() overrides already defined services');
+
+        $container = new ContainerBuilder();
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->get('env(Foo)');
+        $config = new ContainerBuilder($bag);
+        $this->assertSame(['%env(Bar)%'], $config->resolveEnvPlaceholders([$bag->get('env(Bar)')]));
+        $container->merge($config);
+        $this->assertEquals(['Foo' => 0, 'Bar' => 1], $container->getEnvCounters());
+
+        $container = new ContainerBuilder();
+        $config = new ContainerBuilder();
+        $childDefA = $container->registerForAutoconfiguration('AInterface');
+        $childDefB = $config->registerForAutoconfiguration('BInterface');
+        $container->merge($config);
+        $this->assertSame(['AInterface' => $childDefA, 'BInterface' => $childDefB], $container->getAutoconfiguredInstanceof());
+    }
+
+    public function testMergeThrowsExceptionForDuplicateAutomaticInstanceofDefinitions()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('"AInterface" has already been autoconfigured and merge() does not support merging autoconfiguration for the same class/interface.');
+        $container = new ContainerBuilder();
+        $config = new ContainerBuilder();
+        $container->registerForAutoconfiguration('AInterface');
+        $config->registerForAutoconfiguration('AInterface');
+        $container->merge($config);
+    }
+
+    public function testResolveEnvValues()
+    {
+        $_ENV['DUMMY_ENV_VAR'] = 'du%%y';
+        $_SERVER['DUMMY_SERVER_VAR'] = 'ABC';
+        $_SERVER['HTTP_DUMMY_VAR'] = 'DEF';
+
+        $container = new ContainerBuilder();
+        $container->setParameter('bar', '%% %env(DUMMY_ENV_VAR)% %env(DUMMY_SERVER_VAR)% %env(HTTP_DUMMY_VAR)%');
+        $container->setParameter('env(HTTP_DUMMY_VAR)', '123');
+
+        $this->assertSame('%% du%%%%y ABC 123', $container->resolveEnvPlaceholders('%bar%', true));
+
+        unset($_ENV['DUMMY_ENV_VAR'], $_SERVER['DUMMY_SERVER_VAR'], $_SERVER['HTTP_DUMMY_VAR']);
+    }
+
+    public function testResolveEnvValuesWithArray()
+    {
+        $_ENV['ANOTHER_DUMMY_ENV_VAR'] = 'dummy';
+
+        $dummyArray = ['1' => 'one', '2' => 'two'];
+
+        $container = new ContainerBuilder();
+        $container->setParameter('dummy', '%env(ANOTHER_DUMMY_ENV_VAR)%');
+        $container->setParameter('dummy2', $dummyArray);
+
+        $container->resolveEnvPlaceholders('%dummy%', true);
+        $container->resolveEnvPlaceholders('%dummy2%', true);
+
+        $this->assertIsArray($container->resolveEnvPlaceholders('%dummy2%', true));
+
+        foreach ($dummyArray as $key => $value) {
+            $this->assertArrayHasKey($key, $container->resolveEnvPlaceholders('%dummy2%', true));
+        }
+
+        unset($_ENV['ANOTHER_DUMMY_ENV_VAR']);
+    }
+
+    public function testCompileWithResolveEnv()
+    {
+        putenv('DUMMY_ENV_VAR=du%%y');
+        $_SERVER['DUMMY_SERVER_VAR'] = 'ABC';
+        $_SERVER['HTTP_DUMMY_VAR'] = 'DEF';
+
+        $container = new ContainerBuilder();
+        $container->setParameter('env(FOO)', 'Foo');
+        $container->setParameter('env(DUMMY_ENV_VAR)', 'GHI');
+        $container->setParameter('bar', '%% %env(DUMMY_ENV_VAR)% %env(DUMMY_SERVER_VAR)% %env(HTTP_DUMMY_VAR)%');
+        $container->setParameter('foo', '%env(FOO)%');
+        $container->setParameter('baz', '%foo%');
+        $container->setParameter('env(HTTP_DUMMY_VAR)', '123');
+        $container->register('teatime', 'stdClass')
+            ->setProperty('foo', '%env(DUMMY_ENV_VAR)%')
+            ->setPublic(true)
+        ;
+        $container->compile(true);
+
+        $this->assertSame('% du%%y ABC 123', $container->getParameter('bar'));
+        $this->assertSame('Foo', $container->getParameter('baz'));
+        $this->assertSame('du%%y', $container->get('teatime')->foo);
+
+        unset($_SERVER['DUMMY_SERVER_VAR'], $_SERVER['HTTP_DUMMY_VAR']);
+        putenv('DUMMY_ENV_VAR');
+    }
+
+    public function testCompileWithArrayResolveEnv()
+    {
+        putenv('ARRAY={"foo":"bar"}');
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', '%env(json:ARRAY)%');
+        $container->compile(true);
+
+        $this->assertSame(['foo' => 'bar'], $container->getParameter('foo'));
+
+        putenv('ARRAY');
+    }
+
+    public function testCompileWithArrayAndAnotherResolveEnv()
+    {
+        putenv('DUMMY_ENV_VAR=abc');
+        putenv('ARRAY={"foo":"bar"}');
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', '%env(json:ARRAY)%');
+        $container->setParameter('bar', '%env(DUMMY_ENV_VAR)%');
+        $container->compile(true);
+
+        $this->assertSame(['foo' => 'bar'], $container->getParameter('foo'));
+        $this->assertSame('abc', $container->getParameter('bar'));
+
+        putenv('DUMMY_ENV_VAR');
+        putenv('ARRAY');
+    }
+
+    public function testCompileWithArrayInStringResolveEnv()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('A string value must be composed of strings and/or numbers, but found parameter "env(json:ARRAY)" of type array inside string value "ABC %env(json:ARRAY)%".');
+        putenv('ARRAY={"foo":"bar"}');
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', 'ABC %env(json:ARRAY)%');
+        $container->compile(true);
+
+        putenv('ARRAY');
+    }
+
+    public function testCompileWithResolveMissingEnv()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\EnvNotFoundException');
+        $this->expectExceptionMessage('Environment variable not found: "FOO".');
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', '%env(FOO)%');
+        $container->compile(true);
+    }
+
+    public function testDynamicEnv()
+    {
+        putenv('DUMMY_FOO=some%foo%');
+        putenv('DUMMY_BAR=%bar%');
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', 'Foo%env(resolve:DUMMY_BAR)%');
+        $container->setParameter('bar', 'Bar');
+        $container->setParameter('baz', '%env(resolve:DUMMY_FOO)%');
+
+        $container->compile(true);
+        putenv('DUMMY_FOO');
+        putenv('DUMMY_BAR');
+
+        $this->assertSame('someFooBar', $container->getParameter('baz'));
+    }
+
+    public function testCastEnv()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(FAKE)', '123');
+
+        $container->register('foo', 'stdClass')
+            ->setPublic(true)
+            ->setProperties([
+                'fake' => '%env(int:FAKE)%',
+            ]);
+
+        $container->compile(true);
+
+        $this->assertSame(123, $container->get('foo')->fake);
+    }
+
+    public function testEnvAreNullable()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(FAKE)', null);
+
+        $container->register('foo', 'stdClass')
+            ->setPublic(true)
+            ->setProperties([
+            'fake' => '%env(int:FAKE)%',
+        ]);
+
+        $container->compile(true);
+
+        $this->assertNull($container->get('foo')->fake);
+    }
+
+    public function testEnvInId()
+    {
+        $container = include __DIR__.'/Fixtures/containers/container_env_in_id.php';
+        $container->compile(true);
+
+        $expected = [
+            'service_container',
+            'foo',
+            'bar',
+            'bar_%env(BAR)%',
+        ];
+        $this->assertSame($expected, array_keys($container->getDefinitions()));
+
+        $expected = [
+            PsrContainerInterface::class => true,
+            ContainerInterface::class => true,
+            'baz_%env(BAR)%' => true,
+            'bar_%env(BAR)%' => true,
+        ];
+        $this->assertSame($expected, $container->getRemovedIds());
+
+        $this->assertSame(['baz_bar'], array_keys($container->getDefinition('foo')->getArgument(1)));
+    }
+
+    public function testCircularDynamicEnv()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException');
+        $this->expectExceptionMessage('Circular reference detected for parameter "env(resolve:DUMMY_ENV_VAR)" ("env(resolve:DUMMY_ENV_VAR)" > "env(resolve:DUMMY_ENV_VAR)").');
+        putenv('DUMMY_ENV_VAR=some%foo%');
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', '%bar%');
+        $container->setParameter('bar', '%env(resolve:DUMMY_ENV_VAR)%');
+
+        try {
+            $container->compile(true);
+        } finally {
+            putenv('DUMMY_ENV_VAR');
+        }
+    }
+
+    public function testMergeLogicException()
+    {
+        $this->expectException('LogicException');
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->compile();
+        $container->merge(new ContainerBuilder());
+    }
+
+    public function testfindTaggedServiceIds()
+    {
+        $builder = new ContainerBuilder();
+        $builder
+            ->register('foo', 'Bar\FooClass')
+            ->addTag('foo', ['foo' => 'foo'])
+            ->addTag('bar', ['bar' => 'bar'])
+            ->addTag('foo', ['foofoo' => 'foofoo'])
+        ;
+        $this->assertEquals($builder->findTaggedServiceIds('foo'), [
+            'foo' => [
+                ['foo' => 'foo'],
+                ['foofoo' => 'foofoo'],
+            ],
+        ], '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
+        $this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
+    }
+
+    public function testFindUnusedTags()
+    {
+        $builder = new ContainerBuilder();
+        $builder
+            ->register('foo', 'Bar\FooClass')
+            ->addTag('kernel.event_listener', ['foo' => 'foo'])
+            ->addTag('kenrel.event_listener', ['bar' => 'bar'])
+        ;
+        $builder->findTaggedServiceIds('kernel.event_listener');
+        $this->assertEquals(['kenrel.event_listener'], $builder->findUnusedTags(), '->findUnusedTags() returns an array with unused tags');
+    }
+
+    public function testFindDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container->setDefinition('foo', $definition = new Definition('Bar\FooClass'));
+        $container->setAlias('bar', 'foo');
+        $container->setAlias('foobar', 'bar');
+        $this->assertEquals($definition, $container->findDefinition('foobar'), '->findDefinition() returns a Definition');
+    }
+
+    public function testAddObjectResource()
+    {
+        $container = new ContainerBuilder();
+
+        $container->setResourceTracking(false);
+        $container->addObjectResource(new \BarClass());
+
+        $this->assertEmpty($container->getResources(), 'No resources get registered without resource tracking');
+
+        $container->setResourceTracking(true);
+        $container->addObjectResource(new \BarClass());
+
+        $resources = $container->getResources();
+
+        $this->assertCount(2, $resources, '2 resources were registered');
+
+        /* @var $resource \Symfony\Component\Config\Resource\FileResource */
+        $resource = end($resources);
+
+        $this->assertInstanceOf('Symfony\Component\Config\Resource\FileResource', $resource);
+        $this->assertSame(realpath(__DIR__.'/Fixtures/includes/classes.php'), realpath($resource->getResource()));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testAddClassResource()
+    {
+        $container = new ContainerBuilder();
+
+        $container->setResourceTracking(false);
+        $container->addClassResource(new \ReflectionClass('BarClass'));
+
+        $this->assertEmpty($container->getResources(), 'No resources get registered without resource tracking');
+
+        $container->setResourceTracking(true);
+        $container->addClassResource(new \ReflectionClass('BarClass'));
+
+        $resources = $container->getResources();
+
+        $this->assertCount(2, $resources, '2 resources were registered');
+
+        /* @var $resource \Symfony\Component\Config\Resource\FileResource */
+        $resource = end($resources);
+
+        $this->assertInstanceOf('Symfony\Component\Config\Resource\FileResource', $resource);
+        $this->assertSame(realpath(__DIR__.'/Fixtures/includes/classes.php'), realpath($resource->getResource()));
+    }
+
+    public function testGetReflectionClass()
+    {
+        $container = new ContainerBuilder();
+
+        $container->setResourceTracking(false);
+        $r1 = $container->getReflectionClass('BarClass');
+
+        $this->assertEmpty($container->getResources(), 'No resources get registered without resource tracking');
+
+        $container->setResourceTracking(true);
+        $r2 = $container->getReflectionClass('BarClass');
+        $r3 = $container->getReflectionClass('BarClass');
+
+        $this->assertNull($container->getReflectionClass('BarMissingClass'));
+
+        $this->assertEquals($r1, $r2);
+        $this->assertSame($r2, $r3);
+
+        $resources = $container->getResources();
+
+        $this->assertCount(3, $resources, '3 resources were registered');
+
+        $this->assertSame('reflection.BarClass', (string) $resources[1]);
+        $this->assertSame('BarMissingClass', (string) end($resources));
+    }
+
+    public function testGetReflectionClassOnInternalTypes()
+    {
+        $container = new ContainerBuilder();
+
+        $this->assertNull($container->getReflectionClass('int'));
+        $this->assertNull($container->getReflectionClass('float'));
+        $this->assertNull($container->getReflectionClass('string'));
+        $this->assertNull($container->getReflectionClass('bool'));
+        $this->assertNull($container->getReflectionClass('resource'));
+        $this->assertNull($container->getReflectionClass('object'));
+        $this->assertNull($container->getReflectionClass('array'));
+        $this->assertNull($container->getReflectionClass('null'));
+        $this->assertNull($container->getReflectionClass('callable'));
+        $this->assertNull($container->getReflectionClass('iterable'));
+        $this->assertNull($container->getReflectionClass('mixed'));
+    }
+
+    public function testCompilesClassDefinitionsOfLazyServices()
+    {
+        $container = new ContainerBuilder();
+
+        $this->assertEmpty($container->getResources(), 'No resources get registered without resource tracking');
+
+        $container->register('foo', 'BarClass')->setPublic(true);
+        $container->getDefinition('foo')->setLazy(true);
+
+        $container->compile();
+
+        $matchingResources = array_filter(
+            $container->getResources(),
+            function (ResourceInterface $resource) {
+                return 'reflection.BarClass' === (string) $resource;
+            }
+        );
+
+        $this->assertNotEmpty($matchingResources);
+    }
+
+    public function testResources()
+    {
+        $container = new ContainerBuilder();
+        $container->addResource($a = new FileResource(__DIR__.'/Fixtures/xml/services1.xml'));
+        $container->addResource($b = new FileResource(__DIR__.'/Fixtures/xml/services2.xml'));
+        $resources = [];
+        foreach ($container->getResources() as $resource) {
+            if (false === strpos($resource, '.php')) {
+                $resources[] = $resource;
+            }
+        }
+        $this->assertEquals([$a, $b], $resources, '->getResources() returns an array of resources read for the current configuration');
+        $this->assertSame($container, $container->setResources([]));
+        $this->assertEquals([], $container->getResources());
+    }
+
+    public function testFileExists()
+    {
+        $container = new ContainerBuilder();
+        $A = new ComposerResource();
+        $a = new FileResource(__DIR__.'/Fixtures/xml/services1.xml');
+        $b = new FileResource(__DIR__.'/Fixtures/xml/services2.xml');
+        $c = new DirectoryResource($dir = \dirname($b));
+
+        $this->assertTrue($container->fileExists((string) $a) && $container->fileExists((string) $b) && $container->fileExists($dir));
+
+        $resources = [];
+        foreach ($container->getResources() as $resource) {
+            if (false === strpos($resource, '.php')) {
+                $resources[] = $resource;
+            }
+        }
+
+        $this->assertEquals([$A, $a, $b, $c], $resources, '->getResources() returns an array of resources read for the current configuration');
+    }
+
+    public function testExtension()
+    {
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+
+        $container->registerExtension($extension = new \ProjectExtension());
+        $this->assertSame($container->getExtension('project'), $extension, '->registerExtension() registers an extension');
+
+        $this->expectException('LogicException');
+        $container->getExtension('no_registered');
+    }
+
+    public function testRegisteredButNotLoadedExtension()
+    {
+        $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface')->getMock();
+        $extension->expects($this->once())->method('getAlias')->willReturn('project');
+        $extension->expects($this->never())->method('load');
+
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->registerExtension($extension);
+        $container->compile();
+    }
+
+    public function testRegisteredAndLoadedExtension()
+    {
+        $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface')->getMock();
+        $extension->expects($this->exactly(2))->method('getAlias')->willReturn('project');
+        $extension->expects($this->once())->method('load')->with([['foo' => 'bar']]);
+
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->registerExtension($extension);
+        $container->loadFromExtension('project', ['foo' => 'bar']);
+        $container->compile();
+    }
+
+    public function testPrivateServiceUser()
+    {
+        $fooDefinition = new Definition('BarClass');
+        $fooUserDefinition = new Definition('BarUserClass', [new Reference('bar')]);
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+
+        $fooDefinition->setPublic(false);
+
+        $container->addDefinitions([
+            'bar' => $fooDefinition,
+            'bar_user' => $fooUserDefinition->setPublic(true),
+        ]);
+
+        $container->compile();
+        $this->assertInstanceOf('BarClass', $container->get('bar_user')->bar);
+    }
+
+    public function testThrowsExceptionWhenSetServiceOnACompiledContainer()
+    {
+        $this->expectException('BadMethodCallException');
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->register('a', 'stdClass')->setPublic(true);
+        $container->compile();
+        $container->set('a', new \stdClass());
+    }
+
+    public function testThrowsExceptionWhenAddServiceOnACompiledContainer()
+    {
+        $container = new ContainerBuilder();
+        $container->compile();
+        $container->set('a', $foo = new \stdClass());
+        $this->assertSame($foo, $container->get('a'));
+    }
+
+    public function testNoExceptionWhenSetSyntheticServiceOnACompiledContainer()
+    {
+        $container = new ContainerBuilder();
+        $def = new Definition('stdClass');
+        $def->setSynthetic(true)->setPublic(true);
+        $container->setDefinition('a', $def);
+        $container->compile();
+        $container->set('a', $a = new \stdClass());
+        $this->assertEquals($a, $container->get('a'));
+    }
+
+    public function testThrowsExceptionWhenSetDefinitionOnACompiledContainer()
+    {
+        $this->expectException('BadMethodCallException');
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->compile();
+        $container->setDefinition('a', new Definition());
+    }
+
+    public function testExtensionConfig()
+    {
+        $container = new ContainerBuilder();
+
+        $configs = $container->getExtensionConfig('foo');
+        $this->assertEmpty($configs);
+
+        $first = ['foo' => 'bar'];
+        $container->prependExtensionConfig('foo', $first);
+        $configs = $container->getExtensionConfig('foo');
+        $this->assertEquals([$first], $configs);
+
+        $second = ['ding' => 'dong'];
+        $container->prependExtensionConfig('foo', $second);
+        $configs = $container->getExtensionConfig('foo');
+        $this->assertEquals([$second, $first], $configs);
+    }
+
+    public function testAbstractAlias()
+    {
+        $container = new ContainerBuilder();
+
+        $abstract = new Definition('AbstractClass');
+        $abstract->setAbstract(true)->setPublic(true);
+
+        $container->setDefinition('abstract_service', $abstract);
+        $container->setAlias('abstract_alias', 'abstract_service')->setPublic(true);
+
+        $container->compile();
+
+        $this->assertSame('abstract_service', (string) $container->getAlias('abstract_alias'));
+    }
+
+    public function testLazyLoadedService()
+    {
+        $loader = new ClosureLoader($container = new ContainerBuilder());
+        $loader->load(function (ContainerBuilder $container) {
+            $container->set('a', new \BazClass());
+            $definition = new Definition('BazClass');
+            $definition->setLazy(true);
+            $definition->setPublic(true);
+            $container->setDefinition('a', $definition);
+        });
+
+        $container->setResourceTracking(true);
+
+        $container->compile();
+
+        $r = new \ReflectionProperty($container, 'resources');
+        $r->setAccessible(true);
+        $resources = $r->getValue($container);
+
+        $classInList = false;
+        foreach ($resources as $resource) {
+            if ('reflection.BazClass' === (string) $resource) {
+                $classInList = true;
+                break;
+            }
+        }
+
+        $this->assertTrue($classInList);
+    }
+
+    public function testInlinedDefinitions()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = new Definition('BarClass');
+
+        $container->register('bar_user', 'BarUserClass')
+            ->addArgument($definition)
+            ->setProperty('foo', $definition);
+
+        $container->register('bar', 'BarClass')
+            ->setProperty('foo', $definition)
+            ->addMethodCall('setBaz', [$definition]);
+
+        $barUser = $container->get('bar_user');
+        $bar = $container->get('bar');
+
+        $this->assertSame($barUser->foo, $barUser->bar);
+        $this->assertSame($bar->foo, $bar->getBaz());
+        $this->assertNotSame($bar->foo, $barUser->foo);
+    }
+
+    public function testThrowsCircularExceptionForCircularAliases()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $this->expectExceptionMessage('Circular reference detected for service "app.test_class", path: "app.test_class -> App\TestClass -> app.test_class".');
+        $builder = new ContainerBuilder();
+
+        $builder->setAliases([
+            'foo' => new Alias('app.test_class'),
+            'app.test_class' => new Alias('App\\TestClass'),
+            'App\\TestClass' => new Alias('app.test_class'),
+        ]);
+
+        $builder->findDefinition('foo');
+    }
+
+    public function testInitializePropertiesBeforeMethodCalls()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass');
+        $container->register('bar', 'MethodCallClass')
+            ->setPublic(true)
+            ->setProperty('simple', 'bar')
+            ->setProperty('complex', new Reference('foo'))
+            ->addMethodCall('callMe');
+
+        $container->compile();
+
+        $this->assertTrue($container->get('bar')->callPassed(), '->compile() initializes properties before method calls');
+    }
+
+    public function testAutowiring()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(A::class)->setPublic(true);
+        $bDefinition = $container->register('b', __NAMESPACE__.'\B');
+        $bDefinition->setAutowired(true);
+        $bDefinition->setPublic(true);
+
+        $container->compile();
+
+        $this->assertEquals(A::class, (string) $container->getDefinition('b')->getArgument(0));
+    }
+
+    public function testClassFromId()
+    {
+        $container = new ContainerBuilder();
+
+        $unknown = $container->register('Acme\UnknownClass');
+        $autoloadClass = $container->register(CaseSensitiveClass::class);
+        $container->compile();
+
+        $this->assertSame('Acme\UnknownClass', $unknown->getClass());
+        $this->assertEquals(CaseSensitiveClass::class, $autoloadClass->getClass());
+    }
+
+    public function testNoClassFromGlobalNamespaceClassId()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The definition for "DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.');
+        $container = new ContainerBuilder();
+
+        $container->register(\DateTime::class);
+        $container->compile();
+    }
+
+    public function testNoClassFromGlobalNamespaceClassIdWithLeadingSlash()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The definition for "\DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.');
+        $container = new ContainerBuilder();
+
+        $container->register('\\'.\DateTime::class);
+        $container->compile();
+    }
+
+    public function testNoClassFromNamespaceClassIdWithLeadingSlash()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The definition for "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "Symfony\Component\DependencyInjection\Tests\FooClass" to get rid of this error.');
+        $container = new ContainerBuilder();
+
+        $container->register('\\'.FooClass::class);
+        $container->compile();
+    }
+
+    public function testNoClassFromNonClassId()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The definition for "123_abc" has no class.');
+        $container = new ContainerBuilder();
+
+        $container->register('123_abc');
+        $container->compile();
+    }
+
+    public function testNoClassFromNsSeparatorId()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The definition for "\foo" has no class.');
+        $container = new ContainerBuilder();
+
+        $container->register('\\foo');
+        $container->compile();
+    }
+
+    public function testServiceLocator()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo_service', ServiceLocator::class)
+            ->setPublic(true)
+            ->addArgument([
+                'bar' => new ServiceClosureArgument(new Reference('bar_service')),
+                'baz' => new ServiceClosureArgument(new TypedReference('baz_service', 'stdClass')),
+            ])
+        ;
+        $container->register('bar_service', 'stdClass')->setArguments([new Reference('baz_service')])->setPublic(true);
+        $container->register('baz_service', 'stdClass')->setPublic(false);
+        $container->compile();
+
+        $this->assertInstanceOf(ServiceLocator::class, $foo = $container->get('foo_service'));
+        $this->assertSame($container->get('bar_service'), $foo->get('bar'));
+    }
+
+    public function testUninitializedReference()
+    {
+        $container = include __DIR__.'/Fixtures/containers/container_uninitialized_ref.php';
+        $container->compile();
+
+        $bar = $container->get('bar');
+
+        $this->assertNull($bar->foo1);
+        $this->assertNull($bar->foo2);
+        $this->assertNull($bar->foo3);
+        $this->assertNull($bar->closures[0]());
+        $this->assertNull($bar->closures[1]());
+        $this->assertNull($bar->closures[2]());
+        $this->assertSame([], iterator_to_array($bar->iter));
+
+        $container = include __DIR__.'/Fixtures/containers/container_uninitialized_ref.php';
+        $container->compile();
+
+        $container->get('foo1');
+        $container->get('baz');
+
+        $bar = $container->get('bar');
+
+        $this->assertEquals(new \stdClass(), $bar->foo1);
+        $this->assertNull($bar->foo2);
+        $this->assertEquals(new \stdClass(), $bar->foo3);
+        $this->assertEquals(new \stdClass(), $bar->closures[0]());
+        $this->assertNull($bar->closures[1]());
+        $this->assertEquals(new \stdClass(), $bar->closures[2]());
+        $this->assertEquals(['foo1' => new \stdClass(), 'foo3' => new \stdClass()], iterator_to_array($bar->iter));
+    }
+
+    /**
+     * @dataProvider provideAlmostCircular
+     */
+    public function testAlmostCircular($visibility)
+    {
+        $container = include __DIR__.'/Fixtures/containers/container_almost_circular.php';
+
+        $foo = $container->get('foo');
+        $this->assertSame($foo, $foo->bar->foobar->foo);
+
+        $foo2 = $container->get('foo2');
+        $this->assertSame($foo2, $foo2->bar->foobar->foo);
+
+        $this->assertSame([], (array) $container->get('foobar4'));
+
+        $foo5 = $container->get('foo5');
+        $this->assertSame($foo5, $foo5->bar->foo);
+
+        $manager = $container->get('manager');
+        $this->assertEquals(new \stdClass(), $manager);
+
+        $manager = $container->get('manager2');
+        $this->assertEquals(new \stdClass(), $manager);
+
+        $foo6 = $container->get('foo6');
+        $this->assertEquals((object) ['bar6' => (object) []], $foo6);
+
+        $this->assertInstanceOf(\stdClass::class, $container->get('root'));
+
+        $manager3 = $container->get('manager3');
+        $listener3 = $container->get('listener3');
+        $this->assertSame($manager3, $listener3->manager, 'Both should identically be the manager3 service');
+
+        $listener4 = $container->get('listener4');
+        $this->assertInstanceOf('stdClass', $listener4);
+    }
+
+    public function provideAlmostCircular()
+    {
+        yield ['public'];
+        yield ['private'];
+    }
+
+    public function testRegisterForAutoconfiguration()
+    {
+        $container = new ContainerBuilder();
+        $childDefA = $container->registerForAutoconfiguration('AInterface');
+        $childDefB = $container->registerForAutoconfiguration('BInterface');
+        $this->assertSame(['AInterface' => $childDefA, 'BInterface' => $childDefB], $container->getAutoconfiguredInstanceof());
+
+        // when called multiple times, the same instance is returned
+        $this->assertSame($childDefA, $container->registerForAutoconfiguration('AInterface'));
+    }
+
+    /**
+     * This test checks the trigger of a deprecation note and should not be removed in major releases.
+     *
+     * @group legacy
+     * @expectedDeprecation The "foo" service is deprecated. You should stop using it, as it will soon be removed.
+     */
+    public function testPrivateServiceTriggersDeprecation()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')
+            ->setPublic(false)
+            ->setDeprecated(true);
+        $container->register('bar', 'stdClass')
+            ->setPublic(true)
+            ->setProperty('foo', new Reference('foo'));
+
+        $container->compile();
+
+        $container->get('bar');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "FOO" instead of "foo" is deprecated since Symfony 3.4.
+     */
+    public function testParameterWithMixedCase()
+    {
+        $container = new ContainerBuilder(new ParameterBag(['foo' => 'bar']));
+        $container->register('foo', 'stdClass')
+            ->setPublic(true)
+            ->setProperty('foo', '%FOO%');
+
+        $container->compile();
+
+        $this->assertSame('bar', $container->get('foo')->foo);
+    }
+
+    public function testArgumentsHaveHigherPriorityThanBindings()
+    {
+        $container = new ContainerBuilder();
+        $container->register('class.via.bindings', CaseSensitiveClass::class)->setArguments([
+            'via-bindings',
+        ]);
+        $container->register('class.via.argument', CaseSensitiveClass::class)->setArguments([
+            'via-argument',
+        ]);
+        $container->register('foo', SimilarArgumentsDummy::class)->setPublic(true)->setBindings([
+            CaseSensitiveClass::class => new Reference('class.via.bindings'),
+            '$token' => '1234',
+        ])->setArguments([
+            '$class1' => new Reference('class.via.argument'),
+        ]);
+
+        $this->assertSame(['service_container', 'class.via.bindings', 'class.via.argument', 'foo', 'Psr\Container\ContainerInterface', 'Symfony\Component\DependencyInjection\ContainerInterface'], $container->getServiceIds());
+
+        $container->compile();
+
+        $this->assertSame('via-argument', $container->get('foo')->class1->identifier);
+        $this->assertSame('via-bindings', $container->get('foo')->class2->identifier);
+    }
+
+    public function testUninitializedSyntheticReference()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->setPublic(true)->setSynthetic(true);
+        $container->register('bar', 'stdClass')->setPublic(true)->setShared(false)
+            ->setProperty('foo', new Reference('foo', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE));
+
+        $container->compile();
+
+        $this->assertEquals((object) ['foo' => null], $container->get('bar'));
+
+        $container->set('foo', (object) [123]);
+        $this->assertEquals((object) ['foo' => (object) [123]], $container->get('bar'));
+    }
+
+    public function testDecoratedSelfReferenceInvolvingPrivateServices()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')
+            ->setPublic(false)
+            ->setProperty('bar', new Reference('foo'));
+        $container->register('baz', 'stdClass')
+            ->setPublic(false)
+            ->setProperty('inner', new Reference('baz.inner'))
+            ->setDecoratedService('foo');
+
+        $container->compile();
+
+        $this->assertSame(['service_container'], array_keys($container->getDefinitions()));
+    }
+
+    public function testScalarService()
+    {
+        $c = new ContainerBuilder();
+        $c->register('foo', 'string')
+            ->setPublic(true)
+            ->setFactory([ScalarFactory::class, 'getSomeValue'])
+        ;
+
+        $c->compile();
+
+        $this->assertTrue($c->has('foo'));
+        $this->assertSame('some value', $c->get('foo'));
+    }
+}
+
+class FooClass
+{
+}
+
+class A
+{
+}
+
+class B
+{
+    public function __construct(A $a)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ContainerTest.php b/lib/symfony/dependency-injection/Tests/ContainerTest.php
new file mode 100644
index 000000000..46527e09d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ContainerTest.php
@@ -0,0 +1,692 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+class ContainerTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $sc = new Container();
+        $this->assertSame($sc, $sc->get('service_container'), '__construct() automatically registers itself as a service');
+
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
+        $this->assertEquals(['foo' => 'bar'], $sc->getParameterBag()->all(), '__construct() takes an array of parameters as its first argument');
+    }
+
+    /**
+     * @dataProvider dataForTestCamelize
+     */
+    public function testCamelize($id, $expected)
+    {
+        $this->assertEquals($expected, Container::camelize($id), sprintf('Container::camelize("%s")', $id));
+    }
+
+    public function dataForTestCamelize()
+    {
+        return [
+            ['foo_bar', 'FooBar'],
+            ['foo.bar', 'Foo_Bar'],
+            ['foo.bar_baz', 'Foo_BarBaz'],
+            ['foo._bar', 'Foo_Bar'],
+            ['foo_.bar', 'Foo_Bar'],
+            ['_foo', 'Foo'],
+            ['.foo', '_Foo'],
+            ['foo_', 'Foo'],
+            ['foo.', 'Foo_'],
+            ['foo\bar', 'Foo_Bar'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataForTestUnderscore
+     */
+    public function testUnderscore($id, $expected)
+    {
+        $this->assertEquals($expected, Container::underscore($id), sprintf('Container::underscore("%s")', $id));
+    }
+
+    public function dataForTestUnderscore()
+    {
+        return [
+            ['FooBar', 'foo_bar'],
+            ['Foo_Bar', 'foo.bar'],
+            ['Foo_BarBaz', 'foo.bar_baz'],
+            ['FooBar_BazQux', 'foo_bar.baz_qux'],
+            ['_Foo', '.foo'],
+            ['Foo_', 'foo.'],
+        ];
+    }
+
+    public function testCompile()
+    {
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
+        $this->assertFalse($sc->getParameterBag()->isResolved(), '->compile() resolves the parameter bag');
+        $sc->compile();
+        $this->assertTrue($sc->getParameterBag()->isResolved(), '->compile() resolves the parameter bag');
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag', $sc->getParameterBag(), '->compile() changes the parameter bag to a FrozenParameterBag instance');
+        $this->assertEquals(['foo' => 'bar'], $sc->getParameterBag()->all(), '->compile() copies the current parameters to the new parameter bag');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The Symfony\Component\DependencyInjection\Container::isFrozen() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.
+     * @expectedDeprecation The Symfony\Component\DependencyInjection\Container::isFrozen() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.
+     */
+    public function testIsFrozen()
+    {
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
+        $this->assertFalse($sc->isFrozen(), '->isFrozen() returns false if the parameters are not frozen');
+        $sc->compile();
+        $this->assertTrue($sc->isFrozen(), '->isFrozen() returns true if the parameters are frozen');
+    }
+
+    public function testIsCompiled()
+    {
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
+        $this->assertFalse($sc->isCompiled(), '->isCompiled() returns false if the container is not compiled');
+        $sc->compile();
+        $this->assertTrue($sc->isCompiled(), '->isCompiled() returns true if the container is compiled');
+    }
+
+    public function testIsCompiledWithFrozenParameters()
+    {
+        $sc = new Container(new FrozenParameterBag(['foo' => 'bar']));
+        $this->assertFalse($sc->isCompiled(), '->isCompiled() returns false if the container is not compiled but the parameter bag is already frozen');
+    }
+
+    public function testGetParameterBag()
+    {
+        $sc = new Container();
+        $this->assertEquals([], $sc->getParameterBag()->all(), '->getParameterBag() returns an empty array if no parameter has been defined');
+    }
+
+    public function testGetSetParameter()
+    {
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
+        $sc->setParameter('bar', 'foo');
+        $this->assertEquals('foo', $sc->getParameter('bar'), '->setParameter() sets the value of a new parameter');
+
+        $sc->setParameter('foo', 'baz');
+        $this->assertEquals('baz', $sc->getParameter('foo'), '->setParameter() overrides previously set parameter');
+
+        try {
+            $sc->getParameter('baba');
+            $this->fail('->getParameter() thrown an \InvalidArgumentException if the key does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->getParameter() thrown an \InvalidArgumentException if the key does not exist');
+            $this->assertEquals('You have requested a non-existent parameter "baba".', $e->getMessage(), '->getParameter() thrown an \InvalidArgumentException if the key does not exist');
+        }
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "Foo" instead of "foo" is deprecated since Symfony 3.4.
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "FOO" instead of "foo" is deprecated since Symfony 3.4.
+     */
+    public function testGetSetParameterWithMixedCase()
+    {
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
+
+        $sc->setParameter('Foo', 'baz1');
+        $this->assertEquals('baz1', $sc->getParameter('foo'), '->setParameter() converts the key to lowercase');
+        $this->assertEquals('baz1', $sc->getParameter('FOO'), '->getParameter() converts the key to lowercase');
+    }
+
+    public function testGetServiceIds()
+    {
+        $sc = new Container();
+        $sc->set('foo', $obj = new \stdClass());
+        $sc->set('bar', $obj = new \stdClass());
+        $this->assertEquals(['service_container', 'foo', 'bar'], $sc->getServiceIds(), '->getServiceIds() returns all defined service ids');
+
+        $sc = new ProjectServiceContainer();
+        $sc->set('foo', $obj = new \stdClass());
+        $this->assertEquals(['service_container', 'internal', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'internal_dependency', 'alias', 'foo'], $sc->getServiceIds(), '->getServiceIds() returns defined service ids by factory methods in the method map, followed by service ids defined by set()');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     */
+    public function testGetLegacyServiceIds()
+    {
+        $sc = new LegacyProjectServiceContainer();
+        $sc->set('foo', $obj = new \stdClass());
+
+        $this->assertEquals(['internal', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'service_container', 'alias', 'foo'], $sc->getServiceIds(), '->getServiceIds() returns defined service ids by getXXXService() methods, followed by service ids defined by set()');
+    }
+
+    public function testSet()
+    {
+        $sc = new Container();
+        $sc->set('._. \\o/', $foo = new \stdClass());
+        $this->assertSame($foo, $sc->get('._. \\o/'), '->set() sets a service');
+    }
+
+    public function testSetWithNullResetTheService()
+    {
+        $sc = new Container();
+        $sc->set('foo', null);
+        $this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
+    }
+
+    public function testSetReplacesAlias()
+    {
+        $c = new ProjectServiceContainer();
+
+        $c->set('alias', $foo = new \stdClass());
+        $this->assertSame($foo, $c->get('alias'), '->set() replaces an existing alias');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "bar" service is already initialized, unsetting it is deprecated since Symfony 3.3 and will fail in 4.0.
+     */
+    public function testSetWithNullOnInitializedPredefinedService()
+    {
+        $sc = new Container();
+        $sc->set('foo', new \stdClass());
+        $sc->set('foo', null);
+        $this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
+
+        $sc = new ProjectServiceContainer();
+        $sc->get('bar');
+        $sc->set('bar', null);
+        $this->assertTrue($sc->has('bar'), '->set() with null service resets the pre-defined service');
+    }
+
+    public function testSetWithNullOnUninitializedPredefinedService()
+    {
+        $sc = new Container();
+        $sc->set('foo', new \stdClass());
+        $sc->get('foo', null);
+        $sc->set('foo', null);
+        $this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
+
+        $sc = new ProjectServiceContainer();
+        $sc->set('bar', null);
+        $this->assertTrue($sc->has('bar'), '->set() with null service resets the pre-defined service');
+    }
+
+    public function testGet()
+    {
+        $sc = new ProjectServiceContainer();
+        $sc->set('foo', $foo = new \stdClass());
+        $this->assertSame($foo, $sc->get('foo'), '->get() returns the service for the given id');
+        $this->assertSame($sc->__bar, $sc->get('bar'), '->get() returns the service for the given id');
+        $this->assertSame($sc->__foo_bar, $sc->get('foo_bar'), '->get() returns the service if a get*Method() is defined');
+        $this->assertSame($sc->__foo_baz, $sc->get('foo.baz'), '->get() returns the service if a get*Method() is defined');
+
+        try {
+            $sc->get('');
+            $this->fail('->get() throws a \InvalidArgumentException exception if the service is empty');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException', $e, '->get() throws a ServiceNotFoundException exception if the service is empty');
+        }
+        $this->assertNull($sc->get('', ContainerInterface::NULL_ON_INVALID_REFERENCE), '->get() returns null if the service is empty');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Service identifiers will be made case sensitive in Symfony 4.0. Using "Foo" instead of "foo" is deprecated since Symfony 3.3.
+     */
+    public function testGetInsensitivity()
+    {
+        $sc = new ProjectServiceContainer();
+        $sc->set('foo', $foo = new \stdClass());
+        $this->assertSame($foo, $sc->get('Foo'), '->get() returns the service for the given id, and converts id to lowercase');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Service identifiers will be made case sensitive in Symfony 4.0. Using "foo" instead of "Foo" is deprecated since Symfony 3.3.
+     */
+    public function testNormalizeIdKeepsCase()
+    {
+        $sc = new ProjectServiceContainer();
+        $sc->normalizeId('Foo', true);
+        $this->assertSame('Foo', $sc->normalizeId('foo'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Service identifiers will be made case sensitive in Symfony 4.0. Using "Foo" instead of "foo" is deprecated since Symfony 3.3.
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     */
+    public function testLegacyGet()
+    {
+        $sc = new LegacyProjectServiceContainer();
+        $sc->set('foo', $foo = new \stdClass());
+
+        $this->assertSame($foo, $sc->get('foo'), '->get() returns the service for the given id');
+        $this->assertSame($foo, $sc->get('Foo'), '->get() returns the service for the given id, and converts id to lowercase');
+        $this->assertSame($sc->__bar, $sc->get('bar'), '->get() returns the service for the given id');
+        $this->assertSame($sc->__foo_bar, $sc->get('foo_bar'), '->get() returns the service if a get*Method() is defined');
+        $this->assertSame($sc->__foo_baz, $sc->get('foo.baz'), '->get() returns the service if a get*Method() is defined');
+        $this->assertSame($sc->__foo_baz, $sc->get('foo\\baz'), '->get() returns the service if a get*Method() is defined');
+
+        $sc->set('bar', $bar = new \stdClass());
+        $this->assertSame($bar, $sc->get('bar'), '->get() prefers to return a service defined with set() than one defined with a getXXXMethod()');
+
+        try {
+            $sc->get('');
+            $this->fail('->get() throws a \InvalidArgumentException exception if the service is empty');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException', $e, '->get() throws a ServiceNotFoundException exception if the service is empty');
+        }
+        $this->assertNull($sc->get('', ContainerInterface::NULL_ON_INVALID_REFERENCE), '->get() returns null if the service is empty');
+    }
+
+    public function testGetThrowServiceNotFoundException()
+    {
+        $sc = new ProjectServiceContainer();
+        $sc->set('foo', $foo = new \stdClass());
+        $sc->set('baz', $foo = new \stdClass());
+
+        try {
+            $sc->get('foo1');
+            $this->fail('->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException if the key does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException', $e, '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException if the key does not exist');
+            $this->assertEquals('You have requested a non-existent service "foo1". Did you mean this: "foo"?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException with some advices');
+        }
+
+        try {
+            $sc->get('bag');
+            $this->fail('->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException if the key does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException', $e, '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException if the key does not exist');
+            $this->assertEquals('You have requested a non-existent service "bag". Did you mean one of these: "bar", "baz"?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException with some advices');
+        }
+    }
+
+    public function testGetCircularReference()
+    {
+        $sc = new ProjectServiceContainer();
+        try {
+            $sc->get('circular');
+            $this->fail('->get() throws a ServiceCircularReferenceException if it contains circular reference');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException', $e, '->get() throws a ServiceCircularReferenceException if it contains circular reference');
+            $this->assertStringStartsWith('Circular reference detected for service "circular"', $e->getMessage(), '->get() throws a \LogicException if it contains circular reference');
+        }
+    }
+
+    public function testGetSyntheticServiceThrows()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $this->expectExceptionMessage('The "request" service is synthetic, it needs to be set at boot time before it can be used.');
+        require_once __DIR__.'/Fixtures/php/services9_compiled.php';
+
+        $container = new \ProjectServiceContainer();
+        $container->get('request');
+    }
+
+    public function testGetRemovedServiceThrows()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $this->expectExceptionMessage('The "inlined" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.');
+        require_once __DIR__.'/Fixtures/php/services9_compiled.php';
+
+        $container = new \ProjectServiceContainer();
+        $container->get('inlined');
+    }
+
+    public function testHas()
+    {
+        $sc = new ProjectServiceContainer();
+        $sc->set('foo', new \stdClass());
+        $this->assertFalse($sc->has('foo1'), '->has() returns false if the service does not exist');
+        $this->assertTrue($sc->has('foo'), '->has() returns true if the service exists');
+        $this->assertTrue($sc->has('bar'), '->has() returns true if a get*Method() is defined');
+        $this->assertTrue($sc->has('foo_bar'), '->has() returns true if a get*Method() is defined');
+        $this->assertTrue($sc->has('foo.baz'), '->has() returns true if a get*Method() is defined');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     * @expectedDeprecation Generating a dumped container without populating the method map is deprecated since Symfony 3.2 and will be unsupported in 4.0. Update your dumper to generate the method map.
+     */
+    public function testLegacyHas()
+    {
+        $sc = new LegacyProjectServiceContainer();
+        $sc->set('foo', new \stdClass());
+
+        $this->assertFalse($sc->has('foo1'), '->has() returns false if the service does not exist');
+        $this->assertTrue($sc->has('foo'), '->has() returns true if the service exists');
+        $this->assertTrue($sc->has('bar'), '->has() returns true if a get*Method() is defined');
+        $this->assertTrue($sc->has('foo_bar'), '->has() returns true if a get*Method() is defined');
+        $this->assertTrue($sc->has('foo.baz'), '->has() returns true if a get*Method() is defined');
+        $this->assertTrue($sc->has('foo\\baz'), '->has() returns true if a get*Method() is defined');
+    }
+
+    public function testScalarService()
+    {
+        $c = new Container();
+
+        $c->set('foo', 'some value');
+
+        $this->assertTrue($c->has('foo'));
+        $this->assertSame('some value', $c->get('foo'));
+    }
+
+    public function testInitialized()
+    {
+        $sc = new ProjectServiceContainer();
+        $sc->set('foo', new \stdClass());
+        $this->assertTrue($sc->initialized('foo'), '->initialized() returns true if service is loaded');
+        $this->assertFalse($sc->initialized('foo1'), '->initialized() returns false if service is not loaded');
+        $this->assertFalse($sc->initialized('bar'), '->initialized() returns false if a service is defined, but not currently loaded');
+        $this->assertFalse($sc->initialized('alias'), '->initialized() returns false if an aliased service is not initialized');
+
+        $sc->get('bar');
+        $this->assertTrue($sc->initialized('alias'), '->initialized() returns true for alias if aliased service is initialized');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Checking for the initialization of the "internal" private service is deprecated since Symfony 3.4 and won't be supported anymore in Symfony 4.0.
+     */
+    public function testInitializedWithPrivateService()
+    {
+        $sc = new ProjectServiceContainer();
+        $sc->get('internal_dependency');
+        $this->assertTrue($sc->initialized('internal'));
+    }
+
+    public function testReset()
+    {
+        $c = new Container();
+        $c->set('bar', new \stdClass());
+
+        $c->reset();
+
+        $this->assertNull($c->get('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+    }
+
+    public function testGetThrowsException()
+    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('Something went terribly wrong!');
+        $c = new ProjectServiceContainer();
+
+        try {
+            $c->get('throw_exception');
+        } catch (\Exception $e) {
+            // Do nothing.
+        }
+
+        // Retry, to make sure that get*Service() will be called.
+        $c->get('throw_exception');
+    }
+
+    public function testGetThrowsExceptionOnServiceConfiguration()
+    {
+        $c = new ProjectServiceContainer();
+
+        try {
+            $c->get('throws_exception_on_service_configuration');
+        } catch (\Exception $e) {
+            // Do nothing.
+        }
+
+        $this->assertFalse($c->initialized('throws_exception_on_service_configuration'));
+
+        // Retry, to make sure that get*Service() will be called.
+        try {
+            $c->get('throws_exception_on_service_configuration');
+        } catch (\Exception $e) {
+            // Do nothing.
+        }
+        $this->assertFalse($c->initialized('throws_exception_on_service_configuration'));
+    }
+
+    protected function getField($obj, $field)
+    {
+        $reflection = new \ReflectionProperty($obj, $field);
+        $reflection->setAccessible(true);
+
+        return $reflection->getValue($obj);
+    }
+
+    public function testAlias()
+    {
+        $c = new ProjectServiceContainer();
+
+        $this->assertTrue($c->has('alias'));
+        $this->assertSame($c->get('alias'), $c->get('bar'));
+    }
+
+    public function testThatCloningIsNotSupported()
+    {
+        $class = new \ReflectionClass('Symfony\Component\DependencyInjection\Container');
+        $clone = $class->getMethod('__clone');
+        $this->assertFalse($class->isCloneable());
+        $this->assertTrue($clone->isPrivate());
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "internal" service is private, unsetting it is deprecated since Symfony 3.2 and will fail in 4.0.
+     */
+    public function testUnsetInternalPrivateServiceIsDeprecated()
+    {
+        $c = new ProjectServiceContainer();
+        $c->set('internal', null);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "internal" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0.
+     */
+    public function testChangeInternalPrivateServiceIsDeprecated()
+    {
+        $c = new ProjectServiceContainer();
+        $c->set('internal', $internal = new \stdClass());
+        $this->assertSame($c->get('internal'), $internal);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "internal" service is private, checking for its existence is deprecated since Symfony 3.2 and will fail in 4.0.
+     */
+    public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
+    {
+        $c = new ProjectServiceContainer();
+        $c->get('internal_dependency');
+        $this->assertTrue($c->has('internal'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "internal" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     */
+    public function testRequestAnInternalSharedPrivateServiceIsDeprecated()
+    {
+        $c = new ProjectServiceContainer();
+        $c->get('internal_dependency');
+        $c->get('internal');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "bar" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.
+     */
+    public function testReplacingAPreDefinedServiceIsDeprecated()
+    {
+        $c = new ProjectServiceContainer();
+        $c->set('bar', new \stdClass());
+        $c->set('bar', $bar = new \stdClass());
+
+        $this->assertSame($bar, $c->get('bar'), '->set() replaces a pre-defined service');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "synthetic" service is private, replacing it is deprecated since Symfony 3.2 and will fail in 4.0.
+     */
+    public function testSetWithPrivateSyntheticServiceThrowsDeprecation()
+    {
+        $c = new ProjectServiceContainer();
+        $c->set('synthetic', new \stdClass());
+    }
+}
+
+class ProjectServiceContainer extends Container
+{
+    public $__bar;
+    public $__foo_bar;
+    public $__foo_baz;
+    public $__internal;
+    protected $privates;
+    protected $methodMap = [
+        'internal' => 'getInternalService',
+        'bar' => 'getBarService',
+        'foo_bar' => 'getFooBarService',
+        'foo.baz' => 'getFoo_BazService',
+        'circular' => 'getCircularService',
+        'throw_exception' => 'getThrowExceptionService',
+        'throws_exception_on_service_configuration' => 'getThrowsExceptionOnServiceConfigurationService',
+        'internal_dependency' => 'getInternalDependencyService',
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->__bar = new \stdClass();
+        $this->__foo_bar = new \stdClass();
+        $this->__foo_baz = new \stdClass();
+        $this->__internal = new \stdClass();
+        $this->privates = [
+            'internal' => true,
+            'synthetic' => true,
+        ];
+        $this->aliases = ['alias' => 'bar'];
+        $this->syntheticIds['synthetic'] = true;
+    }
+
+    protected function getInternalService()
+    {
+        return $this->services['internal'] = $this->__internal;
+    }
+
+    protected function getBarService()
+    {
+        return $this->services['bar'] = $this->__bar;
+    }
+
+    protected function getFooBarService()
+    {
+        return $this->__foo_bar;
+    }
+
+    protected function getFoo_BazService()
+    {
+        return $this->__foo_baz;
+    }
+
+    protected function getCircularService()
+    {
+        return $this->get('circular');
+    }
+
+    protected function getThrowExceptionService()
+    {
+        throw new \Exception('Something went terribly wrong!');
+    }
+
+    protected function getThrowsExceptionOnServiceConfigurationService()
+    {
+        $this->services['throws_exception_on_service_configuration'] = $instance = new \stdClass();
+
+        throw new \Exception('Something was terribly wrong while trying to configure the service!');
+    }
+
+    protected function getInternalDependencyService()
+    {
+        $this->services['internal_dependency'] = $instance = new \stdClass();
+
+        $instance->internal = isset($this->services['internal']) ? $this->services['internal'] : $this->getInternalService();
+
+        return $instance;
+    }
+}
+
+class LegacyProjectServiceContainer extends Container
+{
+    public $__bar;
+    public $__foo_bar;
+    public $__foo_baz;
+    public $__internal;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->__bar = new \stdClass();
+        $this->__foo_bar = new \stdClass();
+        $this->__foo_baz = new \stdClass();
+        $this->__internal = new \stdClass();
+        $this->privates = ['internal' => true];
+        $this->aliases = ['alias' => 'bar'];
+    }
+
+    protected function getInternalService()
+    {
+        return $this->__internal;
+    }
+
+    protected function getBarService()
+    {
+        return $this->__bar;
+    }
+
+    protected function getFooBarService()
+    {
+        return $this->__foo_bar;
+    }
+
+    protected function getFoo_BazService()
+    {
+        return $this->__foo_baz;
+    }
+
+    protected function getCircularService()
+    {
+        return $this->get('circular');
+    }
+
+    protected function getThrowExceptionService()
+    {
+        throw new \Exception('Something went terribly wrong!');
+    }
+
+    protected function getThrowsExceptionOnServiceConfigurationService()
+    {
+        $this->services['throws_exception_on_service_configuration'] = $instance = new \stdClass();
+
+        throw new \Exception('Something was terribly wrong while trying to configure the service!');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/CrossCheckTest.php b/lib/symfony/dependency-injection/Tests/CrossCheckTest.php
new file mode 100644
index 000000000..fe132af48
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/CrossCheckTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class CrossCheckTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = __DIR__.'/Fixtures/';
+
+        require_once self::$fixturesPath.'/includes/classes.php';
+        require_once self::$fixturesPath.'/includes/foo.php';
+    }
+
+    /**
+     * @dataProvider crossCheckLoadersDumpers
+     */
+    public function testCrossCheck($fixture, $type)
+    {
+        $loaderClass = 'Symfony\\Component\\DependencyInjection\\Loader\\'.ucfirst($type).'FileLoader';
+        $dumperClass = 'Symfony\\Component\\DependencyInjection\\Dumper\\'.ucfirst($type).'Dumper';
+
+        $tmp = tempnam(sys_get_temp_dir(), 'sf');
+
+        copy(self::$fixturesPath.'/'.$type.'/'.$fixture, $tmp);
+
+        $container1 = new ContainerBuilder();
+        $loader1 = new $loaderClass($container1, new FileLocator());
+        $loader1->load($tmp);
+
+        $dumper = new $dumperClass($container1);
+        file_put_contents($tmp, $dumper->dump());
+
+        $container2 = new ContainerBuilder();
+        $loader2 = new $loaderClass($container2, new FileLocator());
+        $loader2->load($tmp);
+
+        unlink($tmp);
+
+        $this->assertEquals($container2->getAliases(), $container1->getAliases(), 'loading a dump from a previously loaded container returns the same container');
+        $this->assertEquals($container2->getDefinitions(), $container1->getDefinitions(), 'loading a dump from a previously loaded container returns the same container');
+        $this->assertEquals($container2->getParameterBag()->all(), $container1->getParameterBag()->all(), '->getParameterBag() returns the same value for both containers');
+
+        $r = new \ReflectionProperty(ContainerBuilder::class, 'normalizedIds');
+        $r->setAccessible(true);
+        $r->setValue($container2, []);
+        $r->setValue($container1, []);
+
+        $this->assertEquals(serialize($container2), serialize($container1), 'loading a dump from a previously loaded container returns the same container');
+
+        $services1 = [];
+        foreach ($container1 as $id => $service) {
+            $services1[$id] = serialize($service);
+        }
+        $services2 = [];
+        foreach ($container2 as $id => $service) {
+            $services2[$id] = serialize($service);
+        }
+
+        unset($services1['service_container'], $services2['service_container']);
+
+        $this->assertEquals($services2, $services1, 'Iterator on the containers returns the same services');
+    }
+
+    public function crossCheckLoadersDumpers()
+    {
+        return [
+            ['services1.xml', 'xml'],
+            ['services2.xml', 'xml'],
+            ['services6.xml', 'xml'],
+            ['services8.xml', 'xml'],
+            ['services9.xml', 'xml'],
+            ['services1.yml', 'yaml'],
+            ['services2.yml', 'yaml'],
+            ['services6.yml', 'yaml'],
+            ['services8.yml', 'yaml'],
+            ['services9.yml', 'yaml'],
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php b/lib/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
new file mode 100644
index 000000000..8d382f81f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
+
+/**
+ * @group legacy
+ */
+class DefinitionDecoratorTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $this->assertEquals('foo', $def->getParent());
+        $this->assertEquals([], $def->getChanges());
+    }
+
+    /**
+     * @dataProvider getPropertyTests
+     */
+    public function testSetProperty($property, $changeKey)
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $getter = 'get'.ucfirst($property);
+        $setter = 'set'.ucfirst($property);
+
+        $this->assertNull($def->$getter());
+        $this->assertSame($def, $def->$setter('foo'));
+        $this->assertEquals('foo', $def->$getter());
+        $this->assertEquals([$changeKey => true], $def->getChanges());
+    }
+
+    public function getPropertyTests()
+    {
+        return [
+            ['class', 'class'],
+            ['factory', 'factory'],
+            ['configurator', 'configurator'],
+            ['file', 'file'],
+        ];
+    }
+
+    public function testSetPublic()
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $this->assertTrue($def->isPublic());
+        $this->assertSame($def, $def->setPublic(false));
+        $this->assertFalse($def->isPublic());
+        $this->assertEquals(['public' => true], $def->getChanges());
+    }
+
+    public function testSetLazy()
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $this->assertFalse($def->isLazy());
+        $this->assertSame($def, $def->setLazy(false));
+        $this->assertFalse($def->isLazy());
+        $this->assertEquals(['lazy' => true], $def->getChanges());
+    }
+
+    public function testSetAutowired()
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $this->assertFalse($def->isAutowired());
+        $this->assertSame($def, $def->setAutowired(true));
+        $this->assertTrue($def->isAutowired());
+        $this->assertSame(['autowired' => true], $def->getChanges());
+    }
+
+    public function testSetArgument()
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $this->assertEquals([], $def->getArguments());
+        $this->assertSame($def, $def->replaceArgument(0, 'foo'));
+        $this->assertEquals(['index_0' => 'foo'], $def->getArguments());
+    }
+
+    public function testReplaceArgumentShouldRequireIntegerIndex()
+    {
+        $this->expectException('InvalidArgumentException');
+        $def = new DefinitionDecorator('foo');
+
+        $def->replaceArgument('0', 'foo');
+    }
+
+    public function testReplaceArgument()
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $def->setArguments([0 => 'foo', 1 => 'bar']);
+        $this->assertEquals('foo', $def->getArgument(0));
+        $this->assertEquals('bar', $def->getArgument(1));
+
+        $this->assertSame($def, $def->replaceArgument(1, 'baz'));
+        $this->assertEquals('foo', $def->getArgument(0));
+        $this->assertEquals('baz', $def->getArgument(1));
+
+        $this->assertEquals([0 => 'foo', 1 => 'bar', 'index_1' => 'baz'], $def->getArguments());
+    }
+
+    public function testGetArgumentShouldCheckBounds()
+    {
+        $this->expectException('OutOfBoundsException');
+        $def = new DefinitionDecorator('foo');
+
+        $def->setArguments([0 => 'foo']);
+        $def->replaceArgument(0, 'foo');
+
+        $def->getArgument(1);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/DefinitionTest.php b/lib/symfony/dependency-injection/Tests/DefinitionTest.php
new file mode 100644
index 000000000..1f1cd380f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/DefinitionTest.php
@@ -0,0 +1,387 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Definition;
+
+class DefinitionTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $def = new Definition('stdClass');
+        $this->assertEquals('stdClass', $def->getClass(), '__construct() takes the class name as its first argument');
+        $this->assertSame(['class' => true], $def->getChanges());
+
+        $def = new Definition('stdClass', ['foo']);
+        $this->assertEquals(['foo'], $def->getArguments(), '__construct() takes an optional array of arguments as its second argument');
+    }
+
+    public function testSetGetFactory()
+    {
+        $def = new Definition();
+
+        $this->assertSame($def, $def->setFactory('foo'), '->setFactory() implements a fluent interface');
+        $this->assertEquals('foo', $def->getFactory(), '->getFactory() returns the factory');
+
+        $def->setFactory('Foo::bar');
+        $this->assertEquals(['Foo', 'bar'], $def->getFactory(), '->setFactory() converts string static method call to the array');
+        $this->assertSame(['factory' => true], $def->getChanges());
+    }
+
+    public function testSetGetClass()
+    {
+        $def = new Definition('stdClass');
+        $this->assertSame($def, $def->setClass('foo'), '->setClass() implements a fluent interface');
+        $this->assertEquals('foo', $def->getClass(), '->getClass() returns the class name');
+    }
+
+    public function testSetGetDecoratedService()
+    {
+        $def = new Definition('stdClass');
+        $this->assertNull($def->getDecoratedService());
+        $def->setDecoratedService('foo', 'foo.renamed', 5);
+        $this->assertEquals(['foo', 'foo.renamed', 5], $def->getDecoratedService());
+        $def->setDecoratedService(null);
+        $this->assertNull($def->getDecoratedService());
+
+        $def = new Definition('stdClass');
+        $this->assertNull($def->getDecoratedService());
+        $def->setDecoratedService('foo', 'foo.renamed');
+        $this->assertEquals(['foo', 'foo.renamed', 0], $def->getDecoratedService());
+        $def->setDecoratedService(null);
+        $this->assertNull($def->getDecoratedService());
+
+        $def = new Definition('stdClass');
+        $def->setDecoratedService('foo');
+        $this->assertEquals(['foo', null, 0], $def->getDecoratedService());
+        $def->setDecoratedService(null);
+        $this->assertNull($def->getDecoratedService());
+
+        $def = new Definition('stdClass');
+
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The decorated service inner name for "foo" must be different than the service name itself.');
+
+        $def->setDecoratedService('foo', 'foo');
+    }
+
+    public function testArguments()
+    {
+        $def = new Definition('stdClass');
+        $this->assertSame($def, $def->setArguments(['foo']), '->setArguments() implements a fluent interface');
+        $this->assertEquals(['foo'], $def->getArguments(), '->getArguments() returns the arguments');
+        $this->assertSame($def, $def->addArgument('bar'), '->addArgument() implements a fluent interface');
+        $this->assertEquals(['foo', 'bar'], $def->getArguments(), '->addArgument() adds an argument');
+    }
+
+    public function testMethodCalls()
+    {
+        $def = new Definition('stdClass');
+        $this->assertSame($def, $def->setMethodCalls([['foo', ['foo']]]), '->setMethodCalls() implements a fluent interface');
+        $this->assertEquals([['foo', ['foo']]], $def->getMethodCalls(), '->getMethodCalls() returns the methods to call');
+        $this->assertSame($def, $def->addMethodCall('bar', ['bar']), '->addMethodCall() implements a fluent interface');
+        $this->assertEquals([['foo', ['foo']], ['bar', ['bar']]], $def->getMethodCalls(), '->addMethodCall() adds a method to call');
+        $this->assertTrue($def->hasMethodCall('bar'), '->hasMethodCall() returns true if first argument is a method to call registered');
+        $this->assertFalse($def->hasMethodCall('no_registered'), '->hasMethodCall() returns false if first argument is not a method to call registered');
+        $this->assertSame($def, $def->removeMethodCall('bar'), '->removeMethodCall() implements a fluent interface');
+        $this->assertEquals([['foo', ['foo']]], $def->getMethodCalls(), '->removeMethodCall() removes a method to call');
+    }
+
+    public function testExceptionOnEmptyMethodCall()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Method name cannot be empty.');
+        $def = new Definition('stdClass');
+        $def->addMethodCall('');
+    }
+
+    public function testSetGetFile()
+    {
+        $def = new Definition('stdClass');
+        $this->assertSame($def, $def->setFile('foo'), '->setFile() implements a fluent interface');
+        $this->assertEquals('foo', $def->getFile(), '->getFile() returns the file to include');
+    }
+
+    public function testSetIsShared()
+    {
+        $def = new Definition('stdClass');
+        $this->assertTrue($def->isShared(), '->isShared() returns true by default');
+        $this->assertSame($def, $def->setShared(false), '->setShared() implements a fluent interface');
+        $this->assertFalse($def->isShared(), '->isShared() returns false if the instance must not be shared');
+    }
+
+    public function testSetIsPublic()
+    {
+        $def = new Definition('stdClass');
+        $this->assertTrue($def->isPublic(), '->isPublic() returns true by default');
+        $this->assertSame($def, $def->setPublic(false), '->setPublic() implements a fluent interface');
+        $this->assertFalse($def->isPublic(), '->isPublic() returns false if the instance must not be public.');
+    }
+
+    public function testSetIsSynthetic()
+    {
+        $def = new Definition('stdClass');
+        $this->assertFalse($def->isSynthetic(), '->isSynthetic() returns false by default');
+        $this->assertSame($def, $def->setSynthetic(true), '->setSynthetic() implements a fluent interface');
+        $this->assertTrue($def->isSynthetic(), '->isSynthetic() returns true if the service is synthetic.');
+    }
+
+    public function testSetIsLazy()
+    {
+        $def = new Definition('stdClass');
+        $this->assertFalse($def->isLazy(), '->isLazy() returns false by default');
+        $this->assertSame($def, $def->setLazy(true), '->setLazy() implements a fluent interface');
+        $this->assertTrue($def->isLazy(), '->isLazy() returns true if the service is lazy.');
+    }
+
+    public function testSetIsAbstract()
+    {
+        $def = new Definition('stdClass');
+        $this->assertFalse($def->isAbstract(), '->isAbstract() returns false by default');
+        $this->assertSame($def, $def->setAbstract(true), '->setAbstract() implements a fluent interface');
+        $this->assertTrue($def->isAbstract(), '->isAbstract() returns true if the instance must not be public.');
+    }
+
+    public function testSetIsDeprecated()
+    {
+        $def = new Definition('stdClass');
+        $this->assertFalse($def->isDeprecated(), '->isDeprecated() returns false by default');
+        $this->assertSame($def, $def->setDeprecated(true), '->setDeprecated() implements a fluent interface');
+        $this->assertTrue($def->isDeprecated(), '->isDeprecated() returns true if the instance should not be used anymore.');
+        $this->assertSame('The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.', $def->getDeprecationMessage('deprecated_service'), '->getDeprecationMessage() should return a formatted message template');
+    }
+
+    /**
+     * @dataProvider invalidDeprecationMessageProvider
+     */
+    public function testSetDeprecatedWithInvalidDeprecationTemplate($message)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $def = new Definition('stdClass');
+        $def->setDeprecated(false, $message);
+    }
+
+    public function invalidDeprecationMessageProvider()
+    {
+        return [
+            "With \rs" => ["invalid \r message %service_id%"],
+            "With \ns" => ["invalid \n message %service_id%"],
+            'With */s' => ['invalid */ message %service_id%'],
+            'message not containing require %service_id% variable' => ['this is deprecated'],
+        ];
+    }
+
+    public function testSetGetConfigurator()
+    {
+        $def = new Definition('stdClass');
+        $this->assertSame($def, $def->setConfigurator('foo'), '->setConfigurator() implements a fluent interface');
+        $this->assertEquals('foo', $def->getConfigurator(), '->getConfigurator() returns the configurator');
+    }
+
+    public function testClearTags()
+    {
+        $def = new Definition('stdClass');
+        $this->assertSame($def, $def->clearTags(), '->clearTags() implements a fluent interface');
+        $def->addTag('foo', ['foo' => 'bar']);
+        $def->clearTags();
+        $this->assertEquals([], $def->getTags(), '->clearTags() removes all current tags');
+    }
+
+    public function testClearTag()
+    {
+        $def = new Definition('stdClass');
+        $this->assertSame($def, $def->clearTags(), '->clearTags() implements a fluent interface');
+        $def->addTag('1foo1', ['foo1' => 'bar1']);
+        $def->addTag('2foo2', ['foo2' => 'bar2']);
+        $def->addTag('3foo3', ['foo3' => 'bar3']);
+        $def->clearTag('2foo2');
+        $this->assertTrue($def->hasTag('1foo1'));
+        $this->assertFalse($def->hasTag('2foo2'));
+        $this->assertTrue($def->hasTag('3foo3'));
+        $def->clearTag('1foo1');
+        $this->assertFalse($def->hasTag('1foo1'));
+        $this->assertTrue($def->hasTag('3foo3'));
+    }
+
+    public function testTags()
+    {
+        $def = new Definition('stdClass');
+        $this->assertEquals([], $def->getTag('foo'), '->getTag() returns an empty array if the tag is not defined');
+        $this->assertFalse($def->hasTag('foo'));
+        $this->assertSame($def, $def->addTag('foo'), '->addTag() implements a fluent interface');
+        $this->assertTrue($def->hasTag('foo'));
+        $this->assertEquals([[]], $def->getTag('foo'), '->getTag() returns attributes for a tag name');
+        $def->addTag('foo', ['foo' => 'bar']);
+        $this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
+        $def->addTag('bar', ['bar' => 'bar']);
+        $this->assertEquals($def->getTags(), [
+            'foo' => [[], ['foo' => 'bar']],
+            'bar' => [['bar' => 'bar']],
+        ], '->getTags() returns all tags');
+    }
+
+    public function testSetArgument()
+    {
+        $def = new Definition('stdClass');
+
+        $def->addArgument('foo');
+        $this->assertSame(['foo'], $def->getArguments());
+
+        $this->assertSame($def, $def->replaceArgument(0, 'moo'));
+        $this->assertSame(['moo'], $def->getArguments());
+
+        $def->addArgument('moo');
+        $def
+            ->replaceArgument(0, 'foo')
+            ->replaceArgument(1, 'bar')
+        ;
+        $this->assertSame(['foo', 'bar'], $def->getArguments());
+    }
+
+    public function testGetArgumentShouldCheckBounds()
+    {
+        $this->expectException('OutOfBoundsException');
+        $def = new Definition('stdClass');
+
+        $def->addArgument('foo');
+        $def->getArgument(1);
+    }
+
+    public function testReplaceArgumentShouldCheckBounds()
+    {
+        $this->expectException('OutOfBoundsException');
+        $this->expectExceptionMessage('The index "1" is not in the range [0, 0].');
+        $def = new Definition('stdClass');
+
+        $def->addArgument('foo');
+        $def->replaceArgument(1, 'bar');
+    }
+
+    public function testReplaceArgumentWithoutExistingArgumentsShouldCheckBounds()
+    {
+        $this->expectException('OutOfBoundsException');
+        $this->expectExceptionMessage('Cannot replace arguments if none have been configured yet.');
+        $def = new Definition('stdClass');
+        $def->replaceArgument(0, 'bar');
+    }
+
+    public function testSetGetProperties()
+    {
+        $def = new Definition('stdClass');
+
+        $this->assertEquals([], $def->getProperties());
+        $this->assertSame($def, $def->setProperties(['foo' => 'bar']));
+        $this->assertEquals(['foo' => 'bar'], $def->getProperties());
+    }
+
+    public function testSetProperty()
+    {
+        $def = new Definition('stdClass');
+
+        $this->assertEquals([], $def->getProperties());
+        $this->assertSame($def, $def->setProperty('foo', 'bar'));
+        $this->assertEquals(['foo' => 'bar'], $def->getProperties());
+    }
+
+    public function testAutowired()
+    {
+        $def = new Definition('stdClass');
+        $this->assertFalse($def->isAutowired());
+
+        $def->setAutowired(true);
+        $this->assertTrue($def->isAutowired());
+
+        $def->setAutowired(false);
+        $this->assertFalse($def->isAutowired());
+    }
+
+    public function testChangesNoChanges()
+    {
+        $def = new Definition();
+
+        $this->assertSame([], $def->getChanges());
+    }
+
+    public function testGetChangesWithChanges()
+    {
+        $def = new Definition('stdClass', ['fooarg']);
+
+        $def->setAbstract(true);
+        $def->setAutowired(true);
+        $def->setConfigurator('configuration_func');
+        $def->setDecoratedService(null);
+        $def->setDeprecated(true);
+        $def->setFactory('factory_func');
+        $def->setFile('foo.php');
+        $def->setLazy(true);
+        $def->setPublic(true);
+        $def->setShared(true);
+        $def->setSynthetic(true);
+        // changes aren't tracked for these, class or arguments
+        $def->setInstanceofConditionals([]);
+        $def->addTag('foo_tag');
+        $def->addMethodCall('methodCall');
+        $def->setProperty('fooprop', true);
+        $def->setAutoconfigured(true);
+
+        $this->assertSame([
+            'class' => true,
+            'autowired' => true,
+            'configurator' => true,
+            'decorated_service' => true,
+            'deprecated' => true,
+            'factory' => true,
+            'file' => true,
+            'lazy' => true,
+            'public' => true,
+            'shared' => true,
+            'autoconfigured' => true,
+        ], $def->getChanges());
+
+        $def->setChanges([]);
+        $this->assertSame([], $def->getChanges());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testTypes()
+    {
+        $def = new Definition('stdClass');
+
+        $this->assertEquals([], $def->getAutowiringTypes());
+        $this->assertSame($def, $def->setAutowiringTypes(['Foo']));
+        $this->assertEquals(['Foo'], $def->getAutowiringTypes());
+        $this->assertSame($def, $def->addAutowiringType('Bar'));
+        $this->assertTrue($def->hasAutowiringType('Bar'));
+        $this->assertSame($def, $def->removeAutowiringType('Foo'));
+        $this->assertEquals(['Bar'], $def->getAutowiringTypes());
+    }
+
+    public function testShouldAutoconfigure()
+    {
+        $def = new Definition('stdClass');
+        $this->assertFalse($def->isAutoconfigured());
+        $def->setAutoconfigured(true);
+        $this->assertTrue($def->isAutoconfigured());
+    }
+
+    public function testAddError()
+    {
+        $def = new Definition('stdClass');
+        $this->assertEmpty($def->getErrors());
+        $def->addError('First error');
+        $def->addError('Second error');
+        $this->assertSame(['First error', 'Second error'], $def->getErrors());
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Dumper/GraphvizDumperTest.php b/lib/symfony/dependency-injection/Tests/Dumper/GraphvizDumperTest.php
new file mode 100644
index 000000000..ea11c7c53
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Dumper/GraphvizDumperTest.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Dumper\GraphvizDumper;
+use Symfony\Component\DependencyInjection\Reference;
+
+class GraphvizDumperTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = __DIR__.'/../Fixtures/';
+    }
+
+    public function testDump()
+    {
+        $dumper = new GraphvizDumper($container = new ContainerBuilder());
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/graphviz/services1.dot', $dumper->dump(), '->dump() dumps an empty container as an empty dot file');
+
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $dumper = new GraphvizDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/graphviz/services9.dot', $dumper->dump(), '->dump() dumps services');
+
+        $container = include self::$fixturesPath.'/containers/container10.php';
+        $dumper = new GraphvizDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/graphviz/services10.dot', $dumper->dump(), '->dump() dumps services');
+
+        $container = include self::$fixturesPath.'/containers/container10.php';
+        $dumper = new GraphvizDumper($container);
+        $this->assertEquals($dumper->dump([
+            'graph' => ['ratio' => 'normal'],
+            'node' => ['fontsize' => 13, 'fontname' => 'Verdana', 'shape' => 'square'],
+            'edge' => ['fontsize' => 12, 'fontname' => 'Verdana', 'color' => 'white', 'arrowhead' => 'closed', 'arrowsize' => 1],
+            'node.instance' => ['fillcolor' => 'green', 'style' => 'empty'],
+            'node.definition' => ['fillcolor' => 'grey'],
+            'node.missing' => ['fillcolor' => 'red', 'style' => 'empty'],
+        ]), file_get_contents(self::$fixturesPath.'/graphviz/services10-1.dot'), '->dump() dumps services');
+    }
+
+    public function testDumpWithFrozenContainer()
+    {
+        $container = include self::$fixturesPath.'/containers/container13.php';
+        $dumper = new GraphvizDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/graphviz/services13.dot', $dumper->dump(), '->dump() dumps services');
+    }
+
+    public function testDumpWithFrozenCustomClassContainer()
+    {
+        $container = include self::$fixturesPath.'/containers/container14.php';
+        $dumper = new GraphvizDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/graphviz/services14.dot', $dumper->dump(), '->dump() dumps services');
+    }
+
+    public function testDumpWithUnresolvedParameter()
+    {
+        $container = include self::$fixturesPath.'/containers/container17.php';
+        $dumper = new GraphvizDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/graphviz/services17.dot', $dumper->dump(), '->dump() dumps services');
+    }
+
+    public function testDumpWithInlineDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->addArgument(
+            (new Definition('stdClass'))->addArgument(new Reference('bar'))
+        );
+        $container->register('bar', 'stdClass');
+        $dumper = new GraphvizDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/graphviz/services_inline.dot', $dumper->dump(), '->dump() dumps nested references');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php b/lib/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
new file mode 100644
index 000000000..b2cbb3caf
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
@@ -0,0 +1,1184 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\DependencyInjection\EnvVarProcessorInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Parameter;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\ScalarFactory;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber;
+use Symfony\Component\DependencyInjection\TypedReference;
+use Symfony\Component\DependencyInjection\Variable;
+use Symfony\Component\ExpressionLanguage\Expression;
+
+require_once __DIR__.'/../Fixtures/includes/classes.php';
+
+class PhpDumperTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
+    }
+
+    public function testDump()
+    {
+        $container = new ContainerBuilder();
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services1.php', $dumper->dump(), '->dump() dumps an empty container as an empty PHP class');
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services1-1.php', $dumper->dump(['class' => 'Container', 'base_class' => 'AbstractContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Dump']), '->dump() takes a class and a base_class options');
+    }
+
+    public function testDumpOptimizationString()
+    {
+        $definition = new Definition();
+        $definition->setClass('stdClass');
+        $definition->addArgument([
+            'only dot' => '.',
+            'concatenation as value' => '.\'\'.',
+            'concatenation from the start value' => '\'\'.',
+            '.' => 'dot as a key',
+            '.\'\'.' => 'concatenation as a key',
+            '\'\'.' => 'concatenation from the start key',
+            'optimize concatenation' => 'string1%some_string%string2',
+            'optimize concatenation with empty string' => 'string1%empty_value%string2',
+            'optimize concatenation from the start' => '%empty_value%start',
+            'optimize concatenation at the end' => 'end%empty_value%',
+            'new line' => "string with \nnew line",
+        ]);
+        $definition->setPublic(true);
+
+        $container = new ContainerBuilder();
+        $container->setResourceTracking(false);
+        $container->setDefinition('test', $definition);
+        $container->setParameter('empty_value', '');
+        $container->setParameter('some_string', '-');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services10.php', $dumper->dump(), '->dump() dumps an empty container as an empty PHP class');
+    }
+
+    public function testDumpRelativeDir()
+    {
+        $definition = new Definition();
+        $definition->setClass('stdClass');
+        $definition->addArgument('%foo%');
+        $definition->addArgument(['%foo%' => '%buz%/']);
+        $definition->setPublic(true);
+
+        $container = new ContainerBuilder();
+        $container->setDefinition('test', $definition);
+        $container->setParameter('foo', 'wiz'.\dirname(__DIR__));
+        $container->setParameter('bar', __DIR__);
+        $container->setParameter('baz', '%bar%/PhpDumperTest.php');
+        $container->setParameter('buz', \dirname(\dirname(__DIR__)));
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services12.php', $dumper->dump(['file' => __FILE__]), '->dump() dumps __DIR__ relative strings');
+    }
+
+    public function testDumpCustomContainerClassWithoutConstructor()
+    {
+        $container = new ContainerBuilder();
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_without_constructor.php', $dumper->dump(['base_class' => 'NoConstructorContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
+    }
+
+    public function testDumpCustomContainerClassConstructorWithoutArguments()
+    {
+        $container = new ContainerBuilder();
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_constructor_without_arguments.php', $dumper->dump(['base_class' => 'ConstructorWithoutArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
+    }
+
+    public function testDumpCustomContainerClassWithOptionalArgumentLessConstructor()
+    {
+        $container = new ContainerBuilder();
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_with_optional_constructor_arguments.php', $dumper->dump(['base_class' => 'ConstructorWithOptionalArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
+    }
+
+    public function testDumpCustomContainerClassWithMandatoryArgumentLessConstructor()
+    {
+        $container = new ContainerBuilder();
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_with_mandatory_constructor_arguments.php', $dumper->dump(['base_class' => 'ConstructorWithMandatoryArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
+    }
+
+    /**
+     * @dataProvider provideInvalidParameters
+     */
+    public function testExportParameters($parameters)
+    {
+        $this->expectException('InvalidArgumentException');
+        $container = new ContainerBuilder(new ParameterBag($parameters));
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+    }
+
+    public function provideInvalidParameters()
+    {
+        return [
+            [['foo' => new Definition('stdClass')]],
+            [['foo' => new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]],
+            [['foo' => new Reference('foo')]],
+            [['foo' => new Variable('foo')]],
+        ];
+    }
+
+    public function testAddParameters()
+    {
+        $container = include self::$fixturesPath.'/containers/container8.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services8.php', $dumper->dump(), '->dump() dumps parameters');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Dumping an uncompiled ContainerBuilder is deprecated since Symfony 3.3 and will not be supported anymore in 4.0. Compile the container beforehand.
+     */
+    public function testAddServiceWithoutCompilation()
+    {
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services9.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
+    }
+
+    public function testAddService()
+    {
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services9_compiled.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
+
+        $container = new ContainerBuilder();
+        $container->register('foo', 'FooClass')->addArgument(new \stdClass())->setPublic(true);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        try {
+            $dumper->dump();
+            $this->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\Symfony\Component\DependencyInjection\Exception\RuntimeException', $e, '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource.', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+        }
+    }
+
+    public function testDumpAsFiles()
+    {
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $container->getDefinition('bar')->addTag('hot');
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot']), true);
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $dump = str_replace('\\\\Fixtures\\\\includes\\\\foo.php', '/Fixtures/includes/foo.php', $dump);
+        }
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_as_files.txt', $dump);
+    }
+
+    public function testServicesWithAnonymousFactories()
+    {
+        $container = include self::$fixturesPath.'/containers/container19.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services19.php', $dumper->dump(), '->dump() dumps services with anonymous factories');
+    }
+
+    public function testAddServiceIdWithUnsupportedCharacters()
+    {
+        $class = 'Symfony_DI_PhpDumper_Test_Unsupported_Characters';
+        $container = new ContainerBuilder();
+        $container->setParameter("'", 'oh-no');
+        $container->register('foo*/oh-no', 'FooClass')->setPublic(true);
+        $container->register('bar$', 'FooClass')->setPublic(true);
+        $container->register('bar$!', 'FooClass')->setPublic(true);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_unsupported_characters.php', $dumper->dump(['class' => $class]));
+
+        require_once self::$fixturesPath.'/php/services_unsupported_characters.php';
+
+        $this->assertTrue(method_exists($class, 'getFooOhNoService'));
+        $this->assertTrue(method_exists($class, 'getBarService'));
+        $this->assertTrue(method_exists($class, 'getBar2Service'));
+    }
+
+    public function testConflictingServiceIds()
+    {
+        $class = 'Symfony_DI_PhpDumper_Test_Conflicting_Service_Ids';
+        $container = new ContainerBuilder();
+        $container->register('foo_bar', 'FooClass')->setPublic(true);
+        $container->register('foobar', 'FooClass')->setPublic(true);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => $class]));
+
+        $this->assertTrue(method_exists($class, 'getFooBarService'));
+        $this->assertTrue(method_exists($class, 'getFoobar2Service'));
+    }
+
+    public function testConflictingMethodsWithParent()
+    {
+        $class = 'Symfony_DI_PhpDumper_Test_Conflicting_Method_With_Parent';
+        $container = new ContainerBuilder();
+        $container->register('bar', 'FooClass')->setPublic(true);
+        $container->register('foo_bar', 'FooClass')->setPublic(true);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump([
+            'class' => $class,
+            'base_class' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\containers\CustomContainer',
+        ]));
+
+        $this->assertTrue(method_exists($class, 'getBar2Service'));
+        $this->assertTrue(method_exists($class, 'getFoobar2Service'));
+    }
+
+    /**
+     * @dataProvider provideInvalidFactories
+     */
+    public function testInvalidFactories($factory)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Cannot dump definition');
+        $container = new ContainerBuilder();
+        $def = new Definition('stdClass');
+        $def->setPublic(true);
+        $def->setFactory($factory);
+        $container->setDefinition('bar', $def);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+    }
+
+    public function provideInvalidFactories()
+    {
+        return [
+            [['', 'method']],
+            [['class', '']],
+            [['...', 'method']],
+            [['class', '...']],
+        ];
+    }
+
+    public function testAliases()
+    {
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $container->setParameter('foo_bar', 'foo_bar');
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Aliases']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Aliases();
+        $foo = $container->get('foo');
+        $this->assertSame($foo, $container->get('alias_for_foo'));
+        $this->assertSame($foo, $container->get('alias_for_alias'));
+    }
+
+    public function testFrozenContainerWithoutAliases()
+    {
+        $container = new ContainerBuilder();
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Frozen_No_Aliases']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Frozen_No_Aliases();
+        $this->assertFalse($container->has('foo'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "decorator_service" service is already initialized, replacing it is deprecated since Symfony 3.3 and will fail in 4.0.
+     */
+    public function testOverrideServiceWhenUsingADumpedContainer()
+    {
+        require_once self::$fixturesPath.'/php/services9_compiled.php';
+
+        $container = new \ProjectServiceContainer();
+        $container->get('decorator_service');
+        $container->set('decorator_service', $decorator = new \stdClass());
+
+        $this->assertSame($decorator, $container->get('decorator_service'), '->set() overrides an already defined service');
+    }
+
+    public function testDumpAutowireData()
+    {
+        $container = include self::$fixturesPath.'/containers/container24.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services24.php', $dumper->dump());
+    }
+
+    public function testEnvInId()
+    {
+        $container = include self::$fixturesPath.'/containers/container_env_in_id.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_env_in_id.php', $dumper->dump());
+    }
+
+    public function testEnvParameter()
+    {
+        $rand = mt_rand();
+        putenv('Baz='.$rand);
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services26.yml');
+        $container->setParameter('env(json_file)', self::$fixturesPath.'/array.json');
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_EnvParameters', 'file' => self::$fixturesPath.'/php/services26.php']));
+
+        require self::$fixturesPath.'/php/services26.php';
+        $container = new \Symfony_DI_PhpDumper_Test_EnvParameters();
+        $this->assertSame($rand, $container->getParameter('baz'));
+        $this->assertSame([123, 'abc'], $container->getParameter('json'));
+        $this->assertSame('sqlite:///foo/bar/var/data.db', $container->getParameter('db_dsn'));
+        putenv('Baz');
+    }
+
+    public function testResolvedBase64EnvParameters()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', base64_encode('world'));
+        $container->setParameter('hello', '%env(base64:foo)%');
+        $container->compile(true);
+
+        $expected = [
+            'env(foo)' => 'd29ybGQ=',
+            'hello' => 'world',
+        ];
+        $this->assertSame($expected, $container->getParameterBag()->all());
+    }
+
+    public function testDumpedBase64EnvParameters()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', base64_encode('world'));
+        $container->setParameter('hello', '%env(base64:foo)%');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_base64_env.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Base64Parameters']));
+
+        require self::$fixturesPath.'/php/services_base64_env.php';
+        $container = new \Symfony_DI_PhpDumper_Test_Base64Parameters();
+        $this->assertSame('world', $container->getParameter('hello'));
+    }
+
+    public function testCustomEnvParameters()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', str_rot13('world'));
+        $container->setParameter('hello', '%env(rot13:foo)%');
+        $container->register(Rot13EnvVarProcessor::class)->addTag('container.env_var_processor')->setPublic(true);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_rot13_env.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Rot13Parameters']));
+
+        require self::$fixturesPath.'/php/services_rot13_env.php';
+        $container = new \Symfony_DI_PhpDumper_Test_Rot13Parameters();
+        $this->assertSame('world', $container->getParameter('hello'));
+    }
+
+    public function testFileEnvProcessor()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', __FILE__);
+        $container->setParameter('random', '%env(file:foo)%');
+        $container->compile(true);
+
+        $this->assertStringEqualsFile(__FILE__, $container->getParameter('random'));
+    }
+
+    public function testUnusedEnvParameter()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\EnvParameterException');
+        $this->expectExceptionMessage('Environment variables "FOO" are never used. Please, check your container\'s configuration.');
+        $container = new ContainerBuilder();
+        $container->getParameter('env(FOO)');
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+    }
+
+    public function testCircularDynamicEnv()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException');
+        $this->expectExceptionMessage('Circular reference detected for parameter "env(resolve:DUMMY_ENV_VAR)" ("env(resolve:DUMMY_ENV_VAR)" > "env(resolve:DUMMY_ENV_VAR)").');
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', '%bar%');
+        $container->setParameter('bar', '%env(resolve:DUMMY_ENV_VAR)%');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dump = $dumper->dump(['class' => $class = __FUNCTION__]);
+
+        eval('?>'.$dump);
+        $container = new $class();
+
+        putenv('DUMMY_ENV_VAR=%foo%');
+        try {
+            $container->getParameter('bar');
+        } finally {
+            putenv('DUMMY_ENV_VAR');
+        }
+    }
+
+    public function testInlinedDefinitionReferencingServiceContainer()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->addMethodCall('add', [new Reference('service_container')])->setPublic(false);
+        $container->register('bar', 'stdClass')->addArgument(new Reference('foo'))->setPublic(true);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services13.php', $dumper->dump(), '->dump() dumps inline definitions which reference service_container');
+    }
+
+    public function testNonSharedLazyDefinitionReferences()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->setShared(false)->setLazy(true);
+        $container->register('bar', 'stdClass')->addArgument(new Reference('foo', ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, false));
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->setProxyDumper(new \DummyProxyDumper());
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_non_shared_lazy.php', $dumper->dump());
+    }
+
+    public function testInitializePropertiesBeforeMethodCalls()
+    {
+        require_once self::$fixturesPath.'/includes/classes.php';
+
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->setPublic(true);
+        $container->register('bar', 'MethodCallClass')
+            ->setPublic(true)
+            ->setProperty('simple', 'bar')
+            ->setProperty('complex', new Reference('foo'))
+            ->addMethodCall('callMe');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Properties_Before_Method_Calls']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Properties_Before_Method_Calls();
+        $this->assertTrue($container->get('bar')->callPassed(), '->dump() initializes properties before method calls');
+    }
+
+    public function testCircularReferenceAllowanceForLazyServices()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->addArgument(new Reference('bar'))->setPublic(true);
+        $container->register('bar', 'stdClass')->setLazy(true)->addArgument(new Reference('foo'))->setPublic(true);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->setProxyDumper(new \DummyProxyDumper());
+        $dumper->dump();
+
+        $this->addToAssertionCount(1);
+
+        $dumper = new PhpDumper($container);
+
+        $message = 'Circular reference detected for service "foo", path: "foo -> bar -> foo". Try running "composer require symfony/proxy-manager-bridge".';
+        $this->expectException(ServiceCircularReferenceException::class);
+        $this->expectExceptionMessage($message);
+
+        $dumper->dump();
+    }
+
+    public function testDedupLazyProxy()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->setLazy(true)->setPublic(true);
+        $container->register('bar', 'stdClass')->setLazy(true)->setPublic(true);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->setProxyDumper(new \DummyProxyDumper());
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_dedup_lazy_proxy.php', $dumper->dump());
+    }
+
+    public function testLazyArgumentProvideGenerator()
+    {
+        require_once self::$fixturesPath.'/includes/classes.php';
+
+        $container = new ContainerBuilder();
+        $container->register('lazy_referenced', 'stdClass')->setPublic(true);
+        $container
+            ->register('lazy_context', 'LazyContext')
+            ->setPublic(true)
+            ->setArguments([
+                new IteratorArgument(['k1' => new Reference('lazy_referenced'), 'k2' => new Reference('service_container')]),
+                new IteratorArgument([]),
+            ])
+        ;
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Lazy_Argument_Provide_Generator']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Lazy_Argument_Provide_Generator();
+        $lazyContext = $container->get('lazy_context');
+
+        $this->assertInstanceOf(RewindableGenerator::class, $lazyContext->lazyValues);
+        $this->assertInstanceOf(RewindableGenerator::class, $lazyContext->lazyEmptyValues);
+        $this->assertCount(2, $lazyContext->lazyValues);
+        $this->assertCount(0, $lazyContext->lazyEmptyValues);
+
+        $i = -1;
+        foreach ($lazyContext->lazyValues as $k => $v) {
+            switch (++$i) {
+                case 0:
+                    $this->assertEquals('k1', $k);
+                    $this->assertInstanceOf('stdCLass', $v);
+                    break;
+                case 1:
+                    $this->assertEquals('k2', $k);
+                    $this->assertInstanceOf('Symfony_DI_PhpDumper_Test_Lazy_Argument_Provide_Generator', $v);
+                    break;
+            }
+        }
+
+        $this->assertEmpty(iterator_to_array($lazyContext->lazyEmptyValues));
+    }
+
+    public function testNormalizedId()
+    {
+        $container = include self::$fixturesPath.'/containers/container33.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services33.php', $dumper->dump());
+    }
+
+    public function testDumpContainerBuilderWithFrozenConstructorIncludingPrivateServices()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo_service', 'stdClass')->setArguments([new Reference('baz_service')])->setPublic(true);
+        $container->register('bar_service', 'stdClass')->setArguments([new Reference('baz_service')])->setPublic(true);
+        $container->register('baz_service', 'stdClass')->setPublic(false);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_private_frozen.php', $dumper->dump());
+    }
+
+    public function testServiceLocator()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo_service', ServiceLocator::class)
+            ->setPublic(true)
+            ->addArgument([
+                'bar' => new ServiceClosureArgument(new Reference('bar_service')),
+                'baz' => new ServiceClosureArgument(new TypedReference('baz_service', 'stdClass')),
+                'nil' => $nil = new ServiceClosureArgument(new Reference('nil')),
+            ])
+        ;
+
+        // no method calls
+        $container->register('translator.loader_1', 'stdClass')->setPublic(true);
+        $container->register('translator.loader_1_locator', ServiceLocator::class)
+            ->setPublic(false)
+            ->addArgument([
+                'translator.loader_1' => new ServiceClosureArgument(new Reference('translator.loader_1')),
+            ]);
+        $container->register('translator_1', StubbedTranslator::class)
+            ->setPublic(true)
+            ->addArgument(new Reference('translator.loader_1_locator'));
+
+        // one method calls
+        $container->register('translator.loader_2', 'stdClass')->setPublic(true);
+        $container->register('translator.loader_2_locator', ServiceLocator::class)
+            ->setPublic(false)
+            ->addArgument([
+                'translator.loader_2' => new ServiceClosureArgument(new Reference('translator.loader_2')),
+            ]);
+        $container->register('translator_2', StubbedTranslator::class)
+            ->setPublic(true)
+            ->addArgument(new Reference('translator.loader_2_locator'))
+            ->addMethodCall('addResource', ['db', new Reference('translator.loader_2'), 'nl']);
+
+        // two method calls
+        $container->register('translator.loader_3', 'stdClass')->setPublic(true);
+        $container->register('translator.loader_3_locator', ServiceLocator::class)
+            ->setPublic(false)
+            ->addArgument([
+                'translator.loader_3' => new ServiceClosureArgument(new Reference('translator.loader_3')),
+            ]);
+        $container->register('translator_3', StubbedTranslator::class)
+            ->setPublic(true)
+            ->addArgument(new Reference('translator.loader_3_locator'))
+            ->addMethodCall('addResource', ['db', new Reference('translator.loader_3'), 'nl'])
+            ->addMethodCall('addResource', ['db', new Reference('translator.loader_3'), 'en']);
+
+        $nil->setValues([null]);
+        $container->register('bar_service', 'stdClass')->setArguments([new Reference('baz_service')])->setPublic(true);
+        $container->register('baz_service', 'stdClass')->setPublic(false);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_locator.php', $dumper->dump());
+    }
+
+    public function testServiceSubscriber()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo_service', TestServiceSubscriber::class)
+            ->setPublic(true)
+            ->setAutowired(true)
+            ->addArgument(new Reference(ContainerInterface::class))
+            ->addTag('container.service_subscriber', [
+                'key' => 'bar',
+                'id' => TestServiceSubscriber::class,
+            ])
+        ;
+        $container->register(TestServiceSubscriber::class, TestServiceSubscriber::class)->setPublic(true);
+
+        $container->register(CustomDefinition::class, CustomDefinition::class)
+            ->setPublic(false);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_subscriber.php', $dumper->dump());
+    }
+
+    public function testPrivateWithIgnoreOnInvalidReference()
+    {
+        require_once self::$fixturesPath.'/includes/classes.php';
+
+        $container = new ContainerBuilder();
+        $container->register('not_invalid', 'BazClass')
+            ->setPublic(false);
+        $container->register('bar', 'BarClass')
+            ->setPublic(true)
+            ->addMethodCall('setBaz', [new Reference('not_invalid', SymfonyContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Private_With_Ignore_On_Invalid_Reference']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Private_With_Ignore_On_Invalid_Reference();
+        $this->assertInstanceOf('BazClass', $container->get('bar')->getBaz());
+    }
+
+    public function testArrayParameters()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('array_1', [123]);
+        $container->setParameter('array_2', [__DIR__]);
+        $container->register('bar', 'BarClass')
+            ->setPublic(true)
+            ->addMethodCall('setBaz', ['%array_1%', '%array_2%', '%%array_1%%', [123]]);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace('\\\\Dumper', '/Dumper', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php'])));
+    }
+
+    public function testExpressionReferencingPrivateService()
+    {
+        $container = new ContainerBuilder();
+        $container->register('private_bar', 'stdClass')
+            ->setPublic(false);
+        $container->register('private_foo', 'stdClass')
+            ->setPublic(false);
+        $container->register('public_foo', 'stdClass')
+            ->setPublic(true)
+            ->addArgument(new Expression('service("private_foo").bar'));
+
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_private_in_expression.php', $dumper->dump());
+    }
+
+    public function testUninitializedReference()
+    {
+        $container = include self::$fixturesPath.'/containers/container_uninitialized_ref.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_uninitialized_ref.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Uninitialized_Reference']));
+
+        require self::$fixturesPath.'/php/services_uninitialized_ref.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Uninitialized_Reference();
+
+        $bar = $container->get('bar');
+
+        $this->assertNull($bar->foo1);
+        $this->assertNull($bar->foo2);
+        $this->assertNull($bar->foo3);
+        $this->assertNull($bar->closures[0]());
+        $this->assertNull($bar->closures[1]());
+        $this->assertNull($bar->closures[2]());
+        $this->assertSame([], iterator_to_array($bar->iter));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Uninitialized_Reference();
+
+        $container->get('foo1');
+        $container->get('baz');
+
+        $bar = $container->get('bar');
+
+        $this->assertEquals(new \stdClass(), $bar->foo1);
+        $this->assertNull($bar->foo2);
+        $this->assertEquals(new \stdClass(), $bar->foo3);
+        $this->assertEquals(new \stdClass(), $bar->closures[0]());
+        $this->assertNull($bar->closures[1]());
+        $this->assertEquals(new \stdClass(), $bar->closures[2]());
+        $this->assertEquals(['foo1' => new \stdClass(), 'foo3' => new \stdClass()], iterator_to_array($bar->iter));
+    }
+
+    /**
+     * @dataProvider provideAlmostCircular
+     */
+    public function testAlmostCircular($visibility)
+    {
+        $container = include self::$fixturesPath.'/containers/container_almost_circular.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $container = 'Symfony_DI_PhpDumper_Test_Almost_Circular_'.ucfirst($visibility);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_almost_circular_'.$visibility.'.php', $dumper->dump(['class' => $container]));
+
+        require self::$fixturesPath.'/php/services_almost_circular_'.$visibility.'.php';
+
+        $container = new $container();
+
+        $foo = $container->get('foo');
+        $this->assertSame($foo, $foo->bar->foobar->foo);
+
+        $foo2 = $container->get('foo2');
+        $this->assertSame($foo2, $foo2->bar->foobar->foo);
+
+        $this->assertSame([], (array) $container->get('foobar4'));
+
+        $foo5 = $container->get('foo5');
+        $this->assertSame($foo5, $foo5->bar->foo);
+
+        $manager = $container->get('manager');
+        $this->assertEquals(new \stdClass(), $manager);
+
+        $manager = $container->get('manager2');
+        $this->assertEquals(new \stdClass(), $manager);
+
+        $foo6 = $container->get('foo6');
+        $this->assertEquals((object) ['bar6' => (object) []], $foo6);
+
+        $this->assertInstanceOf(\stdClass::class, $container->get('root'));
+
+        $manager3 = $container->get('manager3');
+        $listener3 = $container->get('listener3');
+        $this->assertSame($manager3, $listener3->manager);
+
+        $listener4 = $container->get('listener4');
+        $this->assertInstanceOf('stdClass', $listener4);
+    }
+
+    public function provideAlmostCircular()
+    {
+        yield ['public'];
+        yield ['private'];
+    }
+
+    public function testDeepServiceGraph()
+    {
+        $container = new ContainerBuilder();
+
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_deep_graph.yml');
+
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_deep_graph.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Deep_Graph']));
+
+        require self::$fixturesPath.'/php/services_deep_graph.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Deep_Graph();
+
+        $this->assertInstanceOf(FooForDeepGraph::class, $container->get('foo'));
+        $this->assertEquals((object) ['p2' => (object) ['p3' => (object) []]], $container->get('foo')->bClone);
+    }
+
+    public function testInlineSelfRef()
+    {
+        $container = new ContainerBuilder();
+
+        $bar = (new Definition('App\Bar'))
+            ->setProperty('foo', new Reference('App\Foo'));
+
+        $baz = (new Definition('App\Baz'))
+            ->setProperty('bar', $bar)
+            ->addArgument($bar);
+
+        $container->register('App\Foo')
+            ->setPublic(true)
+            ->addArgument($baz);
+
+        $container->getCompiler()->getPassConfig();
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_inline_self_ref.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Inline_Self_Ref']));
+    }
+
+    public function testHotPathOptimizations()
+    {
+        $container = include self::$fixturesPath.'/containers/container_inline_requires.php';
+        $container->setParameter('inline_requires', true);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $dump = $dumper->dump(['hot_path_tag' => 'container.hot_path', 'inline_class_loader_parameter' => 'inline_requires', 'file' => self::$fixturesPath.'/php/services_inline_requires.php']);
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $dump = str_replace("'\\\\includes\\\\HotPath\\\\", "'/includes/HotPath/", $dump);
+        }
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_inline_requires.php', $dump);
+    }
+
+    public function testDumpHandlesLiteralClassWithRootNamespace()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', '\\stdClass')->setPublic(true);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Literal_Class_With_Root_Namespace']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Literal_Class_With_Root_Namespace();
+
+        $this->assertInstanceOf('stdClass', $container->get('foo'));
+    }
+
+    public function testDumpHandlesObjectClassNames()
+    {
+        $container = new ContainerBuilder(new ParameterBag([
+            'class' => 'stdClass',
+        ]));
+
+        $container->setDefinition('foo', new Definition(new Parameter('class')));
+        $container->setDefinition('bar', new Definition('stdClass', [
+            new Reference('foo'),
+        ]))->setPublic(true);
+
+        $container->setParameter('inline_requires', true);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump([
+            'class' => 'Symfony_DI_PhpDumper_Test_Object_Class_Name',
+            'inline_class_loader_parameter' => 'inline_requires',
+        ]));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Object_Class_Name();
+
+        $this->assertInstanceOf('stdClass', $container->get('bar'));
+    }
+
+    public function testUninitializedSyntheticReference()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->setPublic(true)->setSynthetic(true);
+        $container->register('bar', 'stdClass')->setPublic(true)->setShared(false)
+            ->setProperty('foo', new Reference('foo', ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE));
+
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump([
+            'class' => 'Symfony_DI_PhpDumper_Test_UninitializedSyntheticReference',
+            'inline_class_loader_parameter' => 'inline_requires',
+        ]));
+
+        $container = new \Symfony_DI_PhpDumper_Test_UninitializedSyntheticReference();
+
+        $this->assertEquals((object) ['foo' => null], $container->get('bar'));
+
+        $container->set('foo', (object) [123]);
+        $this->assertEquals((object) ['foo' => (object) [123]], $container->get('bar'));
+    }
+
+    public function testAdawsonContainer()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_adawson.yml');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_adawson.php', $dumper->dump());
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "private" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_alias" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "decorated_private" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "decorated_private_alias" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_not_inlined" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_not_removed" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_child" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     * @expectedDeprecation The "private_parent" service is private, getting it from the container is deprecated since Symfony 3.2 and will fail in 4.0. You should either make the service public, or stop using the container directly and use dependency injection instead.
+     */
+    public function testLegacyPrivateServices()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_legacy_privates.yml');
+
+        $container->setDefinition('private_child', new ChildDefinition('foo'));
+        $container->setDefinition('private_parent', new ChildDefinition('private'));
+
+        $container->getDefinition('private')->setPrivate(true);
+        $container->getDefinition('private_not_inlined')->setPrivate(true);
+        $container->getDefinition('private_not_removed')->setPrivate(true);
+        $container->getDefinition('decorated_private')->setPrivate(true);
+        $container->getDefinition('private_child')->setPrivate(true);
+        $container->getAlias('decorated_private_alias')->setPrivate(true);
+        $container->getAlias('private_alias')->setPrivate(true);
+
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_legacy_privates.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Legacy_Privates', 'file' => self::$fixturesPath.'/php/services_legacy_privates.php']));
+
+        require self::$fixturesPath.'/php/services_legacy_privates.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Legacy_Privates();
+
+        $container->get('private');
+        $container->get('private_alias');
+        $container->get('alias_to_private');
+        $container->get('decorated_private');
+        $container->get('decorated_private_alias');
+        $container->get('private_not_inlined');
+        $container->get('private_not_removed');
+        $container->get('private_child');
+        $container->get('private_parent');
+        $container->get('public_child');
+    }
+
+    /**
+     * This test checks the trigger of a deprecation note and should not be removed in major releases.
+     *
+     * @group legacy
+     * @expectedDeprecation The "foo" service is deprecated. You should stop using it, as it will soon be removed.
+     */
+    public function testPrivateServiceTriggersDeprecation()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')
+            ->setPublic(false)
+            ->setDeprecated(true);
+        $container->register('bar', 'stdClass')
+            ->setPublic(true)
+            ->setProperty('foo', new Reference('foo'));
+
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Private_Service_Triggers_Deprecation']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Private_Service_Triggers_Deprecation();
+
+        $container->get('bar');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "foo" instead of "Foo" is deprecated since Symfony 3.4.
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "FOO" instead of "Foo" is deprecated since Symfony 3.4.
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "bar" instead of "BAR" is deprecated since Symfony 3.4.
+     */
+    public function testParameterWithMixedCase()
+    {
+        $container = new ContainerBuilder(new ParameterBag(['Foo' => 'bar', 'BAR' => 'foo']));
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Parameter_With_Mixed_Case']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Parameter_With_Mixed_Case();
+
+        $this->assertSame('bar', $container->getParameter('foo'));
+        $this->assertSame('bar', $container->getParameter('FOO'));
+        $this->assertSame('foo', $container->getParameter('bar'));
+        $this->assertSame('foo', $container->getParameter('BAR'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "FOO" instead of "foo" is deprecated since Symfony 3.4.
+     */
+    public function testParameterWithLowerCase()
+    {
+        $container = new ContainerBuilder(new ParameterBag(['foo' => 'bar']));
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Parameter_With_Lower_Case']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Parameter_With_Lower_Case();
+
+        $this->assertSame('bar', $container->getParameter('FOO'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Service identifiers will be made case sensitive in Symfony 4.0. Using "foo" instead of "Foo" is deprecated since Symfony 3.3.
+     * @expectedDeprecation The "Foo" service is deprecated. You should stop using it, as it will soon be removed.
+     */
+    public function testReferenceWithLowerCaseId()
+    {
+        $container = new ContainerBuilder();
+        $container->register('Bar', 'stdClass')->setProperty('foo', new Reference('foo'))->setPublic(true);
+        $container->register('Foo', 'stdClass')->setDeprecated();
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Reference_With_Lower_Case_Id']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Reference_With_Lower_Case_Id();
+
+        $this->assertEquals((object) ['foo' => (object) []], $container->get('Bar'));
+    }
+
+    public function testScalarService()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'string')
+            ->setPublic(true)
+            ->setFactory([ScalarFactory::class, 'getSomeValue'])
+        ;
+
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Scalar_Service']));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Scalar_Service();
+
+        $this->assertTrue($container->has('foo'));
+        $this->assertSame('some value', $container->get('foo'));
+    }
+
+    public function testAliasCanBeFoundInTheDumpedContainerWhenBothTheAliasAndTheServiceArePublic()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', 'stdClass')->setPublic(true);
+        $container->setAlias('bar', 'foo')->setPublic(true);
+
+        $container->compile();
+
+        // Bar is found in the compiled container
+        $service_ids = $container->getServiceIds();
+        $this->assertContains('bar', $service_ids);
+
+        $dumper = new PhpDumper($container);
+        $dump = $dumper->dump(['class' => 'Symfony_DI_PhpDumper_AliasesCanBeFoundInTheDumpedContainer']);
+        eval('?>'.$dump);
+
+        $container = new \Symfony_DI_PhpDumper_AliasesCanBeFoundInTheDumpedContainer();
+
+        // Bar should still be found in the compiled container
+        $service_ids = $container->getServiceIds();
+        $this->assertContains('bar', $service_ids);
+    }
+}
+
+class Rot13EnvVarProcessor implements EnvVarProcessorInterface
+{
+    public function getEnv($prefix, $name, \Closure $getEnv)
+    {
+        return str_rot13($getEnv($name));
+    }
+
+    public static function getProvidedTypes()
+    {
+        return ['rot13' => 'string'];
+    }
+}
+
+class FooForDeepGraph
+{
+    public $bClone;
+
+    public function __construct(\stdClass $a, \stdClass $b)
+    {
+        // clone to verify that $b has been fully initialized before
+        $this->bClone = clone $b;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Dumper/XmlDumperTest.php b/lib/symfony/dependency-injection/Tests/Dumper/XmlDumperTest.php
new file mode 100644
index 000000000..e660c7e80
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Dumper/XmlDumperTest.php
@@ -0,0 +1,210 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Dumper\XmlDumper;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+
+class XmlDumperTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
+    }
+
+    public function testDump()
+    {
+        $dumper = new XmlDumper(new ContainerBuilder());
+
+        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/xml/services1.xml', $dumper->dump(), '->dump() dumps an empty container as an empty XML file');
+    }
+
+    public function testExportParameters()
+    {
+        $container = include self::$fixturesPath.'//containers/container8.php';
+        $dumper = new XmlDumper($container);
+        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/xml/services8.xml', $dumper->dump(), '->dump() dumps parameters');
+    }
+
+    public function testAddParameters()
+    {
+        $container = include self::$fixturesPath.'//containers/container8.php';
+        $dumper = new XmlDumper($container);
+        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/xml/services8.xml', $dumper->dump(), '->dump() dumps parameters');
+    }
+
+    public function testAddService()
+    {
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $dumper = new XmlDumper($container);
+
+        $this->assertEquals(str_replace('%path%', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/xml/services9.xml')), $dumper->dump(), '->dump() dumps services');
+
+        $dumper = new XmlDumper($container = new ContainerBuilder());
+        $container->register('foo', 'FooClass')->addArgument(new \stdClass())->setPublic(true);
+        try {
+            $dumper->dump();
+            $this->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\RuntimeException', $e, '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource.', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+        }
+    }
+
+    public function testDumpAnonymousServices()
+    {
+        $container = include self::$fixturesPath.'/containers/container11.php';
+        $dumper = new XmlDumper($container);
+        $this->assertEquals('<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
+    <service id="foo" class="FooClass" public="true">
+      <argument type="service">
+        <service class="BarClass">
+          <argument type="service">
+            <service class="BazClass"/>
+          </argument>
+        </service>
+      </argument>
+    </service>
+    <service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/>
+    <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/>
+  </services>
+</container>
+', $dumper->dump());
+    }
+
+    public function testDumpEntities()
+    {
+        $container = include self::$fixturesPath.'/containers/container12.php';
+        $dumper = new XmlDumper($container);
+        $this->assertEquals("<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<container xmlns=\"http://symfony.com/schema/dic/services\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd\">
+  <services>
+    <service id=\"service_container\" class=\"Symfony\Component\DependencyInjection\ContainerInterface\" public=\"true\" synthetic=\"true\"/>
+    <service id=\"foo\" class=\"FooClass\Foo\" public=\"true\">
+      <tag name=\"foo&quot;bar\bar\" foo=\"foo&quot;barřž€\"/>
+      <argument>foo&lt;&gt;&amp;bar</argument>
+    </service>
+    <service id=\"Psr\Container\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
+    <service id=\"Symfony\Component\DependencyInjection\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
+  </services>
+</container>
+", $dumper->dump());
+    }
+
+    /**
+     * @dataProvider provideDecoratedServicesData
+     */
+    public function testDumpDecoratedServices($expectedXmlDump, $container)
+    {
+        $dumper = new XmlDumper($container);
+        $this->assertEquals($expectedXmlDump, $dumper->dump());
+    }
+
+    public function provideDecoratedServicesData()
+    {
+        $fixturesPath = realpath(__DIR__.'/../Fixtures/');
+
+        return [
+            ["<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<container xmlns=\"http://symfony.com/schema/dic/services\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd\">
+  <services>
+    <service id=\"service_container\" class=\"Symfony\Component\DependencyInjection\ContainerInterface\" public=\"true\" synthetic=\"true\"/>
+    <service id=\"foo\" class=\"FooClass\Foo\" public=\"true\" decorates=\"bar\" decoration-inner-name=\"bar.woozy\"/>
+    <service id=\"Psr\Container\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
+    <service id=\"Symfony\Component\DependencyInjection\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
+  </services>
+</container>
+", include $fixturesPath.'/containers/container15.php'],
+            ["<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<container xmlns=\"http://symfony.com/schema/dic/services\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd\">
+  <services>
+    <service id=\"service_container\" class=\"Symfony\Component\DependencyInjection\ContainerInterface\" public=\"true\" synthetic=\"true\"/>
+    <service id=\"foo\" class=\"FooClass\Foo\" public=\"true\" decorates=\"bar\"/>
+    <service id=\"Psr\Container\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
+    <service id=\"Symfony\Component\DependencyInjection\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
+  </services>
+</container>
+", include $fixturesPath.'/containers/container16.php'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideCompiledContainerData
+     */
+    public function testCompiledContainerCanBeDumped($containerFile)
+    {
+        $fixturesPath = __DIR__.'/../Fixtures';
+        $container = require $fixturesPath.'/containers/'.$containerFile.'.php';
+        $container->compile();
+        $dumper = new XmlDumper($container);
+        $dumper->dump();
+
+        $this->addToAssertionCount(1);
+    }
+
+    public function provideCompiledContainerData()
+    {
+        return [
+            ['container8'],
+            ['container9'],
+            ['container11'],
+            ['container12'],
+            ['container14'],
+        ];
+    }
+
+    public function testDumpInlinedServices()
+    {
+        $container = include self::$fixturesPath.'/containers/container21.php';
+        $dumper = new XmlDumper($container);
+
+        $this->assertEquals(file_get_contents(self::$fixturesPath.'/xml/services21.xml'), $dumper->dump());
+    }
+
+    public function testDumpAutowireData()
+    {
+        $container = include self::$fixturesPath.'/containers/container24.php';
+        $dumper = new XmlDumper($container);
+
+        $this->assertEquals(file_get_contents(self::$fixturesPath.'/xml/services24.xml'), $dumper->dump());
+    }
+
+    public function testDumpLoad()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_dump_load.xml');
+
+        $this->assertEquals([new Reference('bar', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)], $container->getDefinition('foo')->getArguments());
+
+        $dumper = new XmlDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/xml/services_dump_load.xml', $dumper->dump());
+    }
+
+    public function testDumpAbstractServices()
+    {
+        $container = include self::$fixturesPath.'/containers/container_abstract.php';
+        $dumper = new XmlDumper($container);
+
+        $this->assertEquals(file_get_contents(self::$fixturesPath.'/xml/services_abstract.xml'), $dumper->dump());
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Dumper/YamlDumperTest.php b/lib/symfony/dependency-injection/Tests/Dumper/YamlDumperTest.php
new file mode 100644
index 000000000..49ee8e6f3
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Dumper/YamlDumperTest.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Yaml;
+
+class YamlDumperTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
+    }
+
+    public function testDump()
+    {
+        $dumper = new YamlDumper($container = new ContainerBuilder());
+
+        $this->assertEqualYamlStructure(file_get_contents(self::$fixturesPath.'/yaml/services1.yml'), $dumper->dump(), '->dump() dumps an empty container as an empty YAML file');
+    }
+
+    public function testAddParameters()
+    {
+        $container = include self::$fixturesPath.'/containers/container8.php';
+        $dumper = new YamlDumper($container);
+        $this->assertEqualYamlStructure(file_get_contents(self::$fixturesPath.'/yaml/services8.yml'), $dumper->dump(), '->dump() dumps parameters');
+    }
+
+    public function testAddService()
+    {
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $dumper = new YamlDumper($container);
+        $this->assertEqualYamlStructure(str_replace('%path%', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/yaml/services9.yml')), $dumper->dump(), '->dump() dumps services');
+
+        $dumper = new YamlDumper($container = new ContainerBuilder());
+        $container->register('foo', 'FooClass')->addArgument(new \stdClass())->setPublic(true);
+        try {
+            $dumper->dump();
+            $this->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\RuntimeException', $e, '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource.', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+        }
+    }
+
+    public function testDumpAutowireData()
+    {
+        $container = include self::$fixturesPath.'/containers/container24.php';
+        $dumper = new YamlDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services24.yml', $dumper->dump());
+    }
+
+    public function testDumpLoad()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_dump_load.yml');
+
+        $this->assertEquals([new Reference('bar', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)], $container->getDefinition('foo')->getArguments());
+
+        $dumper = new YamlDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services_dump_load.yml', $dumper->dump());
+    }
+
+    public function testInlineServices()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'Class1')
+            ->setPublic(true)
+            ->addArgument((new Definition('Class2'))
+                ->addArgument(new Definition('Class2'))
+            )
+        ;
+
+        $dumper = new YamlDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services_inline.yml', $dumper->dump());
+    }
+
+    private function assertEqualYamlStructure($expected, $yaml, $message = '')
+    {
+        $parser = new Parser();
+
+        $this->assertEquals($parser->parse($expected, Yaml::PARSE_CUSTOM_TAGS), $parser->parse($yaml, Yaml::PARSE_CUSTOM_TAGS), $message);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/EnvVarProcessorTest.php b/lib/symfony/dependency-injection/Tests/EnvVarProcessorTest.php
new file mode 100644
index 000000000..2830d46a7
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/EnvVarProcessorTest.php
@@ -0,0 +1,300 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\EnvVarProcessor;
+
+class EnvVarProcessorTest extends TestCase
+{
+    const TEST_CONST = 'test';
+
+    /**
+     * @dataProvider validStrings
+     */
+    public function testGetEnvString($value, $processed)
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(foo)', $value);
+        $container->compile();
+
+        $processor = new EnvVarProcessor($container);
+
+        $result = $processor->getEnv('string', 'foo', function () {
+            $this->fail('Should not be called');
+        });
+
+        $this->assertSame($processed, $result);
+    }
+
+    public function validStrings()
+    {
+        return [
+            ['hello', 'hello'],
+            ['true', 'true'],
+            ['false', 'false'],
+            ['null', 'null'],
+            ['1', '1'],
+            ['0', '0'],
+            ['1.1', '1.1'],
+            ['1e1', '1e1'],
+        ];
+    }
+
+    /**
+     * @dataProvider validBools
+     */
+    public function testGetEnvBool($value, $processed)
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('bool', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+
+        $this->assertSame($processed, $result);
+    }
+
+    public function validBools()
+    {
+        return [
+            ['true', true],
+            ['false', false],
+            ['null', false],
+            ['1', true],
+            ['0', false],
+            ['1.1', true],
+            ['1e1', true],
+        ];
+    }
+
+    /**
+     * @dataProvider validInts
+     */
+    public function testGetEnvInt($value, $processed)
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('int', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+
+        $this->assertSame($processed, $result);
+    }
+
+    public function validInts()
+    {
+        return [
+            ['1', 1],
+            ['1.1', 1],
+            ['1e1', 10],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidInts
+     */
+    public function testGetEnvIntInvalid($value)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Non-numeric env var');
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('int', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+    }
+
+    public function invalidInts()
+    {
+        return [
+            ['foo'],
+            ['true'],
+            ['null'],
+        ];
+    }
+
+    /**
+     * @dataProvider validFloats
+     */
+    public function testGetEnvFloat($value, $processed)
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('float', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+
+        $this->assertSame($processed, $result);
+    }
+
+    public function validFloats()
+    {
+        return [
+            ['1', 1.0],
+            ['1.1', 1.1],
+            ['1e1', 10.0],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidFloats
+     */
+    public function testGetEnvFloatInvalid($value)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Non-numeric env var');
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('float', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+    }
+
+    public function invalidFloats()
+    {
+        return [
+            ['foo'],
+            ['true'],
+            ['null'],
+        ];
+    }
+
+    /**
+     * @dataProvider validConsts
+     */
+    public function testGetEnvConst($value, $processed)
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('const', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+
+        $this->assertSame($processed, $result);
+    }
+
+    public function validConsts()
+    {
+        return [
+            ['Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::TEST_CONST', self::TEST_CONST],
+            ['E_ERROR', E_ERROR],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConsts
+     */
+    public function testGetEnvConstInvalid($value)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('undefined constant');
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('const', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+    }
+
+    public function invalidConsts()
+    {
+        return [
+            ['Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::UNDEFINED_CONST'],
+            ['UNDEFINED_CONST'],
+        ];
+    }
+
+    public function testGetEnvBase64()
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('base64', 'foo', function ($name) {
+            $this->assertSame('foo', $name);
+
+            return base64_encode('hello');
+        });
+
+        $this->assertSame('hello', $result);
+    }
+
+    public function testGetEnvJson()
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('json', 'foo', function ($name) {
+            $this->assertSame('foo', $name);
+
+            return json_encode([1]);
+        });
+
+        $this->assertSame([1], $result);
+    }
+
+    public function testGetEnvInvalidJson()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Syntax error');
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('json', 'foo', function ($name) {
+            $this->assertSame('foo', $name);
+
+            return 'invalid_json';
+        });
+    }
+
+    /**
+     * @dataProvider otherJsonValues
+     */
+    public function testGetEnvJsonOther($value)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Invalid JSON env var');
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('json', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return json_encode($value);
+        });
+    }
+
+    public function otherJsonValues()
+    {
+        return [
+            [1],
+            [1.1],
+            [true],
+            [false],
+        ];
+    }
+
+    public function testGetEnvUnknown()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Unsupported env var prefix');
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('unknown', 'foo', function ($name) {
+            $this->assertSame('foo', $name);
+
+            return 'foo';
+        });
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Extension/ExtensionTest.php b/lib/symfony/dependency-injection/Tests/Extension/ExtensionTest.php
new file mode 100644
index 000000000..9f35b4a41
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Extension/ExtensionTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+
+class ExtensionTest extends TestCase
+{
+    /**
+     * @dataProvider getResolvedEnabledFixtures
+     */
+    public function testIsConfigEnabledReturnsTheResolvedValue($enabled)
+    {
+        $extension = new EnableableExtension();
+        $this->assertSame($enabled, $extension->isConfigEnabled(new ContainerBuilder(), ['enabled' => $enabled]));
+    }
+
+    public function getResolvedEnabledFixtures()
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
+
+    public function testIsConfigEnabledOnNonEnableableConfig()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The config array has no \'enabled\' key.');
+        $extension = new EnableableExtension();
+
+        $extension->isConfigEnabled(new ContainerBuilder(), []);
+    }
+}
+
+class EnableableExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+    }
+
+    public function isConfigEnabled(ContainerBuilder $container, array $config)
+    {
+        return parent::isConfigEnabled($container, $config);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Bar.php b/lib/symfony/dependency-injection/Tests/Fixtures/Bar.php
new file mode 100644
index 000000000..1aaca2f15
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Bar.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+class Bar implements BarInterface
+{
+    public $quz;
+
+    public function __construct($quz = null, \NonExistent $nonExistent = null, BarInterface $decorated = null, array $foo = [])
+    {
+        $this->quz = $quz;
+    }
+
+    public static function create(\NonExistent $nonExistent = null, $factory = null)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/BarInterface.php b/lib/symfony/dependency-injection/Tests/Fixtures/BarInterface.php
new file mode 100644
index 000000000..dc81f33f5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/BarInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+interface BarInterface
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/CaseSensitiveClass.php b/lib/symfony/dependency-injection/Tests/Fixtures/CaseSensitiveClass.php
new file mode 100644
index 000000000..7c6f0ff4c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/CaseSensitiveClass.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+class CaseSensitiveClass
+{
+    public $identifier;
+
+    public function __construct($identifier = null)
+    {
+        $this->identifier = $identifier;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithMandatoryArgumentsContainer.php b/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithMandatoryArgumentsContainer.php
new file mode 100644
index 000000000..ba55fb75d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithMandatoryArgumentsContainer.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
+
+class ConstructorWithMandatoryArgumentsContainer
+{
+    public function __construct($mandatoryArgument)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithOptionalArgumentsContainer.php b/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithOptionalArgumentsContainer.php
new file mode 100644
index 000000000..f97696677
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithOptionalArgumentsContainer.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
+
+class ConstructorWithOptionalArgumentsContainer
+{
+    public function __construct($optionalArgument = 'foo')
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithoutArgumentsContainer.php b/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithoutArgumentsContainer.php
new file mode 100644
index 000000000..5c30b45d9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Container/ConstructorWithoutArgumentsContainer.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
+
+class ConstructorWithoutArgumentsContainer
+{
+    public function __construct()
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Container/NoConstructorContainer.php b/lib/symfony/dependency-injection/Tests/Fixtures/Container/NoConstructorContainer.php
new file mode 100644
index 000000000..b14b013f1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Container/NoConstructorContainer.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
+
+use Symfony\Component\DependencyInjection\Container;
+
+class NoConstructorContainer extends Container
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/CustomDefinition.php b/lib/symfony/dependency-injection/Tests/Fixtures/CustomDefinition.php
new file mode 100644
index 000000000..65eea2106
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/CustomDefinition.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Definition;
+
+class CustomDefinition extends Definition
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/DeprecatedClass.php b/lib/symfony/dependency-injection/Tests/Fixtures/DeprecatedClass.php
new file mode 100644
index 000000000..33f37a030
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/DeprecatedClass.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+@trigger_error('deprecated', E_USER_DEPRECATED);
+
+class DeprecatedClass
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/FactoryDummy.php b/lib/symfony/dependency-injection/Tests/Fixtures/FactoryDummy.php
new file mode 100644
index 000000000..da984b562
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/FactoryDummy.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+class FactoryDummy extends FactoryParent
+{
+    public static function createFactory(): FactoryDummy
+    {
+    }
+
+    public function create(): \stdClass
+    {
+    }
+
+    // Not supported by hhvm
+    public function createBuiltin(): int
+    {
+    }
+
+    public static function createSelf(): self
+    {
+    }
+
+    public static function createParent(): parent
+    {
+    }
+}
+
+class FactoryParent
+{
+}
+
+function factoryFunction(): FactoryDummy
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/FactoryDummyWithoutReturnTypes.php b/lib/symfony/dependency-injection/Tests/Fixtures/FactoryDummyWithoutReturnTypes.php
new file mode 100644
index 000000000..f480a668b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/FactoryDummyWithoutReturnTypes.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+class FactoryDummyWithoutReturnTypes
+{
+    public function createTestDefinition1()
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/FooForCircularWithAddCalls.php b/lib/symfony/dependency-injection/Tests/Fixtures/FooForCircularWithAddCalls.php
new file mode 100644
index 000000000..a8331dc3e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/FooForCircularWithAddCalls.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+class FooForCircularWithAddCalls
+{
+    public function call(\stdClass $argument)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/NamedArgumentsDummy.php b/lib/symfony/dependency-injection/Tests/Fixtures/NamedArgumentsDummy.php
new file mode 100644
index 000000000..09d907dfa
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/NamedArgumentsDummy.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class NamedArgumentsDummy
+{
+    public function __construct(CaseSensitiveClass $c, $apiKey, $hostName)
+    {
+    }
+
+    public function setApiKey($apiKey)
+    {
+    }
+
+    public function setSensitiveClass(CaseSensitiveClass $c)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ParentNotExists.php b/lib/symfony/dependency-injection/Tests/Fixtures/ParentNotExists.php
new file mode 100644
index 000000000..ae637f917
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ParentNotExists.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+class ParentNotExists extends \NotExists
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/BadClasses/MissingParent.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/BadClasses/MissingParent.php
new file mode 100644
index 000000000..53c97249c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/BadClasses/MissingParent.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses;
+
+class MissingParent extends MissingClass
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Foo.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Foo.php
new file mode 100644
index 000000000..b6690a8d2
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Foo.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
+
+class Foo implements FooInterface, Sub\BarInterface
+{
+    public function __construct($bar = null)
+    {
+    }
+
+    public function setFoo(self $foo)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/FooInterface.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/FooInterface.php
new file mode 100644
index 000000000..1855dcfc5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/FooInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
+
+interface FooInterface
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/AnotherSub/DeeperBaz.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/AnotherSub/DeeperBaz.php
new file mode 100644
index 000000000..37f0e7ac4
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/AnotherSub/DeeperBaz.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\AnotherSub;
+
+class DeeperBaz
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Baz.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Baz.php
new file mode 100644
index 000000000..c25742704
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Baz.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir;
+
+class Baz
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir1/Service1.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir1/Service1.php
new file mode 100644
index 000000000..ef3f28abb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir1/Service1.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\Component1\Dir1;
+
+class Service1
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir2/Service2.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir2/Service2.php
new file mode 100644
index 000000000..ba103fce0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component1/Dir2/Service2.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\Component1\Dir2;
+
+class Service2
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir1/Service4.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir1/Service4.php
new file mode 100644
index 000000000..8bca132ab
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir1/Service4.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\Component2\Dir1;
+
+class Service4
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir2/Service5.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir2/Service5.php
new file mode 100644
index 000000000..d2cff5b95
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/OtherDir/Component2/Dir2/Service5.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\Component2\Dir2;
+
+class Service5
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Sub/Bar.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Sub/Bar.php
new file mode 100644
index 000000000..b44a4ca85
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Sub/Bar.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
+
+class Bar implements BarInterface
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Sub/BarInterface.php b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Sub/BarInterface.php
new file mode 100644
index 000000000..554967ec9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/Prototype/Sub/BarInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub;
+
+interface BarInterface
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ScalarFactory.php b/lib/symfony/dependency-injection/Tests/Fixtures/ScalarFactory.php
new file mode 100644
index 000000000..15646a8d0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ScalarFactory.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+final class ScalarFactory
+{
+    /**
+     * @return string
+     */
+    public static function getSomeValue()
+    {
+        return 'some value';
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/SimilarArgumentsDummy.php b/lib/symfony/dependency-injection/Tests/Fixtures/SimilarArgumentsDummy.php
new file mode 100644
index 000000000..2600389bd
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/SimilarArgumentsDummy.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+class SimilarArgumentsDummy
+{
+    public $class1;
+    public $class2;
+
+    public function __construct(CaseSensitiveClass $class1, $token, CaseSensitiveClass $class2)
+    {
+        $this->class1 = $class1;
+        $this->class2 = $class2;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/StubbedTranslator.php b/lib/symfony/dependency-injection/Tests/Fixtures/StubbedTranslator.php
new file mode 100644
index 000000000..eed18426a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/StubbedTranslator.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * @author Iltar van der Berg <kjarli@gmail.com>
+ */
+class StubbedTranslator
+{
+    public function __construct(ContainerInterface $container)
+    {
+    }
+
+    public function addResource($format, $resource, $locale, $domain = null)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/TestDefinition1.php b/lib/symfony/dependency-injection/Tests/Fixtures/TestDefinition1.php
new file mode 100644
index 000000000..8ec76a9de
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/TestDefinition1.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Definition;
+
+class TestDefinition1 extends Definition
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/TestDefinition2.php b/lib/symfony/dependency-injection/Tests/Fixtures/TestDefinition2.php
new file mode 100644
index 000000000..2ec8f9cf8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/TestDefinition2.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Definition;
+
+class TestDefinition2 extends Definition
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/TestServiceSubscriber.php b/lib/symfony/dependency-injection/Tests/Fixtures/TestServiceSubscriber.php
new file mode 100644
index 000000000..a3b042b8f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/TestServiceSubscriber.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+
+class TestServiceSubscriber implements ServiceSubscriberInterface
+{
+    public function __construct($container)
+    {
+    }
+
+    public static function getSubscribedServices()
+    {
+        return [
+            __CLASS__,
+            '?'.CustomDefinition::class,
+            'bar' => CustomDefinition::class,
+            'baz' => '?'.CustomDefinition::class,
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/array.json b/lib/symfony/dependency-injection/Tests/Fixtures/array.json
new file mode 100644
index 000000000..dc27f0fa1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/array.json
@@ -0,0 +1 @@
+[123, "abc"]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/basic.expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/config/basic.expected.yml
new file mode 100644
index 000000000..1137961ad
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/basic.expected.yml
@@ -0,0 +1,10 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    App\BarService:
+        class: App\BarService
+        public: true
+        arguments: [!service { class: FooClass }]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/basic.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/basic.php
new file mode 100644
index 000000000..a9e250b92
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/basic.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use App\BarService;
+
+return function (ContainerConfigurator $c) {
+    $s = $c->services();
+    $s->set(BarService::class)
+        ->args([inline('FooClass')]);
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/child.expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/config/child.expected.yml
new file mode 100644
index 000000000..aaab7131c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/child.expected.yml
@@ -0,0 +1,15 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Class2
+        public: true
+        file: file.php
+        lazy: true
+        arguments: [!service { class: Class1, public: false }]
+    bar:
+        alias: foo
+        public: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/child.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/child.php
new file mode 100644
index 000000000..8a5f2431d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/child.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use App\BarService;
+
+return function (ContainerConfigurator $c) {
+    $c->services()
+        ->set('bar', 'Class1')
+        ->set(BarService::class)
+            ->abstract(true)
+            ->lazy()
+        ->set('foo')
+            ->parent(BarService::class)
+            ->decorate('bar', 'b', 1)
+            ->args([ref('b')])
+            ->class('Class2')
+            ->file('file.php')
+            ->parent('bar')
+            ->parent(BarService::class)
+    ;
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/defaults.expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/config/defaults.expected.yml
new file mode 100644
index 000000000..a534f7267
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/defaults.expected.yml
@@ -0,0 +1,27 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    App\BarService:
+        class: App\BarService
+        public: true
+        arguments: [!service { class: FooClass }]
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        tags:
+            - { name: t, a: b }
+        autowire: true
+        autoconfigure: true
+        arguments: ['@bar']
+    bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: false
+        tags:
+            - { name: t, a: b }
+        autowire: true
+        calls:
+            - [setFoo, ['@bar']]
+
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/defaults.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/defaults.php
new file mode 100644
index 000000000..2889d3fbb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/defaults.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo;
+
+return function (ContainerConfigurator $c) {
+    $c->import('basic.php');
+
+    $s = $c->services()->defaults()
+        ->public()
+        ->private()
+        ->autoconfigure()
+        ->autowire()
+        ->tag('t', ['a' => 'b'])
+        ->bind(Foo::class, ref('bar'))
+        ->private();
+
+    $s->set(Foo::class)->args([ref('bar')])->public();
+    $s->set('bar', Foo::class)->call('setFoo')->autoconfigure(false);
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/factory_short_notation.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/factory_short_notation.php
new file mode 100644
index 000000000..5b37793ea
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/factory_short_notation.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $c) {
+    $c->services()
+        ->set('service', \stdClass::class)
+        ->factory('factory:method');
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/instanceof.expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/config/instanceof.expected.yml
new file mode 100644
index 000000000..b12a30422
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/instanceof.expected.yml
@@ -0,0 +1,21 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        tags:
+            - { name: tag, k: v }
+        lazy: true
+        properties: { p: 1 }
+        calls:
+            - [setFoo, ['@foo']]
+
+        shared: false
+        configurator: c
+    foo:
+        class: App\FooService
+        public: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/instanceof.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/instanceof.php
new file mode 100644
index 000000000..0d6aac7a0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/instanceof.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use App\FooService;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
+
+return function (ContainerConfigurator $c) {
+    $s = $c->services();
+    $s->instanceof(Prototype\Foo::class)
+        ->property('p', 0)
+        ->call('setFoo', [ref('foo')])
+        ->tag('tag', ['k' => 'v'])
+        ->share(false)
+        ->lazy()
+        ->configurator('c')
+        ->property('p', 1);
+
+    $s->load(Prototype::class.'\\', '../Prototype')->exclude('../Prototype/*/*');
+
+    $s->set('foo', FooService::class);
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/php7.expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/config/php7.expected.yml
new file mode 100644
index 000000000..7c5b714ff
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/php7.expected.yml
@@ -0,0 +1,19 @@
+parameters:
+    foo: Foo
+    bar: Bar
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        arguments: ['@bar']
+    bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        calls:
+            - [setFoo, {  }]
+
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/php7.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/php7.php
new file mode 100644
index 000000000..7711624e6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/php7.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo;
+
+return function (ContainerConfigurator $c) {
+    $c->parameters()
+        ('foo', 'Foo')
+        ('bar', 'Bar')
+    ;
+    $c->services()
+        (Foo::class)
+            ->arg('$bar', ref('bar'))
+            ->public()
+        ('bar', Foo::class)
+            ->call('setFoo')
+    ;
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/prototype.expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/config/prototype.expected.yml
new file mode 100644
index 000000000..ebfe087d7
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/prototype.expected.yml
@@ -0,0 +1,25 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        tags:
+            - { name: foo }
+            - { name: baz }
+        deprecated: '%service_id%'
+        arguments: [1]
+        factory: f
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar
+        public: true
+        tags:
+            - { name: foo }
+            - { name: baz }
+        deprecated: '%service_id%'
+        lazy: true
+        arguments: [1]
+        factory: f
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/prototype.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/prototype.php
new file mode 100644
index 000000000..e2884aa20
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/prototype.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
+
+return function (ContainerConfigurator $c) {
+    $di = $c->services()->defaults()
+        ->tag('baz');
+    $di->load(Prototype::class.'\\', '../Prototype')
+        ->autoconfigure()
+        ->exclude('../Prototype/{OtherDir,BadClasses}')
+        ->factory('f')
+        ->deprecate('%service_id%')
+        ->args([0])
+        ->args([1])
+        ->autoconfigure(false)
+        ->tag('foo')
+        ->parent('foo');
+    $di->set('foo')->lazy()->abstract();
+    $di->get(Prototype\Foo::class)->lazy(false);
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/services9.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/services9.php
new file mode 100644
index 000000000..d9373a2a6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/services9.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Bar\FooClass;
+use Symfony\Component\DependencyInjection\Parameter;
+
+require_once __DIR__.'/../includes/classes.php';
+require_once __DIR__.'/../includes/foo.php';
+
+return function (ContainerConfigurator $c) {
+    $p = $c->parameters();
+    $p->set('baz_class', 'BazClass');
+    $p->set('foo_class', FooClass::class)
+      ->set('foo', 'bar');
+
+    $s = $c->services();
+    $s->set('foo')
+        ->args(['foo', ref('foo.baz'), ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%'], true, ref('service_container')])
+        ->class(FooClass::class)
+        ->tag('foo', ['foo' => 'foo'])
+        ->tag('foo', ['bar' => 'bar', 'baz' => 'baz'])
+        ->factory([FooClass::class, 'getInstance'])
+        ->property('foo', 'bar')
+        ->property('moo', ref('foo.baz'))
+        ->property('qux', ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%'])
+        ->call('setBar', [ref('bar')])
+        ->call('initialize')
+        ->configurator('sc_configure');
+
+    $s->set('foo.baz', '%baz_class%')
+        ->factory(['%baz_class%', 'getInstance'])
+        ->configurator(['%baz_class%', 'configureStatic1']);
+
+    $s->set('bar', FooClass::class)
+        ->args(['foo', ref('foo.baz'), new Parameter('foo_bar')])
+        ->configurator([ref('foo.baz'), 'configure']);
+
+    $s->set('foo_bar', '%foo_class%')
+        ->args([ref('deprecated_service')])
+        ->share(false);
+
+    $s->set('method_call1', 'Bar\FooClass')
+        ->file(realpath(__DIR__.'/../includes/foo.php'))
+        ->call('setBar', [ref('foo')])
+        ->call('setBar', [ref('foo2')->nullOnInvalid()])
+        ->call('setBar', [ref('foo3')->ignoreOnInvalid()])
+        ->call('setBar', [ref('foobaz')->ignoreOnInvalid()])
+        ->call('setBar', [expr('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]);
+
+    $s->set('foo_with_inline', 'Foo')
+        ->call('setBar', [ref('inlined')]);
+
+    $s->set('inlined', 'Bar')
+        ->property('pub', 'pub')
+        ->call('setBaz', [ref('baz')])
+        ->private();
+
+    $s->set('baz', 'Baz')
+        ->call('setFoo', [ref('foo_with_inline')]);
+
+    $s->set('request', 'Request')
+        ->synthetic();
+
+    $s->set('configurator_service', 'ConfClass')
+        ->private()
+        ->call('setFoo', [ref('baz')]);
+
+    $s->set('configured_service', 'stdClass')
+        ->configurator([ref('configurator_service'), 'configureStdClass']);
+
+    $s->set('configurator_service_simple', 'ConfClass')
+        ->args(['bar'])
+        ->private();
+
+    $s->set('configured_service_simple', 'stdClass')
+        ->configurator([ref('configurator_service_simple'), 'configureStdClass']);
+
+    $s->set('decorated', 'stdClass');
+
+    $s->set('decorator_service', 'stdClass')
+        ->decorate('decorated');
+
+    $s->set('decorator_service_with_name', 'stdClass')
+        ->decorate('decorated', 'decorated.pif-pouf');
+
+    $s->set('deprecated_service', 'stdClass')
+        ->deprecate();
+
+    $s->set('new_factory', 'FactoryClass')
+        ->property('foo', 'bar')
+        ->private();
+
+    $s->set('factory_service', 'Bar')
+        ->factory([ref('foo.baz'), 'getInstance']);
+
+    $s->set('new_factory_service', 'FooBarBaz')
+        ->property('foo', 'bar')
+        ->factory([ref('new_factory'), 'getInstance']);
+
+    $s->set('service_from_static_method', 'Bar\FooClass')
+        ->factory(['Bar\FooClass', 'getInstance']);
+
+    $s->set('factory_simple', 'SimpleFactoryClass')
+        ->deprecate()
+        ->args(['foo'])
+        ->private();
+
+    $s->set('factory_service_simple', 'Bar')
+        ->factory([ref('factory_simple'), 'getInstance']);
+
+    $s->set('lazy_context', 'LazyContext')
+        ->args([iterator(['k1' => ref('foo.baz'), 'k2' => ref('service_container')]), iterator([])]);
+
+    $s->set('lazy_context_ignore_invalid_ref', 'LazyContext')
+        ->args([iterator([ref('foo.baz'), ref('invalid')->ignoreOnInvalid()]), iterator([])]);
+
+    $s->set('tagged_iterator_foo', 'Bar')
+        ->private()
+        ->tag('foo');
+
+    $s->set('tagged_iterator', 'Bar')
+        ->public()
+        ->args([tagged('foo')]);
+
+    $s->alias('alias_for_foo', 'foo')->private()->public();
+    $s->alias('alias_for_alias', ref('alias_for_foo'));
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/config/services_autoconfigure_with_parent.php b/lib/symfony/dependency-injection/Tests/Fixtures/config/services_autoconfigure_with_parent.php
new file mode 100644
index 000000000..f8ffb1dee
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/config/services_autoconfigure_with_parent.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $c) {
+    $c->services()
+        ->set('parent_service', \stdClass::class)
+        ->set('child_service')->parent('parent_service')->autoconfigure(true);
+};
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/CustomContainer.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/CustomContainer.php
new file mode 100644
index 000000000..225143532
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/CustomContainer.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\containers;
+
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+class CustomContainer extends Container
+{
+    public function getBarService()
+    {
+    }
+
+    public function getFoobarService()
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container10.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container10.php
new file mode 100644
index 000000000..4f5492ad5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container10.php
@@ -0,0 +1,15 @@
+<?php
+
+require_once __DIR__.'/../includes/classes.php';
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+$container = new ContainerBuilder();
+$container->
+    register('foo', 'FooClass')->
+    addArgument(new Reference('bar'))
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container11.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container11.php
new file mode 100644
index 000000000..91e5c2633
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container11.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+$container = new ContainerBuilder();
+$container->
+    register('foo', 'FooClass')->
+    addArgument(new Definition('BarClass', [new Definition('BazClass')]))
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container12.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container12.php
new file mode 100644
index 000000000..ef0770302
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container12.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+$container->
+    register('foo', 'FooClass\\Foo')->
+    addArgument('foo<>&bar')->
+    addTag('foo"bar\\bar', ['foo' => 'foo"barřž€'])
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container13.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container13.php
new file mode 100644
index 000000000..df598d4ea
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container13.php
@@ -0,0 +1,18 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+$container = new ContainerBuilder();
+$container->
+    register('foo', 'FooClass')->
+    addArgument(new Reference('bar'))
+    ->setPublic(true)
+;
+$container->
+    register('bar', 'BarClass')
+    ->setPublic(true)
+;
+$container->compile();
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container14.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container14.php
new file mode 100644
index 000000000..191afb8cd
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container14.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Container14;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/*
+ * This file is included in Tests\Dumper\GraphvizDumperTest::testDumpWithFrozenCustomClassContainer
+ * and Tests\Dumper\XmlDumperTest::testCompiledContainerCanBeDumped.
+ */
+if (!class_exists('Container14\ProjectServiceContainer')) {
+    class ProjectServiceContainer extends ContainerBuilder
+    {
+    }
+}
+
+return new ProjectServiceContainer();
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container15.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container15.php
new file mode 100644
index 000000000..794924755
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container15.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+$container
+    ->register('foo', 'FooClass\\Foo')
+    ->setDecoratedService('bar', 'bar.woozy')
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container16.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container16.php
new file mode 100644
index 000000000..88619ec50
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container16.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+$container
+    ->register('foo', 'FooClass\\Foo')
+    ->setDecoratedService('bar')
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container17.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container17.php
new file mode 100644
index 000000000..7f1db6762
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container17.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+$container
+    ->register('foo', '%foo.class%')
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container19.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container19.php
new file mode 100644
index 000000000..c3af5c960
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container19.php
@@ -0,0 +1,27 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+require_once __DIR__.'/../includes/classes.php';
+
+$container = new ContainerBuilder();
+
+$container->setParameter('env(FOO)', 'Bar\FaooClass');
+$container->setParameter('foo', '%env(FOO)%');
+
+$container
+    ->register('service_from_anonymous_factory', '%foo%')
+    ->setFactory([new Definition('%foo%'), 'getInstance'])
+    ->setPublic(true)
+;
+
+$anonymousServiceWithFactory = new Definition('Bar\FooClass');
+$anonymousServiceWithFactory->setFactory('Bar\FooClass::getInstance');
+$container
+    ->register('service_with_method_call_and_factory', 'Bar\FooClass')
+    ->addMethodCall('setBar', [$anonymousServiceWithFactory])
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container21.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container21.php
new file mode 100644
index 000000000..d82cf3853
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container21.php
@@ -0,0 +1,21 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+$container = new ContainerBuilder();
+
+$bar = new Definition('Bar');
+$bar->setConfigurator([new Definition('Baz'), 'configureBar']);
+
+$fooFactory = new Definition('FooFactory');
+$fooFactory->setFactory([new Definition('Foobar'), 'createFooFactory']);
+
+$container
+    ->register('foo', 'Foo')
+    ->setFactory([$fooFactory, 'createFoo'])
+    ->setConfigurator([$bar, 'configureFoo'])
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container24.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container24.php
new file mode 100644
index 000000000..b9d0b91f1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container24.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+
+$container
+    ->register('foo', 'Foo')
+    ->setAutowired(true)
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container33.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container33.php
new file mode 100644
index 000000000..673abe204
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container33.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container33;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+
+$container->register(\Foo\Foo::class)->setPublic(true);
+$container->register(\Bar\Foo::class)->setPublic(true);
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container8.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container8.php
new file mode 100644
index 000000000..edcd045ea
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container8.php
@@ -0,0 +1,25 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+$container = new ContainerBuilder(new ParameterBag([
+    'foo' => '%baz%',
+    'baz' => 'bar',
+    'bar' => 'foo is %%foo bar',
+    'escape' => '@escapeme',
+    'values' => [true, false, null, 0, 1000.3, 'true', 'false', 'null'],
+    'null string' => 'null',
+    'string of digits' => '123',
+    'string of digits prefixed with minus character' => '-123',
+    'true string' => 'true',
+    'false string' => 'false',
+    'binary number string' => '0b0110',
+    'numeric string' => '-1.2E2',
+    'hexadecimal number string' => '0xFF',
+    'float string' => '10100.1',
+    'positive float string' => '+10100.1',
+    'negative float string' => '-10100.1',
+]));
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container9.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container9.php
new file mode 100644
index 000000000..691a7fa69
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container9.php
@@ -0,0 +1,176 @@
+<?php
+
+require_once __DIR__.'/../includes/classes.php';
+require_once __DIR__.'/../includes/foo.php';
+
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Parameter;
+use Symfony\Component\ExpressionLanguage\Expression;
+
+$container = new ContainerBuilder();
+$container
+    ->register('foo', '\Bar\FooClass')
+    ->addTag('foo', ['foo' => 'foo'])
+    ->addTag('foo', ['bar' => 'bar', 'baz' => 'baz'])
+    ->setFactory(['Bar\\FooClass', 'getInstance'])
+    ->setArguments(['foo', new Reference('foo.baz'), ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%'], true, new Reference('service_container')])
+    ->setProperties(['foo' => 'bar', 'moo' => new Reference('foo.baz'), 'qux' => ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%']])
+    ->addMethodCall('setBar', [new Reference('bar')])
+    ->addMethodCall('initialize')
+    ->setConfigurator('sc_configure')
+    ->setPublic(true)
+;
+$container
+    ->register('foo.baz', '%baz_class%')
+    ->setFactory(['%baz_class%', 'getInstance'])
+    ->setConfigurator(['%baz_class%', 'configureStatic1'])
+    ->setPublic(true)
+;
+$container
+    ->register('bar', 'Bar\FooClass')
+    ->setArguments(['foo', new Reference('foo.baz'), new Parameter('foo_bar')])
+    ->setConfigurator([new Reference('foo.baz'), 'configure'])
+    ->setPublic(true)
+;
+$container
+    ->register('foo_bar', '%foo_class%')
+    ->addArgument(new Reference('deprecated_service'))
+    ->setShared(false)
+    ->setPublic(true)
+;
+$container->getParameterBag()->clear();
+$container->getParameterBag()->add([
+    'baz_class' => 'BazClass',
+    'foo_class' => 'Bar\FooClass',
+    'foo' => 'bar',
+]);
+$container
+    ->register('method_call1', 'Bar\FooClass')
+    ->setFile(realpath(__DIR__.'/../includes/foo.php'))
+    ->addMethodCall('setBar', [new Reference('foo')])
+    ->addMethodCall('setBar', [new Reference('foo2', ContainerInterface::NULL_ON_INVALID_REFERENCE)])
+    ->addMethodCall('setBar', [new Reference('foo3', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
+    ->addMethodCall('setBar', [new Reference('foobaz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
+    ->addMethodCall('setBar', [new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')])
+    ->setPublic(true)
+;
+$container
+    ->register('foo_with_inline', 'Foo')
+    ->addMethodCall('setBar', [new Reference('inlined')])
+    ->setPublic(true)
+;
+$container
+    ->register('inlined', 'Bar')
+    ->setProperty('pub', 'pub')
+    ->addMethodCall('setBaz', [new Reference('baz')])
+    ->setPublic(false)
+;
+$container
+    ->register('baz', 'Baz')
+    ->addMethodCall('setFoo', [new Reference('foo_with_inline')])
+    ->setPublic(true)
+;
+$container
+    ->register('request', 'Request')
+    ->setSynthetic(true)
+    ->setPublic(true)
+;
+$container
+    ->register('configurator_service', 'ConfClass')
+    ->setPublic(false)
+    ->addMethodCall('setFoo', [new Reference('baz')])
+;
+$container
+    ->register('configured_service', 'stdClass')
+    ->setConfigurator([new Reference('configurator_service'), 'configureStdClass'])
+    ->setPublic(true)
+;
+$container
+    ->register('configurator_service_simple', 'ConfClass')
+    ->addArgument('bar')
+    ->setPublic(false)
+;
+$container
+    ->register('configured_service_simple', 'stdClass')
+    ->setConfigurator([new Reference('configurator_service_simple'), 'configureStdClass'])
+    ->setPublic(true)
+;
+$container
+    ->register('decorated', 'stdClass')
+    ->setPublic(true)
+;
+$container
+    ->register('decorator_service', 'stdClass')
+    ->setDecoratedService('decorated')
+    ->setPublic(true)
+;
+$container
+    ->register('decorator_service_with_name', 'stdClass')
+    ->setDecoratedService('decorated', 'decorated.pif-pouf')
+    ->setPublic(true)
+;
+$container
+    ->register('deprecated_service', 'stdClass')
+    ->setDeprecated(true)
+    ->setPublic(true)
+;
+$container
+    ->register('new_factory', 'FactoryClass')
+    ->setProperty('foo', 'bar')
+    ->setPublic(false)
+;
+$container
+    ->register('factory_service', 'Bar')
+    ->setFactory([new Reference('foo.baz'), 'getInstance'])
+    ->setPublic(true)
+;
+$container
+    ->register('new_factory_service', 'FooBarBaz')
+    ->setProperty('foo', 'bar')
+    ->setFactory([new Reference('new_factory'), 'getInstance'])
+    ->setPublic(true)
+;
+$container
+    ->register('service_from_static_method', 'Bar\FooClass')
+    ->setFactory(['Bar\FooClass', 'getInstance'])
+    ->setPublic(true)
+;
+$container
+    ->register('factory_simple', 'SimpleFactoryClass')
+    ->addArgument('foo')
+    ->setDeprecated(true)
+    ->setPublic(false)
+;
+$container
+    ->register('factory_service_simple', 'Bar')
+    ->setFactory([new Reference('factory_simple'), 'getInstance'])
+    ->setPublic(true)
+;
+$container
+    ->register('lazy_context', 'LazyContext')
+    ->setArguments([new IteratorArgument(['k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container')]), new IteratorArgument([])])
+    ->setPublic(true)
+;
+$container
+    ->register('lazy_context_ignore_invalid_ref', 'LazyContext')
+    ->setArguments([new IteratorArgument([new Reference('foo.baz'), new Reference('invalid', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]), new IteratorArgument([])])
+    ->setPublic(true)
+;
+$container
+    ->register('tagged_iterator_foo', 'Bar')
+    ->addTag('foo')
+    ->setPublic(false)
+;
+$container
+    ->register('tagged_iterator', 'Bar')
+    ->addArgument(new TaggedIteratorArgument('foo'))
+    ->setPublic(true)
+;
+$container->setAlias('alias_for_foo', 'foo')->setPublic(true);
+$container->setAlias('alias_for_alias', 'alias_for_foo')->setPublic(true);
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_abstract.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_abstract.php
new file mode 100644
index 000000000..308e22524
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_abstract.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+
+$container
+    ->register('foo', 'Foo')
+    ->setAbstract(true)
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_almost_circular.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_almost_circular.php
new file mode 100644
index 000000000..a1f885399
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_almost_circular.php
@@ -0,0 +1,176 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls;
+
+$public = 'public' === $visibility;
+$container = new ContainerBuilder();
+
+// same visibility for deps
+
+$container->register('foo', FooCircular::class)->setPublic(true)
+   ->addArgument(new Reference('bar'));
+
+$container->register('bar', BarCircular::class)->setPublic($public)
+    ->addMethodCall('addFoobar', [new Reference('foobar')]);
+
+$container->register('foobar', FoobarCircular::class)->setPublic($public)
+    ->addArgument(new Reference('foo'));
+
+// mixed visibility for deps
+
+$container->register('foo2', FooCircular::class)->setPublic(true)
+   ->addArgument(new Reference('bar2'));
+
+$container->register('bar2', BarCircular::class)->setPublic(!$public)
+    ->addMethodCall('addFoobar', [new Reference('foobar2')]);
+
+$container->register('foobar2', FoobarCircular::class)->setPublic($public)
+    ->addArgument(new Reference('foo2'));
+
+// simple inline setter with internal reference
+
+$container->register('bar3', BarCircular::class)->setPublic(true)
+    ->addMethodCall('addFoobar', [new Reference('foobar3'), new Reference('foobar3')]);
+
+$container->register('foobar3', FoobarCircular::class)->setPublic($public);
+
+// loop with non-shared dep
+
+$container->register('foo4', 'stdClass')->setPublic($public)
+    ->setShared(false)
+    ->setProperty('foobar', new Reference('foobar4'));
+
+$container->register('foobar4', 'stdClass')->setPublic(true)
+    ->addArgument(new Reference('foo4'));
+
+// loop on the constructor of a setter-injected dep with property
+
+$container->register('foo5', 'stdClass')->setPublic(true)
+    ->setProperty('bar', new Reference('bar5'));
+
+$container->register('bar5', 'stdClass')->setPublic($public)
+    ->addArgument(new Reference('foo5'))
+    ->setProperty('foo', new Reference('foo5'));
+
+// doctrine-like event system + some extra
+
+$container->register('manager', 'stdClass')->setPublic(true)
+    ->addArgument(new Reference('connection'));
+
+$container->register('logger', 'stdClass')->setPublic(true)
+    ->addArgument(new Reference('connection'))
+    ->setProperty('handler', (new Definition('stdClass'))->addArgument(new Reference('manager')))
+;
+$container->register('connection', 'stdClass')->setPublic(true)
+    ->addArgument(new Reference('dispatcher'))
+    ->addArgument(new Reference('config'));
+
+$container->register('config', 'stdClass')->setPublic(false)
+    ->setProperty('logger', new Reference('logger'));
+
+$container->register('dispatcher', 'stdClass')->setPublic($public)
+    ->setLazy($public)
+    ->setProperty('subscriber', new Reference('subscriber'));
+
+$container->register('subscriber', 'stdClass')->setPublic(true)
+    ->addArgument(new Reference('manager'));
+
+// doctrine-like event system + some extra (bis)
+
+$container->register('manager2', 'stdClass')->setPublic(true)
+    ->addArgument(new Reference('connection2'));
+
+$container->register('logger2', 'stdClass')->setPublic(false)
+    ->addArgument(new Reference('connection2'))
+    ->setProperty('handler2', (new Definition('stdClass'))->addArgument(new Reference('manager2')))
+;
+$container->register('connection2', 'stdClass')->setPublic(true)
+    ->addArgument(new Reference('dispatcher2'))
+    ->addArgument(new Reference('config2'));
+
+$container->register('config2', 'stdClass')->setPublic(false)
+    ->setProperty('logger2', new Reference('logger2'));
+
+$container->register('dispatcher2', 'stdClass')->setPublic($public)
+    ->setLazy($public)
+    ->setProperty('subscriber2', new Reference('subscriber2'));
+
+$container->register('subscriber2', 'stdClass')->setPublic(false)
+    ->addArgument(new Reference('manager2'));
+
+// doctrine-like event system with listener
+
+$container->register('manager3', 'stdClass')
+    ->setLazy(true)
+    ->setPublic(true)
+    ->addArgument(new Reference('connection3'));
+
+$container->register('connection3', 'stdClass')
+    ->setPublic($public)
+    ->setProperty('listener', [new Reference('listener3')]);
+
+$container->register('listener3', 'stdClass')
+    ->setPublic(true)
+    ->setProperty('manager', new Reference('manager3'));
+
+// doctrine-like event system with small differences
+
+$container->register('manager4', 'stdClass')
+    ->setLazy(true)
+    ->addArgument(new Reference('connection4'));
+
+$container->register('connection4', 'stdClass')
+    ->setPublic($public)
+    ->setProperty('listener', [new Reference('listener4')]);
+
+$container->register('listener4', 'stdClass')
+    ->setPublic(true)
+    ->addArgument(new Reference('manager4'));
+
+// private service involved in a loop
+
+$container->register('foo6', 'stdClass')
+    ->setPublic(true)
+    ->setProperty('bar6', new Reference('bar6'));
+
+$container->register('bar6', 'stdClass')
+    ->setPublic(false)
+    ->addArgument(new Reference('foo6'));
+
+$container->register('baz6', 'stdClass')
+    ->setPublic(true)
+    ->setProperty('bar6', new Reference('bar6'));
+
+// provided by Christian Schiffler
+
+$container
+    ->register('root', 'stdClass')
+    ->setArguments([new Reference('level2'), new Reference('multiuse1')])
+    ->setPublic(true);
+
+$container
+    ->register('level2', FooForCircularWithAddCalls::class)
+    ->addMethodCall('call', [new Reference('level3')]);
+
+$container->register('multiuse1', 'stdClass');
+
+$container
+    ->register('level3', 'stdClass')
+    ->addArgument(new Reference('level4'));
+
+$container
+    ->register('level4', 'stdClass')
+    ->setArguments([new Reference('multiuse1'), new Reference('level5')]);
+
+$container
+    ->register('level5', 'stdClass')
+    ->addArgument(new Reference('level6'));
+
+$container
+    ->register('level6', FooForCircularWithAddCalls::class)
+    ->addMethodCall('call', [new Reference('level5')]);
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_env_in_id.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_env_in_id.php
new file mode 100644
index 000000000..1e851cf01
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_env_in_id.php
@@ -0,0 +1,22 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\DependencyInjection\Reference;
+
+$container = new ContainerBuilder();
+
+$container->setParameter('env(BAR)', 'bar');
+
+$container->register('foo', 'stdClass')->setPublic(true)
+   ->addArgument(new Reference('bar_%env(BAR)%'))
+   ->addArgument(['baz_%env(BAR)%' => new Reference('baz_%env(BAR)%')]);
+
+$container->register('bar', 'stdClass')->setPublic(true)
+   ->addArgument(new Reference('bar_%env(BAR)%'));
+
+$container->register('bar_%env(BAR)%', 'stdClass')->setPublic(false);
+$container->register('baz_%env(BAR)%', 'stdClass')->setPublic(false);
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_inline_requires.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_inline_requires.php
new file mode 100644
index 000000000..3bbfa31fa
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_inline_requires.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Symfony\Tests\InlineRequires;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
+
+$container = new ContainerBuilder();
+
+$container->register(HotPath\C1::class)->addTag('container.hot_path')->setPublic(true);
+$container->register(HotPath\C2::class)->addArgument(new Reference(HotPath\C3::class))->setPublic(true);
+$container->register(HotPath\C3::class);
+$container->register(ParentNotExists::class)->setPublic(true);
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_uninitialized_ref.php b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_uninitialized_ref.php
new file mode 100644
index 000000000..36c05c3fa
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/containers/container_uninitialized_ref.php
@@ -0,0 +1,49 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+$container = new ContainerBuilder();
+
+$container
+    ->register('foo1', 'stdClass')
+    ->setPublic(true)
+;
+
+$container
+    ->register('foo2', 'stdClass')
+    ->setPublic(false)
+;
+
+$container
+    ->register('foo3', 'stdClass')
+    ->setPublic(false)
+;
+
+$container
+    ->register('baz', 'stdClass')
+    ->setProperty('foo3', new Reference('foo3'))
+    ->setPublic(true)
+;
+
+$container
+    ->register('bar', 'stdClass')
+    ->setProperty('foo1', new Reference('foo1', $container::IGNORE_ON_UNINITIALIZED_REFERENCE))
+    ->setProperty('foo2', new Reference('foo2', $container::IGNORE_ON_UNINITIALIZED_REFERENCE))
+    ->setProperty('foo3', new Reference('foo3', $container::IGNORE_ON_UNINITIALIZED_REFERENCE))
+    ->setProperty('closures', [
+        new ServiceClosureArgument(new Reference('foo1', $container::IGNORE_ON_UNINITIALIZED_REFERENCE)),
+        new ServiceClosureArgument(new Reference('foo2', $container::IGNORE_ON_UNINITIALIZED_REFERENCE)),
+        new ServiceClosureArgument(new Reference('foo3', $container::IGNORE_ON_UNINITIALIZED_REFERENCE)),
+    ])
+    ->setProperty('iter', new IteratorArgument([
+        'foo1' => new Reference('foo1', $container::IGNORE_ON_UNINITIALIZED_REFERENCE),
+        'foo2' => new Reference('foo2', $container::IGNORE_ON_UNINITIALIZED_REFERENCE),
+        'foo3' => new Reference('foo3', $container::IGNORE_ON_UNINITIALIZED_REFERENCE),
+    ]))
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/directory/import/import.yml b/lib/symfony/dependency-injection/Tests/Fixtures/directory/import/import.yml
new file mode 100644
index 000000000..35ec4a042
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/directory/import/import.yml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: ../recurse/ }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/directory/recurse/simple.ini b/lib/symfony/dependency-injection/Tests/Fixtures/directory/recurse/simple.ini
new file mode 100644
index 000000000..0984cdac7
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/directory/recurse/simple.ini
@@ -0,0 +1,2 @@
+[parameters]
+  ini = ini
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/directory/recurse/simple.yml b/lib/symfony/dependency-injection/Tests/Fixtures/directory/recurse/simple.yml
new file mode 100644
index 000000000..f98ef12ea
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/directory/recurse/simple.yml
@@ -0,0 +1,2 @@
+parameters:
+    yaml: yaml
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/directory/simple.php b/lib/symfony/dependency-injection/Tests/Fixtures/directory/simple.php
new file mode 100644
index 000000000..4750324ad
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/directory/simple.php
@@ -0,0 +1,3 @@
+<?php
+
+$container->setParameter('php', 'php');
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services1.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services1.dot
new file mode 100644
index 000000000..e74010809
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services1.dot
@@ -0,0 +1,7 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services10-1.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services10-1.dot
new file mode 100644
index 000000000..9fdf34106
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services10-1.dot
@@ -0,0 +1,10 @@
+digraph sc {
+  ratio="normal"
+  node [fontsize="13" fontname="Verdana" shape="square"];
+  edge [fontsize="12" fontname="Verdana" color="white" arrowhead="closed" arrowsize="1"];
+
+  node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=square, fillcolor="grey", style="filled"];
+  node_foo [label="foo\nFooClass\n", shape=square, fillcolor="grey", style="filled"];
+  node_bar [label="bar\n\n", shape=square, fillcolor="red", style="empty"];
+  node_foo -> node_bar [label="" style="filled"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services10.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services10.dot
new file mode 100644
index 000000000..309388eac
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services10.dot
@@ -0,0 +1,10 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo [label="foo\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_bar [label="bar\n\n", shape=record, fillcolor="#ff9999", style="filled"];
+  node_foo -> node_bar [label="" style="filled"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services13.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services13.dot
new file mode 100644
index 000000000..fffe8f1b5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services13.dot
@@ -0,0 +1,10 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo [label="foo\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_bar [label="bar\nBarClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo -> node_bar [label="" style="filled"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services14.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services14.dot
new file mode 100644
index 000000000..e74010809
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services14.dot
@@ -0,0 +1,7 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services17.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services17.dot
new file mode 100644
index 000000000..e177fae2a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services17.dot
@@ -0,0 +1,8 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo [label="foo\n%foo.class%\n", shape=record, fillcolor="#eeeeee", style="filled"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services18.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services18.dot
new file mode 100644
index 000000000..4fbcceef3
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services18.dot
@@ -0,0 +1,8 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_foo [label="foo\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services9.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services9.dot
new file mode 100644
index 000000000..6a34c5735
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services9.dot
@@ -0,0 +1,56 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo [label="foo (alias_for_foo)\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo_baz [label="foo.baz\nBazClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_bar [label="bar\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo_bar [label="foo_bar\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="dotted"];
+  node_method_call1 [label="method_call1\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo_with_inline [label="foo_with_inline\nFoo\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_inlined [label="inlined\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_baz [label="baz\nBaz\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_request [label="request\nRequest\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_configurator_service [label="configurator_service\nConfClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_configured_service [label="configured_service\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_configurator_service_simple [label="configurator_service_simple\nConfClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_configured_service_simple [label="configured_service_simple\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_decorated [label="decorated\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_decorator_service [label="decorator_service\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_decorator_service_with_name [label="decorator_service_with_name\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_deprecated_service [label="deprecated_service\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_new_factory [label="new_factory\nFactoryClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_factory_service [label="factory_service\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_new_factory_service [label="new_factory_service\nFooBarBaz\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_service_from_static_method [label="service_from_static_method\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_factory_simple [label="factory_simple\nSimpleFactoryClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_factory_service_simple [label="factory_service_simple\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_lazy_context [label="lazy_context\nLazyContext\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_lazy_context_ignore_invalid_ref [label="lazy_context_ignore_invalid_ref\nLazyContext\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_tagged_iterator_foo [label="tagged_iterator_foo\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_tagged_iterator [label="tagged_iterator\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo2 [label="foo2\n\n", shape=record, fillcolor="#ff9999", style="filled"];
+  node_foo3 [label="foo3\n\n", shape=record, fillcolor="#ff9999", style="filled"];
+  node_foobaz [label="foobaz\n\n", shape=record, fillcolor="#ff9999", style="filled"];
+  node_invalid [label="invalid\n\n", shape=record, fillcolor="#ff9999", style="filled"];
+  node_foo -> node_foo_baz [label="" style="filled"];
+  node_foo -> node_service_container [label="" style="filled"];
+  node_foo -> node_foo_baz [label="" style="dashed"];
+  node_foo -> node_bar [label="setBar()" style="dashed"];
+  node_bar -> node_foo_baz [label="" style="filled"];
+  node_foo_bar -> node_deprecated_service [label="" style="filled"];
+  node_method_call1 -> node_foo [label="setBar()" style="dashed"];
+  node_method_call1 -> node_foo2 [label="setBar()" style="dashed"];
+  node_method_call1 -> node_foo3 [label="setBar()" style="dashed"];
+  node_method_call1 -> node_foobaz [label="setBar()" style="dashed"];
+  node_foo_with_inline -> node_inlined [label="setBar()" style="dashed"];
+  node_inlined -> node_baz [label="setBaz()" style="dashed"];
+  node_baz -> node_foo_with_inline [label="setFoo()" style="dashed"];
+  node_configurator_service -> node_baz [label="setFoo()" style="dashed"];
+  node_lazy_context -> node_foo_baz [label="" style="filled" color="#9999ff"];
+  node_lazy_context -> node_service_container [label="" style="filled" color="#9999ff"];
+  node_lazy_context_ignore_invalid_ref -> node_foo_baz [label="" style="filled" color="#9999ff"];
+  node_lazy_context_ignore_invalid_ref -> node_invalid [label="" style="filled" color="#9999ff"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services_inline.dot b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services_inline.dot
new file mode 100644
index 000000000..b430b186d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/graphviz/services_inline.dot
@@ -0,0 +1,10 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo [label="foo\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_bar [label="bar\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo -> node_bar [label="" style="filled"];
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/FooVariadic.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/FooVariadic.php
new file mode 100644
index 000000000..12861c561
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/FooVariadic.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes;
+
+use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
+
+class FooVariadic
+{
+    public function __construct(Foo $foo)
+    {
+    }
+
+    public function bar(...$arguments)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C1.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C1.php
new file mode 100644
index 000000000..c4934d1f1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C1.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath;
+
+class C1 extends P1
+{
+    use T1;
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C2.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C2.php
new file mode 100644
index 000000000..16bce8f82
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C2.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath;
+
+class C2
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C3.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C3.php
new file mode 100644
index 000000000..5bc6dd89f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/C3.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath;
+
+class C3
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/I1.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/I1.php
new file mode 100644
index 000000000..7147b9d2a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/I1.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath;
+
+interface I1
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/P1.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/P1.php
new file mode 100644
index 000000000..e89bc320a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/P1.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath;
+
+class P1 implements I1
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/T1.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/T1.php
new file mode 100644
index 000000000..3360ace5a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/HotPath/T1.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath;
+
+trait T1
+{
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectExtension.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectExtension.php
new file mode 100644
index 000000000..2198b19c4
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectExtension.php
@@ -0,0 +1,47 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+
+class ProjectExtension implements ExtensionInterface
+{
+    public function load(array $configs, ContainerBuilder $configuration)
+    {
+        $configuration->setParameter('project.configs', $configs);
+        $configs = array_filter($configs);
+
+        if ($configs) {
+            $config = call_user_func_array('array_merge', $configs);
+        } else {
+            $config = [];
+        }
+
+        $configuration->setDefinition('project.service.bar', new Definition('FooClass'));
+        $configuration->setParameter('project.parameter.bar', isset($config['foo']) ? $config['foo'] : 'foobar');
+
+        $configuration->setDefinition('project.service.foo', new Definition('FooClass'));
+        $configuration->setParameter('project.parameter.foo', isset($config['foo']) ? $config['foo'] : 'foobar');
+
+        return $configuration;
+    }
+
+    public function getXsdValidationBasePath()
+    {
+        return false;
+    }
+
+    public function getNamespace()
+    {
+        return 'http://www.example.com/schema/project';
+    }
+
+    public function getAlias()
+    {
+        return 'project';
+    }
+
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtension.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtension.php
new file mode 100644
index 000000000..2ee2f12dc
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtension.php
@@ -0,0 +1,19 @@
+<?php
+
+class ProjectWithXsdExtension extends ProjectExtension
+{
+    public function getXsdValidationBasePath()
+    {
+        return __DIR__.'/schema';
+    }
+
+    public function getNamespace()
+    {
+        return 'http://www.example.com/schema/projectwithxsd';
+    }
+
+    public function getAlias()
+    {
+        return 'projectwithxsd';
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar b/lib/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar
new file mode 100644
index 0000000000000000000000000000000000000000..040e136a342520de248a1e0ae9006bd67a732b1b
GIT binary patch
literal 1161
zcmb7Dzi-n(6m}7lB?cA-7LFT8ic~v=1?8t2+CroRqLR{X=3>9ZF829)cP2qlv4X_J
zzrf1OpTLe_V&#8eL-5W{LMstcEZy0@`@Zkp``){HON4^-Lnf=$gbDLerhS<nfv*oD
z9UiJ+XR3j#DCHe)wjF^JU9S-d$5|x7OSun(n$@c7uBNVp2wEeacYmup@a{hB^*i02
zy)uStH80ukEz7!q<1&sli{iXG9)hgv=Rk^h4N-%4`{w=W>cQua<{zIcIFuhk!dy`p
zv$5$^oT&;v%oye^<(nUKM%|cd+kVWHBL6%g0b_2kKrOtsU)Tg6kqzU>C!>t}8Y@7?
zps^y4SsVq-EVP+|KGR`&J%<-0LzJL1$<fE{&YtHvCAY|+RLgNE_A>PcECD5$56cuw
zq1FNmJ()}#n6gB~;P`1W)1Nyu!PY^8B5vAZWzelSVrpr?ndyI*JgK*)Nlc!BG#%QY
zSQ$!y`zgjAH|YLgcjFGl-m&dEo~K&4K#;;!gZ_UiH1{p1S5fbb#N@V<%CUQ^QrUD5
zd)-HQ%M=97Bvx+W?HSrRO)P{Uh6K3YO=YqTBbLRwL60+RhfxFp#ViTQ^PJ%b$8t94
z5HBpz&&B-H{R70(VFjlH+&l$t=4s|iOluhpGd<rPrRiKNHxzgIm=cu4(5_iJCE2u#
krNZ{+t6wj_e)-nBc+>xRt^D12{q)9@x8^$EYxml}0Tm>CJpcdz

literal 0
HcmV?d00001

diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/autowiring_classes.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/autowiring_classes.php
new file mode 100644
index 000000000..5cf151ef8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/autowiring_classes.php
@@ -0,0 +1,336 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+class Foo
+{
+}
+
+class Bar
+{
+    public function __construct(Foo $foo)
+    {
+    }
+}
+
+interface AInterface
+{
+}
+
+class A implements AInterface
+{
+    public static function create(Foo $foo)
+    {
+    }
+}
+
+class B extends A
+{
+}
+
+class C
+{
+    public function __construct(A $a)
+    {
+    }
+}
+
+interface DInterface
+{
+}
+
+interface EInterface extends DInterface
+{
+}
+
+interface IInterface
+{
+}
+
+class I implements IInterface
+{
+}
+
+class F extends I implements EInterface
+{
+}
+
+class G
+{
+    public function __construct(DInterface $d, EInterface $e, IInterface $i)
+    {
+    }
+}
+
+class H
+{
+    public function __construct(B $b, DInterface $d)
+    {
+    }
+}
+
+class D
+{
+    public function __construct(A $a, DInterface $d)
+    {
+    }
+}
+
+class E
+{
+    public function __construct(D $d = null)
+    {
+    }
+}
+
+class J
+{
+    public function __construct(I $i)
+    {
+    }
+}
+
+class K
+{
+    public function __construct(IInterface $i)
+    {
+    }
+}
+
+interface CollisionInterface
+{
+}
+
+class CollisionA implements CollisionInterface
+{
+}
+
+class CollisionB implements CollisionInterface
+{
+}
+
+class CannotBeAutowired
+{
+    public function __construct(CollisionInterface $collision)
+    {
+    }
+}
+
+class Lille
+{
+}
+
+class Dunglas
+{
+    public function __construct(Lille $l)
+    {
+    }
+}
+
+class LesTilleuls
+{
+    public function __construct(Dunglas $j, Dunglas $k)
+    {
+    }
+}
+
+class OptionalParameter
+{
+    public function __construct(CollisionInterface $c = null, A $a, Foo $f = null)
+    {
+    }
+}
+
+class BadTypeHintedArgument
+{
+    public function __construct(Dunglas $k, NotARealClass $r)
+    {
+    }
+}
+class BadParentTypeHintedArgument
+{
+    public function __construct(Dunglas $k, OptionalServiceClass $r)
+    {
+    }
+}
+class NotGuessableArgument
+{
+    public function __construct(Foo $k)
+    {
+    }
+}
+class NotGuessableArgumentForSubclass
+{
+    public function __construct(A $k)
+    {
+    }
+}
+class MultipleArguments
+{
+    public function __construct(A $k, $foo, Dunglas $dunglas, array $bar)
+    {
+    }
+}
+
+class MultipleArgumentsOptionalScalar
+{
+    public function __construct(A $a, $foo = 'default_val', Lille $lille = null)
+    {
+    }
+}
+class MultipleArgumentsOptionalScalarLast
+{
+    public function __construct(A $a, Lille $lille, $foo = 'some_val')
+    {
+    }
+}
+class MultipleArgumentsOptionalScalarNotReallyOptional
+{
+    public function __construct(A $a, $foo = 'default_val', Lille $lille)
+    {
+    }
+}
+
+/*
+ * Classes used for testing createResourceForClass
+ */
+class ClassForResource
+{
+    public function __construct($foo, Bar $bar = null)
+    {
+    }
+
+    public function setBar(Bar $bar)
+    {
+    }
+}
+class IdenticalClassResource extends ClassForResource
+{
+}
+
+class ClassChangedConstructorArgs extends ClassForResource
+{
+    public function __construct($foo, Bar $bar, $baz)
+    {
+    }
+}
+
+class SetterInjectionCollision
+{
+    /**
+     * @required
+     */
+    public function setMultipleInstancesForOneArg(CollisionInterface $collision)
+    {
+        // The CollisionInterface cannot be autowired - there are multiple
+
+        // should throw an exception
+    }
+}
+
+class SetterInjection extends SetterInjectionParent
+{
+    /**
+     * @required
+     */
+    public function setFoo(Foo $foo)
+    {
+        // should be called
+    }
+
+    /** @inheritdoc*/ // <- brackets are missing on purpose
+    public function setDependencies(Foo $foo, A $a)
+    {
+        // should be called
+    }
+
+    /** {@inheritdoc} */
+    public function setWithCallsConfigured(A $a)
+    {
+        // this method has a calls configured on it
+    }
+
+    public function notASetter(A $a)
+    {
+        // should be called only when explicitly specified
+    }
+
+    /**
+     * @required*/
+    public function setChildMethodWithoutDocBlock(A $a)
+    {
+    }
+}
+
+class SetterInjectionParent
+{
+    /** @required*/
+    public function setDependencies(Foo $foo, A $a)
+    {
+        // should be called
+    }
+
+    public function notASetter(A $a)
+    {
+        // @required should be ignored when the child does not add @inheritdoc
+    }
+
+    /**	@required <tab> prefix is on purpose */
+    public function setWithCallsConfigured(A $a)
+    {
+    }
+
+    /** @required */
+    public function setChildMethodWithoutDocBlock(A $a)
+    {
+    }
+}
+
+class NotWireable
+{
+    public function setNotAutowireable(NotARealClass $n)
+    {
+    }
+
+    public function setBar()
+    {
+    }
+
+    public function setOptionalNotAutowireable(NotARealClass $n = null)
+    {
+    }
+
+    public function setDifferentNamespace(\stdClass $n)
+    {
+    }
+
+    public function setOptionalNoTypeHint($foo = null)
+    {
+    }
+
+    public function setOptionalArgNoAutowireable($other = 'default_val')
+    {
+    }
+
+    /** @required */
+    protected function setProtectedMethod(A $a)
+    {
+    }
+}
+
+class PrivateConstructor
+{
+    private function __construct()
+    {
+    }
+}
+
+class ScalarSetter
+{
+    /**
+     * @required
+     */
+    public function setDefaultLocale($defaultLocale)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/classes.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/classes.php
new file mode 100644
index 000000000..33b043fa3
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/classes.php
@@ -0,0 +1,136 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface as ProxyDumper;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+
+function sc_configure($instance)
+{
+    $instance->configure();
+}
+
+class BarClass extends BazClass
+{
+    protected $baz;
+    public $foo = 'foo';
+
+    public function setBaz(BazClass $baz)
+    {
+        $this->baz = $baz;
+    }
+
+    public function getBaz()
+    {
+        return $this->baz;
+    }
+}
+
+class BazClass
+{
+    protected $foo;
+
+    public function setFoo(Foo $foo)
+    {
+        $this->foo = $foo;
+    }
+
+    public function configure($instance)
+    {
+        $instance->configure();
+    }
+
+    public static function getInstance()
+    {
+        return new self();
+    }
+
+    public static function configureStatic($instance)
+    {
+        $instance->configure();
+    }
+
+    public static function configureStatic1()
+    {
+    }
+}
+
+class BarUserClass
+{
+    public $bar;
+
+    public function __construct(BarClass $bar)
+    {
+        $this->bar = $bar;
+    }
+}
+
+class MethodCallClass
+{
+    public $simple;
+    public $complex;
+    private $callPassed = false;
+
+    public function callMe()
+    {
+        $this->callPassed = is_scalar($this->simple) && is_object($this->complex);
+    }
+
+    public function callPassed()
+    {
+        return $this->callPassed;
+    }
+}
+
+class DummyProxyDumper implements ProxyDumper
+{
+    public function isProxyCandidate(Definition $definition)
+    {
+        return $definition->isLazy();
+    }
+
+    public function getProxyFactoryCode(Definition $definition, $id, $factoryCall = null)
+    {
+        return "        // lazy factory for {$definition->getClass()}\n\n";
+    }
+
+    public function getProxyCode(Definition $definition)
+    {
+        return "// proxy code for {$definition->getClass()}\n";
+    }
+}
+
+class LazyContext
+{
+    public $lazyValues;
+    public $lazyEmptyValues;
+
+    public function __construct($lazyValues, $lazyEmptyValues)
+    {
+        $this->lazyValues = $lazyValues;
+        $this->lazyEmptyValues = $lazyEmptyValues;
+    }
+}
+
+class FoobarCircular
+{
+    public function __construct(FooCircular $foo)
+    {
+        $this->foo = $foo;
+    }
+}
+
+class FooCircular
+{
+    public function __construct(BarCircular $bar)
+    {
+        $this->bar = $bar;
+    }
+}
+
+class BarCircular
+{
+    public function addFoobar(FoobarCircular $foobar)
+    {
+        $this->foobar = $foobar;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/createphar.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/createphar.php
new file mode 100644
index 000000000..c675478fd
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/createphar.php
@@ -0,0 +1,47 @@
+<?php
+
+$file = __DIR__.'/ProjectWithXsdExtensionInPhar.phar';
+if (is_file($file)) {
+    @unlink($file);
+}
+
+$phar = new Phar($file, 0, 'ProjectWithXsdExtensionInPhar.phar');
+$phar->addFromString('ProjectWithXsdExtensionInPhar.php', <<<'EOT'
+<?php
+
+class ProjectWithXsdExtensionInPhar extends ProjectExtension
+{
+    public function getXsdValidationBasePath()
+    {
+        return __DIR__.'/schema';
+    }
+
+    public function getNamespace()
+    {
+        return 'http://www.example.com/schema/projectwithxsdinphar';
+    }
+
+    public function getAlias()
+    {
+        return 'projectwithxsdinphar';
+    }
+}
+EOT
+);
+$phar->addFromString('schema/project-1.0.xsd', <<<'EOT'
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xsd:schema xmlns="http://www.example.com/schema/projectwithxsdinphar"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://www.example.com/schema/projectwithxsdinphar"
+    elementFormDefault="qualified">
+
+  <xsd:element name="bar" type="bar" />
+
+  <xsd:complexType name="bar">
+    <xsd:attribute name="foo" type="xsd:string" />
+  </xsd:complexType>
+</xsd:schema>
+EOT
+);
+$phar->setStub('<?php Phar::mapPhar("ProjectWithXsdExtensionInPhar.phar"); require_once "phar://ProjectWithXsdExtensionInPhar.phar/ProjectWithXsdExtensionInPhar.php"; __HALT_COMPILER(); ?>');
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/foo.php b/lib/symfony/dependency-injection/Tests/Fixtures/includes/foo.php
new file mode 100644
index 000000000..20bc928b9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/foo.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Bar;
+
+class FooClass
+{
+    public $foo;
+    public $moo;
+
+    public $bar = null;
+    public $initialized = false;
+    public $configured = false;
+    public $called = false;
+    public $arguments = [];
+
+    public function __construct($arguments = [])
+    {
+        $this->arguments = $arguments;
+    }
+
+    public static function getInstance($arguments = [])
+    {
+        $obj = new self($arguments);
+        $obj->called = true;
+
+        return $obj;
+    }
+
+    public function initialize()
+    {
+        $this->initialized = true;
+    }
+
+    public function configure()
+    {
+        $this->configured = true;
+    }
+
+    public function setBar($value = null)
+    {
+        $this->bar = $value;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/includes/schema/project-1.0.xsd b/lib/symfony/dependency-injection/Tests/Fixtures/includes/schema/project-1.0.xsd
new file mode 100644
index 000000000..282884e4e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/includes/schema/project-1.0.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xsd:schema xmlns="http://www.example.com/schema/projectwithxsd"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://www.example.com/schema/projectwithxsd"
+    elementFormDefault="qualified">
+
+  <xsd:element name="bar" type="bar" />
+
+  <xsd:complexType name="bar">
+    <xsd:attribute name="foo" type="xsd:string" />
+  </xsd:complexType>
+</xsd:schema>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ini/almostvalid.ini b/lib/symfony/dependency-injection/Tests/Fixtures/ini/almostvalid.ini
new file mode 100644
index 000000000..9fdef8558
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ini/almostvalid.ini
@@ -0,0 +1,2 @@
+foo = '
+bar = bar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ini/ini_with_wrong_ext.xml b/lib/symfony/dependency-injection/Tests/Fixtures/ini/ini_with_wrong_ext.xml
new file mode 100644
index 000000000..7f1b4d3dc
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ini/ini_with_wrong_ext.xml
@@ -0,0 +1,2 @@
+[parameters]
+  with_wrong_ext = 'from ini'
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ini/nonvalid.ini b/lib/symfony/dependency-injection/Tests/Fixtures/ini/nonvalid.ini
new file mode 100644
index 000000000..9f84a6087
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ini/nonvalid.ini
@@ -0,0 +1,2 @@
+{NOT AN INI FILE}
+{JUST A PLAIN TEXT FILE}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters.ini b/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters.ini
new file mode 100644
index 000000000..df92f7527
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters.ini
@@ -0,0 +1,3 @@
+[parameters]
+  foo = bar
+  bar = %foo%
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters1.ini b/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters1.ini
new file mode 100644
index 000000000..e50f7222b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters1.ini
@@ -0,0 +1,3 @@
+[parameters]
+  FOO = foo
+  baz = baz
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters2.ini b/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters2.ini
new file mode 100644
index 000000000..75fbac628
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ini/parameters2.ini
@@ -0,0 +1,2 @@
+[parameters]
+  imported_from_ini = true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/ini/types.ini b/lib/symfony/dependency-injection/Tests/Fixtures/ini/types.ini
new file mode 100644
index 000000000..75840907d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/ini/types.ini
@@ -0,0 +1,28 @@
+[parameters]
+  true = true
+  true_comment = true ; comment
+  false = false
+  null = null
+  on = on
+  off = off
+  yes = yes
+  no = no
+  none = none
+  constant = PHP_VERSION
+  12 = 12
+  12_string = '12'
+  12_quoted_number = "12"
+  12_comment = 12 ; comment
+  12_string_comment = '12' ; comment
+  12_quoted_number_comment = "12" ; comment
+  -12 = -12
+  0 = 0
+  1 = 1
+  0b0110 = 0b0110
+  11112222333344445555 = 1111,2222,3333,4444,5555
+  0777 = 0777
+  255 = 0xFF
+  100.0 = 1e2
+  -120.0 = -1.2E2
+  -10100.1 = -10100.1
+  -10,100.1 = -10,100.1
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
new file mode 100644
index 000000000..56f59d9dd
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithoutArgumentsContainer
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->parameterBag = null;
+
+        $this->services = [];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
new file mode 100644
index 000000000..9e1abeb44
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithMandatoryArgumentsContainer
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
new file mode 100644
index 000000000..2fe30f22e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithOptionalArgumentsContainer
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->parameterBag = null;
+
+        $this->services = [];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_without_constructor.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_without_constructor.php
new file mode 100644
index 000000000..c630ad090
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/custom_container_class_without_constructor.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\NoConstructorContainer
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/php_with_wrong_ext.yml b/lib/symfony/dependency-injection/Tests/Fixtures/php/php_with_wrong_ext.yml
new file mode 100644
index 000000000..fdd312501
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/php_with_wrong_ext.yml
@@ -0,0 +1,3 @@
+<?php
+
+$container->setParameter('with_wrong_ext', 'from php');
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services1-1.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services1-1.php
new file mode 100644
index 000000000..3c0ced8e9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services1-1.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Dump;
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services1.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services1.php
new file mode 100644
index 000000000..f7d49dd4d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services1.php
@@ -0,0 +1,53 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services10.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services10.php
new file mode 100644
index 000000000..961282993
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services10.php
@@ -0,0 +1,157 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->methodMap = [
+            'test' => 'getTestService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'test' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getTestService()
+    {
+        return $this->services['test'] = new \stdClass(['only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end', 'new line' => 'string with '."\n".'new line']);
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'empty_value' => '',
+            'some_string' => '-',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services12.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services12.php
new file mode 100644
index 000000000..0e8f581e8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services12.php
@@ -0,0 +1,171 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $dir = __DIR__;
+        for ($i = 1; $i <= 5; ++$i) {
+            $this->targetDirs[$i] = $dir = \dirname($dir);
+        }
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->methodMap = [
+            'test' => 'getTestService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'test' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getTestService()
+    {
+        return $this->services['test'] = new \stdClass(('wiz'.$this->targetDirs[1]), [('wiz'.$this->targetDirs[1]) => ($this->targetDirs[2].'/')]);
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [
+        'foo' => false,
+        'buz' => false,
+    ];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        switch ($name) {
+            case 'foo': $value = ('wiz'.$this->targetDirs[1]); break;
+            case 'buz': $value = $this->targetDirs[2]; break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+        $this->loadedDynamicParameters[$name] = true;
+
+        return $this->dynamicParameters[$name] = $value;
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'bar' => __DIR__,
+            'baz' => (__DIR__.'/PhpDumperTest.php'),
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services13.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services13.php
new file mode 100644
index 000000000..52f5cf25f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services13.php
@@ -0,0 +1,70 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'foo' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService()
+    {
+        $a = new \stdClass();
+        $a->add($this);
+
+        return $this->services['bar'] = new \stdClass($a);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services19.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services19.php
new file mode 100644
index 000000000..6f6f60451
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services19.php
@@ -0,0 +1,181 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->methodMap = [
+            'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
+            'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'service_from_anonymous_factory' shared service.
+     *
+     * @return object A %env(FOO)% instance
+     */
+    protected function getServiceFromAnonymousFactoryService()
+    {
+        return $this->services['service_from_anonymous_factory'] = (new ${($_ = $this->getEnv('FOO')) && false ?: "_"}())->getInstance();
+    }
+
+    /**
+     * Gets the public 'service_with_method_call_and_factory' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getServiceWithMethodCallAndFactoryService()
+    {
+        $this->services['service_with_method_call_and_factory'] = $instance = new \Bar\FooClass();
+
+        $instance->setBar(\Bar\FooClass::getInstance());
+
+        return $instance;
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [
+        'foo' => false,
+    ];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        switch ($name) {
+            case 'foo': $value = $this->getEnv('FOO'); break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+        $this->loadedDynamicParameters[$name] = true;
+
+        return $this->dynamicParameters[$name] = $value;
+    }
+
+    private $normalizedParameterNames = [
+        'env(foo)' => 'env(FOO)',
+    ];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'env(FOO)' => 'Bar\\FaooClass',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services24.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services24.php
new file mode 100644
index 000000000..963118e20
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services24.php
@@ -0,0 +1,66 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'foo' shared autowired service.
+     *
+     * @return \Foo
+     */
+    protected function getFooService()
+    {
+        return $this->services['foo'] = new \Foo();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services26.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services26.php
new file mode 100644
index 000000000..95055207d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services26.php
@@ -0,0 +1,194 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $dir = __DIR__;
+        for ($i = 1; $i <= 5; ++$i) {
+            $this->targetDirs[$i] = $dir = \dirname($dir);
+        }
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'test' => 'getTestService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\Bar
+     */
+    protected function getBarService()
+    {
+        return $this->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\Bar($this->getEnv('QUZ'));
+    }
+
+    /**
+     * Gets the public 'test' shared service.
+     *
+     * @return object A %env(FOO)% instance
+     */
+    protected function getTestService()
+    {
+        $class = $this->getEnv('FOO');
+
+        return $this->services['test'] = new $class($this->getEnv('Bar'), 'foo'.$this->getEnv('string:FOO').'baz', $this->getEnv('int:Baz'));
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [
+        'bar' => false,
+        'baz' => false,
+        'json' => false,
+        'db_dsn' => false,
+        'env(json_file)' => false,
+    ];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        switch ($name) {
+            case 'bar': $value = $this->getEnv('FOO'); break;
+            case 'baz': $value = $this->getEnv('int:Baz'); break;
+            case 'json': $value = $this->getEnv('json:file:json_file'); break;
+            case 'db_dsn': $value = $this->getEnv('resolve:DB'); break;
+            case 'env(json_file)': $value = ($this->targetDirs[1].'/array.json'); break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+        $this->loadedDynamicParameters[$name] = true;
+
+        return $this->dynamicParameters[$name] = $value;
+    }
+
+    private $normalizedParameterNames = [
+        'env(foo)' => 'env(FOO)',
+        'env(db)' => 'env(DB)',
+    ];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'project_dir' => '/foo/bar',
+            'env(FOO)' => 'foo',
+            'env(DB)' => 'sqlite://%project_dir%/var/data.db',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services33.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services33.php
new file mode 100644
index 000000000..915d05373
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services33.php
@@ -0,0 +1,81 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->normalizedIds = [
+            'bar\\foo' => 'Bar\\Foo',
+            'foo\\foo' => 'Foo\\Foo',
+        ];
+        $this->methodMap = [
+            'Bar\\Foo' => 'getFooService',
+            'Foo\\Foo' => 'getFoo2Service',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'Bar\Foo' shared service.
+     *
+     * @return \Bar\Foo
+     */
+    protected function getFooService()
+    {
+        return $this->services['Bar\\Foo'] = new \Bar\Foo();
+    }
+
+    /**
+     * Gets the public 'Foo\Foo' shared service.
+     *
+     * @return \Foo\Foo
+     */
+    protected function getFoo2Service()
+    {
+        return $this->services['Foo\\Foo'] = new \Foo\Foo();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services8.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services8.php
new file mode 100644
index 000000000..e7a0214a1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services8.php
@@ -0,0 +1,167 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'foo' => 'bar',
+            'baz' => 'bar',
+            'bar' => 'foo is %foo bar',
+            'escape' => '@escapeme',
+            'values' => [
+                0 => true,
+                1 => false,
+                2 => NULL,
+                3 => 0,
+                4 => 1000.3,
+                5 => 'true',
+                6 => 'false',
+                7 => 'null',
+            ],
+            'null string' => 'null',
+            'string of digits' => '123',
+            'string of digits prefixed with minus character' => '-123',
+            'true string' => 'true',
+            'false string' => 'false',
+            'binary number string' => '0b0110',
+            'numeric string' => '-1.2E2',
+            'hexadecimal number string' => '0xFF',
+            'float string' => '10100.1',
+            'positive float string' => '+10100.1',
+            'negative float string' => '-10100.1',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9.php
new file mode 100644
index 000000000..6dd0baabd
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9.php
@@ -0,0 +1,443 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        parent::__construct(new ParameterBag($this->getDefaultParameters()));
+        $this->normalizedIds = [
+            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
+            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
+        ];
+        $this->syntheticIds = [
+            'request' => true,
+        ];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'baz' => 'getBazService',
+            'configurator_service' => 'getConfiguratorServiceService',
+            'configurator_service_simple' => 'getConfiguratorServiceSimpleService',
+            'configured_service' => 'getConfiguredServiceService',
+            'configured_service_simple' => 'getConfiguredServiceSimpleService',
+            'decorated' => 'getDecoratedService',
+            'decorator_service' => 'getDecoratorServiceService',
+            'decorator_service_with_name' => 'getDecoratorServiceWithNameService',
+            'deprecated_service' => 'getDeprecatedServiceService',
+            'factory_service' => 'getFactoryServiceService',
+            'factory_service_simple' => 'getFactoryServiceSimpleService',
+            'factory_simple' => 'getFactorySimpleService',
+            'foo' => 'getFooService',
+            'foo.baz' => 'getFoo_BazService',
+            'foo_bar' => 'getFooBarService',
+            'foo_with_inline' => 'getFooWithInlineService',
+            'inlined' => 'getInlinedService',
+            'lazy_context' => 'getLazyContextService',
+            'lazy_context_ignore_invalid_ref' => 'getLazyContextIgnoreInvalidRefService',
+            'method_call1' => 'getMethodCall1Service',
+            'new_factory' => 'getNewFactoryService',
+            'new_factory_service' => 'getNewFactoryServiceService',
+            'service_from_static_method' => 'getServiceFromStaticMethodService',
+            'tagged_iterator' => 'getTaggedIteratorService',
+            'tagged_iterator_foo' => 'getTaggedIteratorFooService',
+        ];
+        $this->privates = [
+            'configurator_service' => true,
+            'configurator_service_simple' => true,
+            'factory_simple' => true,
+            'inlined' => true,
+            'new_factory' => true,
+            'tagged_iterator_foo' => true,
+        ];
+        $this->aliases = [
+            'Psr\\Container\\ContainerInterface' => 'service_container',
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => 'service_container',
+            'alias_for_alias' => 'foo',
+            'alias_for_foo' => 'foo',
+        ];
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getBarService()
+    {
+        $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'};
+
+        $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar'));
+
+        $a->configure($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'baz' shared service.
+     *
+     * @return \Baz
+     */
+    protected function getBazService()
+    {
+        $this->services['baz'] = $instance = new \Baz();
+
+        $instance->setFoo(${($_ = isset($this->services['foo_with_inline']) ? $this->services['foo_with_inline'] : $this->getFooWithInlineService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'configured_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConfiguredServiceService()
+    {
+        $this->services['configured_service'] = $instance = new \stdClass();
+
+        ${($_ = isset($this->services['configurator_service']) ? $this->services['configurator_service'] : $this->getConfiguratorServiceService()) && false ?: '_'}->configureStdClass($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'configured_service_simple' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConfiguredServiceSimpleService()
+    {
+        $this->services['configured_service_simple'] = $instance = new \stdClass();
+
+        ${($_ = isset($this->services['configurator_service_simple']) ? $this->services['configurator_service_simple'] : ($this->services['configurator_service_simple'] = new \ConfClass('bar'))) && false ?: '_'}->configureStdClass($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'decorated' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getDecoratedService()
+    {
+        return $this->services['decorated'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'decorator_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getDecoratorServiceService()
+    {
+        return $this->services['decorator_service'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'decorator_service_with_name' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getDecoratorServiceWithNameService()
+    {
+        return $this->services['decorator_service_with_name'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'deprecated_service' shared service.
+     *
+     * @return \stdClass
+     *
+     * @deprecated The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.
+     */
+    protected function getDeprecatedServiceService()
+    {
+        @trigger_error('The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED);
+
+        return $this->services['deprecated_service'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'factory_service' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getFactoryServiceService()
+    {
+        return $this->services['factory_service'] = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}->getInstance();
+    }
+
+    /**
+     * Gets the public 'factory_service_simple' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getFactoryServiceSimpleService()
+    {
+        return $this->services['factory_service_simple'] = ${($_ = isset($this->services['factory_simple']) ? $this->services['factory_simple'] : $this->getFactorySimpleService()) && false ?: '_'}->getInstance();
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getFooService()
+    {
+        $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'};
+
+        $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, [$this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')], true, $this);
+
+        $instance->foo = 'bar';
+        $instance->moo = $a;
+        $instance->qux = [$this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')];
+        $instance->setBar(${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->getBarService()) && false ?: '_'});
+        $instance->initialize();
+        sc_configure($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo.baz' shared service.
+     *
+     * @return object A %baz_class% instance
+     */
+    protected function getFoo_BazService()
+    {
+        $this->services['foo.baz'] = $instance = \call_user_func([$this->getParameter('baz_class'), 'getInstance']);
+
+        \call_user_func([$this->getParameter('baz_class'), 'configureStatic1'], $instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo_bar' service.
+     *
+     * @return object A %foo_class% instance
+     */
+    protected function getFooBarService()
+    {
+        $class = $this->getParameter('foo_class');
+
+        return new $class(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->getDeprecatedServiceService()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'foo_with_inline' shared service.
+     *
+     * @return \Foo
+     */
+    protected function getFooWithInlineService()
+    {
+        $this->services['foo_with_inline'] = $instance = new \Foo();
+
+        $instance->setBar(${($_ = isset($this->services['inlined']) ? $this->services['inlined'] : $this->getInlinedService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'lazy_context' shared service.
+     *
+     * @return \LazyContext
+     */
+    protected function getLazyContextService()
+    {
+        return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () {
+            yield 'k1' => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'};
+            yield 'k2' => $this;
+        }, 2), new RewindableGenerator(function () {
+            return new \EmptyIterator();
+        }, 0));
+    }
+
+    /**
+     * Gets the public 'lazy_context_ignore_invalid_ref' shared service.
+     *
+     * @return \LazyContext
+     */
+    protected function getLazyContextIgnoreInvalidRefService()
+    {
+        return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () {
+            yield 0 => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'};
+            if ($this->has('invalid')) {
+                yield 1 => ${($_ = isset($this->services['invalid']) ? $this->services['invalid'] : $this->get('invalid', /* ContainerInterface::NULL_ON_INVALID_REFERENCE */ 2)) && false ?: '_'};
+            }
+        }, function () {
+            return 1 + (int) ($this->has('invalid'));
+        }), new RewindableGenerator(function () {
+            return new \EmptyIterator();
+        }, 0));
+    }
+
+    /**
+     * Gets the public 'method_call1' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getMethodCall1Service()
+    {
+        include_once '%path%foo.php';
+
+        $this->services['method_call1'] = $instance = new \Bar\FooClass();
+
+        $instance->setBar(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'});
+        $instance->setBar(${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : $this->get('foo2', /* ContainerInterface::NULL_ON_INVALID_REFERENCE */ 2)) && false ?: '_'});
+        if ($this->has('foo3')) {
+            $instance->setBar(${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : $this->get('foo3', /* ContainerInterface::NULL_ON_INVALID_REFERENCE */ 2)) && false ?: '_'});
+        }
+        if ($this->has('foobaz')) {
+            $instance->setBar(${($_ = isset($this->services['foobaz']) ? $this->services['foobaz'] : $this->get('foobaz', /* ContainerInterface::NULL_ON_INVALID_REFERENCE */ 2)) && false ?: '_'});
+        }
+        $instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'new_factory_service' shared service.
+     *
+     * @return \FooBarBaz
+     */
+    protected function getNewFactoryServiceService()
+    {
+        $this->services['new_factory_service'] = $instance = ${($_ = isset($this->services['new_factory']) ? $this->services['new_factory'] : $this->getNewFactoryService()) && false ?: '_'}->getInstance();
+
+        $instance->foo = 'bar';
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'service_from_static_method' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getServiceFromStaticMethodService()
+    {
+        return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
+    }
+
+    /**
+     * Gets the public 'tagged_iterator' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getTaggedIteratorService()
+    {
+        return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
+            return new \EmptyIterator();
+        }, 0));
+    }
+
+    /**
+     * Gets the private 'configurator_service' shared service.
+     *
+     * @return \ConfClass
+     */
+    protected function getConfiguratorServiceService()
+    {
+        $this->services['configurator_service'] = $instance = new \ConfClass();
+
+        $instance->setFoo(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->getBazService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'configurator_service_simple' shared service.
+     *
+     * @return \ConfClass
+     */
+    protected function getConfiguratorServiceSimpleService()
+    {
+        return $this->services['configurator_service_simple'] = new \ConfClass('bar');
+    }
+
+    /**
+     * Gets the private 'factory_simple' shared service.
+     *
+     * @return \SimpleFactoryClass
+     *
+     * @deprecated The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed.
+     */
+    protected function getFactorySimpleService()
+    {
+        @trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED);
+
+        return $this->services['factory_simple'] = new \SimpleFactoryClass('foo');
+    }
+
+    /**
+     * Gets the private 'inlined' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getInlinedService()
+    {
+        $this->services['inlined'] = $instance = new \Bar();
+
+        $instance->pub = 'pub';
+        $instance->setBaz(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->getBazService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'new_factory' shared service.
+     *
+     * @return \FactoryClass
+     */
+    protected function getNewFactoryService()
+    {
+        $this->services['new_factory'] = $instance = new \FactoryClass();
+
+        $instance->foo = 'bar';
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'tagged_iterator_foo' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getTaggedIteratorFooService()
+    {
+        return $this->services['tagged_iterator_foo'] = new \Bar();
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'baz_class' => 'BazClass',
+            'foo_class' => 'Bar\\FooClass',
+            'foo' => 'bar',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_as_files.txt b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_as_files.txt
new file mode 100644
index 000000000..ab7024fa5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_as_files.txt
@@ -0,0 +1,508 @@
+Array
+(
+    [Container%s/removed-ids.php] => <?php
+
+return [
+    'Psr\\Container\\ContainerInterface' => true,
+    'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+    'configurator_service' => true,
+    'configurator_service_simple' => true,
+    'decorated.pif-pouf' => true,
+    'decorator_service.inner' => true,
+    'factory_simple' => true,
+    'inlined' => true,
+    'new_factory' => true,
+    'tagged_iterator_foo' => true,
+];
+
+    [Container%s/getBazService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'baz' shared service.
+
+$this->services['baz'] = $instance = new \Baz();
+
+$instance->setFoo(${($_ = isset($this->services['foo_with_inline']) ? $this->services['foo_with_inline'] : $this->load('getFooWithInlineService.php')) && false ?: '_'});
+
+return $instance;
+
+    [Container%s/getConfiguredServiceService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'configured_service' shared service.
+
+$this->services['configured_service'] = $instance = new \stdClass();
+
+$a = new \ConfClass();
+$a->setFoo(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->load('getBazService.php')) && false ?: '_'});
+
+$a->configureStdClass($instance);
+
+return $instance;
+
+    [Container%s/getConfiguredServiceSimpleService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'configured_service_simple' shared service.
+
+$this->services['configured_service_simple'] = $instance = new \stdClass();
+
+(new \ConfClass('bar'))->configureStdClass($instance);
+
+return $instance;
+
+    [Container%s/getDecoratorServiceService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'decorator_service' shared service.
+
+return $this->services['decorator_service'] = new \stdClass();
+
+    [Container%s/getDecoratorServiceWithNameService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'decorator_service_with_name' shared service.
+
+return $this->services['decorator_service_with_name'] = new \stdClass();
+
+    [Container%s/getDeprecatedServiceService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'deprecated_service' shared service.
+
+@trigger_error('The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED);
+
+return $this->services['deprecated_service'] = new \stdClass();
+
+    [Container%s/getFactoryServiceService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'factory_service' shared service.
+
+return $this->services['factory_service'] = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->load('getFoo_BazService.php')) && false ?: '_'}->getInstance();
+
+    [Container%s/getFactoryServiceSimpleService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'factory_service_simple' shared service.
+
+return $this->services['factory_service_simple'] = ${($_ = isset($this->services['factory_simple']) ? $this->services['factory_simple'] : $this->load('getFactorySimpleService.php')) && false ?: '_'}->getInstance();
+
+    [Container%s/getFactorySimpleService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the private 'factory_simple' shared service.
+
+@trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED);
+
+return $this->services['factory_simple'] = new \SimpleFactoryClass('foo');
+
+    [Container%s/getFooService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'foo' shared service.
+
+$a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->load('getFoo_BazService.php')) && false ?: '_'};
+
+$this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, ['bar' => 'foo is bar', 'foobar' => 'bar'], true, $this);
+
+$instance->foo = 'bar';
+$instance->moo = $a;
+$instance->qux = ['bar' => 'foo is bar', 'foobar' => 'bar'];
+$instance->setBar(${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->getBarService()) && false ?: '_'});
+$instance->initialize();
+sc_configure($instance);
+
+return $instance;
+
+    [Container%s/getFoo_BazService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'foo.baz' shared service.
+
+$this->services['foo.baz'] = $instance = \BazClass::getInstance();
+
+\BazClass::configureStatic1($instance);
+
+return $instance;
+
+    [Container%s/getFooWithInlineService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'foo_with_inline' shared service.
+
+$this->services['foo_with_inline'] = $instance = new \Foo();
+
+$a = new \Bar();
+$a->pub = 'pub';
+$a->setBaz(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->load('getBazService.php')) && false ?: '_'});
+
+$instance->setBar($a);
+
+return $instance;
+
+    [Container%s/getLazyContextService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'lazy_context' shared service.
+
+return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () {
+    yield 'k1' => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->load('getFoo_BazService.php')) && false ?: '_'};
+    yield 'k2' => $this;
+}, 2), new RewindableGenerator(function () {
+    return new \EmptyIterator();
+}, 0));
+
+    [Container%s/getLazyContextIgnoreInvalidRefService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'lazy_context_ignore_invalid_ref' shared service.
+
+return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () {
+    yield 0 => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->load('getFoo_BazService.php')) && false ?: '_'};
+}, 1), new RewindableGenerator(function () {
+    return new \EmptyIterator();
+}, 0));
+
+    [Container%s/getMethodCall1Service.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'method_call1' shared service.
+
+include_once ($this->targetDirs[0].'/Fixtures/includes/foo.php');
+
+$this->services['method_call1'] = $instance = new \Bar\FooClass();
+
+$instance->setBar(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->load('getFooService.php')) && false ?: '_'});
+$instance->setBar(NULL);
+$instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->load('getFooService.php')) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+
+return $instance;
+
+    [Container%s/getNewFactoryServiceService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'new_factory_service' shared service.
+
+$a = new \FactoryClass();
+$a->foo = 'bar';
+
+$this->services['new_factory_service'] = $instance = $a->getInstance();
+
+$instance->foo = 'bar';
+
+return $instance;
+
+    [Container%s/getServiceFromStaticMethodService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'service_from_static_method' shared service.
+
+return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
+
+    [Container%s/getTaggedIteratorService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the public 'tagged_iterator' shared service.
+
+return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
+    yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->load('getFooService.php')) && false ?: '_'};
+    yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : ($this->services['tagged_iterator_foo'] = new \Bar())) && false ?: '_'};
+}, 2));
+
+    [Container%s/getTaggedIteratorFooService.php] => <?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+// Returns the private 'tagged_iterator_foo' shared service.
+
+return $this->services['tagged_iterator_foo'] = new \Bar();
+
+    [Container%s/ProjectServiceContainer.php] => <?php
+
+namespace Container%s;
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $buildParameters;
+    private $containerDir;
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct(array $buildParameters = [], $containerDir = __DIR__)
+    {
+        $dir = $this->targetDirs[0] = \dirname($containerDir);
+        for ($i = 1; $i <= 5; ++$i) {
+            $this->targetDirs[$i] = $dir = \dirname($dir);
+        }
+        $this->buildParameters = $buildParameters;
+        $this->containerDir = $containerDir;
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->syntheticIds = [
+            'request' => true,
+        ];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'foo_bar' => 'getFooBarService',
+        ];
+        $this->fileMap = [
+            'baz' => 'getBazService.php',
+            'configured_service' => 'getConfiguredServiceService.php',
+            'configured_service_simple' => 'getConfiguredServiceSimpleService.php',
+            'decorator_service' => 'getDecoratorServiceService.php',
+            'decorator_service_with_name' => 'getDecoratorServiceWithNameService.php',
+            'deprecated_service' => 'getDeprecatedServiceService.php',
+            'factory_service' => 'getFactoryServiceService.php',
+            'factory_service_simple' => 'getFactoryServiceSimpleService.php',
+            'factory_simple' => 'getFactorySimpleService.php',
+            'foo' => 'getFooService.php',
+            'foo.baz' => 'getFoo_BazService.php',
+            'foo_with_inline' => 'getFooWithInlineService.php',
+            'lazy_context' => 'getLazyContextService.php',
+            'lazy_context_ignore_invalid_ref' => 'getLazyContextIgnoreInvalidRefService.php',
+            'method_call1' => 'getMethodCall1Service.php',
+            'new_factory_service' => 'getNewFactoryServiceService.php',
+            'service_from_static_method' => 'getServiceFromStaticMethodService.php',
+            'tagged_iterator' => 'getTaggedIteratorService.php',
+            'tagged_iterator_foo' => 'getTaggedIteratorFooService.php',
+        ];
+        $this->privates = [
+            'factory_simple' => true,
+            'tagged_iterator_foo' => true,
+        ];
+        $this->aliases = [
+            'alias_for_alias' => 'foo',
+            'alias_for_foo' => 'foo',
+            'decorated' => 'decorator_service_with_name',
+        ];
+    }
+
+    public function getRemovedIds()
+    {
+        return require $this->containerDir.\DIRECTORY_SEPARATOR.'removed-ids.php';
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    protected function load($file, $lazyLoad = true)
+    {
+        return require $this->containerDir.\DIRECTORY_SEPARATOR.$file;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getBarService()
+    {
+        $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->load('getFoo_BazService.php')) && false ?: '_'};
+
+        $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar'));
+
+        $a->configure($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo_bar' service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getFooBarService()
+    {
+        return new \Bar\FooClass(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->load('getDeprecatedServiceService.php')) && false ?: '_'});
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (isset($this->buildParameters[$name])) {
+            return $this->buildParameters[$name];
+        }
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        if (isset($this->buildParameters[$name])) {
+            return true;
+        }
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            foreach ($this->buildParameters as $name => $value) {
+                $parameters[$name] = $value;
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'baz_class' => 'BazClass',
+            'foo_class' => 'Bar\\FooClass',
+            'foo' => 'bar',
+        ];
+    }
+}
+
+    [ProjectServiceContainer.php] => <?php
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+
+if (\class_exists(\Container%s\ProjectServiceContainer::class, false)) {
+    // no-op
+} elseif (!include __DIR__.'/Container%s/ProjectServiceContainer.php') {
+    touch(__DIR__.'/Container%s.legacy');
+
+    return;
+}
+
+if (!\class_exists(ProjectServiceContainer::class, false)) {
+    \class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);
+}
+
+return new \Container%s\ProjectServiceContainer([
+    'container.build_hash' => '%s',
+    'container.build_id' => '%s',
+    'container.build_time' => %d,
+], __DIR__.\DIRECTORY_SEPARATOR.'Container%s');
+
+)
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_compiled.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_compiled.php
new file mode 100644
index 000000000..c9df13b2e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services9_compiled.php
@@ -0,0 +1,475 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->syntheticIds = [
+            'request' => true,
+        ];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'baz' => 'getBazService',
+            'configured_service' => 'getConfiguredServiceService',
+            'configured_service_simple' => 'getConfiguredServiceSimpleService',
+            'decorator_service' => 'getDecoratorServiceService',
+            'decorator_service_with_name' => 'getDecoratorServiceWithNameService',
+            'deprecated_service' => 'getDeprecatedServiceService',
+            'factory_service' => 'getFactoryServiceService',
+            'factory_service_simple' => 'getFactoryServiceSimpleService',
+            'factory_simple' => 'getFactorySimpleService',
+            'foo' => 'getFooService',
+            'foo.baz' => 'getFoo_BazService',
+            'foo_bar' => 'getFooBarService',
+            'foo_with_inline' => 'getFooWithInlineService',
+            'lazy_context' => 'getLazyContextService',
+            'lazy_context_ignore_invalid_ref' => 'getLazyContextIgnoreInvalidRefService',
+            'method_call1' => 'getMethodCall1Service',
+            'new_factory_service' => 'getNewFactoryServiceService',
+            'service_from_static_method' => 'getServiceFromStaticMethodService',
+            'tagged_iterator' => 'getTaggedIteratorService',
+            'tagged_iterator_foo' => 'getTaggedIteratorFooService',
+        ];
+        $this->privates = [
+            'factory_simple' => true,
+            'tagged_iterator_foo' => true,
+        ];
+        $this->aliases = [
+            'alias_for_alias' => 'foo',
+            'alias_for_foo' => 'foo',
+            'decorated' => 'decorator_service_with_name',
+        ];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'configurator_service' => true,
+            'configurator_service_simple' => true,
+            'decorated.pif-pouf' => true,
+            'decorator_service.inner' => true,
+            'factory_simple' => true,
+            'inlined' => true,
+            'new_factory' => true,
+            'tagged_iterator_foo' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getBarService()
+    {
+        $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'};
+
+        $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar'));
+
+        $a->configure($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'baz' shared service.
+     *
+     * @return \Baz
+     */
+    protected function getBazService()
+    {
+        $this->services['baz'] = $instance = new \Baz();
+
+        $instance->setFoo(${($_ = isset($this->services['foo_with_inline']) ? $this->services['foo_with_inline'] : $this->getFooWithInlineService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'configured_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConfiguredServiceService()
+    {
+        $this->services['configured_service'] = $instance = new \stdClass();
+
+        $a = new \ConfClass();
+        $a->setFoo(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->getBazService()) && false ?: '_'});
+
+        $a->configureStdClass($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'configured_service_simple' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConfiguredServiceSimpleService()
+    {
+        $this->services['configured_service_simple'] = $instance = new \stdClass();
+
+        (new \ConfClass('bar'))->configureStdClass($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'decorator_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getDecoratorServiceService()
+    {
+        return $this->services['decorator_service'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'decorator_service_with_name' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getDecoratorServiceWithNameService()
+    {
+        return $this->services['decorator_service_with_name'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'deprecated_service' shared service.
+     *
+     * @return \stdClass
+     *
+     * @deprecated The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.
+     */
+    protected function getDeprecatedServiceService()
+    {
+        @trigger_error('The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED);
+
+        return $this->services['deprecated_service'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'factory_service' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getFactoryServiceService()
+    {
+        return $this->services['factory_service'] = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'}->getInstance();
+    }
+
+    /**
+     * Gets the public 'factory_service_simple' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getFactoryServiceSimpleService()
+    {
+        return $this->services['factory_service_simple'] = ${($_ = isset($this->services['factory_simple']) ? $this->services['factory_simple'] : $this->getFactorySimpleService()) && false ?: '_'}->getInstance();
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getFooService()
+    {
+        $a = ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'};
+
+        $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, ['bar' => 'foo is bar', 'foobar' => 'bar'], true, $this);
+
+        $instance->foo = 'bar';
+        $instance->moo = $a;
+        $instance->qux = ['bar' => 'foo is bar', 'foobar' => 'bar'];
+        $instance->setBar(${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->getBarService()) && false ?: '_'});
+        $instance->initialize();
+        sc_configure($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo.baz' shared service.
+     *
+     * @return \BazClass
+     */
+    protected function getFoo_BazService()
+    {
+        $this->services['foo.baz'] = $instance = \BazClass::getInstance();
+
+        \BazClass::configureStatic1($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo_bar' service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getFooBarService()
+    {
+        return new \Bar\FooClass(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->getDeprecatedServiceService()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'foo_with_inline' shared service.
+     *
+     * @return \Foo
+     */
+    protected function getFooWithInlineService()
+    {
+        $this->services['foo_with_inline'] = $instance = new \Foo();
+
+        $a = new \Bar();
+        $a->pub = 'pub';
+        $a->setBaz(${($_ = isset($this->services['baz']) ? $this->services['baz'] : $this->getBazService()) && false ?: '_'});
+
+        $instance->setBar($a);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'lazy_context' shared service.
+     *
+     * @return \LazyContext
+     */
+    protected function getLazyContextService()
+    {
+        return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () {
+            yield 'k1' => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'};
+            yield 'k2' => $this;
+        }, 2), new RewindableGenerator(function () {
+            return new \EmptyIterator();
+        }, 0));
+    }
+
+    /**
+     * Gets the public 'lazy_context_ignore_invalid_ref' shared service.
+     *
+     * @return \LazyContext
+     */
+    protected function getLazyContextIgnoreInvalidRefService()
+    {
+        return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () {
+            yield 0 => ${($_ = isset($this->services['foo.baz']) ? $this->services['foo.baz'] : $this->getFoo_BazService()) && false ?: '_'};
+        }, 1), new RewindableGenerator(function () {
+            return new \EmptyIterator();
+        }, 0));
+    }
+
+    /**
+     * Gets the public 'method_call1' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getMethodCall1Service()
+    {
+        include_once '%path%foo.php';
+
+        $this->services['method_call1'] = $instance = new \Bar\FooClass();
+
+        $instance->setBar(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'});
+        $instance->setBar(NULL);
+        $instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'new_factory_service' shared service.
+     *
+     * @return \FooBarBaz
+     */
+    protected function getNewFactoryServiceService()
+    {
+        $a = new \FactoryClass();
+        $a->foo = 'bar';
+
+        $this->services['new_factory_service'] = $instance = $a->getInstance();
+
+        $instance->foo = 'bar';
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'service_from_static_method' shared service.
+     *
+     * @return \Bar\FooClass
+     */
+    protected function getServiceFromStaticMethodService()
+    {
+        return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
+    }
+
+    /**
+     * Gets the public 'tagged_iterator' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getTaggedIteratorService()
+    {
+        return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
+            yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'};
+            yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : ($this->services['tagged_iterator_foo'] = new \Bar())) && false ?: '_'};
+        }, 2));
+    }
+
+    /**
+     * Gets the private 'factory_simple' shared service.
+     *
+     * @return \SimpleFactoryClass
+     *
+     * @deprecated The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed.
+     */
+    protected function getFactorySimpleService()
+    {
+        @trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED);
+
+        return $this->services['factory_simple'] = new \SimpleFactoryClass('foo');
+    }
+
+    /**
+     * Gets the private 'tagged_iterator_foo' shared service.
+     *
+     * @return \Bar
+     */
+    protected function getTaggedIteratorFooService()
+    {
+        return $this->services['tagged_iterator_foo'] = new \Bar();
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'baz_class' => 'BazClass',
+            'foo_class' => 'Bar\\FooClass',
+            'foo' => 'bar',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_adawson.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_adawson.php
new file mode 100644
index 000000000..f4364df7f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_adawson.php
@@ -0,0 +1,190 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->normalizedIds = [
+            'app\\bus' => 'App\\Bus',
+            'app\\db' => 'App\\Db',
+            'app\\handler1' => 'App\\Handler1',
+            'app\\handler2' => 'App\\Handler2',
+            'app\\processor' => 'App\\Processor',
+            'app\\registry' => 'App\\Registry',
+            'app\\schema' => 'App\\Schema',
+        ];
+        $this->methodMap = [
+            'App\\Bus' => 'getBusService',
+            'App\\Db' => 'getDbService',
+            'App\\Handler1' => 'getHandler1Service',
+            'App\\Handler2' => 'getHandler2Service',
+            'App\\Processor' => 'getProcessorService',
+            'App\\Registry' => 'getRegistryService',
+            'App\\Schema' => 'getSchemaService',
+        ];
+        $this->privates = [
+            'App\\Handler1' => true,
+            'App\\Handler2' => true,
+            'App\\Processor' => true,
+            'App\\Registry' => true,
+            'App\\Schema' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'App\\Handler1' => true,
+            'App\\Handler2' => true,
+            'App\\Processor' => true,
+            'App\\Registry' => true,
+            'App\\Schema' => true,
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'App\Bus' shared service.
+     *
+     * @return \App\Bus
+     */
+    protected function getBusService()
+    {
+        $this->services['App\\Bus'] = $instance = new \App\Bus(${($_ = isset($this->services['App\\Db']) ? $this->services['App\\Db'] : $this->getDbService()) && false ?: '_'});
+
+        $instance->handler1 = ${($_ = isset($this->services['App\\Handler1']) ? $this->services['App\\Handler1'] : $this->getHandler1Service()) && false ?: '_'};
+        $instance->handler2 = ${($_ = isset($this->services['App\\Handler2']) ? $this->services['App\\Handler2'] : $this->getHandler2Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'App\Db' shared service.
+     *
+     * @return \App\Db
+     */
+    protected function getDbService()
+    {
+        $this->services['App\\Db'] = $instance = new \App\Db();
+
+        $instance->schema = ${($_ = isset($this->services['App\\Schema']) ? $this->services['App\\Schema'] : $this->getSchemaService()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'App\Handler1' shared service.
+     *
+     * @return \App\Handler1
+     */
+    protected function getHandler1Service()
+    {
+        $a = ${($_ = isset($this->services['App\\Processor']) ? $this->services['App\\Processor'] : $this->getProcessorService()) && false ?: '_'};
+
+        if (isset($this->services['App\\Handler1'])) {
+            return $this->services['App\\Handler1'];
+        }
+
+        return $this->services['App\\Handler1'] = new \App\Handler1(${($_ = isset($this->services['App\\Db']) ? $this->services['App\\Db'] : $this->getDbService()) && false ?: '_'}, ${($_ = isset($this->services['App\\Schema']) ? $this->services['App\\Schema'] : $this->getSchemaService()) && false ?: '_'}, $a);
+    }
+
+    /**
+     * Gets the private 'App\Handler2' shared service.
+     *
+     * @return \App\Handler2
+     */
+    protected function getHandler2Service()
+    {
+        $a = ${($_ = isset($this->services['App\\Processor']) ? $this->services['App\\Processor'] : $this->getProcessorService()) && false ?: '_'};
+
+        if (isset($this->services['App\\Handler2'])) {
+            return $this->services['App\\Handler2'];
+        }
+
+        return $this->services['App\\Handler2'] = new \App\Handler2(${($_ = isset($this->services['App\\Db']) ? $this->services['App\\Db'] : $this->getDbService()) && false ?: '_'}, ${($_ = isset($this->services['App\\Schema']) ? $this->services['App\\Schema'] : $this->getSchemaService()) && false ?: '_'}, $a);
+    }
+
+    /**
+     * Gets the private 'App\Processor' shared service.
+     *
+     * @return \App\Processor
+     */
+    protected function getProcessorService()
+    {
+        $a = ${($_ = isset($this->services['App\\Registry']) ? $this->services['App\\Registry'] : $this->getRegistryService()) && false ?: '_'};
+
+        if (isset($this->services['App\\Processor'])) {
+            return $this->services['App\\Processor'];
+        }
+
+        return $this->services['App\\Processor'] = new \App\Processor($a, ${($_ = isset($this->services['App\\Db']) ? $this->services['App\\Db'] : $this->getDbService()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the private 'App\Registry' shared service.
+     *
+     * @return \App\Registry
+     */
+    protected function getRegistryService()
+    {
+        $this->services['App\\Registry'] = $instance = new \App\Registry();
+
+        $instance->processor = [0 => ${($_ = isset($this->services['App\\Db']) ? $this->services['App\\Db'] : $this->getDbService()) && false ?: '_'}, 1 => ${($_ = isset($this->services['App\\Bus']) ? $this->services['App\\Bus'] : $this->getBusService()) && false ?: '_'}];
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'App\Schema' shared service.
+     *
+     * @return \App\Schema
+     */
+    protected function getSchemaService()
+    {
+        $a = ${($_ = isset($this->services['App\\Db']) ? $this->services['App\\Db'] : $this->getDbService()) && false ?: '_'};
+
+        if (isset($this->services['App\\Schema'])) {
+            return $this->services['App\\Schema'];
+        }
+
+        return $this->services['App\\Schema'] = new \App\Schema($a);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_private.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_private.php
new file mode 100644
index 000000000..775235db6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -0,0 +1,514 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar2' => 'getBar2Service',
+            'bar3' => 'getBar3Service',
+            'bar6' => 'getBar6Service',
+            'baz6' => 'getBaz6Service',
+            'connection' => 'getConnectionService',
+            'connection2' => 'getConnection2Service',
+            'foo' => 'getFooService',
+            'foo2' => 'getFoo2Service',
+            'foo5' => 'getFoo5Service',
+            'foo6' => 'getFoo6Service',
+            'foobar4' => 'getFoobar4Service',
+            'level2' => 'getLevel2Service',
+            'level3' => 'getLevel3Service',
+            'level4' => 'getLevel4Service',
+            'level5' => 'getLevel5Service',
+            'level6' => 'getLevel6Service',
+            'listener3' => 'getListener3Service',
+            'listener4' => 'getListener4Service',
+            'logger' => 'getLoggerService',
+            'manager' => 'getManagerService',
+            'manager2' => 'getManager2Service',
+            'manager3' => 'getManager3Service',
+            'manager4' => 'getManager4Service',
+            'multiuse1' => 'getMultiuse1Service',
+            'root' => 'getRootService',
+            'subscriber' => 'getSubscriberService',
+        ];
+        $this->privates = [
+            'bar6' => true,
+            'level2' => true,
+            'level3' => true,
+            'level4' => true,
+            'level5' => true,
+            'level6' => true,
+            'manager4' => true,
+            'multiuse1' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'bar' => true,
+            'bar5' => true,
+            'bar6' => true,
+            'config' => true,
+            'config2' => true,
+            'connection3' => true,
+            'connection4' => true,
+            'dispatcher' => true,
+            'dispatcher2' => true,
+            'foo4' => true,
+            'foobar' => true,
+            'foobar2' => true,
+            'foobar3' => true,
+            'level2' => true,
+            'level3' => true,
+            'level4' => true,
+            'level5' => true,
+            'level6' => true,
+            'logger2' => true,
+            'manager4' => true,
+            'multiuse1' => true,
+            'subscriber2' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar2' shared service.
+     *
+     * @return \BarCircular
+     */
+    protected function getBar2Service()
+    {
+        $this->services['bar2'] = $instance = new \BarCircular();
+
+        $instance->addFoobar(new \FoobarCircular(${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : $this->getFoo2Service()) && false ?: '_'}));
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'bar3' shared service.
+     *
+     * @return \BarCircular
+     */
+    protected function getBar3Service()
+    {
+        $this->services['bar3'] = $instance = new \BarCircular();
+
+        $a = new \FoobarCircular();
+
+        $instance->addFoobar($a, $a);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'baz6' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBaz6Service()
+    {
+        $this->services['baz6'] = $instance = new \stdClass();
+
+        $instance->bar6 = ${($_ = isset($this->services['bar6']) ? $this->services['bar6'] : $this->getBar6Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'connection' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConnectionService()
+    {
+        $a = new \stdClass();
+
+        $b = new \stdClass();
+
+        $this->services['connection'] = $instance = new \stdClass($a, $b);
+
+        $b->logger = ${($_ = isset($this->services['logger']) ? $this->services['logger'] : $this->getLoggerService()) && false ?: '_'};
+
+        $a->subscriber = ${($_ = isset($this->services['subscriber']) ? $this->services['subscriber'] : $this->getSubscriberService()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'connection2' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConnection2Service()
+    {
+        $a = new \stdClass();
+
+        $b = new \stdClass();
+
+        $this->services['connection2'] = $instance = new \stdClass($a, $b);
+
+        $c = new \stdClass($instance);
+
+        $d = ${($_ = isset($this->services['manager2']) ? $this->services['manager2'] : $this->getManager2Service()) && false ?: '_'};
+
+        $c->handler2 = new \stdClass($d);
+
+        $b->logger2 = $c;
+
+        $a->subscriber2 = new \stdClass($d);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \FooCircular
+     */
+    protected function getFooService()
+    {
+        $a = new \BarCircular();
+
+        $this->services['foo'] = $instance = new \FooCircular($a);
+
+        $a->addFoobar(new \FoobarCircular($instance));
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo2' shared service.
+     *
+     * @return \FooCircular
+     */
+    protected function getFoo2Service()
+    {
+        $a = ${($_ = isset($this->services['bar2']) ? $this->services['bar2'] : $this->getBar2Service()) && false ?: '_'};
+
+        if (isset($this->services['foo2'])) {
+            return $this->services['foo2'];
+        }
+
+        return $this->services['foo2'] = new \FooCircular($a);
+    }
+
+    /**
+     * Gets the public 'foo5' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoo5Service()
+    {
+        $this->services['foo5'] = $instance = new \stdClass();
+
+        $a = new \stdClass($instance);
+        $a->foo = $instance;
+
+        $instance->bar = $a;
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo6' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoo6Service()
+    {
+        $this->services['foo6'] = $instance = new \stdClass();
+
+        $instance->bar6 = ${($_ = isset($this->services['bar6']) ? $this->services['bar6'] : $this->getBar6Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foobar4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoobar4Service()
+    {
+        $a = new \stdClass();
+
+        $this->services['foobar4'] = $instance = new \stdClass($a);
+
+        $a->foobar = $instance;
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'listener3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getListener3Service()
+    {
+        $this->services['listener3'] = $instance = new \stdClass();
+
+        $instance->manager = ${($_ = isset($this->services['manager3']) ? $this->services['manager3'] : $this->getManager3Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'listener4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getListener4Service()
+    {
+        $a = ${($_ = isset($this->services['manager4']) ? $this->services['manager4'] : $this->getManager4Service()) && false ?: '_'};
+
+        if (isset($this->services['listener4'])) {
+            return $this->services['listener4'];
+        }
+
+        return $this->services['listener4'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the public 'logger' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getLoggerService()
+    {
+        $a = ${($_ = isset($this->services['connection']) ? $this->services['connection'] : $this->getConnectionService()) && false ?: '_'};
+
+        if (isset($this->services['logger'])) {
+            return $this->services['logger'];
+        }
+
+        $this->services['logger'] = $instance = new \stdClass($a);
+
+        $instance->handler = new \stdClass(${($_ = isset($this->services['manager']) ? $this->services['manager'] : $this->getManagerService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'manager' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getManagerService()
+    {
+        $a = ${($_ = isset($this->services['connection']) ? $this->services['connection'] : $this->getConnectionService()) && false ?: '_'};
+
+        if (isset($this->services['manager'])) {
+            return $this->services['manager'];
+        }
+
+        return $this->services['manager'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the public 'manager2' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getManager2Service()
+    {
+        $a = ${($_ = isset($this->services['connection2']) ? $this->services['connection2'] : $this->getConnection2Service()) && false ?: '_'};
+
+        if (isset($this->services['manager2'])) {
+            return $this->services['manager2'];
+        }
+
+        return $this->services['manager2'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the public 'manager3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getManager3Service($lazyLoad = true)
+    {
+        $a = ${($_ = isset($this->services['listener3']) ? $this->services['listener3'] : $this->getListener3Service()) && false ?: '_'};
+
+        if (isset($this->services['manager3'])) {
+            return $this->services['manager3'];
+        }
+        $b = new \stdClass();
+        $b->listener = [0 => $a];
+
+        return $this->services['manager3'] = new \stdClass($b);
+    }
+
+    /**
+     * Gets the public 'root' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getRootService()
+    {
+        return $this->services['root'] = new \stdClass(${($_ = isset($this->services['level2']) ? $this->services['level2'] : $this->getLevel2Service()) && false ?: '_'}, ${($_ = isset($this->services['multiuse1']) ? $this->services['multiuse1'] : ($this->services['multiuse1'] = new \stdClass())) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'subscriber' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getSubscriberService()
+    {
+        $a = ${($_ = isset($this->services['manager']) ? $this->services['manager'] : $this->getManagerService()) && false ?: '_'};
+
+        if (isset($this->services['subscriber'])) {
+            return $this->services['subscriber'];
+        }
+
+        return $this->services['subscriber'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the private 'bar6' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBar6Service()
+    {
+        $a = ${($_ = isset($this->services['foo6']) ? $this->services['foo6'] : $this->getFoo6Service()) && false ?: '_'};
+
+        if (isset($this->services['bar6'])) {
+            return $this->services['bar6'];
+        }
+
+        return $this->services['bar6'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the private 'level2' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls
+     */
+    protected function getLevel2Service()
+    {
+        $this->services['level2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls();
+
+        $instance->call(${($_ = isset($this->services['level3']) ? $this->services['level3'] : $this->getLevel3Service()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'level3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getLevel3Service()
+    {
+        return $this->services['level3'] = new \stdClass(${($_ = isset($this->services['level4']) ? $this->services['level4'] : $this->getLevel4Service()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the private 'level4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getLevel4Service()
+    {
+        return $this->services['level4'] = new \stdClass(${($_ = isset($this->services['multiuse1']) ? $this->services['multiuse1'] : ($this->services['multiuse1'] = new \stdClass())) && false ?: '_'}, ${($_ = isset($this->services['level5']) ? $this->services['level5'] : $this->getLevel5Service()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the private 'level5' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getLevel5Service()
+    {
+        $a = ${($_ = isset($this->services['level6']) ? $this->services['level6'] : $this->getLevel6Service()) && false ?: '_'};
+
+        if (isset($this->services['level5'])) {
+            return $this->services['level5'];
+        }
+
+        return $this->services['level5'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the private 'level6' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls
+     */
+    protected function getLevel6Service()
+    {
+        $this->services['level6'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls();
+
+        $instance->call(${($_ = isset($this->services['level5']) ? $this->services['level5'] : $this->getLevel5Service()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'manager4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getManager4Service($lazyLoad = true)
+    {
+        $a = new \stdClass();
+
+        $this->services['manager4'] = $instance = new \stdClass($a);
+
+        $a->listener = [0 => ${($_ = isset($this->services['listener4']) ? $this->services['listener4'] : $this->getListener4Service()) && false ?: '_'}];
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'multiuse1' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getMultiuse1Service()
+    {
+        return $this->services['multiuse1'] = new \stdClass();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_public.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_public.php
new file mode 100644
index 000000000..d3bab9128
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -0,0 +1,640 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'bar3' => 'getBar3Service',
+            'bar5' => 'getBar5Service',
+            'bar6' => 'getBar6Service',
+            'baz6' => 'getBaz6Service',
+            'connection' => 'getConnectionService',
+            'connection2' => 'getConnection2Service',
+            'connection3' => 'getConnection3Service',
+            'connection4' => 'getConnection4Service',
+            'dispatcher' => 'getDispatcherService',
+            'dispatcher2' => 'getDispatcher2Service',
+            'foo' => 'getFooService',
+            'foo2' => 'getFoo2Service',
+            'foo4' => 'getFoo4Service',
+            'foo5' => 'getFoo5Service',
+            'foo6' => 'getFoo6Service',
+            'foobar' => 'getFoobarService',
+            'foobar2' => 'getFoobar2Service',
+            'foobar3' => 'getFoobar3Service',
+            'foobar4' => 'getFoobar4Service',
+            'level2' => 'getLevel2Service',
+            'level3' => 'getLevel3Service',
+            'level4' => 'getLevel4Service',
+            'level5' => 'getLevel5Service',
+            'level6' => 'getLevel6Service',
+            'listener3' => 'getListener3Service',
+            'listener4' => 'getListener4Service',
+            'logger' => 'getLoggerService',
+            'manager' => 'getManagerService',
+            'manager2' => 'getManager2Service',
+            'manager3' => 'getManager3Service',
+            'manager4' => 'getManager4Service',
+            'multiuse1' => 'getMultiuse1Service',
+            'root' => 'getRootService',
+            'subscriber' => 'getSubscriberService',
+        ];
+        $this->privates = [
+            'bar6' => true,
+            'level2' => true,
+            'level3' => true,
+            'level4' => true,
+            'level5' => true,
+            'level6' => true,
+            'manager4' => true,
+            'multiuse1' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'bar2' => true,
+            'bar6' => true,
+            'config' => true,
+            'config2' => true,
+            'level2' => true,
+            'level3' => true,
+            'level4' => true,
+            'level5' => true,
+            'level6' => true,
+            'logger2' => true,
+            'manager4' => true,
+            'multiuse1' => true,
+            'subscriber2' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \BarCircular
+     */
+    protected function getBarService()
+    {
+        $this->services['bar'] = $instance = new \BarCircular();
+
+        $instance->addFoobar(${($_ = isset($this->services['foobar']) ? $this->services['foobar'] : $this->getFoobarService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'bar3' shared service.
+     *
+     * @return \BarCircular
+     */
+    protected function getBar3Service()
+    {
+        $this->services['bar3'] = $instance = new \BarCircular();
+
+        $a = ${($_ = isset($this->services['foobar3']) ? $this->services['foobar3'] : ($this->services['foobar3'] = new \FoobarCircular())) && false ?: '_'};
+
+        $instance->addFoobar($a, $a);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'bar5' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBar5Service()
+    {
+        $a = ${($_ = isset($this->services['foo5']) ? $this->services['foo5'] : $this->getFoo5Service()) && false ?: '_'};
+
+        if (isset($this->services['bar5'])) {
+            return $this->services['bar5'];
+        }
+
+        $this->services['bar5'] = $instance = new \stdClass($a);
+
+        $instance->foo = $a;
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'baz6' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBaz6Service()
+    {
+        $this->services['baz6'] = $instance = new \stdClass();
+
+        $instance->bar6 = ${($_ = isset($this->services['bar6']) ? $this->services['bar6'] : $this->getBar6Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'connection' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConnectionService()
+    {
+        $a = ${($_ = isset($this->services['dispatcher']) ? $this->services['dispatcher'] : $this->getDispatcherService()) && false ?: '_'};
+
+        if (isset($this->services['connection'])) {
+            return $this->services['connection'];
+        }
+        $b = new \stdClass();
+
+        $this->services['connection'] = $instance = new \stdClass($a, $b);
+
+        $b->logger = ${($_ = isset($this->services['logger']) ? $this->services['logger'] : $this->getLoggerService()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'connection2' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConnection2Service()
+    {
+        $a = ${($_ = isset($this->services['dispatcher2']) ? $this->services['dispatcher2'] : $this->getDispatcher2Service()) && false ?: '_'};
+
+        if (isset($this->services['connection2'])) {
+            return $this->services['connection2'];
+        }
+        $b = new \stdClass();
+
+        $this->services['connection2'] = $instance = new \stdClass($a, $b);
+
+        $c = new \stdClass($instance);
+        $c->handler2 = new \stdClass(${($_ = isset($this->services['manager2']) ? $this->services['manager2'] : $this->getManager2Service()) && false ?: '_'});
+
+        $b->logger2 = $c;
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'connection3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConnection3Service()
+    {
+        $this->services['connection3'] = $instance = new \stdClass();
+
+        $instance->listener = [0 => ${($_ = isset($this->services['listener3']) ? $this->services['listener3'] : $this->getListener3Service()) && false ?: '_'}];
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'connection4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getConnection4Service()
+    {
+        $this->services['connection4'] = $instance = new \stdClass();
+
+        $instance->listener = [0 => ${($_ = isset($this->services['listener4']) ? $this->services['listener4'] : $this->getListener4Service()) && false ?: '_'}];
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'dispatcher' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getDispatcherService($lazyLoad = true)
+    {
+        $this->services['dispatcher'] = $instance = new \stdClass();
+
+        $instance->subscriber = ${($_ = isset($this->services['subscriber']) ? $this->services['subscriber'] : $this->getSubscriberService()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'dispatcher2' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getDispatcher2Service($lazyLoad = true)
+    {
+        $this->services['dispatcher2'] = $instance = new \stdClass();
+
+        $instance->subscriber2 = new \stdClass(${($_ = isset($this->services['manager2']) ? $this->services['manager2'] : $this->getManager2Service()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \FooCircular
+     */
+    protected function getFooService()
+    {
+        $a = ${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->getBarService()) && false ?: '_'};
+
+        if (isset($this->services['foo'])) {
+            return $this->services['foo'];
+        }
+
+        return $this->services['foo'] = new \FooCircular($a);
+    }
+
+    /**
+     * Gets the public 'foo2' shared service.
+     *
+     * @return \FooCircular
+     */
+    protected function getFoo2Service()
+    {
+        $a = new \BarCircular();
+
+        $this->services['foo2'] = $instance = new \FooCircular($a);
+
+        $a->addFoobar(${($_ = isset($this->services['foobar2']) ? $this->services['foobar2'] : $this->getFoobar2Service()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo4' service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoo4Service()
+    {
+        $instance = new \stdClass();
+
+        $instance->foobar = ${($_ = isset($this->services['foobar4']) ? $this->services['foobar4'] : $this->getFoobar4Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo5' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoo5Service()
+    {
+        $this->services['foo5'] = $instance = new \stdClass();
+
+        $instance->bar = ${($_ = isset($this->services['bar5']) ? $this->services['bar5'] : $this->getBar5Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo6' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoo6Service()
+    {
+        $this->services['foo6'] = $instance = new \stdClass();
+
+        $instance->bar6 = ${($_ = isset($this->services['bar6']) ? $this->services['bar6'] : $this->getBar6Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foobar' shared service.
+     *
+     * @return \FoobarCircular
+     */
+    protected function getFoobarService()
+    {
+        $a = ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'};
+
+        if (isset($this->services['foobar'])) {
+            return $this->services['foobar'];
+        }
+
+        return $this->services['foobar'] = new \FoobarCircular($a);
+    }
+
+    /**
+     * Gets the public 'foobar2' shared service.
+     *
+     * @return \FoobarCircular
+     */
+    protected function getFoobar2Service()
+    {
+        $a = ${($_ = isset($this->services['foo2']) ? $this->services['foo2'] : $this->getFoo2Service()) && false ?: '_'};
+
+        if (isset($this->services['foobar2'])) {
+            return $this->services['foobar2'];
+        }
+
+        return $this->services['foobar2'] = new \FoobarCircular($a);
+    }
+
+    /**
+     * Gets the public 'foobar3' shared service.
+     *
+     * @return \FoobarCircular
+     */
+    protected function getFoobar3Service()
+    {
+        return $this->services['foobar3'] = new \FoobarCircular();
+    }
+
+    /**
+     * Gets the public 'foobar4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoobar4Service()
+    {
+        $a = new \stdClass();
+
+        $this->services['foobar4'] = $instance = new \stdClass($a);
+
+        $a->foobar = $instance;
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'listener3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getListener3Service()
+    {
+        $this->services['listener3'] = $instance = new \stdClass();
+
+        $instance->manager = ${($_ = isset($this->services['manager3']) ? $this->services['manager3'] : $this->getManager3Service()) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'listener4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getListener4Service()
+    {
+        $a = ${($_ = isset($this->services['manager4']) ? $this->services['manager4'] : $this->getManager4Service()) && false ?: '_'};
+
+        if (isset($this->services['listener4'])) {
+            return $this->services['listener4'];
+        }
+
+        return $this->services['listener4'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the public 'logger' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getLoggerService()
+    {
+        $a = ${($_ = isset($this->services['connection']) ? $this->services['connection'] : $this->getConnectionService()) && false ?: '_'};
+
+        if (isset($this->services['logger'])) {
+            return $this->services['logger'];
+        }
+
+        $this->services['logger'] = $instance = new \stdClass($a);
+
+        $instance->handler = new \stdClass(${($_ = isset($this->services['manager']) ? $this->services['manager'] : $this->getManagerService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'manager' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getManagerService()
+    {
+        $a = ${($_ = isset($this->services['connection']) ? $this->services['connection'] : $this->getConnectionService()) && false ?: '_'};
+
+        if (isset($this->services['manager'])) {
+            return $this->services['manager'];
+        }
+
+        return $this->services['manager'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the public 'manager2' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getManager2Service()
+    {
+        $a = ${($_ = isset($this->services['connection2']) ? $this->services['connection2'] : $this->getConnection2Service()) && false ?: '_'};
+
+        if (isset($this->services['manager2'])) {
+            return $this->services['manager2'];
+        }
+
+        return $this->services['manager2'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the public 'manager3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getManager3Service($lazyLoad = true)
+    {
+        $a = ${($_ = isset($this->services['connection3']) ? $this->services['connection3'] : $this->getConnection3Service()) && false ?: '_'};
+
+        if (isset($this->services['manager3'])) {
+            return $this->services['manager3'];
+        }
+
+        return $this->services['manager3'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the public 'root' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getRootService()
+    {
+        return $this->services['root'] = new \stdClass(${($_ = isset($this->services['level2']) ? $this->services['level2'] : $this->getLevel2Service()) && false ?: '_'}, ${($_ = isset($this->services['multiuse1']) ? $this->services['multiuse1'] : ($this->services['multiuse1'] = new \stdClass())) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'subscriber' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getSubscriberService()
+    {
+        $a = ${($_ = isset($this->services['manager']) ? $this->services['manager'] : $this->getManagerService()) && false ?: '_'};
+
+        if (isset($this->services['subscriber'])) {
+            return $this->services['subscriber'];
+        }
+
+        return $this->services['subscriber'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the private 'bar6' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBar6Service()
+    {
+        $a = ${($_ = isset($this->services['foo6']) ? $this->services['foo6'] : $this->getFoo6Service()) && false ?: '_'};
+
+        if (isset($this->services['bar6'])) {
+            return $this->services['bar6'];
+        }
+
+        return $this->services['bar6'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the private 'level2' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls
+     */
+    protected function getLevel2Service()
+    {
+        $this->services['level2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls();
+
+        $instance->call(${($_ = isset($this->services['level3']) ? $this->services['level3'] : $this->getLevel3Service()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'level3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getLevel3Service()
+    {
+        return $this->services['level3'] = new \stdClass(${($_ = isset($this->services['level4']) ? $this->services['level4'] : $this->getLevel4Service()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the private 'level4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getLevel4Service()
+    {
+        return $this->services['level4'] = new \stdClass(${($_ = isset($this->services['multiuse1']) ? $this->services['multiuse1'] : ($this->services['multiuse1'] = new \stdClass())) && false ?: '_'}, ${($_ = isset($this->services['level5']) ? $this->services['level5'] : $this->getLevel5Service()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the private 'level5' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getLevel5Service()
+    {
+        $a = ${($_ = isset($this->services['level6']) ? $this->services['level6'] : $this->getLevel6Service()) && false ?: '_'};
+
+        if (isset($this->services['level5'])) {
+            return $this->services['level5'];
+        }
+
+        return $this->services['level5'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the private 'level6' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls
+     */
+    protected function getLevel6Service()
+    {
+        $this->services['level6'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls();
+
+        $instance->call(${($_ = isset($this->services['level5']) ? $this->services['level5'] : $this->getLevel5Service()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'manager4' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getManager4Service($lazyLoad = true)
+    {
+        $a = ${($_ = isset($this->services['connection4']) ? $this->services['connection4'] : $this->getConnection4Service()) && false ?: '_'};
+
+        if (isset($this->services['manager4'])) {
+            return $this->services['manager4'];
+        }
+
+        return $this->services['manager4'] = new \stdClass($a);
+    }
+
+    /**
+     * Gets the private 'multiuse1' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getMultiuse1Service()
+    {
+        return $this->services['multiuse1'] = new \stdClass();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_array_params.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_array_params.php
new file mode 100644
index 000000000..dd1ca0a61
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_array_params.php
@@ -0,0 +1,176 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $dir = __DIR__;
+        for ($i = 1; $i <= 5; ++$i) {
+            $this->targetDirs[$i] = $dir = \dirname($dir);
+        }
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \BarClass
+     */
+    protected function getBarService()
+    {
+        $this->services['bar'] = $instance = new \BarClass();
+
+        $instance->setBaz($this->parameters['array_1'], $this->getParameter('array_2'), '%array_1%', $this->parameters['array_1']);
+
+        return $instance;
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [
+        'array_2' => false,
+    ];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        switch ($name) {
+            case 'array_2': $value = [
+                0 => ($this->targetDirs[2].'/Dumper'),
+            ]; break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+        $this->loadedDynamicParameters[$name] = true;
+
+        return $this->dynamicParameters[$name] = $value;
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'array_1' => [
+                0 => 123,
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_base64_env.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_base64_env.php
new file mode 100644
index 000000000..709a3c4f8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_base64_env.php
@@ -0,0 +1,151 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [
+        'hello' => false,
+    ];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        switch ($name) {
+            case 'hello': $value = $this->getEnv('base64:foo'); break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+        $this->loadedDynamicParameters[$name] = true;
+
+        return $this->dynamicParameters[$name] = $value;
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'env(foo)' => 'd29ybGQ=',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_dedup_lazy_proxy.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_dedup_lazy_proxy.php
new file mode 100644
index 000000000..096b3b396
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_dedup_lazy_proxy.php
@@ -0,0 +1,88 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    protected function createProxy($class, \Closure $factory)
+    {
+        return $factory();
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService($lazyLoad = true)
+    {
+        // lazy factory for stdClass
+
+        return new \stdClass();
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFooService($lazyLoad = true)
+    {
+        // lazy factory for stdClass
+
+        return new \stdClass();
+    }
+}
+
+// proxy code for stdClass
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_deep_graph.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_deep_graph.php
new file mode 100644
index 000000000..0e3eed27f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_deep_graph.php
@@ -0,0 +1,93 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Deep_Graph extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService()
+    {
+        $this->services['bar'] = $instance = new \stdClass();
+
+        $instance->p5 = new \stdClass(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'});
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Dumper\FooForDeepGraph
+     */
+    protected function getFooService()
+    {
+        $a = ${($_ = isset($this->services['bar']) ? $this->services['bar'] : $this->getBarService()) && false ?: '_'};
+
+        if (isset($this->services['foo'])) {
+            return $this->services['foo'];
+        }
+        $b = new \stdClass();
+
+        $c = new \stdClass();
+        $c->p3 = new \stdClass();
+
+        $b->p2 = $c;
+
+        return $this->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\FooForDeepGraph($a, $b);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_env_in_id.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_env_in_id.php
new file mode 100644
index 000000000..e0e4827df
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_env_in_id.php
@@ -0,0 +1,188 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->normalizedIds = [
+            'bar_%env(bar)%' => 'bar_%env(BAR)%',
+        ];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'bar_%env(BAR)%' => 'getBarenvBARService',
+            'foo' => 'getFooService',
+        ];
+        $this->privates = [
+            'bar_%env(BAR)%' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'bar_%env(BAR)%' => true,
+            'baz_%env(BAR)%' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService()
+    {
+        return $this->services['bar'] = new \stdClass(${($_ = isset($this->services['bar_%env(BAR)%']) ? $this->services['bar_%env(BAR)%'] : ($this->services['bar_%env(BAR)%'] = new \stdClass())) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFooService()
+    {
+        return $this->services['foo'] = new \stdClass(${($_ = isset($this->services['bar_%env(BAR)%']) ? $this->services['bar_%env(BAR)%'] : ($this->services['bar_%env(BAR)%'] = new \stdClass())) && false ?: '_'}, ['baz_'.$this->getEnv('string:BAR') => new \stdClass()]);
+    }
+
+    /**
+     * Gets the private 'bar_%env(BAR)%' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarenvBARService()
+    {
+        return $this->services['bar_%env(BAR)%'] = new \stdClass();
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+    }
+
+    private $normalizedParameterNames = [
+        'env(bar)' => 'env(BAR)',
+    ];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'env(BAR)' => 'bar',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_requires.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_requires.php
new file mode 100644
index 000000000..841878836
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_requires.php
@@ -0,0 +1,215 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $dir = __DIR__;
+        for ($i = 1; $i <= 5; ++$i) {
+            $this->targetDirs[$i] = $dir = \dirname($dir);
+        }
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->normalizedIds = [
+            'symfony\\component\\dependencyinjection\\tests\\fixtures\\includes\\hotpath\\c1' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C1',
+            'symfony\\component\\dependencyinjection\\tests\\fixtures\\includes\\hotpath\\c2' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2',
+            'symfony\\component\\dependencyinjection\\tests\\fixtures\\includes\\hotpath\\c3' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C3',
+            'symfony\\component\\dependencyinjection\\tests\\fixtures\\parentnotexists' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists',
+        ];
+        $this->methodMap = [
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists' => 'getParentNotExistsService',
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C1' => 'getC1Service',
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2' => 'getC2Service',
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C3' => 'getC3Service',
+        ];
+        $this->privates = [
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C3' => true,
+        ];
+
+        $this->aliases = [];
+
+        $this->privates['service_container'] = function () {
+            include_once $this->targetDirs[1].'/includes/HotPath/I1.php';
+            include_once $this->targetDirs[1].'/includes/HotPath/P1.php';
+            include_once $this->targetDirs[1].'/includes/HotPath/T1.php';
+            include_once $this->targetDirs[1].'/includes/HotPath/C1.php';
+        };
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C3' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists
+     */
+    protected function getParentNotExistsService()
+    {
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists();
+    }
+
+    /**
+     * Gets the public 'Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1
+     */
+    protected function getC1Service()
+    {
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1();
+    }
+
+    /**
+     * Gets the public 'Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2
+     */
+    protected function getC2Service()
+    {
+        include_once $this->targetDirs[1].'/includes/HotPath/C2.php';
+        include_once $this->targetDirs[1].'/includes/HotPath/C3.php';
+
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(${($_ = isset($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C3']) ? $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C3'] : ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C3'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3())) && false ?: '_'});
+    }
+
+    /**
+     * Gets the private 'Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3
+     */
+    protected function getC3Service()
+    {
+        include_once $this->targetDirs[1].'/includes/HotPath/C3.php';
+
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C3'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3();
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'inline_requires' => true,
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_self_ref.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_self_ref.php
new file mode 100644
index 000000000..906b0cdc7
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_inline_self_ref.php
@@ -0,0 +1,78 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Inline_Self_Ref extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->normalizedIds = [
+            'app\\foo' => 'App\\Foo',
+        ];
+        $this->methodMap = [
+            'App\\Foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'App\Foo' shared service.
+     *
+     * @return \App\Foo
+     */
+    protected function getFooService()
+    {
+        $a = new \App\Bar();
+
+        $b = new \App\Baz($a);
+        $b->bar = $a;
+
+        $this->services['App\\Foo'] = $instance = new \App\Foo($b);
+
+        $a->foo = $instance;
+
+        return $instance;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_legacy_privates.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_legacy_privates.php
new file mode 100644
index 000000000..9a0606173
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_legacy_privates.php
@@ -0,0 +1,193 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Legacy_Privates extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $dir = __DIR__;
+        for ($i = 1; $i <= 5; ++$i) {
+            $this->targetDirs[$i] = $dir = \dirname($dir);
+        }
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'private' => 'getPrivateService',
+            'private_alias' => 'getPrivateAliasService',
+            'private_alias_decorator' => 'getPrivateAliasDecoratorService',
+            'private_child' => 'getPrivateChildService',
+            'private_decorator' => 'getPrivateDecoratorService',
+            'private_not_inlined' => 'getPrivateNotInlinedService',
+            'private_not_removed' => 'getPrivateNotRemovedService',
+            'private_parent' => 'getPrivateParentService',
+            'public_child' => 'getPublicChildService',
+        ];
+        $this->privates = [
+            'decorated_private' => true,
+            'decorated_private_alias' => true,
+            'private' => true,
+            'private_alias' => true,
+            'private_child' => true,
+            'private_not_inlined' => true,
+            'private_not_removed' => true,
+            'private_parent' => true,
+        ];
+        $this->aliases = [
+            'alias_to_private' => 'private',
+            'decorated_private' => 'private_decorator',
+            'decorated_private_alias' => 'private_alias_decorator',
+        ];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'decorated_private' => true,
+            'decorated_private_alias' => true,
+            'foo' => true,
+            'private' => true,
+            'private_alias' => true,
+            'private_alias_decorator.inner' => true,
+            'private_child' => true,
+            'private_decorator.inner' => true,
+            'private_not_inlined' => true,
+            'private_not_removed' => true,
+            'private_parent' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService()
+    {
+        return $this->services['bar'] = new \stdClass(${($_ = isset($this->services['private_not_inlined']) ? $this->services['private_not_inlined'] : ($this->services['private_not_inlined'] = new \stdClass())) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'private_alias_decorator' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateAliasDecoratorService()
+    {
+        return $this->services['private_alias_decorator'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'private_decorator' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateDecoratorService()
+    {
+        return $this->services['private_decorator'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'public_child' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPublicChildService()
+    {
+        return $this->services['public_child'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateService()
+    {
+        return $this->services['private'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_alias' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateAliasService()
+    {
+        return $this->services['private_alias'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_child' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateChildService()
+    {
+        return $this->services['private_child'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_not_inlined' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateNotInlinedService()
+    {
+        return $this->services['private_not_inlined'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_not_removed' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateNotRemovedService()
+    {
+        return $this->services['private_not_removed'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'private_parent' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateParentService()
+    {
+        return $this->services['private_parent'] = new \stdClass();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_locator.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_locator.php
new file mode 100644
index 000000000..3826d5a6e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_locator.php
@@ -0,0 +1,184 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar_service' => 'getBarServiceService',
+            'baz_service' => 'getBazServiceService',
+            'foo_service' => 'getFooServiceService',
+            'translator.loader_1' => 'getTranslator_Loader1Service',
+            'translator.loader_2' => 'getTranslator_Loader2Service',
+            'translator.loader_3' => 'getTranslator_Loader3Service',
+            'translator_1' => 'getTranslator1Service',
+            'translator_2' => 'getTranslator2Service',
+            'translator_3' => 'getTranslator3Service',
+        ];
+        $this->privates = [
+            'baz_service' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'baz_service' => true,
+            'translator.loader_1_locator' => true,
+            'translator.loader_2_locator' => true,
+            'translator.loader_3_locator' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarServiceService()
+    {
+        return $this->services['bar_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : ($this->services['baz_service'] = new \stdClass())) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'foo_service' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\ServiceLocator
+     */
+    protected function getFooServiceService()
+    {
+        return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => function () {
+            return ${($_ = isset($this->services['bar_service']) ? $this->services['bar_service'] : $this->getBarServiceService()) && false ?: '_'};
+        }, 'baz' => function () {
+            $f = function (\stdClass $v) { return $v; }; return $f(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : ($this->services['baz_service'] = new \stdClass())) && false ?: '_'});
+        }, 'nil' => function () {
+            return NULL;
+        }]);
+    }
+
+    /**
+     * Gets the public 'translator.loader_1' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getTranslator_Loader1Service()
+    {
+        return $this->services['translator.loader_1'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'translator.loader_2' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getTranslator_Loader2Service()
+    {
+        return $this->services['translator.loader_2'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'translator.loader_3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getTranslator_Loader3Service()
+    {
+        return $this->services['translator.loader_3'] = new \stdClass();
+    }
+
+    /**
+     * Gets the public 'translator_1' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
+     */
+    protected function getTranslator1Service()
+    {
+        return $this->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => function () {
+            return ${($_ = isset($this->services['translator.loader_1']) ? $this->services['translator.loader_1'] : ($this->services['translator.loader_1'] = new \stdClass())) && false ?: '_'};
+        }]));
+    }
+
+    /**
+     * Gets the public 'translator_2' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
+     */
+    protected function getTranslator2Service()
+    {
+        $this->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => function () {
+            return ${($_ = isset($this->services['translator.loader_2']) ? $this->services['translator.loader_2'] : ($this->services['translator.loader_2'] = new \stdClass())) && false ?: '_'};
+        }]));
+
+        $instance->addResource('db', ${($_ = isset($this->services['translator.loader_2']) ? $this->services['translator.loader_2'] : ($this->services['translator.loader_2'] = new \stdClass())) && false ?: '_'}, 'nl');
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'translator_3' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
+     */
+    protected function getTranslator3Service()
+    {
+        $this->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => function () {
+            return ${($_ = isset($this->services['translator.loader_3']) ? $this->services['translator.loader_3'] : ($this->services['translator.loader_3'] = new \stdClass())) && false ?: '_'};
+        }]));
+
+        $a = ${($_ = isset($this->services['translator.loader_3']) ? $this->services['translator.loader_3'] : ($this->services['translator.loader_3'] = new \stdClass())) && false ?: '_'};
+
+        $instance->addResource('db', $a, 'nl');
+        $instance->addResource('db', $a, 'en');
+
+        return $instance;
+    }
+
+    /**
+     * Gets the private 'baz_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBazServiceService()
+    {
+        return $this->services['baz_service'] = new \stdClass();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_non_shared_lazy.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_non_shared_lazy.php
new file mode 100644
index 000000000..4cea5d2d9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_non_shared_lazy.php
@@ -0,0 +1,92 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'foo' => 'getFooService',
+        ];
+        $this->privates = [
+            'bar' => true,
+            'foo' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'bar' => true,
+            'foo' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    protected function createProxy($class, \Closure $factory)
+    {
+        return $factory();
+    }
+
+    /**
+     * Gets the private 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService()
+    {
+        return $this->services['bar'] = new \stdClass(${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'});
+    }
+
+    /**
+     * Gets the private 'foo' service.
+     *
+     * @return \stdClass
+     */
+    protected function getFooService($lazyLoad = true)
+    {
+        // lazy factory for stdClass
+
+        return new \stdClass();
+    }
+}
+
+// proxy code for stdClass
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_frozen.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_frozen.php
new file mode 100644
index 000000000..95995dec6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_frozen.php
@@ -0,0 +1,92 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar_service' => 'getBarServiceService',
+            'baz_service' => 'getBazServiceService',
+            'foo_service' => 'getFooServiceService',
+        ];
+        $this->privates = [
+            'baz_service' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'baz_service' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarServiceService()
+    {
+        return $this->services['bar_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : ($this->services['baz_service'] = new \stdClass())) && false ?: '_'});
+    }
+
+    /**
+     * Gets the public 'foo_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFooServiceService()
+    {
+        return $this->services['foo_service'] = new \stdClass(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : ($this->services['baz_service'] = new \stdClass())) && false ?: '_'});
+    }
+
+    /**
+     * Gets the private 'baz_service' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBazServiceService()
+    {
+        return $this->services['baz_service'] = new \stdClass();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_in_expression.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_in_expression.php
new file mode 100644
index 000000000..56d73c255
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_private_in_expression.php
@@ -0,0 +1,82 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'private_foo' => 'getPrivateFooService',
+            'public_foo' => 'getPublicFooService',
+        ];
+        $this->privates = [
+            'private_foo' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'private_bar' => true,
+            'private_foo' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'public_foo' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPublicFooService()
+    {
+        return $this->services['public_foo'] = new \stdClass(${($_ = isset($this->services['private_foo']) ? $this->services['private_foo'] : ($this->services['private_foo'] = new \stdClass())) && false ?: '_'}->bar);
+    }
+
+    /**
+     * Gets the private 'private_foo' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getPrivateFooService()
+    {
+        return $this->services['private_foo'] = new \stdClass();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_rot13_env.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_rot13_env.php
new file mode 100644
index 000000000..a7ad1f1c6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_rot13_env.php
@@ -0,0 +1,180 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->normalizedIds = [
+            'symfony\\component\\dependencyinjection\\tests\\dumper\\rot13envvarprocessor' => 'Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor',
+        ];
+        $this->methodMap = [
+            'Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor' => 'getRot13EnvVarProcessorService',
+            'container.env_var_processors_locator' => 'getContainer_EnvVarProcessorsLocatorService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor
+     */
+    protected function getRot13EnvVarProcessorService()
+    {
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor();
+    }
+
+    /**
+     * Gets the public 'container.env_var_processors_locator' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\ServiceLocator
+     */
+    protected function getContainer_EnvVarProcessorsLocatorService()
+    {
+        return $this->services['container.env_var_processors_locator'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['rot13' => function () {
+            return ${($_ = isset($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor']) ? $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] : ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor())) && false ?: '_'};
+        }]);
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [
+        'hello' => false,
+    ];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        switch ($name) {
+            case 'hello': $value = $this->getEnv('rot13:foo'); break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+        $this->loadedDynamicParameters[$name] = true;
+
+        return $this->dynamicParameters[$name] = $value;
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            'env(foo)' => 'jbeyq',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_subscriber.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_subscriber.php
new file mode 100644
index 000000000..ca89e01cc
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_subscriber.php
@@ -0,0 +1,106 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->normalizedIds = [
+            'symfony\\component\\dependencyinjection\\tests\\fixtures\\customdefinition' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
+            'symfony\\component\\dependencyinjection\\tests\\fixtures\\testservicesubscriber' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber',
+        ];
+        $this->methodMap = [
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => 'getCustomDefinitionService',
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => 'getTestServiceSubscriberService',
+            'foo_service' => 'getFooServiceService',
+        ];
+        $this->privates = [
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,
+            'service_locator.jmktfsv' => true,
+            'service_locator.jmktfsv.foo_service' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber
+     */
+    protected function getTestServiceSubscriberService()
+    {
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber();
+    }
+
+    /**
+     * Gets the public 'foo_service' shared autowired service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber
+     */
+    protected function getFooServiceService()
+    {
+        return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\ServiceLocator(['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => function () {
+            $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v = null) { return $v; }; return $f(${($_ = isset($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition']) ? $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition'] : ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition())) && false ?: '_'});
+        }, 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => function () {
+            $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber $v) { return $v; }; return $f(${($_ = isset($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber']) ? $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber'] : ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber())) && false ?: '_'});
+        }, 'bar' => function () {
+            $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v) { return $v; }; return $f(${($_ = isset($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber']) ? $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber'] : ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber())) && false ?: '_'});
+        }, 'baz' => function () {
+            $f = function (\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition $v = null) { return $v; }; return $f(${($_ = isset($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition']) ? $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition'] : ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition())) && false ?: '_'});
+        }]))->withContext('foo_service', $this));
+    }
+
+    /**
+     * Gets the private 'Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition
+     */
+    protected function getCustomDefinitionService()
+    {
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_tsantos.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_tsantos.php
new file mode 100644
index 000000000..b314feff7
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_tsantos.php
@@ -0,0 +1,87 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->normalizedIds = [
+            'tsantos\\serializer\\serializerinterface' => 'TSantos\\Serializer\\SerializerInterface',
+        ];
+        $this->methodMap = [
+            'tsantos_serializer' => 'getTsantosSerializerService',
+        ];
+        $this->aliases = [
+            'TSantos\\Serializer\\SerializerInterface' => 'tsantos_serializer',
+        ];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'tsantos_serializer' shared service.
+     *
+     * @return \TSantos\Serializer\EventEmitterSerializer
+     */
+    protected function getTsantosSerializerService()
+    {
+        $a = new \TSantos\Serializer\NormalizerRegistry();
+
+        $b = new \TSantos\Serializer\Normalizer\CollectionNormalizer();
+
+        $c = new \TSantos\Serializer\EventDispatcher\EventDispatcher();
+        $c->addSubscriber(new \TSantos\SerializerBundle\EventListener\StopwatchListener(new \Symfony\Component\Stopwatch\Stopwatch(true)));
+
+        $this->services['tsantos_serializer'] = $instance = new \TSantos\Serializer\EventEmitterSerializer(new \TSantos\Serializer\Encoder\JsonEncoder(), $a, $c);
+
+        $b->setSerializer($instance);
+        $d = new \TSantos\Serializer\Normalizer\JsonNormalizer();
+        $d->setSerializer($instance);
+
+        $a->add(new \TSantos\Serializer\Normalizer\ObjectNormalizer(new \TSantos\SerializerBundle\Serializer\CircularReferenceHandler()));
+        $a->add($b);
+        $a->add($d);
+
+        return $instance;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_uninitialized_ref.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_uninitialized_ref.php
new file mode 100644
index 000000000..a338c9d52
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -0,0 +1,134 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->services = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'baz' => 'getBazService',
+            'foo1' => 'getFoo1Service',
+            'foo3' => 'getFoo3Service',
+        ];
+        $this->privates = [
+            'foo3' => true,
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+            'foo2' => true,
+            'foo3' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService()
+    {
+        $this->services['bar'] = $instance = new \stdClass();
+
+        $instance->foo1 = ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'};
+        $instance->foo2 = null;
+        $instance->foo3 = ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'};
+        $instance->closures = [0 => function () {
+            return ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'};
+        }, 1 => function () {
+            return null;
+        }, 2 => function () {
+            return ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'};
+        }];
+        $instance->iter = new RewindableGenerator(function () {
+            if (isset($this->services['foo1'])) {
+                yield 'foo1' => ${($_ = isset($this->services['foo1']) ? $this->services['foo1'] : null) && false ?: '_'};
+            }
+            if (false) {
+                yield 'foo2' => null;
+            }
+            if (isset($this->services['foo3'])) {
+                yield 'foo3' => ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : null) && false ?: '_'};
+            }
+        }, function () {
+            return 0 + (int) (isset($this->services['foo1'])) + (int) (false) + (int) (isset($this->services['foo3']));
+        });
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'baz' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBazService()
+    {
+        $this->services['baz'] = $instance = new \stdClass();
+
+        $instance->foo3 = ${($_ = isset($this->services['foo3']) ? $this->services['foo3'] : ($this->services['foo3'] = new \stdClass())) && false ?: '_'};
+
+        return $instance;
+    }
+
+    /**
+     * Gets the public 'foo1' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoo1Service()
+    {
+        return $this->services['foo1'] = new \stdClass();
+    }
+
+    /**
+     * Gets the private 'foo3' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getFoo3Service()
+    {
+        return $this->services['foo3'] = new \stdClass();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/services_unsupported_characters.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_unsupported_characters.php
new file mode 100644
index 000000000..9e7e817df
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/services_unsupported_characters.php
@@ -0,0 +1,178 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ *
+ * @final since Symfony 3.3
+ */
+class Symfony_DI_PhpDumper_Test_Unsupported_Characters extends Container
+{
+    private $parameters = [];
+    private $targetDirs = [];
+
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = [];
+        $this->methodMap = [
+            'bar$' => 'getBarService',
+            'bar$!' => 'getBar2Service',
+            'foo*/oh-no' => 'getFooohnoService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function getRemovedIds()
+    {
+        return [
+            'Psr\\Container\\ContainerInterface' => true,
+            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
+        ];
+    }
+
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled()
+    {
+        return true;
+    }
+
+    public function isFrozen()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar$' shared service.
+     *
+     * @return \FooClass
+     */
+    protected function getBarService()
+    {
+        return $this->services['bar$'] = new \FooClass();
+    }
+
+    /**
+     * Gets the public 'bar$!' shared service.
+     *
+     * @return \FooClass
+     */
+    protected function getBar2Service()
+    {
+        return $this->services['bar$!'] = new \FooClass();
+    }
+
+    /**
+     * Gets the public 'foo oh-no' shared service.
+     *
+     * @return \FooClass
+     */
+    protected function getFooohnoService()
+    {
+        return $this->services['foo*/oh-no'] = new \FooClass();
+    }
+
+    public function getParameter($name)
+    {
+        $name = (string) $name;
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+            $name = $this->normalizeParameterName($name);
+
+            if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+                throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+            }
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter($name)
+    {
+        $name = (string) $name;
+        $name = $this->normalizeParameterName($name);
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    /**
+     * Computes a dynamic parameter.
+     *
+     * @param string $name The name of the dynamic parameter to load
+     *
+     * @return mixed The value of the dynamic parameter
+     *
+     * @throws InvalidArgumentException When the dynamic parameter does not exist
+     */
+    private function getDynamicParameter($name)
+    {
+        throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+    }
+
+    private $normalizedParameterNames = [];
+
+    private function normalizeParameterName($name)
+    {
+        if (isset($this->normalizedParameterNames[$normalizedName = strtolower($name)]) || isset($this->parameters[$normalizedName]) || array_key_exists($normalizedName, $this->parameters)) {
+            $normalizedName = isset($this->normalizedParameterNames[$normalizedName]) ? $this->normalizedParameterNames[$normalizedName] : $normalizedName;
+            if ((string) $name !== $normalizedName) {
+                @trigger_error(sprintf('Parameter names will be made case sensitive in Symfony 4.0. Using "%s" instead of "%s" is deprecated since Symfony 3.4.', $name, $normalizedName), E_USER_DEPRECATED);
+            }
+        } else {
+            $normalizedName = $this->normalizedParameterNames[$normalizedName] = (string) $name;
+        }
+
+        return $normalizedName;
+    }
+
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return [
+            '\'' => 'oh-no',
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/php/simple.php b/lib/symfony/dependency-injection/Tests/Fixtures/php/simple.php
new file mode 100644
index 000000000..aa4df998c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/php/simple.php
@@ -0,0 +1,3 @@
+<?php
+
+$container->setParameter('foo', 'foo');
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/class_from_id.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/class_from_id.xml
new file mode 100644
index 000000000..5b7410090
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/class_from_id.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass" />
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/defaults_bindings.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/defaults_bindings.xml
new file mode 100644
index 000000000..d943dfad2
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/defaults_bindings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <defaults>
+            <bind key="$quz">value</bind>
+            <bind key="$foo" type="collection">
+                <bind>value</bind>
+            </bind>
+        </defaults>
+
+        <service id="bar" class="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar"/>
+
+        <service id="foo" class="stdClass"/>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/defaults_bindings2.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/defaults_bindings2.xml
new file mode 100644
index 000000000..db41330f8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/defaults_bindings2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <defaults>
+            <bind key="$quz">overridden</bind>
+        </defaults>
+
+        <service id="bar" class="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar"/>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extension1/services.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extension1/services.xml
new file mode 100644
index 000000000..1323dd5f2
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extension1/services.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="extension1.foo" class="FooClass1">
+      <argument type="service">
+        <service class="BarClass1">
+        </service>
+      </argument>
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extension2/services.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extension2/services.xml
new file mode 100644
index 000000000..f9c01225d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extension2/services.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="extension2.foo" class="FooClass2">
+      <argument type="service">
+        <service class="BarClass2">
+        </service>
+      </argument>
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services1.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services1.xml
new file mode 100644
index 000000000..792fa0705
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:project="http://www.example.com/schema/project">
+
+    <parameters>
+        <parameter key="project.parameter.foo">BAR</parameter>
+    </parameters>
+
+    <services>
+        <service id="project.service.foo" class="BAR" />
+    </services>
+
+    <project:bar babar="babar">
+        <another />
+        <another2>%project.parameter.foo%</another2>
+    </project:bar>
+
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services2.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services2.xml
new file mode 100644
index 000000000..65c90696a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:project="http://www.example.com/schema/projectwithxsd"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://www.example.com/schema/projectwithxsd http://www.example.com/schema/projectwithxsd/project-1.0.xsd">
+
+    <parameters>
+        <parameter key="project.parameter.foo">BAR</parameter>
+    </parameters>
+
+    <services>
+        <service id="project.service.foo" class="BAR" />
+    </services>
+
+    <project:bar />
+
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services3.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services3.xml
new file mode 100644
index 000000000..4c8184487
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services3.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:project="http://www.example.com/schema/projectwithxsd"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://www.example.com/schema/projectwithxsd http://www.example.com/schema/projectwithxsd/project-1.0.xsd">
+
+    <parameters>
+        <parameter key="project.parameter.foo">BAR</parameter>
+    </parameters>
+
+    <services>
+        <service id="project.service.foo" class="BAR" />
+    </services>
+
+    <project:bar bar="bar" />
+
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services4.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services4.xml
new file mode 100644
index 000000000..2c33c3a7d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:project="http://www.example.com/schema/not_registered_extension">
+  <project:bar />
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services5.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services5.xml
new file mode 100644
index 000000000..c0343373a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services5.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:project="http://www.example.com/schema/projectwithxsd"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://www.example.com/schema/projectwithxsd http://www.example.com/schema/projectwithxsd/project-1.0.xsd">
+
+    <project:foobar />
+
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services6.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services6.xml
new file mode 100644
index 000000000..da2b4bf2b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services6.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:project="http://www.example.com/schema/projectwithxsdinphar"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://www.example.com/schema/projectwithxsdinphar http://www.example.com/schema/projectwithxsdinphar/project-1.0.xsd">
+
+    <project:bar />
+
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services7.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services7.xml
new file mode 100644
index 000000000..fa5c364b3
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/extensions/services7.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:project="http://www.example.com/schema/projectwithxsdinphar"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://www.example.com/schema/projectwithxsdinphar http://www.example.com/schema/projectwithxsdinphar/project-1.0.xsd">
+
+    <project:bar bar="foo" />
+
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/legacy_invalid_alias_definition.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/legacy_invalid_alias_definition.xml
new file mode 100644
index 000000000..a5387b25a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/legacy_invalid_alias_definition.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="Foo" />
+
+    <service id="bar" alias="foo" class="Foo">
+        <tag name="foo.bar" />
+        <factory service="foobar" method="getBar" />
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/namespaces.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/namespaces.xml
new file mode 100644
index 000000000..9dc27fadb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/namespaces.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/doctrine https://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
+
+    <srv:services>
+        <srv:service id="foo" class="FooClass">
+            <srv:tag name="foo.tag" />
+            <srv:call method="setBar">
+                <srv:argument>foo</srv:argument>
+            </srv:call>
+        </srv:service>
+    </srv:services>
+</srv:container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/nested_service_without_id.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/nested_service_without_id.xml
new file mode 100644
index 000000000..cfeed0ff5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/nested_service_without_id.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="FooClass">
+      <argument type="service">
+        <service class="BarClass" />
+      </argument>
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/nonvalid.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/nonvalid.xml
new file mode 100644
index 000000000..e7b5bc973
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/nonvalid.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" ?>
+
+<nonvalid />
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services1.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services1.xml
new file mode 100644
index 000000000..7d8674a30
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service class="Symfony\Component\DependencyInjection\ContainerInterface" id="service_container" public="true" synthetic="true"/>
+        <service alias="service_container" id="Psr\Container\ContainerInterface" public="false"/>
+        <service alias="service_container" id="Symfony\Component\DependencyInjection\ContainerInterface" public="false"/>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services10.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services10.xml
new file mode 100644
index 000000000..921070e1b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services10.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="BarClass">
+        <tag name="foo_tag"
+            some-option="cat"
+            some_option="ciz"
+            other-option="lorem"
+            an_other-option="ipsum"
+        />
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services13.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services13.xml
new file mode 100644
index 000000000..9d86b8e51
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services13.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <parameters>
+    <parameter key="imported_from_xml">true</parameter>
+  </parameters>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services14.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services14.xml
new file mode 100644
index 000000000..639075f5d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services14.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="monolog.logger" parent="monolog.logger_prototype" public="false">
+            <argument index="0">app</argument>
+        </service>
+
+        <service id="logger" alias="monolog.logger" />
+
+        <service id="monolog.logger" parent="monolog.logger_prototype" public="false">
+            <argument index="0">app</argument>
+        </service>
+        <service id="monolog.logger_prototype" class="Symfony\Bridge\Monolog\Logger" abstract="true">
+            <argument /><!-- Channel -->
+        </service>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services2.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services2.xml
new file mode 100644
index 000000000..243a289f7
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services2.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <parameters>
+    <parameter>a string</parameter>
+    <parameter key="foo">bar</parameter>
+    <parameter key="values" type="collection">
+      <parameter>0</parameter>
+      <parameter key="integer">4</parameter>
+      <parameter key="100">null</parameter>
+      <parameter type="string">true</parameter>
+      <parameter>true</parameter>
+      <parameter>false</parameter>
+      <parameter>on</parameter>
+      <parameter>off</parameter>
+      <parameter key="float">1.3</parameter>
+      <parameter>1000.3</parameter>
+      <parameter>a string</parameter>
+      <parameter type="collection">
+        <parameter>foo</parameter>
+        <parameter>bar</parameter>
+      </parameter>
+    </parameter>
+    <parameter key="mixedcase" type="collection"> <!-- Should be lower cased -->
+      <parameter key="MixedCaseKey">value</parameter> <!-- Should stay mixed case -->
+    </parameter>
+    <parameter key="constant" type="constant">PHP_EOL</parameter>
+  </parameters>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services21.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services21.xml
new file mode 100644
index 000000000..20dd4cf47
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services21.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
+    <service id="foo" class="Foo" public="true">
+      <factory method="createFoo">
+        <service class="FooFactory">
+          <factory method="createFooFactory">
+            <service class="Foobar"/>
+          </factory>
+        </service>
+      </factory>
+      <configurator method="configureFoo">
+        <service class="Bar">
+          <configurator method="configureBar">
+            <service class="Baz"/>
+          </configurator>
+        </service>
+      </configurator>
+    </service>
+    <service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/>
+    <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services22.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services22.xml
new file mode 100644
index 000000000..6de7945be
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services22.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="foo" class="Foo">
+            <autowiring-type>Bar</autowiring-type>
+            <autowiring-type>Baz</autowiring-type>
+        </service>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services23.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services23.xml
new file mode 100644
index 000000000..eb56fd11d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services23.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="bar" class="Bar" autowire="true" />
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services24.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services24.xml
new file mode 100644
index 000000000..23c91cdc2
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services24.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
+    <service id="foo" class="Foo" public="true" autowire="true"/>
+    <service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/>
+    <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services28.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services28.xml
new file mode 100644
index 000000000..6b53c0989
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services28.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <defaults public="false" autowire="true">
+            <tag name="foo" />
+        </defaults>
+
+        <service id="bar" class="Bar" public="true" />
+        <service id="with_defaults" class="Foo" />
+        <service id="no_defaults" class="Foo" public="true" autowire="false" />
+        <service id="child_def" parent="with_defaults" public="true" autowire="false" />
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services3.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services3.xml
new file mode 100644
index 000000000..5f0afeb49
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services3.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <parameters>
+    <parameter key="foo">foo</parameter>
+    <parameter key="values" type="collection">
+      <parameter>true</parameter>
+      <parameter>false</parameter>
+    </parameter>
+  </parameters>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services4.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services4.xml
new file mode 100644
index 000000000..399da8159
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services4.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <imports>
+    <import resource="services2.xml" />
+    <import resource="services3.xml" />
+    <import resource="../ini/parameters.ini" />
+    <import resource="../ini/parameters2.ini" />
+    <import resource="../yaml/services13.yml" />
+    <import resource="../yaml/yaml_with_wrong_ext.ini" type="yaml"/>
+  </imports>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services4_bad_import.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services4_bad_import.xml
new file mode 100644
index 000000000..b30178f9e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services4_bad_import.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <imports>
+    <import resource="foo_fake.xml" ignore-errors="true" />
+  </imports>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services5.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services5.xml
new file mode 100644
index 000000000..6c6a14245
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services5.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="FooClass">
+      <argument type="service">
+        <service class="BarClass">
+          <argument type="service">
+            <service class="BazClass">
+            </service>
+          </argument>
+        </service>
+      </argument>
+      <property name="p" type="service">
+        <service class="BuzClass" />
+      </property>
+    </service>
+    <service id="bar" parent="foo" />
+    <service id="biz" class="BizClass">
+        <tag name="biz_tag" />
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
new file mode 100644
index 000000000..84eb57bbe
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="FooClass" />
+    <service id="baz" class="BazClass" />
+    <service id="not_shared" class="FooClass" shared="false" />
+    <service id="file" class="FooClass">
+      <file>%path%/foo.php</file>
+    </service>
+    <service id="arguments" class="FooClass">
+      <argument>foo</argument>
+      <argument type="service" id="foo" />
+      <argument type="collection">
+        <argument>true</argument>
+        <argument>false</argument>
+      </argument>
+    </service>
+    <service id="configurator1" class="FooClass">
+      <configurator function="sc_configure" />
+    </service>
+    <service id="configurator2" class="FooClass">
+      <configurator service="baz" method="configure" />
+    </service>
+    <service id="configurator3" class="FooClass">
+      <configurator class="BazClass" method="configureStatic" />
+    </service>
+    <service id="method_call1" class="FooClass">
+      <call method="setBar" />
+      <call method="setBar">
+        <argument type="expression">service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")</argument>
+      </call>
+    </service>
+    <service id="method_call2" class="FooClass">
+      <call method="setBar">
+        <argument>foo</argument>
+        <argument type="service" id="foo" />
+        <argument type="collection">
+          <argument>true</argument>
+          <argument>false</argument>
+        </argument>
+      </call>
+    </service>
+    <service id="request" class="Request" synthetic="true" lazy="true"/>
+    <service id="decorator_service" decorates="decorated" />
+    <service id="decorator_service_with_name" decorates="decorated" decoration-inner-name="decorated.pif-pouf"/>
+    <service id="decorator_service_with_name_and_priority" decorates="decorated" decoration-inner-name="decorated.pif-pouf" decoration-priority="5"/>
+    <service id="new_factory1" class="FooBarClass">
+      <factory function="factory" />
+    </service>
+    <service id="new_factory2" class="FooBarClass">
+      <factory service="baz" method="getClass" />
+    </service>
+    <service id="new_factory3" class="FooBarClass">
+      <factory class="BazClass" method="getInstance" />
+    </service>
+    <service id="new_factory4" class="BazClass">
+      <factory method="getInstance" />
+    </service>
+    <service id="alias_for_foo" alias="foo" />
+    <service id="another_alias_for_foo" alias="foo" public="false" />
+    <service id="0" class="FooClass" />
+    <service id="1" class="FooClass">
+      <argument type="service" id="0" />
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services7.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services7.xml
new file mode 100644
index 000000000..5b322105b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services7.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="BarClass" />
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services8.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services8.xml
new file mode 100644
index 000000000..4b07bbb7d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services8.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <parameters>
+    <parameter key="foo">%baz%</parameter>
+    <parameter key="baz">bar</parameter>
+    <parameter key="bar">foo is %%foo bar</parameter>
+    <parameter key="escape">@escapeme</parameter>
+    <parameter key="values" type="collection">
+      <parameter>true</parameter>
+      <parameter>false</parameter>
+      <parameter>null</parameter>
+      <parameter>0</parameter>
+      <parameter>1000.3</parameter>
+      <parameter type="string">true</parameter>
+      <parameter type="string">false</parameter>
+      <parameter type="string">null</parameter>
+    </parameter>
+    <parameter key="null string" type="string">null</parameter>
+    <parameter key="string of digits" type="string">123</parameter>
+    <parameter key="string of digits prefixed with minus character" type="string">-123</parameter>
+    <parameter key="true string" type="string">true</parameter>
+    <parameter key="false string" type="string">false</parameter>
+    <parameter key="binary number string" type="string">0b0110</parameter>
+    <parameter key="numeric string" type="string">-1.2E2</parameter>
+    <parameter key="hexadecimal number string" type="string">0xFF</parameter>
+    <parameter key="float string" type="string">10100.1</parameter>
+    <parameter key="positive float string" type="string">+10100.1</parameter>
+    <parameter key="negative float string" type="string">-10100.1</parameter>
+  </parameters>
+  <services>
+    <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
+    <service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/>
+    <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services9.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services9.xml
new file mode 100644
index 000000000..128c1bac2
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services9.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <parameters>
+    <parameter key="baz_class">BazClass</parameter>
+    <parameter key="foo_class">Bar\FooClass</parameter>
+    <parameter key="foo">bar</parameter>
+  </parameters>
+  <services>
+    <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
+    <service id="foo" class="Bar\FooClass" public="true">
+      <tag name="foo" foo="foo"/>
+      <tag name="foo" bar="bar" baz="baz"/>
+      <argument>foo</argument>
+      <argument type="service" id="foo.baz"/>
+      <argument type="collection">
+        <argument key="%foo%">foo is %foo%</argument>
+        <argument key="foobar">%foo%</argument>
+      </argument>
+      <argument>true</argument>
+      <argument type="service" id="service_container"/>
+      <property name="foo">bar</property>
+      <property name="moo" type="service" id="foo.baz"/>
+      <property name="qux" type="collection">
+        <property key="%foo%">foo is %foo%</property>
+        <property key="foobar">%foo%</property>
+      </property>
+      <call method="setBar">
+        <argument type="service" id="bar"/>
+      </call>
+      <call method="initialize"/>
+      <factory class="Bar\FooClass" method="getInstance"/>
+      <configurator function="sc_configure"/>
+    </service>
+    <service id="foo.baz" class="%baz_class%" public="true">
+      <factory class="%baz_class%" method="getInstance"/>
+      <configurator class="%baz_class%" method="configureStatic1"/>
+    </service>
+    <service id="bar" class="Bar\FooClass" public="true">
+      <argument>foo</argument>
+      <argument type="service" id="foo.baz"/>
+      <argument>%foo_bar%</argument>
+      <configurator service="foo.baz" method="configure"/>
+    </service>
+    <service id="foo_bar" class="%foo_class%" shared="false" public="true">
+      <argument type="service" id="deprecated_service"/>
+    </service>
+    <service id="method_call1" class="Bar\FooClass" public="true">
+      <file>%path%foo.php</file>
+      <call method="setBar">
+        <argument type="service" id="foo"/>
+      </call>
+      <call method="setBar">
+        <argument type="service" id="foo2" on-invalid="null"/>
+      </call>
+      <call method="setBar">
+        <argument type="service" id="foo3" on-invalid="ignore"/>
+      </call>
+      <call method="setBar">
+        <argument type="service" id="foobaz" on-invalid="ignore"/>
+      </call>
+      <call method="setBar">
+        <argument type="expression">service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")</argument>
+      </call>
+    </service>
+    <service id="foo_with_inline" class="Foo" public="true">
+      <call method="setBar">
+        <argument type="service" id="inlined"/>
+      </call>
+    </service>
+    <service id="inlined" class="Bar" public="false">
+      <property name="pub">pub</property>
+      <call method="setBaz">
+        <argument type="service" id="baz"/>
+      </call>
+    </service>
+    <service id="baz" class="Baz" public="true">
+      <call method="setFoo">
+        <argument type="service" id="foo_with_inline"/>
+      </call>
+    </service>
+    <service id="request" class="Request" public="true" synthetic="true"/>
+    <service id="configurator_service" class="ConfClass" public="false">
+      <call method="setFoo">
+        <argument type="service" id="baz"/>
+      </call>
+    </service>
+    <service id="configured_service" class="stdClass" public="true">
+      <configurator service="configurator_service" method="configureStdClass"/>
+    </service>
+    <service id="configurator_service_simple" class="ConfClass" public="false">
+      <argument>bar</argument>
+    </service>
+    <service id="configured_service_simple" class="stdClass" public="true">
+      <configurator service="configurator_service_simple" method="configureStdClass"/>
+    </service>
+    <service id="decorated" class="stdClass" public="true"/>
+    <service id="decorator_service" class="stdClass" public="true" decorates="decorated"/>
+    <service id="decorator_service_with_name" class="stdClass" public="true" decorates="decorated" decoration-inner-name="decorated.pif-pouf"/>
+    <service id="deprecated_service" class="stdClass" public="true">
+      <deprecated>The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.</deprecated>
+    </service>
+    <service id="new_factory" class="FactoryClass" public="false">
+      <property name="foo">bar</property>
+    </service>
+    <service id="factory_service" class="Bar" public="true">
+      <factory service="foo.baz" method="getInstance"/>
+    </service>
+    <service id="new_factory_service" class="FooBarBaz" public="true">
+      <property name="foo">bar</property>
+      <factory service="new_factory" method="getInstance"/>
+    </service>
+    <service id="service_from_static_method" class="Bar\FooClass" public="true">
+      <factory class="Bar\FooClass" method="getInstance"/>
+    </service>
+    <service id="factory_simple" class="SimpleFactoryClass" public="false">
+      <argument>foo</argument>
+      <deprecated>The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.</deprecated>
+    </service>
+    <service id="factory_service_simple" class="Bar" public="true">
+      <factory service="factory_simple" method="getInstance"/>
+    </service>
+    <service id="lazy_context" class="LazyContext" public="true">
+      <argument type="iterator">
+        <argument key="k1" type="service" id="foo.baz"/>
+        <argument key="k2" type="service" id="service_container"/>
+      </argument>
+      <argument type="iterator"/>
+    </service>
+    <service id="lazy_context_ignore_invalid_ref" class="LazyContext" public="true">
+      <argument type="iterator">
+        <argument type="service" id="foo.baz"/>
+        <argument type="service" id="invalid" on-invalid="ignore"/>
+      </argument>
+      <argument type="iterator"/>
+    </service>
+    <service id="tagged_iterator_foo" class="Bar" public="false">
+      <tag name="foo"/>
+    </service>
+    <service id="tagged_iterator" class="Bar" public="true">
+      <argument type="tagged" tag="foo"/>
+    </service>
+    <service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/>
+    <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/>
+    <service id="alias_for_foo" alias="foo" public="true"/>
+    <service id="alias_for_alias" alias="foo" public="true"/>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_abstract.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_abstract.xml
new file mode 100644
index 000000000..47fd3a53b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_abstract.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
+    <service id="foo" class="Foo" public="true" abstract="true"/>
+    <service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/>
+    <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_autoconfigure.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_autoconfigure.xml
new file mode 100644
index 000000000..91cfa5f4d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_autoconfigure.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <defaults autoconfigure="true" />
+
+        <service id="use_defaults_settings" />
+        <service id="override_defaults_settings_to_false" autoconfigure="false" />
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_autoconfigure_with_parent.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_autoconfigure_with_parent.xml
new file mode 100644
index 000000000..97a8facf4
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_autoconfigure_with_parent.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="parent_service" class="stdClass" />
+        <service id="child_service" class="stdClass" parent="parent_service" autoconfigure="true" />
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_bindings.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_bindings.xml
new file mode 100644
index 000000000..0fb57daa5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_bindings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <defaults>
+            <bind key="NonExistent">null</bind>
+            <bind key="$quz">quz</bind>
+            <bind key="$factory">factory</bind>
+        </defaults>
+
+        <service id="bar" class="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar" autowire="true">
+            <bind key="Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface" type="service" id="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar" />
+            <bind key="$foo" type="collection">
+                <bind>null</bind>
+            </bind>
+        </service>
+
+        <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar">
+            <factory method="create" />
+        </service>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_defaults_with_parent.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_defaults_with_parent.xml
new file mode 100644
index 000000000..bb1511898
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_defaults_with_parent.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <defaults autowire="true" />
+
+        <service id="parent_service" class="stdClass" />
+        <service id="child_service" parent="parent_service" />
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_deprecated.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_deprecated.xml
new file mode 100644
index 000000000..ae3a0b089
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_deprecated.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="Foo">
+      <deprecated />
+    </service>
+    <service id="bar" class="Bar">
+      <deprecated>The "%service_id%" service is deprecated.</deprecated>
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_dump_load.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_dump_load.xml
new file mode 100644
index 000000000..7a91166c1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_dump_load.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
+    <service id="foo" autoconfigure="true" abstract="true">
+      <argument type="service" id="bar" on-invalid="ignore_uninitialized"/>
+    </service>
+    <service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/>
+    <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_inline_not_candidate.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_inline_not_candidate.xml
new file mode 100644
index 000000000..e6857813c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_inline_not_candidate.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="stdClass">
+      <argument type="service">
+        <service class="Symfony\Component\DependencyInjection\Tests\Compiler\D"/>
+      </argument>
+    </service>
+    <service id="autowired" class="Symfony\Component\DependencyInjection\Tests\Compiler\E" autowire="true"/>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_instanceof.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_instanceof.xml
new file mode 100644
index 000000000..097687e1a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_instanceof.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <instanceof id="Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface" lazy="true" autowire="true">
+            <tag name="foo" />
+            <tag name="bar" />
+        </instanceof>
+
+        <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar" class="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar" />
+        <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface" alias="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar" />
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_instanceof_with_parent.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_instanceof_with_parent.xml
new file mode 100644
index 000000000..c2fce5eb2
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_instanceof_with_parent.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <instanceof id="FooInterface" autowire="true" />
+
+        <service id="parent_service" class="stdClass" />
+        <service id="child_service" class="stdClass" parent="parent_service" />
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_named_args.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_named_args.xml
new file mode 100644
index 000000000..68ade19dd
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_named_args.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy">
+            <argument key="$apiKey">ABCD</argument>
+            <argument key="Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass">null</argument>
+            <call method="setApiKey">
+                <argument key="$apiKey">123</argument>
+            </call>
+        </service>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_prototype.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_prototype.xml
new file mode 100644
index 000000000..9d1d622d4
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_prototype.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+      <prototype namespace="Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\" resource="../Prototype/*" exclude="../Prototype/{OtherDir,BadClasses}" />
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_tsantos.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_tsantos.xml
new file mode 100644
index 000000000..2a35f4686
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_tsantos.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
+    <service id="tsantos_serializer" class="TSantos\Serializer\EventEmitterSerializer" public="true">
+      <argument type="service">
+        <service class="TSantos\Serializer\Encoder\JsonEncoder" public="false">
+          <tag name="tsantos_serializer.encoder" format="json"/>
+        </service>
+      </argument>
+      <argument type="service">
+        <service class="TSantos\Serializer\NormalizerRegistry" public="false">
+          <call method="add">
+            <argument type="service">
+              <service class="TSantos\Serializer\Normalizer\ObjectNormalizer" public="false">
+                <tag name="tsantos_serializer.normalizer" priority="-800"/>
+                <argument type="service">
+                  <service class="TSantos\SerializerBundle\Serializer\CircularReferenceHandler" public="false"/>
+                </argument>
+              </service>
+            </argument>
+          </call>
+          <call method="add">
+            <argument type="service">
+              <service class="TSantos\Serializer\Normalizer\CollectionNormalizer" public="false">
+                <tag name="tsantos_serializer.normalizer" priority="-900"/>
+                <call method="setSerializer">
+                  <argument type="service" id="tsantos_serializer"/>
+                </call>
+              </service>
+            </argument>
+          </call>
+          <call method="add">
+            <argument type="service">
+              <service class="TSantos\Serializer\Normalizer\JsonNormalizer" public="false">
+                <tag name="tsantos_serializer.normalizer" priority="-1000"/>
+                <call method="setSerializer">
+                  <argument type="service" id="tsantos_serializer"/>
+                </call>
+              </service>
+            </argument>
+          </call>
+        </service>
+      </argument>
+      <argument type="service">
+        <service class="TSantos\Serializer\EventDispatcher\EventDispatcher" public="false">
+          <call method="addSubscriber">
+            <argument type="service">
+              <service class="TSantos\SerializerBundle\EventListener\StopwatchListener" public="false">
+                <tag name="tsantos_serializer.event_subscriber"/>
+                <argument type="service">
+                  <service class="Symfony\Component\Stopwatch\Stopwatch" public="false">
+                    <tag name="kernel.reset" method="reset"/>
+                    <argument>true</argument>
+                  </service>
+                </argument>
+              </service>
+            </argument>
+          </call>
+        </service>
+      </argument>
+    </service>
+    <service id="TSantos\Serializer\SerializerInterface" alias="tsantos_serializer" public="true"/>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_without_id.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_without_id.xml
new file mode 100644
index 000000000..fe65f08f4
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/services_without_id.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <defaults public="true" />
+    <service class="FooClass"/>
+    <service id="FooClass">
+      <argument type="service">
+        <service class="BarClass" />
+      </argument>
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/tag_with_empty_name.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/tag_with_empty_name.xml
new file mode 100644
index 000000000..08e3e78fa
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/tag_with_empty_name.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="foo" class="BarClass">
+            <tag name="" foo="bar" />
+        </service>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/tag_without_name.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/tag_without_name.xml
new file mode 100644
index 000000000..1ff392903
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/tag_without_name.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="foo" class="BarClass">
+            <tag foo="bar" />
+        </service>
+    </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/with_key_outside_collection.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/with_key_outside_collection.xml
new file mode 100644
index 000000000..1f6d32079
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/with_key_outside_collection.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="Foo">
+      <argument key="type">foo</argument>
+      <argument>bar</argument>
+    </service>
+  </services>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/withdoctype.xml b/lib/symfony/dependency-injection/Tests/Fixtures/xml/withdoctype.xml
new file mode 100644
index 000000000..f217d5bca
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/withdoctype.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!DOCTYPE foo>
+<foo></foo>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/xml/xml_with_wrong_ext.php b/lib/symfony/dependency-injection/Tests/Fixtures/xml/xml_with_wrong_ext.php
new file mode 100644
index 000000000..dcf167db8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/xml/xml_with_wrong_ext.php
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <parameters>
+    <parameter key="with_wrong_ext">from xml</parameter>
+  </parameters>
+</container>
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services.yml
new file mode 100644
index 000000000..fe54b8987
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services.yml
@@ -0,0 +1,14 @@
+imports:
+    # Ensure the anonymous services count is reset after importing a file
+    - { resource: anonymous_services_in_instanceof.yml }
+
+services:
+    _defaults:
+        autowire: true
+
+    Foo:
+        arguments:
+            - !service
+                class: Bar
+                autowire: true
+        factory: [ !service { class: Quz }, 'constructFoo' ]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_alias.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_alias.yml
new file mode 100644
index 000000000..96546b83a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_alias.yml
@@ -0,0 +1,7 @@
+services:
+    Bar: ~
+
+    Foo:
+        arguments:
+            - !service
+                alias: Bar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_in_instanceof.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_in_instanceof.yml
new file mode 100644
index 000000000..ea0bebaf1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_in_instanceof.yml
@@ -0,0 +1,15 @@
+services:
+    _instanceof:
+        # Ensure previous conditionals aren't applied on anonymous services
+        Quz:
+            autowire: true
+
+        DummyInterface:
+            properties:
+                foo: !service { class: Anonymous }
+
+        # Ensure next conditionals are not considered as services
+        Bar:
+            autowire: true
+
+    Dummy: ~
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_in_parameters.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_in_parameters.yml
new file mode 100644
index 000000000..9d9bea344
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/anonymous_services_in_parameters.yml
@@ -0,0 +1,2 @@
+parameters:
+    foo: [ !service { } ]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_calls.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_calls.yml
new file mode 100644
index 000000000..3f34b07eb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_calls.yml
@@ -0,0 +1,4 @@
+services:
+    method_call1:
+        class: FooClass
+        calls: foo
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_decorates.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_decorates.yml
new file mode 100644
index 000000000..79c048a84
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_decorates.yml
@@ -0,0 +1,7 @@
+services:
+    foo:
+        class: stdClass
+    bar:
+        class: stdClass
+        decorates: "@foo"
+        arguments: ["@bar.inner"]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_empty_defaults.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_empty_defaults.yml
new file mode 100644
index 000000000..85d910e3e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_empty_defaults.yml
@@ -0,0 +1,2 @@
+services:
+    _defaults:
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_empty_instanceof.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_empty_instanceof.yml
new file mode 100644
index 000000000..2c8ce09ff
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_empty_instanceof.yml
@@ -0,0 +1,2 @@
+services:
+    _instanceof:
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_format.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_format.yml
new file mode 100644
index 000000000..1f58cac6a
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_format.yml
@@ -0,0 +1,2 @@
+parameters:
+	FOO: bar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_import.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_import.yml
new file mode 100644
index 000000000..2dbbcbf26
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_import.yml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: ~ }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_imports.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_imports.yml
new file mode 100644
index 000000000..1ce9d57c6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_imports.yml
@@ -0,0 +1,2 @@
+imports:
+    foo:bar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_parameters.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_parameters.yml
new file mode 100644
index 000000000..bbd13ac0b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_parameters.yml
@@ -0,0 +1,2 @@
+parameters:
+    foo:bar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_service.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_service.yml
new file mode 100644
index 000000000..811af3c0e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_service.yml
@@ -0,0 +1,2 @@
+services:
+    foo: bar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_services.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_services.yml
new file mode 100644
index 000000000..cfbf17ce5
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_services.yml
@@ -0,0 +1 @@
+services: foo
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_types1.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_types1.yml
new file mode 100644
index 000000000..891e01497
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_types1.yml
@@ -0,0 +1,5 @@
+services:
+    foo_service:
+        class:            FooClass
+        # types is not an array
+        autowiring_types: 1
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_types2.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_types2.yml
new file mode 100644
index 000000000..fb1d53e15
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bad_types2.yml
@@ -0,0 +1,5 @@
+services:
+    foo_service:
+        class:            FooClass
+        # autowiring_types is not a string
+        autowiring_types: [ 1 ]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag1.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag1.yml
new file mode 100644
index 000000000..14536fdb3
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag1.yml
@@ -0,0 +1,5 @@
+services:
+    foo_service:
+        class:    FooClass
+        # tags is not an array
+        tags:     string
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag2.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag2.yml
new file mode 100644
index 000000000..90288144c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag2.yml
@@ -0,0 +1,6 @@
+services:
+    foo_service:
+        class:    FooClass
+        tags:
+          # tag is missing the name key
+          foo_tag:   { foo: bar }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag3.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag3.yml
new file mode 100644
index 000000000..72ec4e8f0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/badtag3.yml
@@ -0,0 +1,6 @@
+services:
+    foo_service:
+        class:    FooClass
+        tags:
+          # tag-attribute is not a scalar
+          - { name: foo, bar: { foo: foo, bar: bar } }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bar/services.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bar/services.yml
new file mode 100644
index 000000000..0f846f5f7
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/bar/services.yml
@@ -0,0 +1,4 @@
+services:
+    AppBundle\Foo:
+        arguments:
+            - !service {class: AppBundle\Bar }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/class_from_id.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/class_from_id.yml
new file mode 100644
index 000000000..33f0b2ea6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/class_from_id.yml
@@ -0,0 +1,3 @@
+services:
+    Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass:
+      autowire: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/defaults_bindings.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/defaults_bindings.yml
new file mode 100644
index 000000000..ca5e5048d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/defaults_bindings.yml
@@ -0,0 +1,11 @@
+services:
+    _defaults:
+        bind:
+            $quz: value
+            $foo: [value]
+
+    bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Bar
+
+    foo:
+        class: stdClass
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/defaults_bindings2.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/defaults_bindings2.yml
new file mode 100644
index 000000000..01fc5af62
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/defaults_bindings2.yml
@@ -0,0 +1,7 @@
+services:
+    _defaults:
+        bind:
+            $quz: overridden
+
+    bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Bar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/foo/services.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/foo/services.yml
new file mode 100644
index 000000000..76eee552f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/foo/services.yml
@@ -0,0 +1,4 @@
+services:
+    AppBundle\Hello:
+        arguments:
+            - !service {class: AppBundle\World}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/_child.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/_child.yml
new file mode 100644
index 000000000..89d8b9144
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/_child.yml
@@ -0,0 +1,4 @@
+services:
+    child_service:
+        class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
+        parent: parent_service
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/expected.yml
new file mode 100644
index 000000000..ca08caad6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/expected.yml
@@ -0,0 +1,10 @@
+services:
+    child_service_expected:
+        class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
+        # the parent has autoconfigure true, but that does not cascade to the child
+        autoconfigure: false
+        # an autoconfigured "instanceof" is setup for IntegrationTestStub
+        # but its calls are NOT added, because the class was only
+        # set on the parent, not the child
+        #calls:
+        #    - [enableSummer, [true]]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/main.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/main.yml
new file mode 100644
index 000000000..02533bf0f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_child_not_applied/main.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: _child.yml }
+
+services:
+    parent_service:
+        autoconfigure: true
+        abstract: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/_child.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/_child.yml
new file mode 100644
index 000000000..5319c2045
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/_child.yml
@@ -0,0 +1,3 @@
+services:
+    child_service:
+        parent: parent_service
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/expected.yml
new file mode 100644
index 000000000..c1dca0763
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/expected.yml
@@ -0,0 +1,5 @@
+services:
+    child_service_expected:
+        class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
+        # autoconfigure is set on the parent, but not on the child
+        autoconfigure: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/main.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/main.yml
new file mode 100644
index 000000000..ab9877d16
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child/main.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: _child.yml }
+
+services:
+    parent_service:
+        class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
+        autoconfigure: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/_child.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/_child.yml
new file mode 100644
index 000000000..5319c2045
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/_child.yml
@@ -0,0 +1,3 @@
+services:
+    child_service:
+        parent: parent_service
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/expected.yml
new file mode 100644
index 000000000..02cf0037e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/expected.yml
@@ -0,0 +1,6 @@
+services:
+    child_service_expected:
+        class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
+        # from an autoconfigured "instanceof" applied to parent class
+        # but NOT inherited down to child
+        # tags: [from_autoconfigure]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/main.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/main.yml
new file mode 100644
index 000000000..ab9877d16
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/autoconfigure_parent_child_tags/main.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: _child.yml }
+
+services:
+    parent_service:
+        class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
+        autoconfigure: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/child_parent/expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/child_parent/expected.yml
new file mode 100644
index 000000000..54cd91c20
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/child_parent/expected.yml
@@ -0,0 +1,9 @@
+services:
+    # child_service in the end should be identical to this
+    child_service_expected:
+        class: stdClass
+        autowire: false
+        public: true
+        lazy: true
+        # ONLY the child tag, the parent tag does not inherit
+        tags: [from_child]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/child_parent/main.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/child_parent/main.yml
new file mode 100644
index 000000000..edaa3a3b4
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/child_parent/main.yml
@@ -0,0 +1,13 @@
+services:
+    parent_service:
+        abstract: true
+        lazy: true
+        autowire: false
+        public: false
+        tags: [from_parent]
+
+    child_service:
+        class: stdClass
+        parent: parent_service
+        public: true
+        tags: [from_child]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_child_tags/expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_child_tags/expected.yml
new file mode 100644
index 000000000..cb36636e0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_child_tags/expected.yml
@@ -0,0 +1,8 @@
+services:
+    child_service_expected:
+        class: stdClass
+        # set explicitly on child (not overridden by parent)
+        autoconfigure: false
+        # set explicitly on child
+        autowire: true
+        tags: [from_defaults]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_child_tags/main.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_child_tags/main.yml
new file mode 100644
index 000000000..b5dc66ff0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_child_tags/main.yml
@@ -0,0 +1,18 @@
+services:
+    _defaults:
+        autoconfigure: true
+        autowire: true
+        tags: [from_defaults]
+
+    parent_service:
+        class: stdClass
+        # will not override child
+        autoconfigure: true
+        # parent definitions are not applied to children
+        tags: [from_parent]
+
+    child_service:
+        parent: parent_service
+        # _defaults is ok because these are explicitly set
+        autoconfigure: false
+        autowire: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/expected.yml
new file mode 100644
index 000000000..e9161dccf
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/expected.yml
@@ -0,0 +1,26 @@
+services:
+    # main_service should look like this in the end
+    main_service_expected:
+        class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
+        # _instanceof overrides _defaults
+        autowire: false
+        # inherited from _defaults
+        autoconfigure: true
+        # from _instanceof
+        shared: false
+        # service definition overrides _instanceof
+        public: true
+
+        tags:
+            - { name: foo_tag, tag_option: from_service }
+            # these 2 are from instanceof
+            - { name: foo_tag, tag_option: from_instanceof }
+            - { name: bar_tag }
+            - { name: from_defaults }
+        # calls from instanceof are kept, but this comes later
+        calls:
+            # first call is from instanceof
+            - [setSunshine, [bright]]
+            #
+            - [enableSummer, [true]]
+            - [setSunshine, [warm]]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/main.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/main.yml
new file mode 100644
index 000000000..406a351d1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/main.yml
@@ -0,0 +1,30 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
+        tags: [from_defaults]
+
+    _instanceof:
+        Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStubParent:
+            autowire: false
+            shared: false
+            public: false
+            tags:
+                - { name: foo_tag, tag_option: from_instanceof }
+            calls:
+                - [setSunshine, [bright]]
+
+        Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub:
+            tags:
+                - { name: bar_tag }
+
+    main_service:
+        class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
+        public: true
+        tags:
+            - { name: foo_tag, tag_option: from_service }
+        # calls from instanceof are kept, but this comes later
+        calls:
+            - [enableSummer, [true]]
+            - [setSunshine, [warm]]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/_child.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/_child.yml
new file mode 100644
index 000000000..86ef83c26
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/_child.yml
@@ -0,0 +1,4 @@
+services:
+    # loaded here to avoid defaults in other file
+    child_service:
+        parent: parent_service
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/expected.yml
new file mode 100644
index 000000000..012672ff8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/expected.yml
@@ -0,0 +1,6 @@
+services:
+    child_service_expected:
+        class: stdClass
+        # _defaults is applied to the parent, but autoconfigure: true
+        # does not cascade to the child
+        autoconfigure: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/main.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/main.yml
new file mode 100644
index 000000000..8b90b4e98
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/defaults_parent_child/main.yml
@@ -0,0 +1,9 @@
+imports:
+    - { resource: _child.yml }
+
+services:
+    _defaults:
+        autoconfigure: true
+
+    parent_service:
+        class: stdClass
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/_child.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/_child.yml
new file mode 100644
index 000000000..86ef83c26
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/_child.yml
@@ -0,0 +1,4 @@
+services:
+    # loaded here to avoid defaults in other file
+    child_service:
+        parent: parent_service
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/expected.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/expected.yml
new file mode 100644
index 000000000..074ed01d0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/expected.yml
@@ -0,0 +1,7 @@
+services:
+    child_service_expected:
+        class: stdClass
+        # applied to _instanceof of parent
+        autowire: true
+        # from _instanceof, applies to parent, but does NOT inherit to here
+        # tags: [from_instanceof]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/main.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/main.yml
new file mode 100644
index 000000000..44cf9b004
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/integration/instanceof_parent_child/main.yml
@@ -0,0 +1,11 @@
+imports:
+    - { resource: _child.yml }
+
+services:
+    _instanceof:
+        stdClass:
+            autowire: true
+            tags: [from_instanceof]
+
+    parent_service:
+        class: stdClass
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/legacy_invalid_alias_definition.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/legacy_invalid_alias_definition.yml
new file mode 100644
index 000000000..00c011c1d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/legacy_invalid_alias_definition.yml
@@ -0,0 +1,5 @@
+services:
+    foo:
+        alias: bar
+        factory: foo
+        parent: quz
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/legacy_invalid_definition.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/legacy_invalid_definition.yml
new file mode 100644
index 000000000..8487e854d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/legacy_invalid_definition.yml
@@ -0,0 +1,10 @@
+services:
+    # This definition is valid and should not raise any deprecation notice
+    foo:
+        class: stdClass
+        arguments: [ 'foo', 'bar' ]
+
+    # This definition is invalid and must raise a deprecation notice
+    bar:
+        class: stdClass
+        private: true        # the "private" keyword is invalid
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/nonvalid1.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/nonvalid1.yml
new file mode 100644
index 000000000..4eddb872b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/nonvalid1.yml
@@ -0,0 +1,2 @@
+foo:
+  bar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/nonvalid2.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/nonvalid2.yml
new file mode 100644
index 000000000..c508d5366
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/nonvalid2.yml
@@ -0,0 +1 @@
+false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/null_config.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/null_config.yml
new file mode 100644
index 000000000..e88e12e2f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/null_config.yml
@@ -0,0 +1 @@
+project: ~
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services1.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services1.yml
new file mode 100644
index 000000000..071742f2e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services1.yml
@@ -0,0 +1,11 @@
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    Psr\Container\ContainerInterface:
+        alias: service_container
+        public: false
+    Symfony\Component\DependencyInjection\ContainerInterface:
+        alias: service_container
+        public: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services10.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services10.yml
new file mode 100644
index 000000000..c66084cdb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services10.yml
@@ -0,0 +1,9 @@
+parameters:
+    project.parameter.foo: BAR
+
+services:
+    project.service.foo:
+        class: BAR
+
+project:
+    test: '%project.parameter.foo%'
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services11.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services11.yml
new file mode 100644
index 000000000..40126f005
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services11.yml
@@ -0,0 +1 @@
+foobarfoobar: {}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services13.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services13.yml
new file mode 100644
index 000000000..d52d355c2
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services13.yml
@@ -0,0 +1,3 @@
+# used to test imports in XML
+parameters:
+    imported_from_yaml: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services14.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services14.yml
new file mode 100644
index 000000000..4c188c5fb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services14.yml
@@ -0,0 +1,3 @@
+services:
+    factory: { class: FooBarClass, factory: baz:getClass}
+    factory_with_static_call: { class: FooBarClass, factory: FooBacFactory::createFooBar}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services2.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services2.yml
new file mode 100644
index 000000000..e05d69d77
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services2.yml
@@ -0,0 +1,13 @@
+parameters:
+    foo: bar
+    values:
+        - true
+        - false
+        - 0
+        - 1000.3
+        - !php/const PHP_INT_MAX
+    bar: foo
+    escape: '@@escapeme'
+    foo_bar: '@foo_bar'
+    mixedcase:
+        MixedCaseKey: value
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services21.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services21.yml
new file mode 100644
index 000000000..a2617c168
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services21.yml
@@ -0,0 +1,15 @@
+services:
+    manager:
+        class: UserManager
+        arguments:
+          - true
+        calls:
+          - method: setLogger
+            arguments:
+              - '@logger'
+          - method: setClass
+            arguments:
+              - User
+        tags:
+          - name: manager
+            alias: user
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services22.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services22.yml
new file mode 100644
index 000000000..55d015bae
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services22.yml
@@ -0,0 +1,8 @@
+services:
+    foo_service:
+        class:            FooClass
+        autowiring_types: [ Foo, Bar ]
+
+    baz_service:
+        class:            Baz
+        autowiring_types: Foo
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services23.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services23.yml
new file mode 100644
index 000000000..1984c1771
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services23.yml
@@ -0,0 +1,4 @@
+services:
+    bar_service:
+        class:    BarClass
+        autowire: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services24.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services24.yml
new file mode 100644
index 000000000..f59354e3e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services24.yml
@@ -0,0 +1,16 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Foo
+        public: true
+        autowire: true
+    Psr\Container\ContainerInterface:
+        alias: service_container
+        public: false
+    Symfony\Component\DependencyInjection\ContainerInterface:
+        alias: service_container
+        public: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services26.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services26.yml
new file mode 100644
index 000000000..a1f235a7c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services26.yml
@@ -0,0 +1,22 @@
+parameters:
+    project_dir: '/foo/bar'
+    env(FOO): foo
+    env(DB): 'sqlite://%%project_dir%%/var/data.db'
+    bar: '%env(FOO)%'
+    baz: '%env(int:Baz)%'
+    json: '%env(json:file:json_file)%'
+    db_dsn: '%env(resolve:DB)%'
+
+services:
+    test:
+        public: true
+        class: '%env(FOO)%'
+        arguments:
+            - '%env(Bar)%'
+            - 'foo%bar%baz'
+            - '%baz%'
+    bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Bar
+        public: true
+        bind:
+            $quz: '%env(QUZ)%'
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services28.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services28.yml
new file mode 100644
index 000000000..fd0ce4cf9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services28.yml
@@ -0,0 +1,34 @@
+services:
+    _defaults:
+        public: false
+        autowire: true
+        tags:
+            - name: foo
+
+    Acme\Foo: ~
+
+    with_defaults:
+        class: Foo
+
+    with_null:
+        class: Foo
+        public: true
+        autowire: ~
+
+    no_defaults:
+        class: Foo
+        public: true
+        autowire: false
+        tags: []
+
+    with_defaults_aliased:
+        alias: with_defaults
+
+    with_defaults_aliased_short: '@with_defaults'
+
+    Acme\WithShortCutArgs: [foo]
+
+    child_def:
+        parent: with_defaults
+        public: true
+        autowire: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services3.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services3.yml
new file mode 100644
index 000000000..0e92cdf50
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services3.yml
@@ -0,0 +1,5 @@
+parameters:
+    foo: foo
+    values:
+        - true
+        - false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services31_invalid_tags.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services31_invalid_tags.yml
new file mode 100644
index 000000000..a6061a90e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services31_invalid_tags.yml
@@ -0,0 +1,6 @@
+services:
+    _defaults:
+        tags: ['foo']
+
+    Foo\Bar:
+        tags: invalid
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services4.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services4.yml
new file mode 100644
index 000000000..073f55547
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services4.yml
@@ -0,0 +1,8 @@
+imports:
+    - services2.yml
+    - { resource: services3.yml }
+    - { resource: "../php/simple.php" }
+    - { resource: "../ini/parameters.ini", class: Symfony\Component\DependencyInjection\Loader\IniFileLoader }
+    - { resource: "../ini/parameters2.ini" }
+    - { resource: "../xml/services13.xml" }
+    - { resource: "../xml/xml_with_wrong_ext.php", type: xml }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services4_bad_import.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services4_bad_import.yml
new file mode 100644
index 000000000..f7089fc4d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services4_bad_import.yml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: foo_fake.yml, ignore_errors: true }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
new file mode 100644
index 000000000..1ee6c6ec7
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
@@ -0,0 +1,43 @@
+services:
+    foo: { class: FooClass }
+    baz: { class: BazClass }
+    not_shared: { class: FooClass, shared: false }
+    file: { class: FooClass, file: '%path%/foo.php' }
+    arguments: { class: FooClass, arguments: [foo, '@foo', [true, false]] }
+    configurator1: { class: FooClass, configurator: sc_configure }
+    configurator2: { class: FooClass, configurator: ['@baz', configure] }
+    configurator3: { class: FooClass, configurator: [BazClass, configureStatic] }
+    method_call1:
+        class: FooClass
+        calls:
+            - [ setBar, [] ]
+            - [ setBar ]
+            - [ setBar, ['@=service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")'] ]
+    method_call2:
+        class: FooClass
+        calls:
+            - [ setBar, [ foo, '@foo', [true, false] ] ]
+    request:
+        class: Request
+        synthetic: true
+        lazy: true
+    decorator_service:
+        decorates: decorated
+    decorator_service_with_name:
+        decorates: decorated
+        decoration_inner_name: decorated.pif-pouf
+    decorator_service_with_name_and_priority:
+        decorates: decorated
+        decoration_inner_name: decorated.pif-pouf
+        decoration_priority: 5
+    new_factory1: { class: FooBarClass, factory: factory}
+    new_factory2: { class: FooBarClass, factory: ['@baz', getClass]}
+    new_factory3: { class: FooBarClass, factory: [BazClass, getInstance]}
+    new_factory4: { class: BazClass, factory: [~, getInstance]}
+    Acme\WithShortCutArgs: [foo, '@baz']
+    alias_for_foo: '@foo'
+    another_alias_for_foo:
+        alias: foo
+        public: false
+    another_third_alias_for_foo:
+        alias: foo
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services7.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services7.yml
new file mode 100644
index 000000000..09064f200
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services7.yml
@@ -0,0 +1,2 @@
+services:
+    foo: { class: BarClass }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services8.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services8.yml
new file mode 100644
index 000000000..002b1d4bc
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services8.yml
@@ -0,0 +1,29 @@
+parameters:
+    foo: '%baz%'
+    baz: bar
+    bar: 'foo is %%foo bar'
+    escape: '@@escapeme'
+    values: [true, false, null, 0, 1000.3, 'true', 'false', 'null']
+    null string: 'null'
+    string of digits: '123'
+    string of digits prefixed with minus character: '-123'
+    true string: 'true'
+    false string: 'false'
+    binary number string: '0b0110'
+    numeric string: '-1.2E2'
+    hexadecimal number string: '0xFF'
+    float string: '10100.1'
+    positive float string: '+10100.1'
+    negative float string: '-10100.1'
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    Psr\Container\ContainerInterface:
+        alias: service_container
+        public: false
+    Symfony\Component\DependencyInjection\ContainerInterface:
+        alias: service_container
+        public: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services9.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services9.yml
new file mode 100644
index 000000000..2501ddcc1
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services9.yml
@@ -0,0 +1,163 @@
+parameters:
+    baz_class: BazClass
+    foo_class: Bar\FooClass
+    foo: bar
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Bar\FooClass
+        tags:
+            - { name: foo, foo: foo }
+            - { name: foo, bar: bar, baz: baz }
+        arguments: [foo, '@foo.baz', { '%foo%': 'foo is %foo%', foobar: '%foo%' }, true, '@service_container']
+        properties: { foo: bar, moo: '@foo.baz', qux: { '%foo%': 'foo is %foo%', foobar: '%foo%' } }
+        calls:
+            - [setBar, ['@bar']]
+            - [initialize, {  }]
+
+        factory: [Bar\FooClass, getInstance]
+        configurator: sc_configure
+        public: true
+    foo.baz:
+        class: '%baz_class%'
+        factory: ['%baz_class%', getInstance]
+        configurator: ['%baz_class%', configureStatic1]
+        public: true
+    bar:
+        class: Bar\FooClass
+        arguments: [foo, '@foo.baz', '%foo_bar%']
+        configurator: ['@foo.baz', configure]
+        public: true
+    foo_bar:
+        class: '%foo_class%'
+        shared: false
+        arguments: ['@deprecated_service']
+        public: true
+    method_call1:
+        class: Bar\FooClass
+        file: '%path%foo.php'
+        calls:
+            - [setBar, ['@foo']]
+            - [setBar, ['@?foo2']]
+            - [setBar, ['@?foo3']]
+            - [setBar, ['@?foobaz']]
+            - [setBar, ['@=service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")']]
+        public: true
+
+    foo_with_inline:
+        class: Foo
+        calls:
+            - [setBar, ['@inlined']]
+        public: true
+
+    inlined:
+        class: Bar
+        public: false
+        properties: { pub: pub }
+        calls:
+            - [setBaz, ['@baz']]
+
+    baz:
+        class: Baz
+        calls:
+            - [setFoo, ['@foo_with_inline']]
+        public: true
+
+    request:
+        class: Request
+        synthetic: true
+        public: true
+    configurator_service:
+        class: ConfClass
+        public: false
+        calls:
+            - [setFoo, ['@baz']]
+
+    configured_service:
+        class: stdClass
+        configurator: ['@configurator_service', configureStdClass]
+        public: true
+    configurator_service_simple:
+        class: ConfClass
+        public: false
+        arguments: ['bar']
+    configured_service_simple:
+        class: stdClass
+        configurator: ['@configurator_service_simple', configureStdClass]
+        public: true
+    decorated:
+        class: stdClass
+        public: true
+    decorator_service:
+        class: stdClass
+        decorates: decorated
+        public: true
+    decorator_service_with_name:
+        class: stdClass
+        decorates: decorated
+        decoration_inner_name: decorated.pif-pouf
+        public: true
+    deprecated_service:
+        class: stdClass
+        deprecated: The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.
+        public: true
+    new_factory:
+        class: FactoryClass
+        public: false
+        properties: { foo: bar }
+    factory_service:
+        class: Bar
+        factory: ['@foo.baz', getInstance]
+        public: true
+    new_factory_service:
+        class: FooBarBaz
+        properties: { foo: bar }
+        factory: ['@new_factory', getInstance]
+        public: true
+    service_from_static_method:
+        class: Bar\FooClass
+        factory: [Bar\FooClass, getInstance]
+        public: true
+    factory_simple:
+        class: SimpleFactoryClass
+        deprecated: The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.
+        public: false
+        arguments: ['foo']
+    factory_service_simple:
+        class: Bar
+        factory: ['@factory_simple', getInstance]
+        public: true
+    lazy_context:
+        class: LazyContext
+        arguments: [!iterator {'k1': '@foo.baz', 'k2': '@service_container'}, !iterator []]
+        public: true
+    lazy_context_ignore_invalid_ref:
+        class: LazyContext
+        arguments: [!iterator ['@foo.baz', '@?invalid'], !iterator []]
+        public: true
+    tagged_iterator_foo:
+        class: Bar
+        tags:
+            - { name: foo }
+        public: false
+    tagged_iterator:
+        class: Bar
+        arguments:
+            - !tagged foo
+        public: true
+    Psr\Container\ContainerInterface:
+        alias: service_container
+        public: false
+    Symfony\Component\DependencyInjection\ContainerInterface:
+        alias: service_container
+        public: false
+    alias_for_foo:
+        alias: 'foo'
+        public: true
+    alias_for_alias:
+        alias: 'foo'
+        public: true
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_adawson.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_adawson.yml
new file mode 100644
index 000000000..2a26f38a8
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_adawson.yml
@@ -0,0 +1,28 @@
+services:
+    App\Db:
+        public: true
+        properties:
+            schema: '@App\Schema'
+
+    App\Bus:
+        public: true
+        arguments: ['@App\Db']
+        properties:
+            handler1: '@App\Handler1'
+            handler2: '@App\Handler2'
+
+    App\Handler1:
+        ['@App\Db', '@App\Schema', '@App\Processor']
+
+    App\Handler2:
+        ['@App\Db', '@App\Schema', '@App\Processor']
+
+    App\Processor:
+        ['@App\Registry', '@App\Db']
+
+    App\Registry:
+        properties:
+            processor: ['@App\Db', '@App\Bus']
+
+    App\Schema:
+        arguments: ['@App\Db']
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_autoconfigure.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_autoconfigure.yml
new file mode 100644
index 000000000..809c9f47d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_autoconfigure.yml
@@ -0,0 +1,9 @@
+
+services:
+    _defaults:
+        autoconfigure: true
+
+    use_defaults_settings: ~
+
+    override_defaults_settings_to_false:
+        autoconfigure: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_autoconfigure_with_parent.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_autoconfigure_with_parent.yml
new file mode 100644
index 000000000..c6e308019
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_autoconfigure_with_parent.yml
@@ -0,0 +1,8 @@
+services:
+    parent_service:
+        class: stdClass
+
+    child_service:
+        class: stdClass
+        autoconfigure: true
+        parent: parent_service
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_bindings.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_bindings.yml
new file mode 100644
index 000000000..48ad04040
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_bindings.yml
@@ -0,0 +1,16 @@
+services:
+    _defaults:
+        bind:
+            NonExistent: ~
+            $quz: quz
+            $factory: factory
+
+    bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Bar
+        autowire: true
+        bind:
+            Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface: '@Symfony\Component\DependencyInjection\Tests\Fixtures\Bar'
+            $foo: [ ~ ]
+
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Bar:
+        factory: [ ~, 'create' ]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_configurator_short_syntax.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_configurator_short_syntax.yml
new file mode 100644
index 000000000..cc5c2be57
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_configurator_short_syntax.yml
@@ -0,0 +1,8 @@
+services:
+    foo_bar:
+        class: FooBarClass
+        configurator: foo_bar_configurator:configure
+
+    foo_bar_with_static_call:
+        class: FooBarClass
+        configurator: FooBarConfigurator::configureFooBar
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_deep_graph.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_deep_graph.yml
new file mode 100644
index 000000000..f16329aef
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_deep_graph.yml
@@ -0,0 +1,24 @@
+
+services:
+    foo:
+        class: Symfony\Component\DependencyInjection\Tests\Dumper\FooForDeepGraph
+        public: true
+        arguments:
+            - '@bar'
+            - !service
+                class: stdClass
+                properties:
+                    p2: !service
+                        class: stdClass
+                        properties:
+                            p3: !service
+                                class: stdClass
+
+    bar:
+        class: stdClass
+        public: true
+        properties:
+            p5: !service
+                class: stdClass
+                arguments: ['@foo']
+
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_defaults_with_parent.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_defaults_with_parent.yml
new file mode 100644
index 000000000..28dec4ce9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_defaults_with_parent.yml
@@ -0,0 +1,10 @@
+services:
+    _defaults:
+        autowire: true
+
+    parent_service:
+        class: stdClass
+
+    child_service:
+        class: stdClass
+        parent: parent_service
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_dump_load.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_dump_load.yml
new file mode 100644
index 000000000..8f3e153af
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_dump_load.yml
@@ -0,0 +1,15 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        synthetic: true
+    foo:
+        autoconfigure: true
+        abstract: true
+        arguments: ['@!bar']
+    Psr\Container\ContainerInterface:
+        alias: service_container
+        public: false
+    Symfony\Component\DependencyInjection\ContainerInterface:
+        alias: service_container
+        public: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_inline.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_inline.yml
new file mode 100644
index 000000000..b985cabd9
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_inline.yml
@@ -0,0 +1,16 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Class1
+        public: true
+        arguments: [!service { class: Class2, arguments: [!service { class: Class2 }] }]
+    Psr\Container\ContainerInterface:
+        alias: service_container
+        public: false
+    Symfony\Component\DependencyInjection\ContainerInterface:
+        alias: service_container
+        public: false
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_instanceof.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_instanceof.yml
new file mode 100644
index 000000000..a58cc079e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_instanceof.yml
@@ -0,0 +1,11 @@
+services:
+    _instanceof:
+        Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface:
+            autowire: true
+            lazy: true
+            tags:
+                - { name: foo }
+                - { name: bar }
+
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Bar: ~
+    Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface: '@Symfony\Component\DependencyInjection\Tests\Fixtures\Bar'
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_instanceof_with_parent.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_instanceof_with_parent.yml
new file mode 100644
index 000000000..fb21cdf2f
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_instanceof_with_parent.yml
@@ -0,0 +1,11 @@
+services:
+    _instanceof:
+        FooInterface:
+            autowire: true
+
+    parent_service:
+        class: stdClass
+
+    child_service:
+        class: stdClass
+        parent: parent_service
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_legacy_privates.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_legacy_privates.yml
new file mode 100644
index 000000000..0fd20446e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_legacy_privates.yml
@@ -0,0 +1,27 @@
+services:
+    _defaults: {public: true}
+
+    foo: {class: stdClass, public: false}
+
+    bar:
+        class: stdClass
+        arguments: [ '@private_not_inlined' ]
+
+    private: {class: stdClass, public: false}
+    decorated_private: {class: stdClass}
+    decorated_private_alias: '@foo'
+    alias_to_private: '@private'
+    private_alias: {alias: foo, public: false}
+
+    private_decorator:
+        class: stdClass
+        decorates: 'decorated_private'
+
+    private_alias_decorator:
+        class: stdClass
+        decorates: 'decorated_private_alias'
+
+    private_not_inlined: {class: stdClass, public: false}
+    private_not_removed: {class: stdClass, public: false}
+
+    public_child: {parent: private, public: true}
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_named_args.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_named_args.yml
new file mode 100644
index 000000000..97e310148
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_named_args.yml
@@ -0,0 +1,10 @@
+services:
+    Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy: { 0: ~, $apiKey: ABCD }
+
+    another_one:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy
+        arguments:
+            $apiKey: ABCD
+            Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass: ~
+        calls:
+            - ['setApiKey', { $apiKey: '123' }]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype.yml
new file mode 100644
index 000000000..8c0b202aa
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype.yml
@@ -0,0 +1,4 @@
+services:
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\:
+        resource: ../Prototype
+        exclude: '../Prototype/{OtherDir,BadClasses}'
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype_namespace.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype_namespace.yml
new file mode 100644
index 000000000..5c30d011e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype_namespace.yml
@@ -0,0 +1,10 @@
+services:
+    dir1:
+        namespace: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\
+        resource: ../Prototype/OtherDir/*/Dir1
+        tags: [foo]
+
+    dir2:
+        namespace: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\
+        resource: ../Prototype/OtherDir/*/Dir2
+        tags: [bar]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype_namespace_without_resource.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype_namespace_without_resource.yml
new file mode 100644
index 000000000..abd370ef0
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_prototype_namespace_without_resource.yml
@@ -0,0 +1,4 @@
+services:
+    dir1:
+        namespace: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\
+        tags: [foo]
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_underscore.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_underscore.yml
new file mode 100644
index 000000000..0cdbf9032
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/services_underscore.yml
@@ -0,0 +1,3 @@
+services:
+    _foo:
+        class: Foo
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_empty_string.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_empty_string.yml
new file mode 100644
index 000000000..0ea5f53da
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_empty_string.yml
@@ -0,0 +1,6 @@
+services:
+    foo_service:
+        class:    FooClass
+        tags:
+          # tag name is an empty string
+          - { name: '', foo: bar }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_no_string.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_no_string.yml
new file mode 100644
index 000000000..f24cafd22
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_no_string.yml
@@ -0,0 +1,6 @@
+services:
+    foo_service:
+        class:    FooClass
+        tags:
+          # tag name is not a string
+          - { name: [], foo: bar }
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_only.yml b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_only.yml
new file mode 100644
index 000000000..90180b0bb
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/tag_name_only.yml
@@ -0,0 +1,5 @@
+services:
+    foo_service:
+        class: FooClass
+        tags:
+          - foo
diff --git a/lib/symfony/dependency-injection/Tests/Fixtures/yaml/yaml_with_wrong_ext.ini b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/yaml_with_wrong_ext.ini
new file mode 100644
index 000000000..1395458bf
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Fixtures/yaml/yaml_with_wrong_ext.ini
@@ -0,0 +1,2 @@
+parameters:
+    with_wrong_ext: from yaml
diff --git a/lib/symfony/dependency-injection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php b/lib/symfony/dependency-injection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
new file mode 100644
index 000000000..7f757297b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\LazyProxy\Instantiator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
+
+/**
+ * Tests for {@see \Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator}.
+ *
+ * @author Marco Pivetta <ocramius@gmail.com>
+ */
+class RealServiceInstantiatorTest extends TestCase
+{
+    public function testInstantiateProxy()
+    {
+        $instantiator = new RealServiceInstantiator();
+        $instance = new \stdClass();
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $callback = function () use ($instance) {
+            return $instance;
+        };
+
+        $this->assertSame($instance, $instantiator->instantiateProxy($container, new Definition(), 'foo', $callback));
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/LazyProxy/PhpDumper/NullDumperTest.php b/lib/symfony/dependency-injection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
new file mode 100644
index 000000000..5ae149324
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/LazyProxy/PhpDumper/NullDumperTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\LazyProxy\PhpDumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\NullDumper;
+
+/**
+ * Tests for {@see \Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\NullDumper}.
+ *
+ * @author Marco Pivetta <ocramius@gmail.com>
+ */
+class NullDumperTest extends TestCase
+{
+    public function testNullDumper()
+    {
+        $dumper = new NullDumper();
+        $definition = new Definition('stdClass');
+
+        $this->assertFalse($dumper->isProxyCandidate($definition));
+        $this->assertSame('', $dumper->getProxyFactoryCode($definition, 'foo', '(false)'));
+        $this->assertSame('', $dumper->getProxyCode($definition));
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/ClosureLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/ClosureLoaderTest.php
new file mode 100644
index 000000000..125e09b6c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/ClosureLoaderTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
+
+class ClosureLoaderTest extends TestCase
+{
+    public function testSupports()
+    {
+        $loader = new ClosureLoader(new ContainerBuilder());
+
+        $this->assertTrue($loader->supports(function ($container) {}), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
+    }
+
+    public function testLoad()
+    {
+        $loader = new ClosureLoader($container = new ContainerBuilder());
+
+        $loader->load(function ($container) {
+            $container->setParameter('foo', 'foo');
+        });
+
+        $this->assertEquals('foo', $container->getParameter('foo'), '->load() loads a \Closure resource');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/DirectoryLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/DirectoryLoaderTest.php
new file mode 100644
index 000000000..b4f969a0e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/DirectoryLoaderTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
+use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+class DirectoryLoaderTest extends TestCase
+{
+    private static $fixturesPath;
+
+    private $container;
+    private $loader;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
+    }
+
+    protected function setUp()
+    {
+        $locator = new FileLocator(self::$fixturesPath);
+        $this->container = new ContainerBuilder();
+        $this->loader = new DirectoryLoader($this->container, $locator);
+        $resolver = new LoaderResolver([
+            new PhpFileLoader($this->container, $locator),
+            new IniFileLoader($this->container, $locator),
+            new YamlFileLoader($this->container, $locator),
+            $this->loader,
+        ]);
+        $this->loader->setResolver($resolver);
+    }
+
+    public function testDirectoryCanBeLoadedRecursively()
+    {
+        $this->loader->load('directory/');
+        $this->assertEquals(['ini' => 'ini', 'yaml' => 'yaml', 'php' => 'php'], $this->container->getParameterBag()->all(), '->load() takes a single directory');
+    }
+
+    public function testImports()
+    {
+        $this->loader->resolve('directory/import/import.yml')->load('directory/import/import.yml');
+        $this->assertEquals(['ini' => 'ini', 'yaml' => 'yaml'], $this->container->getParameterBag()->all(), '->load() takes a single file that imports a directory');
+    }
+
+    public function testExceptionIsRaisedWhenDirectoryDoesNotExist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The file "foo" does not exist (in:');
+        $this->loader->load('foo/');
+    }
+
+    public function testSupports()
+    {
+        $loader = new DirectoryLoader(new ContainerBuilder(), new FileLocator());
+
+        $this->assertTrue($loader->supports('directory/'), '->supports("directory/") returns true');
+        $this->assertTrue($loader->supports('directory/', 'directory'), '->supports("directory/", "directory") returns true');
+        $this->assertFalse($loader->supports('directory'), '->supports("directory") returns false');
+        $this->assertTrue($loader->supports('directory', 'directory'), '->supports("directory", "directory") returns true');
+        $this->assertFalse($loader->supports('directory', 'foo'), '->supports("directory", "foo") returns false');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
new file mode 100644
index 000000000..ffe58a67e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
@@ -0,0 +1,239 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Loader\FileLoader;
+use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingParent;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\FooInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\AnotherSub\DeeperBaz;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\Baz;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\BarInterface;
+
+class FileLoaderTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/../');
+    }
+
+    public function testImportWithGlobPattern()
+    {
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath));
+
+        $resolver = new LoaderResolver([
+            new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
+            new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
+            new PhpFileLoader($container, new FileLocator(self::$fixturesPath.'/php')),
+            new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
+        ]);
+
+        $loader->setResolver($resolver);
+        $loader->import('{F}ixtures/{xml,yaml}/services2.{yml,xml}');
+
+        $actual = $container->getParameterBag()->all();
+        $expected = [
+            'a string',
+            'foo' => 'bar',
+            'values' => [
+                0,
+                'integer' => 4,
+                100 => null,
+                'true',
+                true,
+                false,
+                'on',
+                'off',
+                'float' => 1.3,
+                1000.3,
+                'a string',
+                ['foo', 'bar'],
+            ],
+            'mixedcase' => ['MixedCaseKey' => 'value'],
+            'constant' => PHP_EOL,
+            'bar' => '%foo%',
+            'escape' => '@escapeme',
+            'foo_bar' => new Reference('foo_bar'),
+        ];
+
+        $this->assertEquals(array_keys($expected), array_keys($actual), '->load() imports and merges imported files');
+    }
+
+    public function testRegisterClasses()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('sub_dir', 'Sub');
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+
+        $loader->registerClasses(new Definition(), 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\\', 'Prototype/%sub_dir%/*');
+
+        $this->assertEquals(
+            ['service_container', Bar::class],
+            array_keys($container->getDefinitions())
+        );
+        $this->assertEquals(
+            [
+                PsrContainerInterface::class,
+                ContainerInterface::class,
+                BarInterface::class,
+            ],
+            array_keys($container->getAliases())
+        );
+    }
+
+    public function testRegisterClassesWithExclude()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('other_dir', 'OtherDir');
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+
+        $loader->registerClasses(
+            new Definition(),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
+            'Prototype/*',
+            // load everything, except OtherDir/AnotherSub & Foo.php
+            'Prototype/{%other_dir%/AnotherSub,Foo.php}'
+        );
+
+        $this->assertTrue($container->has(Bar::class));
+        $this->assertTrue($container->has(Baz::class));
+        $this->assertFalse($container->has(Foo::class));
+        $this->assertFalse($container->has(DeeperBaz::class));
+
+        $this->assertEquals(
+            [
+                PsrContainerInterface::class,
+                ContainerInterface::class,
+                BarInterface::class,
+            ],
+            array_keys($container->getAliases())
+        );
+    }
+
+    public function testNestedRegisterClasses()
+    {
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+
+        $prototype = new Definition();
+        $prototype->setPublic(true)->setPrivate(true);
+        $loader->registerClasses($prototype, 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\', 'Prototype/*');
+
+        $this->assertTrue($container->has(Bar::class));
+        $this->assertTrue($container->has(Baz::class));
+        $this->assertTrue($container->has(Foo::class));
+
+        $this->assertEquals(
+            [
+                PsrContainerInterface::class,
+                ContainerInterface::class,
+                FooInterface::class,
+            ],
+            array_keys($container->getAliases())
+        );
+
+        $alias = $container->getAlias(FooInterface::class);
+        $this->assertSame(Foo::class, (string) $alias);
+        $this->assertFalse($alias->isPublic());
+        $this->assertFalse($alias->isPrivate());
+    }
+
+    public function testMissingParentClass()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('bad_classes_dir', 'BadClasses');
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+
+        $loader->registerClasses(
+            (new Definition())->setPublic(false),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\\',
+            'Prototype/%bad_classes_dir%/*'
+        );
+
+        $this->assertTrue($container->has(MissingParent::class));
+
+        $this->assertRegExp(
+            '{Class "?Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Fixtures\\\\Prototype\\\\BadClasses\\\\MissingClass"? not found}',
+            $container->getDefinition(MissingParent::class)->getErrors()[0]
+        );
+    }
+
+    public function testRegisterClassesWithBadPrefix()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Expected to find class "Symfony\\\Component\\\DependencyInjection\\\Tests\\\Fixtures\\\Prototype\\\Bar" in file ".+" while importing services from resource "Prototype\/Sub\/\*", but it was not found\! Check the namespace prefix used with the resource/');
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+
+        // the Sub is missing from namespace prefix
+        $loader->registerClasses(new Definition(), 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\', 'Prototype/Sub/*');
+    }
+
+    /**
+     * @dataProvider getIncompatibleExcludeTests
+     */
+    public function testRegisterClassesWithIncompatibleExclude($resourcePattern, $excludePattern)
+    {
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+
+        try {
+            $loader->registerClasses(
+                new Definition(),
+                'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
+                $resourcePattern,
+                $excludePattern
+            );
+        } catch (InvalidArgumentException $e) {
+            $this->assertEquals(
+                sprintf('Invalid "exclude" pattern when importing classes for "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s)', $excludePattern, $resourcePattern),
+                $e->getMessage()
+            );
+        }
+    }
+
+    public function getIncompatibleExcludeTests()
+    {
+        yield ['Prototype/*', 'yaml/*', false];
+        yield ['Prototype/OtherDir/*', 'Prototype/*', false];
+    }
+}
+
+class TestFileLoader extends FileLoader
+{
+    public function load($resource, $type = null)
+    {
+        return $resource;
+    }
+
+    public function supports($resource, $type = null)
+    {
+        return false;
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/GlobFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/GlobFileLoaderTest.php
new file mode 100644
index 000000000..74822f551
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/GlobFileLoaderTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\GlobResource;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
+
+class GlobFileLoaderTest extends TestCase
+{
+    public function testSupports()
+    {
+        $loader = new GlobFileLoader(new ContainerBuilder(), new FileLocator());
+
+        $this->assertTrue($loader->supports('any-path', 'glob'), '->supports() returns true if the resource has the glob type');
+        $this->assertFalse($loader->supports('any-path'), '->supports() returns false if the resource is not of glob type');
+    }
+
+    public function testLoadAddsTheGlobResourceToTheContainer()
+    {
+        $loader = new GlobFileLoaderWithoutImport($container = new ContainerBuilder(), new FileLocator());
+        $loader->load(__DIR__.'/../Fixtures/config/*');
+
+        $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/config', '/*', false), $container->getResources()[1]);
+    }
+}
+
+class GlobFileLoaderWithoutImport extends GlobFileLoader
+{
+    public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)
+    {
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/IniFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/IniFileLoaderTest.php
new file mode 100644
index 000000000..6f02b9ff6
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/IniFileLoaderTest.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
+
+class IniFileLoaderTest extends TestCase
+{
+    protected $container;
+    protected $loader;
+
+    protected function setUp()
+    {
+        $this->container = new ContainerBuilder();
+        $this->loader = new IniFileLoader($this->container, new FileLocator(realpath(__DIR__.'/../Fixtures/').'/ini'));
+    }
+
+    public function testIniFileCanBeLoaded()
+    {
+        $this->loader->load('parameters.ini');
+        $this->assertEquals(['foo' => 'bar', 'bar' => '%foo%'], $this->container->getParameterBag()->all(), '->load() takes a single file name as its first argument');
+    }
+
+    /**
+     * @dataProvider getTypeConversions
+     */
+    public function testTypeConversions($key, $value, $supported)
+    {
+        $this->loader->load('types.ini');
+        $parameters = $this->container->getParameterBag()->all();
+        $this->assertSame($value, $parameters[$key], '->load() converts values to PHP types');
+    }
+
+    /**
+     * @dataProvider getTypeConversions
+     * @requires PHP 5.6.1
+     * This test illustrates where our conversions differs from INI_SCANNER_TYPED introduced in PHP 5.6.1
+     */
+    public function testTypeConversionsWithNativePhp($key, $value, $supported)
+    {
+        if (\defined('HHVM_VERSION_ID')) {
+            $this->markTestSkipped();
+        }
+
+        if (!$supported) {
+            $this->markTestSkipped(sprintf('Converting the value "%s" to "%s" is not supported by the IniFileLoader.', $key, $value));
+        }
+
+        $expected = parse_ini_file(__DIR__.'/../Fixtures/ini/types.ini', true, INI_SCANNER_TYPED);
+        $this->assertSame($value, $expected['parameters'][$key], '->load() converts values to PHP types');
+    }
+
+    public function getTypeConversions()
+    {
+        return [
+            ['true_comment', true, true],
+            ['true', true, true],
+            ['false', false, true],
+            ['on', true, true],
+            ['off', false, true],
+            ['yes', true, true],
+            ['no', false, true],
+            ['none', false, true],
+            ['null', null, true],
+            ['constant', PHP_VERSION, true],
+            ['12', 12, true],
+            ['12_string', '12', true],
+            ['12_quoted_number', 12, false], // INI_SCANNER_RAW removes the double quotes
+            ['12_comment', 12, true],
+            ['12_string_comment', '12', true],
+            ['12_quoted_number_comment', 12, false], // INI_SCANNER_RAW removes the double quotes
+            ['-12', -12, true],
+            ['1', 1, true],
+            ['0', 0, true],
+            ['0b0110', bindec('0b0110'), false], // not supported by INI_SCANNER_TYPED
+            ['11112222333344445555', '1111,2222,3333,4444,5555', true],
+            ['0777', 0777, false], // not supported by INI_SCANNER_TYPED
+            ['255', 0xFF, false], // not supported by INI_SCANNER_TYPED
+            ['100.0', 1e2, false], // not supported by INI_SCANNER_TYPED
+            ['-120.0', -1.2E2, false], // not supported by INI_SCANNER_TYPED
+            ['-10100.1', -10100.1, false], // not supported by INI_SCANNER_TYPED
+            ['-10,100.1', '-10,100.1', true],
+        ];
+    }
+
+    public function testExceptionIsRaisedWhenIniFileDoesNotExist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The file "foo.ini" does not exist (in:');
+        $this->loader->load('foo.ini');
+    }
+
+    public function testExceptionIsRaisedWhenIniFileCannotBeParsed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The "nonvalid.ini" file is not valid.');
+        @$this->loader->load('nonvalid.ini');
+    }
+
+    public function testExceptionIsRaisedWhenIniFileIsAlmostValid()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The "almostvalid.ini" file is not valid.');
+        @$this->loader->load('almostvalid.ini');
+    }
+
+    public function testSupports()
+    {
+        $loader = new IniFileLoader(new ContainerBuilder(), new FileLocator());
+
+        $this->assertTrue($loader->supports('foo.ini'), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
+        $this->assertTrue($loader->supports('with_wrong_ext.yml', 'ini'), '->supports() returns true if the resource with forced type is loadable');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/LoaderResolverTest.php b/lib/symfony/dependency-injection/Tests/Loader/LoaderResolverTest.php
new file mode 100644
index 000000000..9167e18ce
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/LoaderResolverTest.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
+use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+class LoaderResolverTest extends TestCase
+{
+    private static $fixturesPath;
+
+    /** @var LoaderResolver */
+    private $resolver;
+
+    protected function setUp()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
+
+        $container = new ContainerBuilder();
+        $this->resolver = new LoaderResolver([
+            new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
+            new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
+            new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
+            new PhpFileLoader($container, new FileLocator(self::$fixturesPath.'/php')),
+            new ClosureLoader($container),
+        ]);
+    }
+
+    public function provideResourcesToLoad()
+    {
+        return [
+            ['ini_with_wrong_ext.xml', 'ini', IniFileLoader::class],
+            ['xml_with_wrong_ext.php', 'xml', XmlFileLoader::class],
+            ['php_with_wrong_ext.yml', 'php', PhpFileLoader::class],
+            ['yaml_with_wrong_ext.ini', 'yaml', YamlFileLoader::class],
+        ];
+    }
+
+    /**
+     * @dataProvider provideResourcesToLoad
+     */
+    public function testResolvesForcedType($resource, $type, $expectedClass)
+    {
+        $this->assertInstanceOf($expectedClass, $this->resolver->resolve($resource, $type));
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/PhpFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/PhpFileLoaderTest.php
new file mode 100644
index 000000000..e1812305e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/PhpFileLoaderTest.php
@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+class PhpFileLoaderTest extends TestCase
+{
+    public function testSupports()
+    {
+        $loader = new PhpFileLoader(new ContainerBuilder(), new FileLocator());
+
+        $this->assertTrue($loader->supports('foo.php'), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
+        $this->assertTrue($loader->supports('with_wrong_ext.yml', 'php'), '->supports() returns true if the resource with forced type is loadable');
+    }
+
+    public function testLoad()
+    {
+        $loader = new PhpFileLoader($container = new ContainerBuilder(), new FileLocator());
+
+        $loader->load(__DIR__.'/../Fixtures/php/simple.php');
+
+        $this->assertEquals('foo', $container->getParameter('foo'), '->load() loads a PHP file resource');
+    }
+
+    public function testConfigServices()
+    {
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $loader = new PhpFileLoader($container = new ContainerBuilder(), new FileLocator());
+        $loader->load($fixtures.'/config/services9.php');
+
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile($fixtures.'/php/services9_compiled.php', str_replace(str_replace('\\', '\\\\', $fixtures.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR), '%path%', $dumper->dump()));
+    }
+
+    /**
+     * @dataProvider provideConfig
+     */
+    public function testConfig($file)
+    {
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $loader = new PhpFileLoader($container = new ContainerBuilder(), new FileLocator());
+        $loader->load($fixtures.'/config/'.$file.'.php');
+
+        $container->compile();
+
+        $dumper = new YamlDumper($container);
+        $this->assertStringEqualsFile($fixtures.'/config/'.$file.'.expected.yml', $dumper->dump());
+    }
+
+    public function provideConfig()
+    {
+        yield ['basic'];
+        yield ['defaults'];
+        yield ['instanceof'];
+        yield ['prototype'];
+        yield ['child'];
+
+        if (\PHP_VERSION_ID >= 70000) {
+            yield ['php7'];
+        }
+    }
+
+    public function testAutoConfigureAndChildDefinitionNotAllowed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The service "child_service" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.');
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $container = new ContainerBuilder();
+        $loader = new PhpFileLoader($container, new FileLocator());
+        $loader->load($fixtures.'/config/services_autoconfigure_with_parent.php');
+        $container->compile();
+    }
+
+    public function testFactoryShortNotationNotAllowed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid factory "factory:method": the `service:method` notation is not available when using PHP-based DI configuration. Use "[ref(\'factory\'), \'method\']" instead.');
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $container = new ContainerBuilder();
+        $loader = new PhpFileLoader($container, new FileLocator());
+        $loader->load($fixtures.'/config/factory_short_notation.php');
+        $container->compile();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
new file mode 100644
index 000000000..2b963968d
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
@@ -0,0 +1,829 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Config\Resource\GlobResource;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Bar;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
+use Symfony\Component\ExpressionLanguage\Expression;
+
+class XmlFileLoaderTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
+        require_once self::$fixturesPath.'/includes/foo.php';
+        require_once self::$fixturesPath.'/includes/ProjectExtension.php';
+        require_once self::$fixturesPath.'/includes/ProjectWithXsdExtension.php';
+    }
+
+    public function testLoad()
+    {
+        $loader = new XmlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/ini'));
+
+        try {
+            $loader->load('foo.xml');
+            $this->fail('->load() throws an InvalidArgumentException if the loaded file does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the loaded file does not exist');
+            $this->assertStringStartsWith('The file "foo.xml" does not exist (in:', $e->getMessage(), '->load() throws an InvalidArgumentException if the loaded file does not exist');
+        }
+    }
+
+    public function testParseFile()
+    {
+        $loader = new XmlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/ini'));
+        $r = new \ReflectionObject($loader);
+        $m = $r->getMethod('parseFileToDOM');
+        $m->setAccessible(true);
+
+        try {
+            $m->invoke($loader, self::$fixturesPath.'/ini/parameters.ini');
+            $this->fail('->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
+            $this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'parameters.ini'), $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
+
+            $e = $e->getPrevious();
+            $this->assertInstanceOf('InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
+            $this->assertStringStartsWith('[ERROR 4] Start tag expected, \'<\' not found (in', $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
+        }
+
+        $loader = new XmlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/xml'));
+
+        try {
+            $m->invoke($loader, self::$fixturesPath.'/xml/nonvalid.xml');
+            $this->fail('->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
+            $this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'nonvalid.xml'), $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file is not a valid XML file');
+
+            $e = $e->getPrevious();
+            $this->assertInstanceOf('InvalidArgumentException', $e, '->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
+            $this->assertStringStartsWith('[ERROR 1845] Element \'nonvalid\': No matching global declaration available for the validation root. (in', $e->getMessage(), '->parseFileToDOM() throws an InvalidArgumentException if the loaded file does not validate the XSD');
+        }
+
+        $xml = $m->invoke($loader, self::$fixturesPath.'/xml/services1.xml');
+        $this->assertInstanceOf('DOMDocument', $xml, '->parseFileToDOM() returns an SimpleXMLElement object');
+    }
+
+    public function testLoadWithExternalEntitiesDisabled()
+    {
+        $disableEntities = libxml_disable_entity_loader(true);
+
+        $containerBuilder = new ContainerBuilder();
+        $loader = new XmlFileLoader($containerBuilder, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services2.xml');
+
+        libxml_disable_entity_loader($disableEntities);
+
+        $this->assertGreaterThan(0, $containerBuilder->getParameterBag()->all(), 'Parameters can be read from the config file.');
+    }
+
+    public function testLoadParameters()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services2.xml');
+
+        $actual = $container->getParameterBag()->all();
+        $expected = [
+            'a string',
+            'foo' => 'bar',
+            'values' => [
+                0,
+                'integer' => 4,
+                100 => null,
+                'true',
+                true,
+                false,
+                'on',
+                'off',
+                'float' => 1.3,
+                1000.3,
+                'a string',
+                ['foo', 'bar'],
+            ],
+            'mixedcase' => ['MixedCaseKey' => 'value'],
+            'constant' => PHP_EOL,
+        ];
+
+        $this->assertEquals($expected, $actual, '->load() converts XML values to PHP ones');
+    }
+
+    public function testLoadImports()
+    {
+        $container = new ContainerBuilder();
+        $resolver = new LoaderResolver([
+            new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
+            new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yml')),
+            $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
+        ]);
+        $loader->setResolver($resolver);
+        $loader->load('services4.xml');
+
+        $actual = $container->getParameterBag()->all();
+        $expected = [
+            'a string',
+            'foo' => 'bar',
+            'values' => [
+                0,
+                'integer' => 4,
+                100 => null,
+                'true',
+                true,
+                false,
+                'on',
+                'off',
+                'float' => 1.3,
+                1000.3,
+                'a string',
+                ['foo', 'bar'],
+            ],
+            'mixedcase' => ['MixedCaseKey' => 'value'],
+            'constant' => PHP_EOL,
+            'bar' => '%foo%',
+            'imported_from_ini' => true,
+            'imported_from_yaml' => true,
+            'with_wrong_ext' => 'from yaml',
+        ];
+
+        $this->assertEquals(array_keys($expected), array_keys($actual), '->load() imports and merges imported files');
+        $this->assertTrue($actual['imported_from_ini']);
+
+        // Bad import throws no exception due to ignore_errors value.
+        $loader->load('services4_bad_import.xml');
+    }
+
+    public function testLoadAnonymousServices()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services5.xml');
+        $services = $container->getDefinitions();
+        $this->assertCount(7, $services, '->load() attributes unique ids to anonymous services');
+
+        // anonymous service as an argument
+        $args = $services['foo']->getArguments();
+        $this->assertCount(1, $args, '->load() references anonymous services as "normal" ones');
+        $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Reference', $args[0], '->load() converts anonymous services to references to "normal" services');
+        $this->assertArrayHasKey((string) $args[0], $services, '->load() makes a reference to the created ones');
+        $inner = $services[(string) $args[0]];
+        $this->assertEquals('BarClass', $inner->getClass(), '->load() uses the same configuration as for the anonymous ones');
+        $this->assertFalse($inner->isPublic());
+
+        // inner anonymous services
+        $args = $inner->getArguments();
+        $this->assertCount(1, $args, '->load() references anonymous services as "normal" ones');
+        $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Reference', $args[0], '->load() converts anonymous services to references to "normal" services');
+        $this->assertArrayHasKey((string) $args[0], $services, '->load() makes a reference to the created ones');
+        $inner = $services[(string) $args[0]];
+        $this->assertEquals('BazClass', $inner->getClass(), '->load() uses the same configuration as for the anonymous ones');
+        $this->assertFalse($inner->isPublic());
+
+        // anonymous service as a property
+        $properties = $services['foo']->getProperties();
+        $property = $properties['p'];
+        $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Reference', $property, '->load() converts anonymous services to references to "normal" services');
+        $this->assertArrayHasKey((string) $property, $services, '->load() makes a reference to the created ones');
+        $inner = $services[(string) $property];
+        $this->assertEquals('BuzClass', $inner->getClass(), '->load() uses the same configuration as for the anonymous ones');
+        $this->assertFalse($inner->isPublic());
+
+        // "wild" service
+        $service = $container->findTaggedServiceIds('biz_tag');
+        $this->assertCount(1, $service);
+
+        foreach ($service as $id => $tag) {
+            $service = $container->getDefinition($id);
+        }
+        $this->assertEquals('BizClass', $service->getClass(), '->load() uses the same configuration as for the anonymous ones');
+        $this->assertTrue($service->isPublic());
+
+        // anonymous services are shared when using decoration definitions
+        $container->compile();
+        $services = $container->getDefinitions();
+        $fooArgs = $services['foo']->getArguments();
+        $barArgs = $services['bar']->getArguments();
+        $this->assertSame($fooArgs[0], $barArgs[0]);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Top-level anonymous services are deprecated since Symfony 3.4, the "id" attribute will be required in version 4.0 in %sservices_without_id.xml at line 5.
+     */
+    public function testLoadAnonymousServicesWithoutId()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_without_id.xml');
+    }
+
+    public function testLoadAnonymousNestedServices()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('nested_service_without_id.xml');
+
+        $this->assertTrue($container->hasDefinition('FooClass'));
+        $arguments = $container->getDefinition('FooClass')->getArguments();
+        $this->assertInstanceOf(Reference::class, array_shift($arguments));
+    }
+
+    public function testLoadServices()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services6.xml');
+        $services = $container->getDefinitions();
+        $this->assertArrayHasKey('foo', $services, '->load() parses <service> elements');
+        $this->assertFalse($services['not_shared']->isShared(), '->load() parses shared flag');
+        $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Definition', $services['foo'], '->load() converts <service> element to Definition instances');
+        $this->assertEquals('FooClass', $services['foo']->getClass(), '->load() parses the class attribute');
+        $this->assertEquals('%path%/foo.php', $services['file']->getFile(), '->load() parses the file tag');
+        $this->assertEquals(['foo', new Reference('foo'), [true, false]], $services['arguments']->getArguments(), '->load() parses the argument tags');
+        $this->assertEquals('sc_configure', $services['configurator1']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals([new Reference('baz'), 'configure'], $services['configurator2']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals(['BazClass', 'configureStatic'], $services['configurator3']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals([['setBar', []], ['setBar', [new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]]], $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals([['setBar', ['foo', new Reference('foo'), [true, false]]]], $services['method_call2']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals('factory', $services['new_factory1']->getFactory(), '->load() parses the factory tag');
+        $this->assertEquals([new Reference('baz'), 'getClass'], $services['new_factory2']->getFactory(), '->load() parses the factory tag');
+        $this->assertEquals(['BazClass', 'getInstance'], $services['new_factory3']->getFactory(), '->load() parses the factory tag');
+        $this->assertSame([null, 'getInstance'], $services['new_factory4']->getFactory(), '->load() accepts factory tag without class');
+
+        $aliases = $container->getAliases();
+        $this->assertArrayHasKey('alias_for_foo', $aliases, '->load() parses <service> elements');
+        $this->assertEquals('foo', (string) $aliases['alias_for_foo'], '->load() parses aliases');
+        $this->assertTrue($aliases['alias_for_foo']->isPublic());
+        $this->assertArrayHasKey('another_alias_for_foo', $aliases);
+        $this->assertEquals('foo', (string) $aliases['another_alias_for_foo']);
+        $this->assertFalse($aliases['another_alias_for_foo']->isPublic());
+
+        $this->assertEquals(['decorated', null, 0], $services['decorator_service']->getDecoratedService());
+        $this->assertEquals(['decorated', 'decorated.pif-pouf', 0], $services['decorator_service_with_name']->getDecoratedService());
+        $this->assertEquals(['decorated', 'decorated.pif-pouf', 5], $services['decorator_service_with_name_and_priority']->getDecoratedService());
+    }
+
+    public function testParsesIteratorArgument()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services9.xml');
+
+        $lazyDefinition = $container->getDefinition('lazy_context');
+
+        $this->assertEquals([new IteratorArgument(['k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container')]), new IteratorArgument([])], $lazyDefinition->getArguments(), '->load() parses lazy arguments');
+    }
+
+    public function testParsesTags()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services10.xml');
+
+        $services = $container->findTaggedServiceIds('foo_tag');
+        $this->assertCount(1, $services);
+
+        foreach ($services as $id => $tagAttributes) {
+            foreach ($tagAttributes as $attributes) {
+                $this->assertArrayHasKey('other_option', $attributes);
+                $this->assertEquals('lorem', $attributes['other_option']);
+                $this->assertArrayHasKey('other-option', $attributes, 'unnormalized tag attributes should not be removed');
+
+                $this->assertEquals('ciz', $attributes['some_option'], 'no overriding should be done when normalizing');
+                $this->assertEquals('cat', $attributes['some-option']);
+
+                $this->assertArrayNotHasKey('an_other_option', $attributes, 'normalization should not be done when an underscore is already found');
+            }
+        }
+    }
+
+    public function testParseTagsWithoutNameThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('tag_without_name.xml');
+    }
+
+    public function testParseTagWithEmptyNameThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .* must be a non-empty string/');
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('tag_with_empty_name.xml');
+    }
+
+    public function testDeprecated()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_deprecated.xml');
+
+        $this->assertTrue($container->getDefinition('foo')->isDeprecated());
+        $message = 'The "foo" service is deprecated. You should stop using it, as it will soon be removed.';
+        $this->assertSame($message, $container->getDefinition('foo')->getDeprecationMessage('foo'));
+
+        $this->assertTrue($container->getDefinition('bar')->isDeprecated());
+        $message = 'The "bar" service is deprecated.';
+        $this->assertSame($message, $container->getDefinition('bar')->getDeprecationMessage('bar'));
+    }
+
+    public function testConvertDomElementToArray()
+    {
+        $doc = new \DOMDocument('1.0');
+        $doc->loadXML('<foo>bar</foo>');
+        $this->assertEquals('bar', XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+
+        $doc = new \DOMDocument('1.0');
+        $doc->loadXML('<foo foo="bar" />');
+        $this->assertEquals(['foo' => 'bar'], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+
+        $doc = new \DOMDocument('1.0');
+        $doc->loadXML('<foo><foo>bar</foo></foo>');
+        $this->assertEquals(['foo' => 'bar'], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+
+        $doc = new \DOMDocument('1.0');
+        $doc->loadXML('<foo><foo>bar<foo>bar</foo></foo></foo>');
+        $this->assertEquals(['foo' => ['value' => 'bar', 'foo' => 'bar']], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+
+        $doc = new \DOMDocument('1.0');
+        $doc->loadXML('<foo><foo></foo></foo>');
+        $this->assertEquals(['foo' => null], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+
+        $doc = new \DOMDocument('1.0');
+        $doc->loadXML('<foo><foo><!-- foo --></foo></foo>');
+        $this->assertEquals(['foo' => null], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+
+        $doc = new \DOMDocument('1.0');
+        $doc->loadXML('<foo><foo foo="bar"/><foo foo="bar"/></foo>');
+        $this->assertEquals(['foo' => [['foo' => 'bar'], ['foo' => 'bar']]], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+    }
+
+    public function testExtensions()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \ProjectExtension());
+        $container->registerExtension(new \ProjectWithXsdExtension());
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+
+        // extension without an XSD
+        $loader->load('extensions/services1.xml');
+        $container->compile();
+        $services = $container->getDefinitions();
+        $parameters = $container->getParameterBag()->all();
+
+        $this->assertArrayHasKey('project.service.bar', $services, '->load() parses extension elements');
+        $this->assertArrayHasKey('project.parameter.bar', $parameters, '->load() parses extension elements');
+
+        $this->assertEquals('BAR', $services['project.service.foo']->getClass(), '->load() parses extension elements');
+        $this->assertEquals('BAR', $parameters['project.parameter.foo'], '->load() parses extension elements');
+
+        // extension with an XSD
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \ProjectExtension());
+        $container->registerExtension(new \ProjectWithXsdExtension());
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('extensions/services2.xml');
+        $container->compile();
+        $services = $container->getDefinitions();
+        $parameters = $container->getParameterBag()->all();
+
+        $this->assertArrayHasKey('project.service.bar', $services, '->load() parses extension elements');
+        $this->assertArrayHasKey('project.parameter.bar', $parameters, '->load() parses extension elements');
+
+        $this->assertEquals('BAR', $services['project.service.foo']->getClass(), '->load() parses extension elements');
+        $this->assertEquals('BAR', $parameters['project.parameter.foo'], '->load() parses extension elements');
+
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \ProjectExtension());
+        $container->registerExtension(new \ProjectWithXsdExtension());
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+
+        // extension with an XSD (does not validate)
+        try {
+            $loader->load('extensions/services3.xml');
+            $this->fail('->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+            $this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'services3.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+
+            $e = $e->getPrevious();
+            $this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+            $this->assertStringContainsString('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+        }
+
+        // non-registered extension
+        try {
+            $loader->load('extensions/services4.xml');
+            $this->fail('->load() throws an InvalidArgumentException if the tag is not valid');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the tag is not valid');
+            $this->assertStringStartsWith('There is no extension able to load the configuration for "project:bar" (in', $e->getMessage(), '->load() throws an InvalidArgumentException if the tag is not valid');
+        }
+    }
+
+    public function testExtensionInPhar()
+    {
+        if (\extension_loaded('suhosin') && false === strpos(ini_get('suhosin.executor.include.whitelist'), 'phar')) {
+            $this->markTestSkipped('To run this test, add "phar" to the "suhosin.executor.include.whitelist" settings in your php.ini file.');
+        }
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM makes this test conflict with those run in separate processes.');
+        }
+
+        require_once self::$fixturesPath.'/includes/ProjectWithXsdExtensionInPhar.phar';
+
+        // extension with an XSD in PHAR archive
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \ProjectWithXsdExtensionInPhar());
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('extensions/services6.xml');
+
+        // extension with an XSD in PHAR archive (does not validate)
+        try {
+            $loader->load('extensions/services7.xml');
+            $this->fail('->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+            $this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'services7.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+
+            $e = $e->getPrevious();
+            $this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+            $this->assertStringContainsString('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+        }
+    }
+
+    public function testSupports()
+    {
+        $loader = new XmlFileLoader(new ContainerBuilder(), new FileLocator());
+
+        $this->assertTrue($loader->supports('foo.xml'), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
+        $this->assertTrue($loader->supports('with_wrong_ext.yml', 'xml'), '->supports() returns true if the resource with forced type is loadable');
+    }
+
+    public function testNoNamingConflictsForAnonymousServices()
+    {
+        $container = new ContainerBuilder();
+
+        $loader1 = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml/extension1'));
+        $loader1->load('services.xml');
+        $services = $container->getDefinitions();
+        $this->assertCount(3, $services, '->load() attributes unique ids to anonymous services');
+        $loader2 = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml/extension2'));
+        $loader2->load('services.xml');
+        $services = $container->getDefinitions();
+        $this->assertCount(5, $services, '->load() attributes unique ids to anonymous services');
+
+        $services = $container->getDefinitions();
+        $args1 = $services['extension1.foo']->getArguments();
+        $inner1 = $services[(string) $args1[0]];
+        $this->assertEquals('BarClass1', $inner1->getClass(), '->load() uses the same configuration as for the anonymous ones');
+        $args2 = $services['extension2.foo']->getArguments();
+        $inner2 = $services[(string) $args2[0]];
+        $this->assertEquals('BarClass2', $inner2->getClass(), '->load() uses the same configuration as for the anonymous ones');
+    }
+
+    public function testDocTypeIsNotAllowed()
+    {
+        $container = new ContainerBuilder();
+
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+
+        // document types are not allowed.
+        try {
+            $loader->load('withdoctype.xml');
+            $this->fail('->load() throws an InvalidArgumentException if the configuration contains a document type');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Exception\\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration contains a document type');
+            $this->assertRegExp(sprintf('#^Unable to parse file ".+%s": .+.$#', 'withdoctype.xml'), $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration contains a document type');
+
+            $e = $e->getPrevious();
+            $this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration contains a document type');
+            $this->assertSame('Document types are not allowed.', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration contains a document type');
+        }
+    }
+
+    public function testXmlNamespaces()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('namespaces.xml');
+        $services = $container->getDefinitions();
+
+        $this->assertArrayHasKey('foo', $services, '->load() parses <srv:service> elements');
+        $this->assertCount(1, $services['foo']->getTag('foo.tag'), '->load parses <srv:tag> elements');
+        $this->assertEquals([['setBar', ['foo']]], $services['foo']->getMethodCalls(), '->load() parses the <srv:call> tag');
+    }
+
+    public function testLoadIndexedArguments()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services14.xml');
+
+        $this->assertEquals(['index_0' => 'app'], $container->findDefinition('logger')->getArguments());
+    }
+
+    public function testLoadInlinedServices()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services21.xml');
+
+        $foo = $container->getDefinition('foo');
+
+        $fooFactory = $foo->getFactory();
+        $this->assertInstanceOf(Reference::class, $fooFactory[0]);
+        $this->assertTrue($container->has((string) $fooFactory[0]));
+        $fooFactoryDefinition = $container->getDefinition((string) $fooFactory[0]);
+        $this->assertSame('FooFactory', $fooFactoryDefinition->getClass());
+        $this->assertSame('createFoo', $fooFactory[1]);
+
+        $fooFactoryFactory = $fooFactoryDefinition->getFactory();
+        $this->assertInstanceOf(Reference::class, $fooFactoryFactory[0]);
+        $this->assertTrue($container->has((string) $fooFactoryFactory[0]));
+        $this->assertSame('Foobar', $container->getDefinition((string) $fooFactoryFactory[0])->getClass());
+        $this->assertSame('createFooFactory', $fooFactoryFactory[1]);
+
+        $fooConfigurator = $foo->getConfigurator();
+        $this->assertInstanceOf(Reference::class, $fooConfigurator[0]);
+        $this->assertTrue($container->has((string) $fooConfigurator[0]));
+        $fooConfiguratorDefinition = $container->getDefinition((string) $fooConfigurator[0]);
+        $this->assertSame('Bar', $fooConfiguratorDefinition->getClass());
+        $this->assertSame('configureFoo', $fooConfigurator[1]);
+
+        $barConfigurator = $fooConfiguratorDefinition->getConfigurator();
+        $this->assertInstanceOf(Reference::class, $barConfigurator[0]);
+        $this->assertSame('Baz', $container->getDefinition((string) $barConfigurator[0])->getClass());
+        $this->assertSame('configureBar', $barConfigurator[1]);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testType()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services22.xml');
+
+        $this->assertEquals(['Bar', 'Baz'], $container->getDefinition('foo')->getAutowiringTypes());
+    }
+
+    public function testAutowire()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services23.xml');
+
+        $this->assertTrue($container->getDefinition('bar')->isAutowired());
+    }
+
+    public function testClassFromId()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('class_from_id.xml');
+        $container->compile();
+
+        $this->assertEquals(CaseSensitiveClass::class, $container->getDefinition(CaseSensitiveClass::class)->getClass());
+    }
+
+    public function testPrototype()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_prototype.xml');
+
+        $ids = array_keys($container->getDefinitions());
+        sort($ids);
+        $this->assertSame([Prototype\Foo::class, Prototype\Sub\Bar::class, 'service_container'], $ids);
+
+        $resources = $container->getResources();
+
+        $fixturesDir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
+        $resources = array_map('strval', $resources);
+        $this->assertContains((string) (new FileResource($fixturesDir.'xml'.\DIRECTORY_SEPARATOR.'services_prototype.xml')), $resources);
+        $this->assertContains((string) (new GlobResource($fixturesDir.'Prototype', '/*', true)), $resources);
+        $this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo', $resources);
+        $this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar', $resources);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Using the attribute "class" is deprecated for the service "bar" which is defined as an alias %s.
+     * @expectedDeprecation Using the element "tag" is deprecated for the service "bar" which is defined as an alias %s.
+     * @expectedDeprecation Using the element "factory" is deprecated for the service "bar" which is defined as an alias %s.
+     */
+    public function testAliasDefinitionContainsUnsupportedElements()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+
+        $loader->load('legacy_invalid_alias_definition.xml');
+
+        $this->assertTrue($container->has('bar'));
+    }
+
+    public function testArgumentWithKeyOutsideCollection()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('with_key_outside_collection.xml');
+
+        $this->assertSame(['type' => 'foo', 'bar'], $container->getDefinition('foo')->getArguments());
+    }
+
+    public function testDefaults()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services28.xml');
+
+        $this->assertFalse($container->getDefinition('with_defaults')->isPublic());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('with_defaults')->getTags());
+        $this->assertTrue($container->getDefinition('with_defaults')->isAutowired());
+        $this->assertArrayNotHasKey('public', $container->getDefinition('with_defaults')->getChanges());
+        $this->assertArrayNotHasKey('autowire', $container->getDefinition('with_defaults')->getChanges());
+
+        $container->compile();
+
+        $this->assertTrue($container->getDefinition('no_defaults')->isPublic());
+
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('no_defaults')->getTags());
+
+        $this->assertFalse($container->getDefinition('no_defaults')->isAutowired());
+
+        $this->assertTrue($container->getDefinition('child_def')->isPublic());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('child_def')->getTags());
+        $this->assertFalse($container->getDefinition('child_def')->isAutowired());
+
+        $definitions = $container->getDefinitions();
+        $this->assertSame('service_container', key($definitions));
+
+        array_shift($definitions);
+        $anonymous = current($definitions);
+        $this->assertSame('bar', key($definitions));
+        $this->assertTrue($anonymous->isPublic());
+        $this->assertTrue($anonymous->isAutowired());
+        $this->assertSame(['foo' => [[]]], $anonymous->getTags());
+    }
+
+    public function testNamedArguments()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_named_args.xml');
+
+        $this->assertEquals(['$apiKey' => 'ABCD', CaseSensitiveClass::class => null], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+
+        $container->compile();
+
+        $this->assertEquals([null, 'ABCD'], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+        $this->assertEquals([['setApiKey', ['123']]], $container->getDefinition(NamedArgumentsDummy::class)->getMethodCalls());
+    }
+
+    public function testInstanceof()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_instanceof.xml');
+        $container->compile();
+
+        $definition = $container->getDefinition(Bar::class);
+        $this->assertTrue($definition->isAutowired());
+        $this->assertTrue($definition->isLazy());
+        $this->assertSame(['foo' => [[]], 'bar' => [[]]], $definition->getTags());
+    }
+
+    public function testInstanceOfAndChildDefinitionNotAllowed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The service "child_service" cannot use the "parent" option in the same file where "instanceof" configuration is defined as using both is not supported. Move your child definitions to a separate file.');
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_instanceof_with_parent.xml');
+        $container->compile();
+    }
+
+    public function testAutoConfigureAndChildDefinitionNotAllowed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The service "child_service" cannot have a "parent" and also have "autoconfigure". Try setting autoconfigure="false" for the service.');
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_autoconfigure_with_parent.xml');
+        $container->compile();
+    }
+
+    public function testDefaultsAndChildDefinitionNotAllowed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Attribute "autowire" on service "child_service" cannot be inherited from "defaults" when a "parent" is set. Move your child definitions to a separate file or define this attribute explicitly.');
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_defaults_with_parent.xml');
+        $container->compile();
+    }
+
+    public function testAutoConfigureInstanceof()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_autoconfigure.xml');
+
+        $this->assertTrue($container->getDefinition('use_defaults_settings')->isAutoconfigured());
+        $this->assertFalse($container->getDefinition('override_defaults_settings_to_false')->isAutoconfigured());
+    }
+
+    public function testBindings()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_bindings.xml');
+        $container->compile();
+
+        $definition = $container->getDefinition('bar');
+        $this->assertEquals([
+            'NonExistent' => null,
+            BarInterface::class => new Reference(Bar::class),
+            '$foo' => [null],
+            '$quz' => 'quz',
+            '$factory' => 'factory',
+        ], array_map(function ($v) { return $v->getValues()[0]; }, $definition->getBindings()));
+        $this->assertEquals([
+            'quz',
+            null,
+            new Reference(Bar::class),
+            [null],
+        ], $definition->getArguments());
+
+        $definition = $container->getDefinition(Bar::class);
+        $this->assertEquals([
+            null,
+            'factory',
+        ], $definition->getArguments());
+        $this->assertEquals([
+            'NonExistent' => null,
+            '$quz' => 'quz',
+            '$factory' => 'factory',
+        ], array_map(function ($v) { return $v->getValues()[0]; }, $definition->getBindings()));
+    }
+
+    public function testTsantosContainer()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_tsantos.xml');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_tsantos.php', $dumper->dump());
+    }
+
+    /**
+     * The pass may throw an exception, which will cause the test to fail.
+     */
+    public function testOverriddenDefaultsBindings()
+    {
+        $container = new ContainerBuilder();
+
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('defaults_bindings.xml');
+        $loader->load('defaults_bindings2.xml');
+
+        (new ResolveBindingsPass())->process($container);
+
+        $this->assertSame('overridden', $container->get('bar')->quz);
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php b/lib/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
new file mode 100644
index 000000000..cce392185
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
@@ -0,0 +1,736 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Config\Resource\GlobResource;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Bar;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
+use Symfony\Component\ExpressionLanguage\Expression;
+
+class YamlFileLoaderTest extends TestCase
+{
+    protected static $fixturesPath;
+
+    public static function setUpBeforeClass()
+    {
+        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
+        require_once self::$fixturesPath.'/includes/foo.php';
+        require_once self::$fixturesPath.'/includes/ProjectExtension.php';
+    }
+
+    public function testLoadUnExistFile()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The file ".+" does not exist./');
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/ini'));
+        $r = new \ReflectionObject($loader);
+        $m = $r->getMethod('loadFile');
+        $m->setAccessible(true);
+
+        $m->invoke($loader, 'foo.yml');
+    }
+
+    public function testLoadInvalidYamlFile()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The file ".+" does not contain valid YAML./');
+        $path = self::$fixturesPath.'/ini';
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator($path));
+        $r = new \ReflectionObject($loader);
+        $m = $r->getMethod('loadFile');
+        $m->setAccessible(true);
+
+        $m->invoke($loader, $path.'/parameters.ini');
+    }
+
+    /**
+     * @dataProvider provideInvalidFiles
+     */
+    public function testLoadInvalidFile($file)
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+
+        $loader->load($file.'.yml');
+    }
+
+    public function provideInvalidFiles()
+    {
+        return [
+            ['bad_parameters'],
+            ['bad_imports'],
+            ['bad_import'],
+            ['bad_services'],
+            ['bad_service'],
+            ['bad_calls'],
+            ['bad_format'],
+            ['nonvalid1'],
+            ['nonvalid2'],
+        ];
+    }
+
+    public function testLoadParameters()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services2.yml');
+        $this->assertEquals(['foo' => 'bar', 'mixedcase' => ['MixedCaseKey' => 'value'], 'values' => [true, false, 0, 1000.3, PHP_INT_MAX], 'bar' => 'foo', 'escape' => '@escapeme', 'foo_bar' => new Reference('foo_bar')], $container->getParameterBag()->all(), '->load() converts YAML keys to lowercase');
+    }
+
+    public function testLoadImports()
+    {
+        $container = new ContainerBuilder();
+        $resolver = new LoaderResolver([
+            new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
+            new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
+            new PhpFileLoader($container, new FileLocator(self::$fixturesPath.'/php')),
+            $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
+        ]);
+        $loader->setResolver($resolver);
+        $loader->load('services4.yml');
+
+        $actual = $container->getParameterBag()->all();
+        $expected = [
+            'foo' => 'bar',
+            'values' => [true, false, PHP_INT_MAX],
+            'bar' => '%foo%',
+            'escape' => '@escapeme',
+            'foo_bar' => new Reference('foo_bar'),
+            'mixedcase' => ['MixedCaseKey' => 'value'],
+            'imported_from_ini' => true,
+            'imported_from_xml' => true,
+            'with_wrong_ext' => 'from yaml',
+        ];
+        $this->assertEquals(array_keys($expected), array_keys($actual), '->load() imports and merges imported files');
+        $this->assertTrue($actual['imported_from_ini']);
+
+        // Bad import throws no exception due to ignore_errors value.
+        $loader->load('services4_bad_import.yml');
+    }
+
+    public function testLoadServices()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services6.yml');
+        $services = $container->getDefinitions();
+        $this->assertArrayHasKey('foo', $services, '->load() parses service elements');
+        $this->assertFalse($services['not_shared']->isShared(), '->load() parses the shared flag');
+        $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Definition', $services['foo'], '->load() converts service element to Definition instances');
+        $this->assertEquals('FooClass', $services['foo']->getClass(), '->load() parses the class attribute');
+        $this->assertEquals('%path%/foo.php', $services['file']->getFile(), '->load() parses the file tag');
+        $this->assertEquals(['foo', new Reference('foo'), [true, false]], $services['arguments']->getArguments(), '->load() parses the argument tags');
+        $this->assertEquals('sc_configure', $services['configurator1']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals([new Reference('baz'), 'configure'], $services['configurator2']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals(['BazClass', 'configureStatic'], $services['configurator3']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals([['setBar', []], ['setBar', []], ['setBar', [new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]]], $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals([['setBar', ['foo', new Reference('foo'), [true, false]]]], $services['method_call2']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals('factory', $services['new_factory1']->getFactory(), '->load() parses the factory tag');
+        $this->assertEquals([new Reference('baz'), 'getClass'], $services['new_factory2']->getFactory(), '->load() parses the factory tag');
+        $this->assertEquals(['BazClass', 'getInstance'], $services['new_factory3']->getFactory(), '->load() parses the factory tag');
+        $this->assertSame([null, 'getInstance'], $services['new_factory4']->getFactory(), '->load() accepts factory tag without class');
+        $this->assertEquals(['foo', new Reference('baz')], $services['Acme\WithShortCutArgs']->getArguments(), '->load() parses short service definition');
+
+        $aliases = $container->getAliases();
+        $this->assertArrayHasKey('alias_for_foo', $aliases, '->load() parses aliases');
+        $this->assertEquals('foo', (string) $aliases['alias_for_foo'], '->load() parses aliases');
+        $this->assertTrue($aliases['alias_for_foo']->isPublic());
+        $this->assertArrayHasKey('another_alias_for_foo', $aliases);
+        $this->assertEquals('foo', (string) $aliases['another_alias_for_foo']);
+        $this->assertFalse($aliases['another_alias_for_foo']->isPublic());
+        $this->assertTrue(isset($aliases['another_third_alias_for_foo']));
+        $this->assertEquals('foo', (string) $aliases['another_third_alias_for_foo']);
+        $this->assertTrue($aliases['another_third_alias_for_foo']->isPublic());
+
+        $this->assertEquals(['decorated', null, 0], $services['decorator_service']->getDecoratedService());
+        $this->assertEquals(['decorated', 'decorated.pif-pouf', 0], $services['decorator_service_with_name']->getDecoratedService());
+        $this->assertEquals(['decorated', 'decorated.pif-pouf', 5], $services['decorator_service_with_name_and_priority']->getDecoratedService());
+    }
+
+    public function testLoadFactoryShortSyntax()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services14.yml');
+        $services = $container->getDefinitions();
+
+        $this->assertEquals([new Reference('baz'), 'getClass'], $services['factory']->getFactory(), '->load() parses the factory tag with service:method');
+        $this->assertEquals(['FooBacFactory', 'createFooBar'], $services['factory_with_static_call']->getFactory(), '->load() parses the factory tag with Class::method');
+    }
+
+    public function testLoadConfiguratorShortSyntax()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_configurator_short_syntax.yml');
+        $services = $container->getDefinitions();
+
+        $this->assertEquals([new Reference('foo_bar_configurator'), 'configure'], $services['foo_bar']->getConfigurator(), '->load() parses the configurator tag with service:method');
+        $this->assertEquals(['FooBarConfigurator', 'configureFooBar'], $services['foo_bar_with_static_call']->getConfigurator(), '->load() parses the configurator tag with Class::method');
+    }
+
+    public function testExtensions()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \ProjectExtension());
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services10.yml');
+        $container->compile();
+        $services = $container->getDefinitions();
+        $parameters = $container->getParameterBag()->all();
+
+        $this->assertArrayHasKey('project.service.bar', $services, '->load() parses extension elements');
+        $this->assertArrayHasKey('project.parameter.bar', $parameters, '->load() parses extension elements');
+
+        $this->assertEquals('BAR', $services['project.service.foo']->getClass(), '->load() parses extension elements');
+        $this->assertEquals('BAR', $parameters['project.parameter.foo'], '->load() parses extension elements');
+
+        try {
+            $loader->load('services11.yml');
+            $this->fail('->load() throws an InvalidArgumentException if the tag is not valid');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the tag is not valid');
+            $this->assertStringStartsWith('There is no extension able to load the configuration for "foobarfoobar" (in', $e->getMessage(), '->load() throws an InvalidArgumentException if the tag is not valid');
+        }
+    }
+
+    public function testExtensionWithNullConfig()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \ProjectExtension());
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('null_config.yml');
+        $container->compile();
+
+        $this->assertSame([null], $container->getParameter('project.configs'));
+    }
+
+    public function testSupports()
+    {
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator());
+
+        $this->assertTrue($loader->supports('foo.yml'), '->supports() returns true if the resource is loadable');
+        $this->assertTrue($loader->supports('foo.yaml'), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
+        $this->assertTrue($loader->supports('with_wrong_ext.xml', 'yml'), '->supports() returns true if the resource with forced type is loadable');
+        $this->assertTrue($loader->supports('with_wrong_ext.xml', 'yaml'), '->supports() returns true if the resource with forced type is loadable');
+    }
+
+    public function testNonArrayTagsThrowsException()
+    {
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        try {
+            $loader->load('badtag1.yml');
+            $this->fail('->load() should throw an exception when the tags key of a service is not an array');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the tags key is not an array');
+            $this->assertStringStartsWith('Parameter "tags" must be an array for service', $e->getMessage(), '->load() throws an InvalidArgumentException if the tags key is not an array');
+        }
+    }
+
+    public function testTagWithoutNameThrowsException()
+    {
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        try {
+            $loader->load('badtag2.yml');
+            $this->fail('->load() should throw an exception when a tag is missing the name key');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if a tag is missing the name key');
+            $this->assertStringStartsWith('A "tags" entry is missing a "name" key for service ', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag is missing the name key');
+        }
+    }
+
+    public function testNameOnlyTagsAreAllowedAsString()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('tag_name_only.yml');
+
+        $this->assertCount(1, $container->getDefinition('foo_service')->getTag('foo'));
+    }
+
+    public function testTagWithAttributeArrayThrowsException()
+    {
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        try {
+            $loader->load('badtag3.yml');
+            $this->fail('->load() should throw an exception when a tag-attribute is not a scalar');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if a tag-attribute is not a scalar');
+            $this->assertStringStartsWith('A "tags" attribute must be of a scalar-type for service "foo_service", tag "foo", attribute "bar"', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag-attribute is not a scalar');
+        }
+    }
+
+    public function testLoadYamlOnlyWithKeys()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services21.yml');
+
+        $definition = $container->getDefinition('manager');
+        $this->assertEquals([['setLogger', [new Reference('logger')]], ['setClass', ['User']]], $definition->getMethodCalls());
+        $this->assertEquals([true], $definition->getArguments());
+        $this->assertEquals(['manager' => [['alias' => 'user']]], $definition->getTags());
+    }
+
+    public function testTagWithEmptyNameThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .+ must be a non-empty string/');
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('tag_name_empty_string.yml');
+    }
+
+    public function testTagWithNonStringNameThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .+ must be a non-empty string/');
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('tag_name_no_string.yml');
+    }
+
+    public function testTypesNotArray()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('bad_types1.yml');
+    }
+
+    public function testTypeNotString()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('bad_types2.yml');
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testTypes()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services22.yml');
+
+        $this->assertEquals(['Foo', 'Bar'], $container->getDefinition('foo_service')->getAutowiringTypes());
+        $this->assertEquals(['Foo'], $container->getDefinition('baz_service')->getAutowiringTypes());
+    }
+
+    public function testParsesIteratorArgument()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services9.yml');
+
+        $lazyDefinition = $container->getDefinition('lazy_context');
+
+        $this->assertEquals([new IteratorArgument(['k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container')]), new IteratorArgument([])], $lazyDefinition->getArguments(), '->load() parses lazy arguments');
+
+        $message = 'The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.';
+        $this->assertSame($message, $container->getDefinition('deprecated_service')->getDeprecationMessage('deprecated_service'));
+    }
+
+    public function testAutowire()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services23.yml');
+
+        $this->assertTrue($container->getDefinition('bar_service')->isAutowired());
+    }
+
+    public function testClassFromId()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('class_from_id.yml');
+        $container->compile();
+
+        $this->assertEquals(CaseSensitiveClass::class, $container->getDefinition(CaseSensitiveClass::class)->getClass());
+    }
+
+    public function testPrototype()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_prototype.yml');
+
+        $ids = array_keys($container->getDefinitions());
+        sort($ids);
+        $this->assertSame([Prototype\Foo::class, Prototype\Sub\Bar::class, 'service_container'], $ids);
+
+        $resources = $container->getResources();
+
+        $fixturesDir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
+        $resources = array_map('strval', $resources);
+        $this->assertContains((string) (new FileResource($fixturesDir.'yaml'.\DIRECTORY_SEPARATOR.'services_prototype.yml')), $resources);
+        $this->assertContains((string) (new GlobResource($fixturesDir.'Prototype', '', true)), $resources);
+        $this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo', $resources);
+        $this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar', $resources);
+    }
+
+    public function testPrototypeWithNamespace()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_prototype_namespace.yml');
+
+        $ids = array_keys($container->getDefinitions());
+        sort($ids);
+
+        $this->assertSame([
+            Prototype\OtherDir\Component1\Dir1\Service1::class,
+            Prototype\OtherDir\Component1\Dir2\Service2::class,
+            Prototype\OtherDir\Component2\Dir1\Service4::class,
+            Prototype\OtherDir\Component2\Dir2\Service5::class,
+            'service_container',
+        ], $ids);
+
+        $this->assertTrue($container->getDefinition(Prototype\OtherDir\Component1\Dir1\Service1::class)->hasTag('foo'));
+        $this->assertTrue($container->getDefinition(Prototype\OtherDir\Component2\Dir1\Service4::class)->hasTag('foo'));
+        $this->assertFalse($container->getDefinition(Prototype\OtherDir\Component1\Dir1\Service1::class)->hasTag('bar'));
+        $this->assertFalse($container->getDefinition(Prototype\OtherDir\Component2\Dir1\Service4::class)->hasTag('bar'));
+
+        $this->assertTrue($container->getDefinition(Prototype\OtherDir\Component1\Dir2\Service2::class)->hasTag('bar'));
+        $this->assertTrue($container->getDefinition(Prototype\OtherDir\Component2\Dir2\Service5::class)->hasTag('bar'));
+        $this->assertFalse($container->getDefinition(Prototype\OtherDir\Component1\Dir2\Service2::class)->hasTag('foo'));
+        $this->assertFalse($container->getDefinition(Prototype\OtherDir\Component2\Dir2\Service5::class)->hasTag('foo'));
+    }
+
+    public function testPrototypeWithNamespaceAndNoResource()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/A "resource" attribute must be set when the "namespace" attribute is set for service ".+" in .+/');
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_prototype_namespace_without_resource.yml');
+    }
+
+    public function testDefaults()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services28.yml');
+
+        $this->assertFalse($container->getDefinition('with_defaults')->isPublic());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('with_defaults')->getTags());
+        $this->assertTrue($container->getDefinition('with_defaults')->isAutowired());
+        $this->assertArrayNotHasKey('public', $container->getDefinition('with_defaults')->getChanges());
+        $this->assertArrayNotHasKey('autowire', $container->getDefinition('with_defaults')->getChanges());
+
+        $this->assertFalse($container->getAlias('with_defaults_aliased')->isPublic());
+        $this->assertFalse($container->getAlias('with_defaults_aliased_short')->isPublic());
+
+        $this->assertFalse($container->getDefinition('Acme\WithShortCutArgs')->isPublic());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('Acme\WithShortCutArgs')->getTags());
+        $this->assertTrue($container->getDefinition('Acme\WithShortCutArgs')->isAutowired());
+
+        $container->compile();
+
+        $this->assertTrue($container->getDefinition('with_null')->isPublic());
+        $this->assertTrue($container->getDefinition('no_defaults')->isPublic());
+
+        // foo tag is inherited from defaults
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('with_null')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('no_defaults')->getTags());
+
+        $this->assertTrue($container->getDefinition('with_null')->isAutowired());
+        $this->assertFalse($container->getDefinition('no_defaults')->isAutowired());
+
+        $this->assertTrue($container->getDefinition('child_def')->isPublic());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('child_def')->getTags());
+        $this->assertFalse($container->getDefinition('child_def')->isAutowired());
+    }
+
+    public function testNamedArguments()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_named_args.yml');
+
+        $this->assertEquals([null, '$apiKey' => 'ABCD'], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+        $this->assertEquals(['$apiKey' => 'ABCD', CaseSensitiveClass::class => null], $container->getDefinition('another_one')->getArguments());
+
+        $container->compile();
+
+        $this->assertEquals([null, 'ABCD'], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+        $this->assertEquals([null, 'ABCD'], $container->getDefinition('another_one')->getArguments());
+        $this->assertEquals([['setApiKey', ['123']]], $container->getDefinition('another_one')->getMethodCalls());
+    }
+
+    public function testInstanceof()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_instanceof.yml');
+        $container->compile();
+
+        $definition = $container->getDefinition(Bar::class);
+        $this->assertTrue($definition->isAutowired());
+        $this->assertTrue($definition->isLazy());
+        $this->assertSame(['foo' => [[]], 'bar' => [[]]], $definition->getTags());
+    }
+
+    public function testInstanceOfAndChildDefinitionNotAllowed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The service "child_service" cannot use the "parent" option in the same file where "_instanceof" configuration is defined as using both is not supported. Move your child definitions to a separate file.');
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_instanceof_with_parent.yml');
+        $container->compile();
+    }
+
+    public function testAutoConfigureAndChildDefinitionNotAllowed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The service "child_service" cannot have a "parent" and also have "autoconfigure". Try setting "autoconfigure: false" for the service.');
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_autoconfigure_with_parent.yml');
+        $container->compile();
+    }
+
+    public function testDefaultsAndChildDefinitionNotAllowed()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Attribute "autowire" on service "child_service" cannot be inherited from "_defaults" when a "parent" is set. Move your child definitions to a separate file or define this attribute explicitly.');
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_defaults_with_parent.yml');
+        $container->compile();
+    }
+
+    public function testDecoratedServicesWithWrongSyntaxThrowsException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The value of the "decorates" option for the "bar" service must be the id of the service without the "@" prefix (replace "@foo" with "foo").');
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('bad_decorates.yml');
+    }
+
+    public function testInvalidTagsWithDefaults()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Parameter "tags" must be an array for service "Foo\\\Bar" in .+services31_invalid_tags\.yml\. Check your YAML syntax./');
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services31_invalid_tags.yml');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Service names that start with an underscore are deprecated since Symfony 3.3 and will be reserved in 4.0. Rename the "_foo" service or define it in XML instead.
+     */
+    public function testUnderscoreServiceId()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_underscore.yml');
+    }
+
+    public function testAnonymousServices()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('anonymous_services.yml');
+
+        $definition = $container->getDefinition('Foo');
+        $this->assertTrue($definition->isAutowired());
+
+        // Anonymous service in an argument
+        $args = $definition->getArguments();
+        $this->assertCount(1, $args);
+        $this->assertInstanceOf(Reference::class, $args[0]);
+        $this->assertTrue($container->has((string) $args[0]));
+        $this->assertRegExp('/^\d+_Bar~[._A-Za-z0-9]{7}$/', (string) $args[0]);
+
+        $anonymous = $container->getDefinition((string) $args[0]);
+        $this->assertEquals('Bar', $anonymous->getClass());
+        $this->assertFalse($anonymous->isPublic());
+        $this->assertTrue($anonymous->isAutowired());
+
+        // Anonymous service in a callable
+        $factory = $definition->getFactory();
+        $this->assertIsArray($factory);
+        $this->assertInstanceOf(Reference::class, $factory[0]);
+        $this->assertTrue($container->has((string) $factory[0]));
+        $this->assertRegExp('/^\d+_Quz~[._A-Za-z0-9]{7}$/', (string) $factory[0]);
+        $this->assertEquals('constructFoo', $factory[1]);
+
+        $anonymous = $container->getDefinition((string) $factory[0]);
+        $this->assertEquals('Quz', $anonymous->getClass());
+        $this->assertFalse($anonymous->isPublic());
+        $this->assertFalse($anonymous->isAutowired());
+    }
+
+    public function testAnonymousServicesInDifferentFilesWithSameNameDoNotConflict()
+    {
+        $container = new ContainerBuilder();
+
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml/foo'));
+        $loader->load('services.yml');
+
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml/bar'));
+        $loader->load('services.yml');
+
+        $this->assertCount(5, $container->getDefinitions());
+    }
+
+    public function testAnonymousServicesInInstanceof()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('anonymous_services_in_instanceof.yml');
+
+        $definition = $container->getDefinition('Dummy');
+
+        $instanceof = $definition->getInstanceofConditionals();
+        $this->assertCount(3, $instanceof);
+        $this->assertArrayHasKey('DummyInterface', $instanceof);
+
+        $args = $instanceof['DummyInterface']->getProperties();
+        $this->assertCount(1, $args);
+        $this->assertInstanceOf(Reference::class, $args['foo']);
+        $this->assertTrue($container->has((string) $args['foo']));
+
+        $anonymous = $container->getDefinition((string) $args['foo']);
+        $this->assertEquals('Anonymous', $anonymous->getClass());
+        $this->assertFalse($anonymous->isPublic());
+        $this->assertEmpty($anonymous->getInstanceofConditionals());
+
+        $this->assertFalse($container->has('Bar'));
+    }
+
+    public function testAnonymousServicesWithAliases()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Creating an alias using the tag "!service" is not allowed in ".+anonymous_services_alias\.yml"\./');
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('anonymous_services_alias.yml');
+    }
+
+    public function testAnonymousServicesInParameters()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Using an anonymous service in a parameter is not allowed in ".+anonymous_services_in_parameters\.yml"\./');
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('anonymous_services_in_parameters.yml');
+    }
+
+    public function testAutoConfigureInstanceof()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_autoconfigure.yml');
+
+        $this->assertTrue($container->getDefinition('use_defaults_settings')->isAutoconfigured());
+        $this->assertFalse($container->getDefinition('override_defaults_settings_to_false')->isAutoconfigured());
+    }
+
+    public function testEmptyDefaultsThrowsClearException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Service "_defaults" key must be an array, "NULL" given in ".+bad_empty_defaults\.yml"\./');
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('bad_empty_defaults.yml');
+    }
+
+    public function testEmptyInstanceofThrowsClearException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/Service "_instanceof" key must be an array, "NULL" given in ".+bad_empty_instanceof\.yml"\./');
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('bad_empty_instanceof.yml');
+    }
+
+    public function testBindings()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_bindings.yml');
+        $container->compile();
+
+        $definition = $container->getDefinition('bar');
+        $this->assertEquals([
+            'NonExistent' => null,
+            BarInterface::class => new Reference(Bar::class),
+            '$foo' => [null],
+            '$quz' => 'quz',
+            '$factory' => 'factory',
+        ], array_map(function ($v) { return $v->getValues()[0]; }, $definition->getBindings()));
+        $this->assertEquals([
+            'quz',
+            null,
+            new Reference(Bar::class),
+            [null],
+        ], $definition->getArguments());
+
+        $definition = $container->getDefinition(Bar::class);
+        $this->assertEquals([
+            null,
+            'factory',
+        ], $definition->getArguments());
+        $this->assertEquals([
+            'NonExistent' => null,
+            '$quz' => 'quz',
+            '$factory' => 'factory',
+        ], array_map(function ($v) { return $v->getValues()[0]; }, $definition->getBindings()));
+    }
+
+    /**
+     * The pass may throw an exception, which will cause the test to fail.
+     */
+    public function testOverriddenDefaultsBindings()
+    {
+        $container = new ContainerBuilder();
+
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('defaults_bindings.yml');
+        $loader->load('defaults_bindings2.yml');
+
+        (new ResolveBindingsPass())->process($container);
+
+        $this->assertSame('overridden', $container->get('bar')->quz);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The configuration key "factory" is unsupported for the service "foo" which is defined as an alias in %s.
+     * @expectedDeprecation The configuration key "parent" is unsupported for the service "foo" which is defined as an alias in %s.
+     */
+    public function testAliasDefinitionContainsUnsupportedElements()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('legacy_invalid_alias_definition.yml');
+        $this->assertTrue($container->has('foo'));
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/lib/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
new file mode 100644
index 000000000..4fcb2c840
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -0,0 +1,159 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\ParameterBag;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
+
+class EnvPlaceholderParameterBagTest extends TestCase
+{
+    public function testGetThrowsInvalidArgumentExceptionIfEnvNameContainsNonWordCharacters()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->get('env(%foo%)');
+    }
+
+    public function testMergeWillNotDuplicateIdenticalParameters()
+    {
+        $envVariableName = 'DB_HOST';
+        $parameter = sprintf('env(%s)', $envVariableName);
+        $firstBag = new EnvPlaceholderParameterBag();
+
+        // initialize placeholders
+        $firstBag->get($parameter);
+        $secondBag = clone $firstBag;
+
+        $firstBag->mergeEnvPlaceholders($secondBag);
+        $mergedPlaceholders = $firstBag->getEnvPlaceholders();
+
+        $placeholderForVariable = $mergedPlaceholders[$envVariableName];
+        $placeholder = array_values($placeholderForVariable)[0];
+
+        $this->assertCount(1, $placeholderForVariable);
+        $this->assertIsString($placeholder);
+        $this->assertStringContainsString($envVariableName, $placeholder);
+    }
+
+    public function testMergeWhereFirstBagIsEmptyWillWork()
+    {
+        $envVariableName = 'DB_HOST';
+        $parameter = sprintf('env(%s)', $envVariableName);
+        $firstBag = new EnvPlaceholderParameterBag();
+        $secondBag = new EnvPlaceholderParameterBag();
+
+        // initialize placeholder only in second bag
+        $secondBag->get($parameter);
+
+        $this->assertEmpty($firstBag->getEnvPlaceholders());
+
+        $firstBag->mergeEnvPlaceholders($secondBag);
+        $mergedPlaceholders = $firstBag->getEnvPlaceholders();
+
+        $placeholderForVariable = $mergedPlaceholders[$envVariableName];
+        $placeholder = array_values($placeholderForVariable)[0];
+
+        $this->assertCount(1, $placeholderForVariable);
+        $this->assertIsString($placeholder);
+        $this->assertStringContainsString($envVariableName, $placeholder);
+    }
+
+    public function testMergeWherePlaceholderOnlyExistsInSecond()
+    {
+        $uniqueEnvName = 'DB_HOST';
+        $commonEnvName = 'DB_USER';
+
+        $uniqueParamName = sprintf('env(%s)', $uniqueEnvName);
+        $commonParamName = sprintf('env(%s)', $commonEnvName);
+
+        $firstBag = new EnvPlaceholderParameterBag();
+        // initialize common placeholder
+        $firstBag->get($commonParamName);
+        $secondBag = clone $firstBag;
+
+        // initialize unique placeholder
+        $secondBag->get($uniqueParamName);
+
+        $firstBag->mergeEnvPlaceholders($secondBag);
+        $merged = $firstBag->getEnvPlaceholders();
+
+        $this->assertCount(1, $merged[$uniqueEnvName]);
+        // second bag has same placeholder for commonEnvName
+        $this->assertCount(1, $merged[$commonEnvName]);
+    }
+
+    public function testMergeWithDifferentIdentifiersForPlaceholders()
+    {
+        $envName = 'DB_USER';
+        $paramName = sprintf('env(%s)', $envName);
+
+        $firstBag = new EnvPlaceholderParameterBag();
+        $secondBag = new EnvPlaceholderParameterBag();
+        // initialize placeholders
+        $firstPlaceholder = $firstBag->get($paramName);
+        $secondPlaceholder = $secondBag->get($paramName);
+
+        $firstBag->mergeEnvPlaceholders($secondBag);
+        $merged = $firstBag->getEnvPlaceholders();
+
+        $this->assertNotEquals($firstPlaceholder, $secondPlaceholder);
+        $this->assertCount(2, $merged[$envName]);
+    }
+
+    public function testResolveEnvCastsIntToString()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->get('env(INT_VAR)');
+        $bag->set('env(INT_VAR)', 2);
+        $bag->resolve();
+        $this->assertSame('2', $bag->all()['env(INT_VAR)']);
+    }
+
+    public function testResolveEnvAllowsNull()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->get('env(NULL_VAR)');
+        $bag->set('env(NULL_VAR)', null);
+        $bag->resolve();
+        $this->assertNull($bag->all()['env(NULL_VAR)']);
+    }
+
+    public function testResolveThrowsOnBadDefaultValue()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The default value of env parameter "ARRAY_VAR" must be scalar or null, array given.');
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->get('env(ARRAY_VAR)');
+        $bag->set('env(ARRAY_VAR)', []);
+        $bag->resolve();
+    }
+
+    public function testGetEnvAllowsNull()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->set('env(NULL_VAR)', null);
+        $bag->get('env(NULL_VAR)');
+        $bag->resolve();
+
+        $this->assertNull($bag->all()['env(NULL_VAR)']);
+    }
+
+    public function testGetThrowsOnBadDefaultValue()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The default value of an env() parameter must be scalar or null, but "array" given to "env(ARRAY_VAR)".');
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->set('env(ARRAY_VAR)', []);
+        $bag->get('env(ARRAY_VAR)');
+        $bag->resolve();
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ParameterBag/FrozenParameterBagTest.php b/lib/symfony/dependency-injection/Tests/ParameterBag/FrozenParameterBagTest.php
new file mode 100644
index 000000000..ed89c8e4e
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ParameterBag/FrozenParameterBagTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\ParameterBag;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+class FrozenParameterBagTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $parameters = [
+            'foo' => 'foo',
+            'bar' => 'bar',
+        ];
+        $bag = new FrozenParameterBag($parameters);
+        $this->assertEquals($parameters, $bag->all(), '__construct() takes an array of parameters as its first argument');
+    }
+
+    public function testClear()
+    {
+        $this->expectException('LogicException');
+        $bag = new FrozenParameterBag([]);
+        $bag->clear();
+    }
+
+    public function testSet()
+    {
+        $this->expectException('LogicException');
+        $bag = new FrozenParameterBag([]);
+        $bag->set('foo', 'bar');
+    }
+
+    public function testAdd()
+    {
+        $this->expectException('LogicException');
+        $bag = new FrozenParameterBag([]);
+        $bag->add([]);
+    }
+
+    public function testRemove()
+    {
+        $this->expectException('LogicException');
+        $bag = new FrozenParameterBag(['foo' => 'bar']);
+        $bag->remove('foo');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php b/lib/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
new file mode 100644
index 000000000..0a75b445b
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
@@ -0,0 +1,264 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\ParameterBag;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+class ParameterBagTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $bag = new ParameterBag($parameters = [
+            'foo' => 'foo',
+            'bar' => 'bar',
+        ]);
+        $this->assertEquals($parameters, $bag->all(), '__construct() takes an array of parameters as its first argument');
+    }
+
+    public function testClear()
+    {
+        $bag = new ParameterBag($parameters = [
+            'foo' => 'foo',
+            'bar' => 'bar',
+        ]);
+        $bag->clear();
+        $this->assertEquals([], $bag->all(), '->clear() removes all parameters');
+    }
+
+    public function testRemove()
+    {
+        $bag = new ParameterBag([
+            'foo' => 'foo',
+            'bar' => 'bar',
+        ]);
+        $bag->remove('foo');
+        $this->assertEquals(['bar' => 'bar'], $bag->all(), '->remove() removes a parameter');
+    }
+
+    public function testGetSet()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $bag->set('bar', 'foo');
+        $this->assertEquals('foo', $bag->get('bar'), '->set() sets the value of a new parameter');
+
+        $bag->set('foo', 'baz');
+        $this->assertEquals('baz', $bag->get('foo'), '->set() overrides previously set parameter');
+
+        try {
+            $bag->get('baba');
+            $this->fail('->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException if the key does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException', $e, '->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException if the key does not exist');
+            $this->assertEquals('You have requested a non-existent parameter "baba".', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException if the key does not exist');
+        }
+    }
+
+    /**
+     * @dataProvider provideGetThrowParameterNotFoundExceptionData
+     */
+    public function testGetThrowParameterNotFoundException($parameterKey, $exceptionMessage)
+    {
+        $bag = new ParameterBag([
+            'foo' => 'foo',
+            'bar' => 'bar',
+            'baz' => 'baz',
+            'fiz' => ['bar' => ['boo' => 12]],
+        ]);
+
+        $this->expectException(ParameterNotFoundException::class);
+        $this->expectExceptionMessage($exceptionMessage);
+
+        $bag->get($parameterKey);
+    }
+
+    public function provideGetThrowParameterNotFoundExceptionData()
+    {
+        return [
+            ['foo1', 'You have requested a non-existent parameter "foo1". Did you mean this: "foo"?'],
+            ['bag', 'You have requested a non-existent parameter "bag". Did you mean one of these: "bar", "baz"?'],
+            ['', 'You have requested a non-existent parameter "".'],
+
+            ['fiz.bar.boo', 'You have requested a non-existent parameter "fiz.bar.boo". You cannot access nested array items, do you want to inject "fiz" instead?'],
+        ];
+    }
+
+    public function testHas()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $this->assertTrue($bag->has('foo'), '->has() returns true if a parameter is defined');
+        $this->assertFalse($bag->has('bar'), '->has() returns false if a parameter is not defined');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "BAR" instead of "bar" is deprecated since Symfony 3.4.
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "Foo" instead of "foo" is deprecated since Symfony 3.4.
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "FOO" instead of "foo" is deprecated since Symfony 3.4.
+     * @expectedDeprecation Parameter names will be made case sensitive in Symfony 4.0. Using "Foo" instead of "foo" is deprecated since Symfony 3.4.
+     */
+    public function testMixedCase()
+    {
+        $bag = new ParameterBag([
+            'foo' => 'foo',
+            'bar' => 'bar',
+        ]);
+
+        $bag->remove('BAR');
+        $this->assertEquals(['foo' => 'foo'], $bag->all(), '->remove() converts key to lowercase before removing');
+
+        $bag->set('Foo', 'baz1');
+        $this->assertEquals('baz1', $bag->get('foo'), '->set() converts the key to lowercase');
+        $this->assertEquals('baz1', $bag->get('FOO'), '->get() converts the key to lowercase');
+
+        $this->assertTrue($bag->has('Foo'), '->has() converts the key to lowercase');
+    }
+
+    public function testResolveValue()
+    {
+        $bag = new ParameterBag([]);
+        $this->assertEquals('foo', $bag->resolveValue('foo'), '->resolveValue() returns its argument unmodified if no placeholders are found');
+
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $this->assertEquals('I\'m a bar', $bag->resolveValue('I\'m a %foo%'), '->resolveValue() replaces placeholders by their values');
+        $this->assertEquals(['bar' => 'bar'], $bag->resolveValue(['%foo%' => '%foo%']), '->resolveValue() replaces placeholders in keys and values of arrays');
+        $this->assertEquals(['bar' => ['bar' => ['bar' => 'bar']]], $bag->resolveValue(['%foo%' => ['%foo%' => ['%foo%' => '%foo%']]]), '->resolveValue() replaces placeholders in nested arrays');
+        $this->assertEquals('I\'m a %%foo%%', $bag->resolveValue('I\'m a %%foo%%'), '->resolveValue() supports % escaping by doubling it');
+        $this->assertEquals('I\'m a bar %%foo bar', $bag->resolveValue('I\'m a %foo% %%foo %foo%'), '->resolveValue() supports % escaping by doubling it');
+        $this->assertEquals(['foo' => ['bar' => ['ding' => 'I\'m a bar %%foo %%bar']]], $bag->resolveValue(['foo' => ['bar' => ['ding' => 'I\'m a bar %%foo %%bar']]]), '->resolveValue() supports % escaping by doubling it');
+
+        $bag = new ParameterBag(['foo' => true]);
+        $this->assertTrue($bag->resolveValue('%foo%'), '->resolveValue() replaces arguments that are just a placeholder by their value without casting them to strings');
+        $bag = new ParameterBag(['foo' => null]);
+        $this->assertNull($bag->resolveValue('%foo%'), '->resolveValue() replaces arguments that are just a placeholder by their value without casting them to strings');
+
+        $bag = new ParameterBag(['foo' => 'bar', 'baz' => '%%%foo% %foo%%% %%foo%% %%%foo%%%']);
+        $this->assertEquals('%%bar bar%% %%foo%% %%bar%%', $bag->resolveValue('%baz%'), '->resolveValue() replaces params placed besides escaped %');
+
+        $bag = new ParameterBag(['baz' => '%%s?%%s']);
+        $this->assertEquals('%%s?%%s', $bag->resolveValue('%baz%'), '->resolveValue() is not replacing greedily');
+
+        $bag = new ParameterBag([]);
+        try {
+            $bag->resolveValue('%foobar%');
+            $this->fail('->resolveValue() throws an InvalidArgumentException if a placeholder references a non-existent parameter');
+        } catch (ParameterNotFoundException $e) {
+            $this->assertEquals('You have requested a non-existent parameter "foobar".', $e->getMessage(), '->resolveValue() throws a ParameterNotFoundException if a placeholder references a non-existent parameter');
+        }
+
+        try {
+            $bag->resolveValue('foo %foobar% bar');
+            $this->fail('->resolveValue() throws a ParameterNotFoundException if a placeholder references a non-existent parameter');
+        } catch (ParameterNotFoundException $e) {
+            $this->assertEquals('You have requested a non-existent parameter "foobar".', $e->getMessage(), '->resolveValue() throws a ParameterNotFoundException if a placeholder references a non-existent parameter');
+        }
+
+        $bag = new ParameterBag(['foo' => 'a %bar%', 'bar' => []]);
+        try {
+            $bag->resolveValue('%foo%');
+            $this->fail('->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter');
+        } catch (RuntimeException $e) {
+            $this->assertEquals('A string value must be composed of strings and/or numbers, but found parameter "bar" of type array inside string value "a %bar%".', $e->getMessage(), '->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter');
+        }
+
+        $bag = new ParameterBag(['foo' => '%bar%', 'bar' => '%foobar%', 'foobar' => '%foo%']);
+        try {
+            $bag->resolveValue('%foo%');
+            $this->fail('->resolveValue() throws a ParameterCircularReferenceException when a parameter has a circular reference');
+        } catch (ParameterCircularReferenceException $e) {
+            $this->assertEquals('Circular reference detected for parameter "foo" ("foo" > "bar" > "foobar" > "foo").', $e->getMessage(), '->resolveValue() throws a ParameterCircularReferenceException when a parameter has a circular reference');
+        }
+
+        $bag = new ParameterBag(['foo' => 'a %bar%', 'bar' => 'a %foobar%', 'foobar' => 'a %foo%']);
+        try {
+            $bag->resolveValue('%foo%');
+            $this->fail('->resolveValue() throws a ParameterCircularReferenceException when a parameter has a circular reference');
+        } catch (ParameterCircularReferenceException $e) {
+            $this->assertEquals('Circular reference detected for parameter "foo" ("foo" > "bar" > "foobar" > "foo").', $e->getMessage(), '->resolveValue() throws a ParameterCircularReferenceException when a parameter has a circular reference');
+        }
+
+        $bag = new ParameterBag(['host' => 'foo.bar', 'port' => 1337]);
+        $this->assertEquals('foo.bar:1337', $bag->resolveValue('%host%:%port%'));
+    }
+
+    public function testResolveIndicatesWhyAParameterIsNeeded()
+    {
+        $bag = new ParameterBag(['foo' => '%bar%']);
+
+        try {
+            $bag->resolve();
+        } catch (ParameterNotFoundException $e) {
+            $this->assertEquals('The parameter "foo" has a dependency on a non-existent parameter "bar".', $e->getMessage());
+        }
+
+        $bag = new ParameterBag(['foo' => '%bar%']);
+
+        try {
+            $bag->resolve();
+        } catch (ParameterNotFoundException $e) {
+            $this->assertEquals('The parameter "foo" has a dependency on a non-existent parameter "bar".', $e->getMessage());
+        }
+    }
+
+    public function testResolveUnescapesValue()
+    {
+        $bag = new ParameterBag([
+            'foo' => ['bar' => ['ding' => 'I\'m a bar %%foo %%bar']],
+            'bar' => 'I\'m a %%foo%%',
+        ]);
+
+        $bag->resolve();
+
+        $this->assertEquals('I\'m a %foo%', $bag->get('bar'), '->resolveValue() supports % escaping by doubling it');
+        $this->assertEquals(['bar' => ['ding' => 'I\'m a bar %foo %bar']], $bag->get('foo'), '->resolveValue() supports % escaping by doubling it');
+    }
+
+    public function testEscapeValue()
+    {
+        $bag = new ParameterBag();
+
+        $bag->add([
+            'foo' => $bag->escapeValue(['bar' => ['ding' => 'I\'m a bar %foo %bar', 'zero' => null]]),
+            'bar' => $bag->escapeValue('I\'m a %foo%'),
+        ]);
+
+        $this->assertEquals('I\'m a %%foo%%', $bag->get('bar'), '->escapeValue() escapes % by doubling it');
+        $this->assertEquals(['bar' => ['ding' => 'I\'m a bar %%foo %%bar', 'zero' => null]], $bag->get('foo'), '->escapeValue() escapes % by doubling it');
+    }
+
+    /**
+     * @dataProvider stringsWithSpacesProvider
+     */
+    public function testResolveStringWithSpacesReturnsString($expected, $test, $description)
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+
+        try {
+            $this->assertEquals($expected, $bag->resolveString($test), $description);
+        } catch (ParameterNotFoundException $e) {
+            $this->fail(sprintf('%s - "%s"', $description, $expected));
+        }
+    }
+
+    public function stringsWithSpacesProvider()
+    {
+        return [
+            ['bar', '%foo%', 'Parameters must be wrapped by %.'],
+            ['% foo %', '% foo %', 'Parameters should not have spaces.'],
+            ['{% set my_template = "foo" %}', '{% set my_template = "foo" %}', 'Twig-like strings are not parameters.'],
+            ['50% is less than 100%', '50% is less than 100%', 'Text between % signs is allowed, if there are spaces.'],
+        ];
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ParameterTest.php b/lib/symfony/dependency-injection/Tests/ParameterTest.php
new file mode 100644
index 000000000..975e5582c
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ParameterTest.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Parameter;
+
+class ParameterTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $ref = new Parameter('foo');
+        $this->assertEquals('foo', (string) $ref, '__construct() sets the id of the parameter, which is used for the __toString() method');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ReferenceTest.php b/lib/symfony/dependency-injection/Tests/ReferenceTest.php
new file mode 100644
index 000000000..1fc274a29
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ReferenceTest.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Reference;
+
+class ReferenceTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $ref = new Reference('foo');
+        $this->assertEquals('foo', (string) $ref, '__construct() sets the id of the reference, which is used for the __toString() method');
+    }
+}
diff --git a/lib/symfony/dependency-injection/Tests/ServiceLocatorTest.php b/lib/symfony/dependency-injection/Tests/ServiceLocatorTest.php
new file mode 100644
index 000000000..52466af94
--- /dev/null
+++ b/lib/symfony/dependency-injection/Tests/ServiceLocatorTest.php
@@ -0,0 +1,148 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+
+class ServiceLocatorTest extends TestCase
+{
+    public function testHas()
+    {
+        $locator = new ServiceLocator([
+            'foo' => function () { return 'bar'; },
+            'bar' => function () { return 'baz'; },
+            function () { return 'dummy'; },
+        ]);
+
+        $this->assertTrue($locator->has('foo'));
+        $this->assertTrue($locator->has('bar'));
+        $this->assertFalse($locator->has('dummy'));
+    }
+
+    public function testGet()
+    {
+        $locator = new ServiceLocator([
+            'foo' => function () { return 'bar'; },
+            'bar' => function () { return 'baz'; },
+        ]);
+
+        $this->assertSame('bar', $locator->get('foo'));
+        $this->assertSame('baz', $locator->get('bar'));
+    }
+
+    public function testGetDoesNotMemoize()
+    {
+        $i = 0;
+        $locator = new ServiceLocator([
+            'foo' => function () use (&$i) {
+                ++$i;
+
+                return 'bar';
+            },
+        ]);
+
+        $this->assertSame('bar', $locator->get('foo'));
+        $this->assertSame('bar', $locator->get('foo'));
+        $this->assertSame(2, $i);
+    }
+
+    public function testGetThrowsOnUndefinedService()
+    {
+        $this->expectException('Psr\Container\NotFoundExceptionInterface');
+        $this->expectExceptionMessage('Service "dummy" not found: the container inside "Symfony\Component\DependencyInjection\Tests\ServiceLocatorTest" is a smaller service locator that only knows about the "foo" and "bar" services.');
+        $locator = new ServiceLocator([
+            'foo' => function () { return 'bar'; },
+            'bar' => function () { return 'baz'; },
+        ]);
+
+        $locator->get('dummy');
+    }
+
+    public function testThrowsOnUndefinedInternalService()
+    {
+        $this->expectException('Psr\Container\NotFoundExceptionInterface');
+        $this->expectExceptionMessage('The service "foo" has a dependency on a non-existent service "bar". This locator only knows about the "foo" service.');
+        $locator = new ServiceLocator([
+            'foo' => function () use (&$locator) { return $locator->get('bar'); },
+        ]);
+
+        $locator->get('foo');
+    }
+
+    public function testThrowsOnCircularReference()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
+        $this->expectExceptionMessage('Circular reference detected for service "bar", path: "bar -> baz -> bar".');
+        $locator = new ServiceLocator([
+            'foo' => function () use (&$locator) { return $locator->get('bar'); },
+            'bar' => function () use (&$locator) { return $locator->get('baz'); },
+            'baz' => function () use (&$locator) { return $locator->get('bar'); },
+        ]);
+
+        $locator->get('foo');
+    }
+
+    public function testThrowsInServiceSubscriber()
+    {
+        $this->expectException('Psr\Container\NotFoundExceptionInterface');
+        $this->expectExceptionMessage('Service "foo" not found: even though it exists in the app\'s container, the container inside "caller" is a smaller service locator that only knows about the "bar" service. Unless you need extra laziness, try using dependency injection instead. Otherwise, you need to declare it using "SomeServiceSubscriber::getSubscribedServices()".');
+        $container = new Container();
+        $container->set('foo', new \stdClass());
+        $subscriber = new SomeServiceSubscriber();
+        $subscriber->container = new ServiceLocator(['bar' => function () {}]);
+        $subscriber->container = $subscriber->container->withContext('caller', $container);
+
+        $subscriber->getFoo();
+    }
+
+    public function testGetThrowsServiceNotFoundException()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $this->expectExceptionMessage('Service "foo" not found: even though it exists in the app\'s container, the container inside "foo" is a smaller service locator that is empty... Try using dependency injection instead.');
+        $container = new Container();
+        $container->set('foo', new \stdClass());
+
+        $locator = new ServiceLocator([]);
+        $locator = $locator->withContext('foo', $container);
+        $locator->get('foo');
+    }
+
+    public function testInvoke()
+    {
+        $locator = new ServiceLocator([
+            'foo' => function () { return 'bar'; },
+            'bar' => function () { return 'baz'; },
+        ]);
+
+        $this->assertSame('bar', $locator('foo'));
+        $this->assertSame('baz', $locator('bar'));
+        $this->assertNull($locator('dummy'), '->__invoke() should return null on invalid service');
+    }
+}
+
+class SomeServiceSubscriber implements ServiceSubscriberinterface
+{
+    public $container;
+
+    public function getFoo()
+    {
+        return $this->container->get('foo');
+    }
+
+    public static function getSubscribedServices()
+    {
+        return ['bar' => 'stdClass'];
+    }
+}
diff --git a/lib/symfony/dotenv/Tests/DotenvTest.php b/lib/symfony/dotenv/Tests/DotenvTest.php
new file mode 100644
index 000000000..1e493f24b
--- /dev/null
+++ b/lib/symfony/dotenv/Tests/DotenvTest.php
@@ -0,0 +1,317 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Dotenv\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\Dotenv\Exception\FormatException;
+
+class DotenvTest extends TestCase
+{
+    /**
+     * @dataProvider getEnvDataWithFormatErrors
+     */
+    public function testParseWithFormatError($data, $error)
+    {
+        $dotenv = new Dotenv();
+
+        try {
+            $dotenv->parse($data);
+            $this->fail('Should throw a FormatException');
+        } catch (FormatException $e) {
+            $this->assertStringMatchesFormat($error, $e->getMessage());
+        }
+    }
+
+    public function getEnvDataWithFormatErrors()
+    {
+        $tests = [
+            ['FOO=BAR BAZ', "A value containing spaces must be surrounded by quotes in \".env\" at line 1.\n...FOO=BAR BAZ...\n             ^ line 1 offset 11"],
+            ['FOO BAR=BAR', "Whitespace characters are not supported after the variable name in \".env\" at line 1.\n...FOO BAR=BAR...\n     ^ line 1 offset 3"],
+            ['FOO', "Missing = in the environment variable declaration in \".env\" at line 1.\n...FOO...\n     ^ line 1 offset 3"],
+            ['FOO="foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO=\"foo...\n          ^ line 1 offset 8"],
+            ['FOO=\'foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO='foo...\n          ^ line 1 offset 8"],
+            ['FOO=\'foo'."\n", "Missing quote to end the value in \".env\" at line 1.\n...FOO='foo\\n...\n            ^ line 1 offset 9"],
+            ['export FOO', "Unable to unset an environment variable in \".env\" at line 1.\n...export FOO...\n            ^ line 1 offset 10"],
+            ['FOO=${FOO', "Unclosed braces on variable expansion in \".env\" at line 1.\n...FOO=\${FOO...\n           ^ line 1 offset 9"],
+        ];
+
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $tests[] = ['FOO=$((1dd2))', "Issue expanding a command (%s\n) in \".env\" at line 1.\n...FOO=$((1dd2))...\n               ^ line 1 offset 13"];
+        }
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider getEnvData
+     */
+    public function testParse($data, $expected)
+    {
+        $dotenv = new Dotenv();
+        $this->assertSame($expected, $dotenv->parse($data));
+    }
+
+    public function getEnvData()
+    {
+        putenv('LOCAL=local');
+        $_ENV['LOCAL'] = 'local';
+        $_ENV['REMOTE'] = 'remote';
+
+        $tests = [
+            // backslashes
+            ['FOO=foo\\\\bar', ['FOO' => 'foo\\bar']],
+            ["FOO='foo\\\\bar'", ['FOO' => 'foo\\\\bar']],
+            ['FOO="foo\\\\bar"', ['FOO' => 'foo\\bar']],
+
+            // escaped backslash in front of variable
+            ["BAR=bar\nFOO=foo\\\\\$BAR", ['BAR' => 'bar', 'FOO' => 'foo\\bar']],
+            ["BAR=bar\nFOO='foo\\\\\$BAR'", ['BAR' => 'bar', 'FOO' => 'foo\\\\$BAR']],
+            ["BAR=bar\nFOO=\"foo\\\\\$BAR\"", ['BAR' => 'bar', 'FOO' => 'foo\\bar']],
+
+            ['FOO=foo\\\\\\$BAR', ['FOO' => 'foo\\$BAR']],
+            ['FOO=\'foo\\\\\\$BAR\'', ['FOO' => 'foo\\\\\\$BAR']],
+            ['FOO="foo\\\\\\$BAR"', ['FOO' => 'foo\\$BAR']],
+
+            // spaces
+            ['FOO=bar', ['FOO' => 'bar']],
+            [' FOO=bar ', ['FOO' => 'bar']],
+            ['FOO=', ['FOO' => '']],
+            ["FOO=\n\n\nBAR=bar", ['FOO' => '', 'BAR' => 'bar']],
+            ['FOO=  ', ['FOO' => '']],
+            ["FOO=\nBAR=bar", ['FOO' => '', 'BAR' => 'bar']],
+
+            // newlines
+            ["\n\nFOO=bar\r\n\n", ['FOO' => 'bar']],
+            ["FOO=bar\r\nBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+            ["FOO=bar\rBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+            ["FOO=bar\nBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+
+            // quotes
+            ["FOO=\"bar\"\n", ['FOO' => 'bar']],
+            ["FOO=\"bar'foo\"\n", ['FOO' => 'bar\'foo']],
+            ["FOO='bar'\n", ['FOO' => 'bar']],
+            ["FOO='bar\"foo'\n", ['FOO' => 'bar"foo']],
+            ["FOO=\"bar\\\"foo\"\n", ['FOO' => 'bar"foo']],
+            ['FOO="bar\nfoo"', ['FOO' => "bar\nfoo"]],
+            ['FOO="bar\rfoo"', ['FOO' => "bar\rfoo"]],
+            ['FOO=\'bar\nfoo\'', ['FOO' => 'bar\nfoo']],
+            ['FOO=\'bar\rfoo\'', ['FOO' => 'bar\rfoo']],
+            ["FOO='bar\nfoo'", ['FOO' => "bar\nfoo"]],
+            ['FOO=" FOO "', ['FOO' => ' FOO ']],
+            ['FOO="  "', ['FOO' => '  ']],
+            ['PATH="c:\\\\"', ['PATH' => 'c:\\']],
+            ["FOO=\"bar\nfoo\"", ['FOO' => "bar\nfoo"]],
+            ['FOO=BAR\\"', ['FOO' => 'BAR"']],
+            ["FOO=BAR\\'BAZ", ['FOO' => "BAR'BAZ"]],
+            ['FOO=\\"BAR', ['FOO' => '"BAR']],
+
+            // concatenated values
+            ["FOO='bar''foo'\n", ['FOO' => 'barfoo']],
+            ["FOO='bar '' baz'", ['FOO' => 'bar  baz']],
+            ["FOO=bar\nBAR='baz'\"\$FOO\"", ['FOO' => 'bar', 'BAR' => 'bazbar']],
+            ["FOO='bar '\\'' baz'", ['FOO' => "bar ' baz"]],
+
+            // comments
+            ["#FOO=bar\nBAR=foo", ['BAR' => 'foo']],
+            ["#FOO=bar # Comment\nBAR=foo", ['BAR' => 'foo']],
+            ["FOO='bar foo' # Comment", ['FOO' => 'bar foo']],
+            ["FOO='bar#foo' # Comment", ['FOO' => 'bar#foo']],
+            ["# Comment\r\nFOO=bar\n# Comment\nBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+            ["FOO=bar # Another comment\nBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+            ["FOO=\n\n# comment\nBAR=bar", ['FOO' => '', 'BAR' => 'bar']],
+            ['FOO=NOT#COMMENT', ['FOO' => 'NOT#COMMENT']],
+            ['FOO=  # Comment', ['FOO' => '']],
+
+            // edge cases (no conversions, only strings as values)
+            ['FOO=0', ['FOO' => '0']],
+            ['FOO=false', ['FOO' => 'false']],
+            ['FOO=null', ['FOO' => 'null']],
+
+            // export
+            ['export FOO=bar', ['FOO' => 'bar']],
+            ['  export   FOO=bar', ['FOO' => 'bar']],
+
+            // variable expansion
+            ["FOO=BAR\nBAR=\$FOO", ['FOO' => 'BAR', 'BAR' => 'BAR']],
+            ["FOO=BAR\nBAR=\"\$FOO\"", ['FOO' => 'BAR', 'BAR' => 'BAR']],
+            ["FOO=BAR\nBAR='\$FOO'", ['FOO' => 'BAR', 'BAR' => '$FOO']],
+            ["FOO_BAR9=BAR\nBAR=\$FOO_BAR9", ['FOO_BAR9' => 'BAR', 'BAR' => 'BAR']],
+            ["FOO=BAR\nBAR=\${FOO}Z", ['FOO' => 'BAR', 'BAR' => 'BARZ']],
+            ["FOO=BAR\nBAR=\$FOO}", ['FOO' => 'BAR', 'BAR' => 'BAR}']],
+            ["FOO=BAR\nBAR=\\\$FOO", ['FOO' => 'BAR', 'BAR' => '$FOO']],
+            ['FOO=" \\$ "', ['FOO' => ' $ ']],
+            ['FOO=" $ "', ['FOO' => ' $ ']],
+            ['BAR=$LOCAL', ['BAR' => 'local']],
+            ['BAR=$REMOTE', ['BAR' => 'remote']],
+            ['FOO=$NOTDEFINED', ['FOO' => '']],
+        ];
+
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $tests = array_merge($tests, [
+                // command expansion
+                ['FOO=$(echo foo)', ['FOO' => 'foo']],
+                ['FOO=$((1+2))', ['FOO' => '3']],
+                ['FOO=FOO$((1+2))BAR', ['FOO' => 'FOO3BAR']],
+                ['FOO=$(echo "$(echo "$(echo "$(echo foo)")")")', ['FOO' => 'foo']],
+                ["FOO=$(echo \"Quotes won't be a problem\")", ['FOO' => 'Quotes won\'t be a problem']],
+                ["FOO=bar\nBAR=$(echo \"FOO is \$FOO\")", ['FOO' => 'bar', 'BAR' => 'FOO is bar']],
+            ]);
+        }
+
+        return $tests;
+    }
+
+    public function testLoad()
+    {
+        unset($_ENV['FOO']);
+        unset($_ENV['BAR']);
+        unset($_SERVER['FOO']);
+        unset($_SERVER['BAR']);
+        putenv('FOO');
+        putenv('BAR');
+
+        @mkdir($tmpdir = sys_get_temp_dir().'/dotenv');
+
+        $path1 = tempnam($tmpdir, 'sf-');
+        $path2 = tempnam($tmpdir, 'sf-');
+
+        file_put_contents($path1, 'FOO=BAR');
+        file_put_contents($path2, 'BAR=BAZ');
+
+        (new Dotenv())->load($path1, $path2);
+
+        $foo = getenv('FOO');
+        $bar = getenv('BAR');
+
+        putenv('FOO');
+        putenv('BAR');
+        unlink($path1);
+        unlink($path2);
+        rmdir($tmpdir);
+
+        $this->assertSame('BAR', $foo);
+        $this->assertSame('BAZ', $bar);
+    }
+
+    public function testLoadDirectory()
+    {
+        $this->expectException('Symfony\Component\Dotenv\Exception\PathException');
+        $dotenv = new Dotenv();
+        $dotenv->load(__DIR__);
+    }
+
+    public function testServerSuperglobalIsNotOverridden()
+    {
+        $originalValue = $_SERVER['argc'];
+
+        $dotenv = new Dotenv();
+        $dotenv->populate(['argc' => 'new_value']);
+
+        $this->assertSame($originalValue, $_SERVER['argc']);
+    }
+
+    public function testEnvVarIsNotOverridden()
+    {
+        putenv('TEST_ENV_VAR=original_value');
+        $_SERVER['TEST_ENV_VAR'] = 'original_value';
+
+        $dotenv = new Dotenv();
+        $dotenv->populate(['TEST_ENV_VAR' => 'new_value']);
+
+        $this->assertSame('original_value', getenv('TEST_ENV_VAR'));
+    }
+
+    public function testHttpVarIsPartiallyOverridden()
+    {
+        $_SERVER['HTTP_TEST_ENV_VAR'] = 'http_value';
+
+        $dotenv = new Dotenv();
+        $dotenv->populate(['HTTP_TEST_ENV_VAR' => 'env_value']);
+
+        $this->assertSame('env_value', getenv('HTTP_TEST_ENV_VAR'));
+        $this->assertSame('env_value', $_ENV['HTTP_TEST_ENV_VAR']);
+        $this->assertSame('http_value', $_SERVER['HTTP_TEST_ENV_VAR']);
+    }
+
+    public function testMemorizingLoadedVarsNamesInSpecialVar()
+    {
+        // Special variable not exists
+        unset($_ENV['SYMFONY_DOTENV_VARS']);
+        unset($_SERVER['SYMFONY_DOTENV_VARS']);
+        putenv('SYMFONY_DOTENV_VARS');
+
+        unset($_ENV['APP_DEBUG']);
+        unset($_SERVER['APP_DEBUG']);
+        putenv('APP_DEBUG');
+        unset($_ENV['DATABASE_URL']);
+        unset($_SERVER['DATABASE_URL']);
+        putenv('DATABASE_URL');
+
+        $dotenv = new Dotenv();
+        $dotenv->populate(['APP_DEBUG' => '1', 'DATABASE_URL' => 'mysql://root@localhost/db']);
+
+        $this->assertSame('APP_DEBUG,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS'));
+
+        // Special variable has a value
+        $_ENV['SYMFONY_DOTENV_VARS'] = 'APP_ENV';
+        $_SERVER['SYMFONY_DOTENV_VARS'] = 'APP_ENV';
+        putenv('SYMFONY_DOTENV_VARS=APP_ENV');
+
+        $_ENV['APP_DEBUG'] = '1';
+        $_SERVER['APP_DEBUG'] = '1';
+        putenv('APP_DEBUG=1');
+        unset($_ENV['DATABASE_URL']);
+        unset($_SERVER['DATABASE_URL']);
+        putenv('DATABASE_URL');
+
+        $dotenv = new Dotenv();
+        $dotenv->populate(['APP_DEBUG' => '0', 'DATABASE_URL' => 'mysql://root@localhost/db']);
+        $dotenv->populate(['DATABASE_URL' => 'sqlite:///somedb.sqlite']);
+
+        $this->assertSame('APP_ENV,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS'));
+    }
+
+    public function testOverridingEnvVarsWithNamesMemorizedInSpecialVar()
+    {
+        putenv('SYMFONY_DOTENV_VARS='.$_SERVER['SYMFONY_DOTENV_VARS'] = 'FOO,BAR,BAZ');
+
+        putenv('FOO=foo');
+        putenv('BAR=bar');
+        putenv('BAZ=baz');
+        putenv('DOCUMENT_ROOT=/var/www');
+
+        $dotenv = new Dotenv();
+        $dotenv->populate(['FOO' => 'foo1', 'BAR' => 'bar1', 'BAZ' => 'baz1', 'DOCUMENT_ROOT' => '/boot']);
+
+        $this->assertSame('foo1', getenv('FOO'));
+        $this->assertSame('bar1', getenv('BAR'));
+        $this->assertSame('baz1', getenv('BAZ'));
+        $this->assertSame('/var/www', getenv('DOCUMENT_ROOT'));
+    }
+
+    public function testGetVariablesValueFromEnvFirst()
+    {
+        $_ENV['APP_ENV'] = 'prod';
+        $dotenv = new Dotenv(true);
+
+        $test = "APP_ENV=dev\nTEST1=foo1_\${APP_ENV}";
+        $values = $dotenv->parse($test);
+        $this->assertSame('foo1_prod', $values['TEST1']);
+
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $test = "APP_ENV=dev\nTEST2=foo2_\$(php -r 'echo \$_SERVER[\"APP_ENV\"];')";
+            $values = $dotenv->parse($test);
+            $this->assertSame('foo2_prod', $values['TEST2']);
+        }
+    }
+}
diff --git a/lib/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php b/lib/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
new file mode 100644
index 000000000..359e6005f
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
@@ -0,0 +1,442 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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 PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+abstract class AbstractEventDispatcherTest extends 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([], $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', [$this->listener, 'preFoo']);
+        $this->dispatcher->addListener('post.foo', [$this->listener, 'postFoo']);
+        $this->assertTrue($this->dispatcher->hasListeners());
+        $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', [$listener1, 'preFoo'], -10);
+        $this->dispatcher->addListener('pre.foo', [$listener2, 'preFoo'], 10);
+        $this->dispatcher->addListener('pre.foo', [$listener3, 'preFoo']);
+
+        $expected = [
+            [$listener2, 'preFoo'],
+            [$listener3, 'preFoo'],
+            [$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 = [
+            'pre.foo' => [$listener3, $listener2, $listener1],
+            'post.foo' => [$listener6, $listener5, $listener4],
+        ];
+
+        $this->assertSame($expected, $this->dispatcher->getListeners());
+    }
+
+    public function testGetListenerPriority()
+    {
+        $listener1 = new TestEventListener();
+        $listener2 = new TestEventListener();
+
+        $this->dispatcher->addListener('pre.foo', $listener1, -10);
+        $this->dispatcher->addListener('pre.foo', $listener2);
+
+        $this->assertSame(-10, $this->dispatcher->getListenerPriority('pre.foo', $listener1));
+        $this->assertSame(0, $this->dispatcher->getListenerPriority('pre.foo', $listener2));
+        $this->assertNull($this->dispatcher->getListenerPriority('pre.bar', $listener2));
+        $this->assertNull($this->dispatcher->getListenerPriority('pre.foo', function () {}));
+    }
+
+    public function testDispatch()
+    {
+        $this->dispatcher->addListener('pre.foo', [$this->listener, 'preFoo']);
+        $this->dispatcher->addListener('post.foo', [$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);
+    }
+
+    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', [$this->listener, 'postFoo'], 10);
+        $this->dispatcher->addListener('post.foo', [$otherListener, 'postFoo']);
+        $this->dispatcher->dispatch(self::postFoo);
+        $this->assertTrue($this->listener->postFooInvoked);
+        $this->assertFalse($otherListener->postFooInvoked);
+    }
+
+    public function testDispatchByPriority()
+    {
+        $invoked = [];
+        $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(['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));
+    }
+
+    public function testEventReceivesTheDispatcherInstanceAsArgument()
+    {
+        $listener = new TestWithDispatcher();
+        $this->dispatcher->addListener('test', [$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/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([], $this->dispatcher->getListeners());
+    }
+
+    public function testHasListenersWithoutEventsReturnsFalseAfterHasListenersWithEventHasBeenCalled()
+    {
+        $this->assertFalse($this->dispatcher->hasListeners('foo'));
+        $this->assertFalse($this->dispatcher->hasListeners());
+    }
+
+    public function testHasListenersIsLazy()
+    {
+        $called = 0;
+        $listener = [function () use (&$called) { ++$called; }, 'onFoo'];
+        $this->dispatcher->addListener('foo', $listener);
+        $this->assertTrue($this->dispatcher->hasListeners());
+        $this->assertTrue($this->dispatcher->hasListeners('foo'));
+        $this->assertSame(0, $called);
+    }
+
+    public function testDispatchLazyListener()
+    {
+        $called = 0;
+        $factory = function () use (&$called) {
+            ++$called;
+
+            return new TestWithDispatcher();
+        };
+        $this->dispatcher->addListener('foo', [$factory, 'foo']);
+        $this->assertSame(0, $called);
+        $this->dispatcher->dispatch('foo', new Event());
+        $this->dispatcher->dispatch('foo', new Event());
+        $this->assertSame(1, $called);
+    }
+
+    public function testRemoveFindsLazyListeners()
+    {
+        $test = new TestWithDispatcher();
+        $factory = function () use ($test) { return $test; };
+
+        $this->dispatcher->addListener('foo', [$factory, 'foo']);
+        $this->assertTrue($this->dispatcher->hasListeners('foo'));
+        $this->dispatcher->removeListener('foo', [$test, 'foo']);
+        $this->assertFalse($this->dispatcher->hasListeners('foo'));
+
+        $this->dispatcher->addListener('foo', [$test, 'foo']);
+        $this->assertTrue($this->dispatcher->hasListeners('foo'));
+        $this->dispatcher->removeListener('foo', [$factory, 'foo']);
+        $this->assertFalse($this->dispatcher->hasListeners('foo'));
+    }
+
+    public function testPriorityFindsLazyListeners()
+    {
+        $test = new TestWithDispatcher();
+        $factory = function () use ($test) { return $test; };
+
+        $this->dispatcher->addListener('foo', [$factory, 'foo'], 3);
+        $this->assertSame(3, $this->dispatcher->getListenerPriority('foo', [$test, 'foo']));
+        $this->dispatcher->removeListener('foo', [$factory, 'foo']);
+
+        $this->dispatcher->addListener('foo', [$test, 'foo'], 5);
+        $this->assertSame(5, $this->dispatcher->getListenerPriority('foo', [$factory, 'foo']));
+    }
+
+    public function testGetLazyListeners()
+    {
+        $test = new TestWithDispatcher();
+        $factory = function () use ($test) { return $test; };
+
+        $this->dispatcher->addListener('foo', [$factory, 'foo'], 3);
+        $this->assertSame([[$test, 'foo']], $this->dispatcher->getListeners('foo'));
+
+        $this->dispatcher->removeListener('foo', [$test, 'foo']);
+        $this->dispatcher->addListener('bar', [$factory, 'foo'], 3);
+        $this->assertSame(['bar' => [[$test, 'foo']]], $this->dispatcher->getListeners());
+    }
+}
+
+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 ['pre.foo' => 'preFoo', 'post.foo' => 'postFoo'];
+    }
+}
+
+class TestEventSubscriberWithPriorities implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return [
+            'pre.foo' => ['preFoo', 10],
+            'post.foo' => ['postFoo'],
+        ];
+    }
+}
+
+class TestEventSubscriberWithMultipleListeners implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return ['pre.foo' => [
+            ['preFoo1'],
+            ['preFoo2', 10],
+        ]];
+    }
+}
diff --git a/lib/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php b/lib/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php
new file mode 100644
index 000000000..685cdfc3a
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php
@@ -0,0 +1,210 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * @group legacy
+ */
+class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
+{
+    protected function createEventDispatcher()
+    {
+        $container = new Container();
+
+        return new ContainerAwareEventDispatcher($container);
+    }
+
+    public function testAddAListenerService()
+    {
+        $event = new Event();
+
+        $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
+
+        $service
+            ->expects($this->once())
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', ['service.listener', 'onEvent']);
+
+        $dispatcher->dispatch('onEvent', $event);
+    }
+
+    public function testAddASubscriberService()
+    {
+        $event = new Event();
+
+        $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\SubscriberService')->getMock();
+
+        $service
+            ->expects($this->once())
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $service
+            ->expects($this->once())
+            ->method('onEventWithPriority')
+            ->with($event)
+        ;
+
+        $service
+            ->expects($this->once())
+            ->method('onEventNested')
+            ->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);
+        $dispatcher->dispatch('onEventWithPriority', $event);
+        $dispatcher->dispatch('onEventNested', $event);
+    }
+
+    public function testPreventDuplicateListenerService()
+    {
+        $event = new Event();
+
+        $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
+
+        $service
+            ->expects($this->once())
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', ['service.listener', 'onEvent'], 5);
+        $dispatcher->addListenerService('onEvent', ['service.listener', 'onEvent'], 10);
+
+        $dispatcher->dispatch('onEvent', $event);
+    }
+
+    public function testHasListenersOnLazyLoad()
+    {
+        $event = new Event();
+
+        $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', ['service.listener', '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->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', ['service.listener', 'onEvent']);
+
+        $listeners = $dispatcher->getListeners();
+
+        $this->assertArrayHasKey('onEvent', $listeners);
+
+        $this->assertCount(1, $dispatcher->getListeners('onEvent'));
+    }
+
+    public function testRemoveAfterDispatch()
+    {
+        $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', ['service.listener', 'onEvent']);
+
+        $dispatcher->dispatch('onEvent', new Event());
+        $dispatcher->removeListener('onEvent', [$container->get('service.listener'), 'onEvent']);
+        $this->assertFalse($dispatcher->hasListeners('onEvent'));
+    }
+
+    public function testRemoveBeforeDispatch()
+    {
+        $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', ['service.listener', 'onEvent']);
+
+        $dispatcher->removeListener('onEvent', [$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 [
+            'onEvent' => 'onEvent',
+            'onEventWithPriority' => ['onEventWithPriority', 10],
+            'onEventNested' => [['onEventNested']],
+        ];
+    }
+
+    public function onEvent(Event $e)
+    {
+    }
+
+    public function onEventWithPriority(Event $e)
+    {
+    }
+
+    public function onEventNested(Event $e)
+    {
+    }
+}
diff --git a/lib/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/lib/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
new file mode 100644
index 000000000..aabd95c0f
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -0,0 +1,269 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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 PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+class TraceableEventDispatcherTest extends 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 testGetListenerPriority()
+    {
+        $dispatcher = new EventDispatcher();
+        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
+
+        $tdispatcher->addListener('foo', function () {}, 123);
+
+        $listeners = $dispatcher->getListeners('foo');
+        $this->assertSame(123, $tdispatcher->getListenerPriority('foo', $listeners[0]));
+
+        // Verify that priority is preserved when listener is removed and re-added
+        // in preProcess() and postProcess().
+        $tdispatcher->dispatch('foo', new Event());
+        $listeners = $dispatcher->getListeners('foo');
+        $this->assertSame(123, $tdispatcher->getListenerPriority('foo', $listeners[0]));
+    }
+
+    public function testGetListenerPriorityWhileDispatching()
+    {
+        $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $priorityWhileDispatching = null;
+
+        $listener = function () use ($tdispatcher, &$priorityWhileDispatching, &$listener) {
+            $priorityWhileDispatching = $tdispatcher->getListenerPriority('bar', $listener);
+        };
+
+        $tdispatcher->addListener('bar', $listener, 5);
+        $tdispatcher->dispatch('bar');
+        $this->assertSame(5, $priorityWhileDispatching);
+    }
+
+    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([$subscriber, 'call'], $listeners[0]);
+
+        $tdispatcher->removeSubscriber($subscriber);
+        $this->assertCount(0, $dispatcher->getListeners('foo'));
+    }
+
+    public function testGetCalledListeners()
+    {
+        $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $tdispatcher->addListener('foo', function () {}, 5);
+
+        $listeners = $tdispatcher->getNotCalledListeners();
+        $this->assertArrayHasKey('stub', $listeners[0]);
+        unset($listeners[0]['stub']);
+        $this->assertEquals([], $tdispatcher->getCalledListeners());
+        $this->assertEquals([['event' => 'foo', 'pretty' => 'closure', 'priority' => 5]], $listeners);
+
+        $tdispatcher->dispatch('foo');
+
+        $listeners = $tdispatcher->getCalledListeners();
+        $this->assertArrayHasKey('stub', $listeners[0]);
+        unset($listeners[0]['stub']);
+        $this->assertEquals([['event' => 'foo', 'pretty' => 'closure', 'priority' => 5]], $listeners);
+        $this->assertEquals([], $tdispatcher->getNotCalledListeners());
+    }
+
+    public function testClearCalledListeners()
+    {
+        $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $tdispatcher->addListener('foo', function () {}, 5);
+
+        $tdispatcher->dispatch('foo');
+        $tdispatcher->reset();
+
+        $listeners = $tdispatcher->getNotCalledListeners();
+        $this->assertArrayHasKey('stub', $listeners[0]);
+        unset($listeners[0]['stub']);
+        $this->assertEquals([], $tdispatcher->getCalledListeners());
+        $this->assertEquals([['event' => 'foo', 'pretty' => 'closure', 'priority' => 5]], $listeners);
+    }
+
+    public function testDispatchAfterReset()
+    {
+        $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $tdispatcher->addListener('foo', function () {}, 5);
+
+        $tdispatcher->reset();
+        $tdispatcher->dispatch('foo');
+
+        $listeners = $tdispatcher->getCalledListeners();
+        $this->assertArrayHasKey('stub', $listeners[0]);
+    }
+
+    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->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+
+        $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 "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']);
+        $logger->expects($this->at(1))->method('debug')->with('Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']);
+
+        $tdispatcher->dispatch('foo');
+    }
+
+    public function testLoggerWithStoppedEvent()
+    {
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+
+        $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 "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']);
+        $logger->expects($this->at(1))->method('debug')->with('Listener "{listener}" stopped propagation of the event "{event}".', ['event' => 'foo', 'listener' => 'closure']);
+        $logger->expects($this->at(2))->method('debug')->with('Listener "{listener}" was not called for event "{event}".', ['event' => 'foo', 'listener' => 'closure']);
+
+        $tdispatcher->dispatch('foo');
+    }
+
+    public function testDispatchCallListeners()
+    {
+        $called = [];
+
+        $dispatcher = new EventDispatcher();
+        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
+        $tdispatcher->addListener('foo', function () use (&$called) { $called[] = 'foo1'; }, 10);
+        $tdispatcher->addListener('foo', function () use (&$called) { $called[] = 'foo2'; }, 20);
+
+        $tdispatcher->dispatch('foo');
+
+        $this->assertSame(['foo2', 'foo1'], $called);
+    }
+
+    public function testDispatchNested()
+    {
+        $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $loop = 1;
+        $dispatchedEvents = 0;
+        $dispatcher->addListener('foo', $listener1 = function () use ($dispatcher, &$loop) {
+            ++$loop;
+            if (2 == $loop) {
+                $dispatcher->dispatch('foo');
+            }
+        });
+        $dispatcher->addListener('foo', function () use (&$dispatchedEvents) {
+            ++$dispatchedEvents;
+        });
+
+        $dispatcher->dispatch('foo');
+
+        $this->assertSame(2, $dispatchedEvents);
+    }
+
+    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 ['foo' => 'call'];
+    }
+}
diff --git a/lib/symfony/event-dispatcher/Tests/Debug/WrappedListenerTest.php b/lib/symfony/event-dispatcher/Tests/Debug/WrappedListenerTest.php
new file mode 100644
index 000000000..258938ed9
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/Debug/WrappedListenerTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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 PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\Debug\WrappedListener;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+class WrappedListenerTest extends TestCase
+{
+    /**
+     * @dataProvider provideListenersToDescribe
+     */
+    public function testListenerDescription(callable $listener, $expected)
+    {
+        $wrappedListener = new WrappedListener($listener, null, $this->getMockBuilder(Stopwatch::class)->getMock(), $this->getMockBuilder(EventDispatcherInterface::class)->getMock());
+
+        $this->assertStringMatchesFormat($expected, $wrappedListener->getPretty());
+    }
+
+    public function provideListenersToDescribe()
+    {
+        $listeners = [
+            [new FooListener(), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::__invoke'],
+            [[new FooListener(), 'listen'], 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listen'],
+            [['Symfony\Component\EventDispatcher\Tests\Debug\FooListener', 'listenStatic'], 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listenStatic'],
+            ['var_dump', 'var_dump'],
+            [function () {}, 'closure'],
+        ];
+
+        if (\PHP_VERSION_ID >= 70100) {
+            $listeners[] = [\Closure::fromCallable([new FooListener(), 'listen']), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listen'];
+            $listeners[] = [\Closure::fromCallable(['Symfony\Component\EventDispatcher\Tests\Debug\FooListener', 'listenStatic']), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listenStatic'];
+            $listeners[] = [\Closure::fromCallable(function () {}), 'closure'];
+        }
+
+        return $listeners;
+    }
+}
+
+class FooListener
+{
+    public function listen()
+    {
+    }
+
+    public function __invoke()
+    {
+    }
+
+    public static function listenStatic()
+    {
+    }
+}
diff --git a/lib/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/lib/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
new file mode 100644
index 000000000..61c047af3
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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 PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
+
+class RegisterListenersPassTest extends TestCase
+{
+    /**
+     * Tests that event subscribers not implementing EventSubscriberInterface
+     * trigger an exception.
+     */
+    public function testEventSubscriberWithoutInterface()
+    {
+        $this->expectException('InvalidArgumentException');
+        $builder = new ContainerBuilder();
+        $builder->register('event_dispatcher');
+        $builder->register('my_event_subscriber', 'stdClass')
+            ->addTag('kernel.event_subscriber');
+
+        $registerListenersPass = new RegisterListenersPass();
+        $registerListenersPass->process($builder);
+    }
+
+    public function testValidEventSubscriber()
+    {
+        $builder = new ContainerBuilder();
+        $eventDispatcherDefinition = $builder->register('event_dispatcher');
+        $builder->register('my_event_subscriber', 'Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService')
+            ->addTag('kernel.event_subscriber');
+
+        $registerListenersPass = new RegisterListenersPass();
+        $registerListenersPass->process($builder);
+
+        $expectedCalls = [
+            [
+                'addListener',
+                [
+                    'event',
+                    [new ServiceClosureArgument(new Reference('my_event_subscriber')), 'onEvent'],
+                    0,
+                ],
+            ],
+        ];
+        $this->assertEquals($expectedCalls, $eventDispatcherDefinition->getMethodCalls());
+    }
+
+    public function testAbstractEventListener()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The service "foo" tagged "kernel.event_listener" must not be abstract.');
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_listener', []);
+        $container->register('event_dispatcher', 'stdClass');
+
+        $registerListenersPass = new RegisterListenersPass();
+        $registerListenersPass->process($container);
+    }
+
+    public function testAbstractEventSubscriber()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The service "foo" tagged "kernel.event_subscriber" must not be abstract.');
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_subscriber', []);
+        $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', []);
+        $container->register('event_dispatcher', 'stdClass');
+
+        $registerListenersPass = new RegisterListenersPass();
+        $registerListenersPass->process($container);
+
+        $definition = $container->getDefinition('event_dispatcher');
+        $expectedCalls = [
+            [
+                'addListener',
+                [
+                    'event',
+                    [new ServiceClosureArgument(new Reference('foo')), 'onEvent'],
+                    0,
+                ],
+            ],
+        ];
+        $this->assertEquals($expectedCalls, $definition->getMethodCalls());
+    }
+
+    public function testHotPathEvents()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', SubscriberService::class)->addTag('kernel.event_subscriber', []);
+        $container->register('event_dispatcher', 'stdClass');
+
+        (new RegisterListenersPass())->setHotPathEvents(['event'])->process($container);
+
+        $this->assertTrue($container->getDefinition('foo')->hasTag('container.hot_path'));
+    }
+
+    public function testEventSubscriberUnresolvableClassName()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('You have requested a non-existent parameter "subscriber.class"');
+        $container = new ContainerBuilder();
+        $container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', []);
+        $container->register('event_dispatcher', 'stdClass');
+
+        $registerListenersPass = new RegisterListenersPass();
+        $registerListenersPass->process($container);
+    }
+}
+
+class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return [
+            'event' => 'onEvent',
+        ];
+    }
+}
diff --git a/lib/symfony/event-dispatcher/Tests/EventDispatcherTest.php b/lib/symfony/event-dispatcher/Tests/EventDispatcherTest.php
new file mode 100644
index 000000000..5faa5c8be
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/EventDispatcherTest.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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/lib/symfony/event-dispatcher/Tests/EventTest.php b/lib/symfony/event-dispatcher/Tests/EventTest.php
new file mode 100644
index 000000000..5be2ea09f
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/EventTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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 PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * Test class for Event.
+ */
+class EventTest extends TestCase
+{
+    /**
+     * @var \Symfony\Component\EventDispatcher\Event
+     */
+    protected $event;
+
+    /**
+     * 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();
+    }
+
+    /**
+     * 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;
+    }
+
+    public function testIsPropagationStopped()
+    {
+        $this->assertFalse($this->event->isPropagationStopped());
+    }
+
+    public function testStopPropagationAndIsPropagationStopped()
+    {
+        $this->event->stopPropagation();
+        $this->assertTrue($this->event->isPropagationStopped());
+    }
+}
diff --git a/lib/symfony/event-dispatcher/Tests/GenericEventTest.php b/lib/symfony/event-dispatcher/Tests/GenericEventTest.php
new file mode 100644
index 000000000..f0f0d71f2
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/GenericEventTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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 PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\GenericEvent;
+
+/**
+ * Test class for Event.
+ */
+class GenericEventTest extends TestCase
+{
+    /**
+     * @var GenericEvent
+     */
+    private $event;
+
+    private $subject;
+
+    /**
+     * Prepares the environment before running a test.
+     */
+    protected function setUp()
+    {
+        $this->subject = new \stdClass();
+        $this->event = new GenericEvent($this->subject, ['name' => 'Event']);
+    }
+
+    /**
+     * Cleans up the environment after running a test.
+     */
+    protected function tearDown()
+    {
+        $this->subject = null;
+        $this->event = null;
+    }
+
+    public function testConstruct()
+    {
+        $this->assertEquals($this->event, new GenericEvent($this->subject, ['name' => 'Event']));
+    }
+
+    /**
+     * Tests Event->getArgs().
+     */
+    public function testGetArguments()
+    {
+        // test getting all
+        $this->assertSame(['name' => 'Event'], $this->event->getArguments());
+    }
+
+    public function testSetArguments()
+    {
+        $result = $this->event->setArguments(['foo' => 'bar']);
+        $this->assertSame(['foo' => 'bar'], $this->event->getArguments());
+        $this->assertSame($this->event, $result);
+    }
+
+    public function testSetArgument()
+    {
+        $result = $this->event->setArgument('foo2', 'bar2');
+        $this->assertSame(['name' => 'Event', 'foo2' => 'bar2'], $this->event->getArguments());
+        $this->assertEquals($this->event, $result);
+    }
+
+    public function testGetArgument()
+    {
+        // test getting key
+        $this->assertEquals('Event', $this->event->getArgument('name'));
+    }
+
+    public function testGetArgException()
+    {
+        $this->expectException('\InvalidArgumentException');
+        $this->event->getArgument('nameNotExist');
+    }
+
+    public function testOffsetGet()
+    {
+        // test getting key
+        $this->assertEquals('Event', $this->event['name']);
+
+        // test getting invalid arg
+        $this->expectException('InvalidArgumentException');
+        $this->assertFalse($this->event['nameNotExist']);
+    }
+
+    public function testOffsetSet()
+    {
+        $this->event['foo2'] = 'bar2';
+        $this->assertSame(['name' => 'Event', 'foo2' => 'bar2'], $this->event->getArguments());
+    }
+
+    public function testOffsetUnset()
+    {
+        unset($this->event['name']);
+        $this->assertSame([], $this->event->getArguments());
+    }
+
+    public function testOffsetIsset()
+    {
+        $this->assertArrayHasKey('name', $this->event);
+        $this->assertArrayNotHasKey('nameNotExist', $this->event);
+    }
+
+    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 = [];
+        foreach ($this->event as $key => $value) {
+            $data[$key] = $value;
+        }
+        $this->assertEquals(['name' => 'Event'], $data);
+    }
+}
diff --git a/lib/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php b/lib/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
new file mode 100644
index 000000000..da8502ab9
--- /dev/null
+++ b/lib/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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 PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class ImmutableEventDispatcherTest extends TestCase
+{
+    /**
+     * @var MockObject
+     */
+    private $innerDispatcher;
+
+    /**
+     * @var ImmutableEventDispatcher
+     */
+    private $dispatcher;
+
+    protected function setUp()
+    {
+        $this->innerDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+        $this->dispatcher = new ImmutableEventDispatcher($this->innerDispatcher);
+    }
+
+    public function testDispatchDelegates()
+    {
+        $event = new Event();
+        $resultEvent = new Event();
+
+        $this->innerDispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with('event', $event)
+            ->willReturn($resultEvent);
+
+        $this->assertSame($resultEvent, $this->dispatcher->dispatch('event', $event));
+    }
+
+    public function testGetListenersDelegates()
+    {
+        $this->innerDispatcher->expects($this->once())
+            ->method('getListeners')
+            ->with('event')
+            ->willReturn(['result']);
+
+        $this->assertSame(['result'], $this->dispatcher->getListeners('event'));
+    }
+
+    public function testHasListenersDelegates()
+    {
+        $this->innerDispatcher->expects($this->once())
+            ->method('hasListeners')
+            ->with('event')
+            ->willReturn(true);
+
+        $this->assertTrue($this->dispatcher->hasListeners('event'));
+    }
+
+    public function testAddListenerDisallowed()
+    {
+        $this->expectException('\BadMethodCallException');
+        $this->dispatcher->addListener('event', function () { return 'foo'; });
+    }
+
+    public function testAddSubscriberDisallowed()
+    {
+        $this->expectException('\BadMethodCallException');
+        $subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
+
+        $this->dispatcher->addSubscriber($subscriber);
+    }
+
+    public function testRemoveListenerDisallowed()
+    {
+        $this->expectException('\BadMethodCallException');
+        $this->dispatcher->removeListener('event', function () { return 'foo'; });
+    }
+
+    public function testRemoveSubscriberDisallowed()
+    {
+        $this->expectException('\BadMethodCallException');
+        $subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
+
+        $this->dispatcher->removeSubscriber($subscriber);
+    }
+}
diff --git a/lib/symfony/filesystem/Tests/ExceptionTest.php b/lib/symfony/filesystem/Tests/ExceptionTest.php
new file mode 100644
index 000000000..300acf103
--- /dev/null
+++ b/lib/symfony/filesystem/Tests/ExceptionTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Filesystem\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Filesystem\Exception\FileNotFoundException;
+use Symfony\Component\Filesystem\Exception\IOException;
+
+/**
+ * Test class for Filesystem.
+ */
+class ExceptionTest extends TestCase
+{
+    public function testGetPath()
+    {
+        $e = new IOException('', 0, null, '/foo');
+        $this->assertEquals('/foo', $e->getPath(), 'The pass should be returned.');
+    }
+
+    public function testGeneratedMessage()
+    {
+        $e = new FileNotFoundException(null, 0, null, '/foo');
+        $this->assertEquals('/foo', $e->getPath());
+        $this->assertEquals('File "/foo" could not be found.', $e->getMessage(), 'A message should be generated.');
+    }
+
+    public function testGeneratedMessageWithoutPath()
+    {
+        $e = new FileNotFoundException();
+        $this->assertEquals('File could not be found.', $e->getMessage(), 'A message should be generated.');
+    }
+
+    public function testCustomMessage()
+    {
+        $e = new FileNotFoundException('bar', 0, null, '/foo');
+        $this->assertEquals('bar', $e->getMessage(), 'A custom message should be possible still.');
+    }
+}
diff --git a/lib/symfony/filesystem/Tests/FilesystemTest.php b/lib/symfony/filesystem/Tests/FilesystemTest.php
new file mode 100644
index 000000000..e9e7784a3
--- /dev/null
+++ b/lib/symfony/filesystem/Tests/FilesystemTest.php
@@ -0,0 +1,1656 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Filesystem\Tests;
+
+/**
+ * Test class for Filesystem.
+ */
+class FilesystemTest extends FilesystemTestCase
+{
+    public function testCopyCreatesNewFile()
+    {
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($sourceFilePath, 'SOURCE FILE');
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath);
+
+        $this->assertFileExists($targetFilePath);
+        $this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
+    }
+
+    public function testCopyFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath);
+    }
+
+    public function testCopyUnreadableFileFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        // skip test on Windows; PHP can't easily set file as unreadable on Windows
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test cannot run on Windows.');
+        }
+
+        if (!getenv('USER') || 'root' === getenv('USER')) {
+            $this->markTestSkipped('This test will fail if run under superuser');
+        }
+
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($sourceFilePath, 'SOURCE FILE');
+
+        // make sure target cannot be read
+        $this->filesystem->chmod($sourceFilePath, 0222);
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath);
+    }
+
+    public function testCopyOverridesExistingFileIfModified()
+    {
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($sourceFilePath, 'SOURCE FILE');
+        file_put_contents($targetFilePath, 'TARGET FILE');
+        touch($targetFilePath, time() - 1000);
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath);
+
+        $this->assertFileExists($targetFilePath);
+        $this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
+    }
+
+    public function testCopyDoesNotOverrideExistingFileByDefault()
+    {
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($sourceFilePath, 'SOURCE FILE');
+        file_put_contents($targetFilePath, 'TARGET FILE');
+
+        // make sure both files have the same modification time
+        $modificationTime = time() - 1000;
+        touch($sourceFilePath, $modificationTime);
+        touch($targetFilePath, $modificationTime);
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath);
+
+        $this->assertFileExists($targetFilePath);
+        $this->assertStringEqualsFile($targetFilePath, 'TARGET FILE');
+    }
+
+    public function testCopyOverridesExistingFileIfForced()
+    {
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($sourceFilePath, 'SOURCE FILE');
+        file_put_contents($targetFilePath, 'TARGET FILE');
+
+        // make sure both files have the same modification time
+        $modificationTime = time() - 1000;
+        touch($sourceFilePath, $modificationTime);
+        touch($targetFilePath, $modificationTime);
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath, true);
+
+        $this->assertFileExists($targetFilePath);
+        $this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
+    }
+
+    public function testCopyWithOverrideWithReadOnlyTargetFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        // skip test on Windows; PHP can't easily set file as unwritable on Windows
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test cannot run on Windows.');
+        }
+
+        if (!getenv('USER') || 'root' === getenv('USER')) {
+            $this->markTestSkipped('This test will fail if run under superuser');
+        }
+
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($sourceFilePath, 'SOURCE FILE');
+        file_put_contents($targetFilePath, 'TARGET FILE');
+
+        // make sure both files have the same modification time
+        $modificationTime = time() - 1000;
+        touch($sourceFilePath, $modificationTime);
+        touch($targetFilePath, $modificationTime);
+
+        // make sure target is read-only
+        $this->filesystem->chmod($targetFilePath, 0444);
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath, true);
+    }
+
+    public function testCopyCreatesTargetDirectoryIfItDoesNotExist()
+    {
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFileDirectory = $this->workspace.\DIRECTORY_SEPARATOR.'directory';
+        $targetFilePath = $targetFileDirectory.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($sourceFilePath, 'SOURCE FILE');
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath);
+
+        $this->assertDirectoryExists($targetFileDirectory);
+        $this->assertFileExists($targetFilePath);
+        $this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
+    }
+
+    /**
+     * @group network
+     */
+    public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
+    {
+        if (!\in_array('https', stream_get_wrappers())) {
+            $this->markTestSkipped('"https" stream wrapper is not enabled.');
+        }
+        $sourceFilePath = 'https://symfony.com/images/common/logo/logo_symfony_header.png';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($targetFilePath, 'TARGET FILE');
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath, false);
+
+        $this->assertFileExists($targetFilePath);
+        $this->assertEquals(file_get_contents($sourceFilePath), file_get_contents($targetFilePath));
+    }
+
+    public function testMkdirCreatesDirectoriesRecursively()
+    {
+        $directory = $this->workspace
+            .\DIRECTORY_SEPARATOR.'directory'
+            .\DIRECTORY_SEPARATOR.'sub_directory';
+
+        $this->filesystem->mkdir($directory);
+
+        $this->assertDirectoryExists($directory);
+    }
+
+    public function testMkdirCreatesDirectoriesFromArray()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+        $directories = [
+            $basePath.'1', $basePath.'2', $basePath.'3',
+        ];
+
+        $this->filesystem->mkdir($directories);
+
+        $this->assertDirectoryExists($basePath.'1');
+        $this->assertDirectoryExists($basePath.'2');
+        $this->assertDirectoryExists($basePath.'3');
+    }
+
+    public function testMkdirCreatesDirectoriesFromTraversableObject()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+        $directories = new \ArrayObject([
+            $basePath.'1', $basePath.'2', $basePath.'3',
+        ]);
+
+        $this->filesystem->mkdir($directories);
+
+        $this->assertDirectoryExists($basePath.'1');
+        $this->assertDirectoryExists($basePath.'2');
+        $this->assertDirectoryExists($basePath.'3');
+    }
+
+    public function testMkdirCreatesDirectoriesFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+        $dir = $basePath.'2';
+
+        file_put_contents($dir, '');
+
+        $this->filesystem->mkdir($dir);
+    }
+
+    public function testTouchCreatesEmptyFile()
+    {
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'1';
+
+        $this->filesystem->touch($file);
+
+        $this->assertFileExists($file);
+    }
+
+    public function testTouchFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'1'.\DIRECTORY_SEPARATOR.'2';
+
+        $this->filesystem->touch($file);
+    }
+
+    public function testTouchCreatesEmptyFilesFromArray()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+        $files = [
+            $basePath.'1', $basePath.'2', $basePath.'3',
+        ];
+
+        $this->filesystem->touch($files);
+
+        $this->assertFileExists($basePath.'1');
+        $this->assertFileExists($basePath.'2');
+        $this->assertFileExists($basePath.'3');
+    }
+
+    public function testTouchCreatesEmptyFilesFromTraversableObject()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+        $files = new \ArrayObject([
+            $basePath.'1', $basePath.'2', $basePath.'3',
+        ]);
+
+        $this->filesystem->touch($files);
+
+        $this->assertFileExists($basePath.'1');
+        $this->assertFileExists($basePath.'2');
+        $this->assertFileExists($basePath.'3');
+    }
+
+    public function testRemoveCleansFilesAndDirectoriesIteratively()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR.'directory'.\DIRECTORY_SEPARATOR;
+
+        mkdir($basePath);
+        mkdir($basePath.'dir');
+        touch($basePath.'file');
+
+        $this->filesystem->remove($basePath);
+
+        $this->assertFileNotExists($basePath);
+    }
+
+    public function testRemoveCleansArrayOfFilesAndDirectories()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+
+        mkdir($basePath.'dir');
+        touch($basePath.'file');
+
+        $files = [
+            $basePath.'dir', $basePath.'file',
+        ];
+
+        $this->filesystem->remove($files);
+
+        $this->assertFileNotExists($basePath.'dir');
+        $this->assertFileNotExists($basePath.'file');
+    }
+
+    public function testRemoveCleansTraversableObjectOfFilesAndDirectories()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+
+        mkdir($basePath.'dir');
+        touch($basePath.'file');
+
+        $files = new \ArrayObject([
+            $basePath.'dir', $basePath.'file',
+        ]);
+
+        $this->filesystem->remove($files);
+
+        $this->assertFileNotExists($basePath.'dir');
+        $this->assertFileNotExists($basePath.'file');
+    }
+
+    public function testRemoveIgnoresNonExistingFiles()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+
+        mkdir($basePath.'dir');
+
+        $files = [
+            $basePath.'dir', $basePath.'file',
+        ];
+
+        $this->filesystem->remove($files);
+
+        $this->assertFileNotExists($basePath.'dir');
+    }
+
+    public function testRemoveCleansInvalidLinks()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR.'directory'.\DIRECTORY_SEPARATOR;
+
+        mkdir($basePath);
+        mkdir($basePath.'dir');
+        // create symlink to nonexistent file
+        @symlink($basePath.'file', $basePath.'file-link');
+
+        // create symlink to dir using trailing forward slash
+        $this->filesystem->symlink($basePath.'dir/', $basePath.'dir-link');
+        $this->assertDirectoryExists($basePath.'dir-link');
+
+        // create symlink to nonexistent dir
+        rmdir($basePath.'dir');
+        $this->assertFalse('\\' === \DIRECTORY_SEPARATOR ? @readlink($basePath.'dir-link') : is_dir($basePath.'dir-link'));
+
+        $this->filesystem->remove($basePath);
+
+        $this->assertFileNotExists($basePath);
+    }
+
+    public function testFilesExists()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR.'directory'.\DIRECTORY_SEPARATOR;
+
+        mkdir($basePath);
+        touch($basePath.'file1');
+        mkdir($basePath.'folder');
+
+        $this->assertTrue($this->filesystem->exists($basePath.'file1'));
+        $this->assertTrue($this->filesystem->exists($basePath.'folder'));
+    }
+
+    public function testFilesExistsFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Long file names are an issue on Windows');
+        }
+        $basePath = $this->workspace.'\\directory\\';
+        $maxPathLength = PHP_MAXPATHLEN - 2;
+
+        $oldPath = getcwd();
+        mkdir($basePath);
+        chdir($basePath);
+        $file = str_repeat('T', $maxPathLength - \strlen($basePath) + 1);
+        $path = $basePath.$file;
+        exec('TYPE NUL >>'.$file); // equivalent of touch, we can not use the php touch() here because it suffers from the same limitation
+        $this->longPathNamesWindows[] = $path; // save this so we can clean up later
+        chdir($oldPath);
+        $this->filesystem->exists($path);
+    }
+
+    public function testFilesExistsTraversableObjectOfFilesAndDirectories()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+
+        mkdir($basePath.'dir');
+        touch($basePath.'file');
+
+        $files = new \ArrayObject([
+            $basePath.'dir', $basePath.'file',
+        ]);
+
+        $this->assertTrue($this->filesystem->exists($files));
+    }
+
+    public function testFilesNotExistsTraversableObjectOfFilesAndDirectories()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
+
+        mkdir($basePath.'dir');
+        touch($basePath.'file');
+        touch($basePath.'file2');
+
+        $files = new \ArrayObject([
+            $basePath.'dir', $basePath.'file', $basePath.'file2',
+        ]);
+
+        unlink($basePath.'file');
+
+        $this->assertFalse($this->filesystem->exists($files));
+    }
+
+    public function testInvalidFileNotExists()
+    {
+        $basePath = $this->workspace.\DIRECTORY_SEPARATOR.'directory'.\DIRECTORY_SEPARATOR;
+
+        $this->assertFalse($this->filesystem->exists($basePath.time()));
+    }
+
+    public function testChmodChangesFileMode()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+        $file = $dir.\DIRECTORY_SEPARATOR.'file';
+        touch($file);
+
+        $this->filesystem->chmod($file, 0400);
+        $this->filesystem->chmod($dir, 0753);
+
+        $this->assertFilePermissions(753, $dir);
+        $this->assertFilePermissions(400, $file);
+    }
+
+    public function testChmodWithWrongModLeavesPreviousPermissionsUntouched()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('chmod() changes permissions even when passing invalid modes on HHVM');
+        }
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        touch($dir);
+
+        $permissions = fileperms($dir);
+
+        $this->filesystem->chmod($dir, 'Wrongmode');
+
+        $this->assertSame($permissions, fileperms($dir));
+    }
+
+    public function testChmodRecursive()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+        $file = $dir.\DIRECTORY_SEPARATOR.'file';
+        touch($file);
+
+        $this->filesystem->chmod($file, 0400, 0000, true);
+        $this->filesystem->chmod($dir, 0753, 0000, true);
+
+        $this->assertFilePermissions(753, $dir);
+        $this->assertFilePermissions(753, $file);
+    }
+
+    public function testChmodAppliesUmask()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        touch($file);
+
+        $this->filesystem->chmod($file, 0770, 0022);
+        $this->assertFilePermissions(750, $file);
+    }
+
+    public function testChmodChangesModeOfArrayOfFiles()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $directory = $this->workspace.\DIRECTORY_SEPARATOR.'directory';
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $files = [$directory, $file];
+
+        mkdir($directory);
+        touch($file);
+
+        $this->filesystem->chmod($files, 0753);
+
+        $this->assertFilePermissions(753, $file);
+        $this->assertFilePermissions(753, $directory);
+    }
+
+    public function testChmodChangesModeOfTraversableFileObject()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $directory = $this->workspace.\DIRECTORY_SEPARATOR.'directory';
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $files = new \ArrayObject([$directory, $file]);
+
+        mkdir($directory);
+        touch($file);
+
+        $this->filesystem->chmod($files, 0753);
+
+        $this->assertFilePermissions(753, $file);
+        $this->assertFilePermissions(753, $directory);
+    }
+
+    public function testChmodChangesZeroModeOnSubdirectoriesOnRecursive()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $directory = $this->workspace.\DIRECTORY_SEPARATOR.'directory';
+        $subdirectory = $directory.\DIRECTORY_SEPARATOR.'subdirectory';
+
+        mkdir($directory);
+        mkdir($subdirectory);
+        chmod($subdirectory, 0000);
+
+        $this->filesystem->chmod($directory, 0753, 0000, true);
+
+        $this->assertFilePermissions(753, $subdirectory);
+    }
+
+    public function testChown()
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+
+        $owner = $this->getFileOwner($dir);
+        $this->filesystem->chown($dir, $owner);
+
+        $this->assertSame($owner, $this->getFileOwner($dir));
+    }
+
+    public function testChownRecursive()
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+        $file = $dir.\DIRECTORY_SEPARATOR.'file';
+        touch($file);
+
+        $owner = $this->getFileOwner($dir);
+        $this->filesystem->chown($dir, $owner, true);
+
+        $this->assertSame($owner, $this->getFileOwner($file));
+    }
+
+    public function testChownSymlink()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->symlink($file, $link);
+
+        $owner = $this->getFileOwner($link);
+        $this->filesystem->chown($link, $owner);
+
+        $this->assertSame($owner, $this->getFileOwner($link));
+    }
+
+    public function testChownLink()
+    {
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->hardlink($file, $link);
+
+        $owner = $this->getFileOwner($link);
+        $this->filesystem->chown($link, $owner);
+
+        $this->assertSame($owner, $this->getFileOwner($link));
+    }
+
+    public function testChownSymlinkFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->symlink($file, $link);
+
+        $this->filesystem->chown($link, 'user'.time().mt_rand(1000, 9999));
+    }
+
+    public function testChownLinkFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->hardlink($file, $link);
+
+        $this->filesystem->chown($link, 'user'.time().mt_rand(1000, 9999));
+    }
+
+    public function testChownFail()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+
+        $this->filesystem->chown($dir, 'user'.time().mt_rand(1000, 9999));
+    }
+
+    public function testChgrp()
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+
+        $group = $this->getFileGroup($dir);
+        $this->filesystem->chgrp($dir, $group);
+
+        $this->assertSame($group, $this->getFileGroup($dir));
+    }
+
+    public function testChgrpRecursive()
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+        $file = $dir.\DIRECTORY_SEPARATOR.'file';
+        touch($file);
+
+        $group = $this->getFileGroup($dir);
+        $this->filesystem->chgrp($dir, $group, true);
+
+        $this->assertSame($group, $this->getFileGroup($file));
+    }
+
+    public function testChgrpSymlink()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->symlink($file, $link);
+
+        $group = $this->getFileGroup($link);
+        $this->filesystem->chgrp($link, $group);
+
+        $this->assertSame($group, $this->getFileGroup($link));
+    }
+
+    public function testChgrpLink()
+    {
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->hardlink($file, $link);
+
+        $group = $this->getFileGroup($link);
+        $this->filesystem->chgrp($link, $group);
+
+        $this->assertSame($group, $this->getFileGroup($link));
+    }
+
+    public function testChgrpSymlinkFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->symlink($file, $link);
+
+        $this->filesystem->chgrp($link, 'user'.time().mt_rand(1000, 9999));
+    }
+
+    public function testChgrpLinkFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->hardlink($file, $link);
+
+        $this->filesystem->chgrp($link, 'user'.time().mt_rand(1000, 9999));
+    }
+
+    public function testChgrpFail()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+        mkdir($dir);
+
+        $this->filesystem->chgrp($dir, 'user'.time().mt_rand(1000, 9999));
+    }
+
+    public function testRename()
+    {
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $newPath = $this->workspace.\DIRECTORY_SEPARATOR.'new_file';
+        touch($file);
+
+        $this->filesystem->rename($file, $newPath);
+
+        $this->assertFileNotExists($file);
+        $this->assertFileExists($newPath);
+    }
+
+    public function testRenameThrowsExceptionIfTargetAlreadyExists()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $newPath = $this->workspace.\DIRECTORY_SEPARATOR.'new_file';
+
+        touch($file);
+        touch($newPath);
+
+        $this->filesystem->rename($file, $newPath);
+    }
+
+    public function testRenameOverwritesTheTargetIfItAlreadyExists()
+    {
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $newPath = $this->workspace.\DIRECTORY_SEPARATOR.'new_file';
+
+        touch($file);
+        touch($newPath);
+
+        $this->filesystem->rename($file, $newPath, true);
+
+        $this->assertFileNotExists($file);
+        $this->assertFileExists($newPath);
+    }
+
+    public function testRenameThrowsExceptionOnError()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.uniqid('fs_test_', true);
+        $newPath = $this->workspace.\DIRECTORY_SEPARATOR.'new_file';
+
+        $this->filesystem->rename($file, $newPath);
+    }
+
+    public function testSymlink()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Windows does not support creating "broken" symlinks');
+        }
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        // $file does not exist right now: creating "broken" links is a wanted feature
+        $this->filesystem->symlink($file, $link);
+
+        $this->assertTrue(is_link($link));
+
+        // Create the linked file AFTER creating the link
+        touch($file);
+
+        $this->assertEquals($file, readlink($link));
+    }
+
+    /**
+     * @depends testSymlink
+     */
+    public function testRemoveSymlink()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        $this->filesystem->remove($link);
+
+        $this->assertFalse(is_link($link));
+        $this->assertFalse(is_file($link));
+        $this->assertDirectoryNotExists($link);
+    }
+
+    public function testSymlinkIsOverwrittenIfPointsToDifferentTarget()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+        symlink($this->workspace, $link);
+
+        $this->filesystem->symlink($file, $link);
+
+        $this->assertTrue(is_link($link));
+        $this->assertEquals($file, readlink($link));
+    }
+
+    public function testSymlinkIsNotOverwrittenIfAlreadyCreated()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+        symlink($file, $link);
+
+        $this->filesystem->symlink($file, $link);
+
+        $this->assertTrue(is_link($link));
+        $this->assertEquals($file, readlink($link));
+    }
+
+    public function testSymlinkCreatesTargetDirectoryIfItDoesNotExist()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link1 = $this->workspace.\DIRECTORY_SEPARATOR.'dir'.\DIRECTORY_SEPARATOR.'link';
+        $link2 = $this->workspace.\DIRECTORY_SEPARATOR.'dir'.\DIRECTORY_SEPARATOR.'subdir'.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        $this->filesystem->symlink($file, $link1);
+        $this->filesystem->symlink($file, $link2);
+
+        $this->assertTrue(is_link($link1));
+        $this->assertEquals($file, readlink($link1));
+        $this->assertTrue(is_link($link2));
+        $this->assertEquals($file, readlink($link2));
+    }
+
+    public function testLink()
+    {
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+        $this->filesystem->hardlink($file, $link);
+
+        $this->assertTrue(is_file($link));
+        $this->assertEquals(fileinode($file), fileinode($link));
+    }
+
+    /**
+     * @depends testLink
+     */
+    public function testRemoveLink()
+    {
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        $this->filesystem->remove($link);
+
+        $this->assertTrue(!is_file($link));
+    }
+
+    public function testLinkIsOverwrittenIfPointsToDifferentTarget()
+    {
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $file2 = $this->workspace.\DIRECTORY_SEPARATOR.'file2';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+        touch($file2);
+        link($file2, $link);
+
+        $this->filesystem->hardlink($file, $link);
+
+        $this->assertTrue(is_file($link));
+        $this->assertEquals(fileinode($file), fileinode($link));
+    }
+
+    public function testLinkIsNotOverwrittenIfAlreadyCreated()
+    {
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+        link($file, $link);
+
+        $this->filesystem->hardlink($file, $link);
+
+        $this->assertTrue(is_file($link));
+        $this->assertEquals(fileinode($file), fileinode($link));
+    }
+
+    public function testLinkWithSeveralTargets()
+    {
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link1 = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+        $link2 = $this->workspace.\DIRECTORY_SEPARATOR.'link2';
+
+        touch($file);
+
+        $this->filesystem->hardlink($file, [$link1, $link2]);
+
+        $this->assertTrue(is_file($link1));
+        $this->assertEquals(fileinode($file), fileinode($link1));
+        $this->assertTrue(is_file($link2));
+        $this->assertEquals(fileinode($file), fileinode($link2));
+    }
+
+    public function testLinkWithSameTarget()
+    {
+        $this->markAsSkippedIfLinkIsMissing();
+
+        $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+        $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+        touch($file);
+
+        // practically same as testLinkIsNotOverwrittenIfAlreadyCreated
+        $this->filesystem->hardlink($file, [$link, $link]);
+
+        $this->assertTrue(is_file($link));
+        $this->assertEquals(fileinode($file), fileinode($link));
+    }
+
+    public function testReadRelativeLink()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Relative symbolic links are not supported on Windows');
+        }
+
+        $file = $this->workspace.'/file';
+        $link1 = $this->workspace.'/dir/link';
+        $link2 = $this->workspace.'/dir/link2';
+        touch($file);
+
+        $this->filesystem->symlink('../file', $link1);
+        $this->filesystem->symlink('link', $link2);
+
+        $this->assertEquals($this->normalize('../file'), $this->filesystem->readlink($link1));
+        $this->assertEquals('link', $this->filesystem->readlink($link2));
+        $this->assertEquals($file, $this->filesystem->readlink($link1, true));
+        $this->assertEquals($file, $this->filesystem->readlink($link2, true));
+        $this->assertEquals($file, $this->filesystem->readlink($file, true));
+    }
+
+    public function testReadAbsoluteLink()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->normalize($this->workspace.'/file');
+        $link1 = $this->normalize($this->workspace.'/dir/link');
+        $link2 = $this->normalize($this->workspace.'/dir/link2');
+        touch($file);
+
+        $this->filesystem->symlink($file, $link1);
+        $this->filesystem->symlink($link1, $link2);
+
+        $this->assertEquals($file, $this->filesystem->readlink($link1));
+        $this->assertEquals($link1, $this->filesystem->readlink($link2));
+        $this->assertEquals($file, $this->filesystem->readlink($link1, true));
+        $this->assertEquals($file, $this->filesystem->readlink($link2, true));
+        $this->assertEquals($file, $this->filesystem->readlink($file, true));
+    }
+
+    public function testReadBrokenLink()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Windows does not support creating "broken" symlinks');
+        }
+
+        $file = $this->workspace.'/file';
+        $link = $this->workspace.'/link';
+
+        $this->filesystem->symlink($file, $link);
+
+        $this->assertEquals($file, $this->filesystem->readlink($link));
+        $this->assertNull($this->filesystem->readlink($link, true));
+
+        touch($file);
+        $this->assertEquals($file, $this->filesystem->readlink($link, true));
+    }
+
+    public function testReadLinkDefaultPathDoesNotExist()
+    {
+        $this->assertNull($this->filesystem->readlink($this->normalize($this->workspace.'/invalid')));
+    }
+
+    public function testReadLinkDefaultPathNotLink()
+    {
+        $file = $this->normalize($this->workspace.'/file');
+        touch($file);
+
+        $this->assertNull($this->filesystem->readlink($file));
+    }
+
+    public function testReadLinkCanonicalizePath()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $file = $this->normalize($this->workspace.'/file');
+        mkdir($this->normalize($this->workspace.'/dir'));
+        touch($file);
+
+        $this->assertEquals($file, $this->filesystem->readlink($this->normalize($this->workspace.'/dir/../file'), true));
+    }
+
+    public function testReadLinkCanonicalizedPathDoesNotExist()
+    {
+        $this->assertNull($this->filesystem->readlink($this->normalize($this->workspace.'invalid'), true));
+    }
+
+    /**
+     * @dataProvider providePathsForMakePathRelative
+     */
+    public function testMakePathRelative($endPath, $startPath, $expectedPath)
+    {
+        $path = $this->filesystem->makePathRelative($endPath, $startPath);
+
+        $this->assertEquals($expectedPath, $path);
+    }
+
+    public function providePathsForMakePathRelative()
+    {
+        $paths = [
+            ['/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component', '../'],
+            ['/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component/', '../'],
+            ['/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component', '../'],
+            ['/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'],
+            ['/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'],
+            ['/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', 'src/Symfony/'],
+            ['/aa/bb', '/aa/bb', './'],
+            ['/aa/bb', '/aa/bb/', './'],
+            ['/aa/bb/', '/aa/bb', './'],
+            ['/aa/bb/', '/aa/bb/', './'],
+            ['/aa/bb/cc', '/aa/bb/cc/dd', '../'],
+            ['/aa/bb/cc', '/aa/bb/cc/dd/', '../'],
+            ['/aa/bb/cc/', '/aa/bb/cc/dd', '../'],
+            ['/aa/bb/cc/', '/aa/bb/cc/dd/', '../'],
+            ['/aa/bb/cc', '/aa', 'bb/cc/'],
+            ['/aa/bb/cc', '/aa/', 'bb/cc/'],
+            ['/aa/bb/cc/', '/aa', 'bb/cc/'],
+            ['/aa/bb/cc/', '/aa/', 'bb/cc/'],
+            ['/a/aab/bb', '/a/aa', '../aab/bb/'],
+            ['/a/aab/bb', '/a/aa/', '../aab/bb/'],
+            ['/a/aab/bb/', '/a/aa', '../aab/bb/'],
+            ['/a/aab/bb/', '/a/aa/', '../aab/bb/'],
+            ['/a/aab/bb/', '/', 'a/aab/bb/'],
+            ['/a/aab/bb/', '/b/aab', '../../a/aab/bb/'],
+            ['/aab/bb', '/aa', '../aab/bb/'],
+            ['/aab', '/aa', '../aab/'],
+            ['/aa/bb/cc', '/aa/dd/..', 'bb/cc/'],
+            ['/aa/../bb/cc', '/aa/dd/..', '../bb/cc/'],
+            ['/aa/bb/../../cc', '/aa/../dd/..', 'cc/'],
+            ['/../aa/bb/cc', '/aa/dd/..', 'bb/cc/'],
+            ['/../../aa/../bb/cc', '/aa/dd/..', '../bb/cc/'],
+            ['C:/aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'],
+            ['c:/aa/../bb/cc', 'c:/aa/dd/..', '../bb/cc/'],
+            ['C:/aa/bb/../../cc', 'C:/aa/../dd/..', 'cc/'],
+            ['C:/../aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'],
+            ['C:/../../aa/../bb/cc', 'C:/aa/dd/..', '../bb/cc/'],
+        ];
+
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $paths[] = ['c:\var\lib/symfony/src/Symfony/', 'c:/var/lib/symfony/', 'src/Symfony/'];
+        }
+
+        return $paths;
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider provideLegacyPathsForMakePathRelativeWithRelativePaths
+     * @expectedDeprecation Support for passing relative paths to Symfony\Component\Filesystem\Filesystem::makePathRelative() is deprecated since Symfony 3.4 and will be removed in 4.0.
+     */
+    public function testMakePathRelativeWithRelativePaths($endPath, $startPath, $expectedPath)
+    {
+        $path = $this->filesystem->makePathRelative($endPath, $startPath);
+
+        $this->assertEquals($expectedPath, $path);
+    }
+
+    public function provideLegacyPathsForMakePathRelativeWithRelativePaths()
+    {
+        return [
+            ['usr/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'],
+            ['aa/bb', 'aa/cc', '../bb/'],
+            ['aa/cc', 'bb/cc', '../../aa/cc/'],
+            ['aa/bb', 'aa/./cc', '../bb/'],
+            ['aa/./bb', 'aa/cc', '../bb/'],
+            ['aa/./bb', 'aa/./cc', '../bb/'],
+            ['../../', '../../', './'],
+            ['../aa/bb/', 'aa/bb/', '../../../aa/bb/'],
+            ['../../../', '../../', '../'],
+            ['', '', './'],
+            ['', 'aa/', '../'],
+            ['aa/', '', 'aa/'],
+        ];
+    }
+
+    public function testMirrorCopiesFilesAndDirectoriesRecursively()
+    {
+        $sourcePath = $this->workspace.\DIRECTORY_SEPARATOR.'source'.\DIRECTORY_SEPARATOR;
+        $directory = $sourcePath.'directory'.\DIRECTORY_SEPARATOR;
+        $file1 = $directory.'file1';
+        $file2 = $sourcePath.'file2';
+
+        mkdir($sourcePath);
+        mkdir($directory);
+        file_put_contents($file1, 'FILE1');
+        file_put_contents($file2, 'FILE2');
+
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'target'.\DIRECTORY_SEPARATOR;
+
+        $this->filesystem->mirror($sourcePath, $targetPath);
+
+        $this->assertDirectoryExists($targetPath);
+        $this->assertDirectoryExists($targetPath.'directory');
+        $this->assertFileEquals($file1, $targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1');
+        $this->assertFileEquals($file2, $targetPath.'file2');
+
+        $this->filesystem->remove($file1);
+
+        $this->filesystem->mirror($sourcePath, $targetPath, null, ['delete' => false]);
+        $this->assertTrue($this->filesystem->exists($targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1'));
+
+        $this->filesystem->mirror($sourcePath, $targetPath, null, ['delete' => true]);
+        $this->assertFalse($this->filesystem->exists($targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1'));
+
+        file_put_contents($file1, 'FILE1');
+
+        $this->filesystem->mirror($sourcePath, $targetPath, null, ['delete' => true]);
+        $this->assertTrue($this->filesystem->exists($targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1'));
+
+        $this->filesystem->remove($directory);
+        $this->filesystem->mirror($sourcePath, $targetPath, null, ['delete' => true]);
+        $this->assertFalse($this->filesystem->exists($targetPath.'directory'));
+        $this->assertFalse($this->filesystem->exists($targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1'));
+    }
+
+    public function testMirrorCreatesEmptyDirectory()
+    {
+        $sourcePath = $this->workspace.\DIRECTORY_SEPARATOR.'source'.\DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath);
+
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'target'.\DIRECTORY_SEPARATOR;
+
+        $this->filesystem->mirror($sourcePath, $targetPath);
+
+        $this->assertDirectoryExists($targetPath);
+
+        $this->filesystem->remove($sourcePath);
+    }
+
+    public function testMirrorCopiesLinks()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $sourcePath = $this->workspace.\DIRECTORY_SEPARATOR.'source'.\DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath);
+        file_put_contents($sourcePath.'file1', 'FILE1');
+        symlink($sourcePath.'file1', $sourcePath.'link1');
+
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'target'.\DIRECTORY_SEPARATOR;
+
+        $this->filesystem->mirror($sourcePath, $targetPath);
+
+        $this->assertDirectoryExists($targetPath);
+        $this->assertFileEquals($sourcePath.'file1', $targetPath.'link1');
+        $this->assertTrue(is_link($targetPath.\DIRECTORY_SEPARATOR.'link1'));
+    }
+
+    public function testMirrorCopiesLinkedDirectoryContents()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing(true);
+
+        $sourcePath = $this->workspace.\DIRECTORY_SEPARATOR.'source'.\DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath.'nested/', 0777, true);
+        file_put_contents($sourcePath.'/nested/file1.txt', 'FILE1');
+        // Note: We symlink directory, not file
+        symlink($sourcePath.'nested', $sourcePath.'link1');
+
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'target'.\DIRECTORY_SEPARATOR;
+
+        $this->filesystem->mirror($sourcePath, $targetPath);
+
+        $this->assertDirectoryExists($targetPath);
+        $this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
+        $this->assertTrue(is_link($targetPath.\DIRECTORY_SEPARATOR.'link1'));
+    }
+
+    public function testMirrorCopiesRelativeLinkedContents()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing(true);
+
+        $sourcePath = $this->workspace.\DIRECTORY_SEPARATOR.'source'.\DIRECTORY_SEPARATOR;
+        $oldPath = getcwd();
+
+        mkdir($sourcePath.'nested/', 0777, true);
+        file_put_contents($sourcePath.'/nested/file1.txt', 'FILE1');
+        // Note: Create relative symlink
+        chdir($sourcePath);
+        symlink('nested', 'link1');
+
+        chdir($oldPath);
+
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'target'.\DIRECTORY_SEPARATOR;
+
+        $this->filesystem->mirror($sourcePath, $targetPath);
+
+        $this->assertDirectoryExists($targetPath);
+        $this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
+        $this->assertTrue(is_link($targetPath.\DIRECTORY_SEPARATOR.'link1'));
+        $this->assertEquals('\\' === \DIRECTORY_SEPARATOR ? realpath($sourcePath.'\nested') : 'nested', readlink($targetPath.\DIRECTORY_SEPARATOR.'link1'));
+    }
+
+    public function testMirrorContentsWithSameNameAsSourceOrTargetWithoutDeleteOption()
+    {
+        $sourcePath = $this->workspace.\DIRECTORY_SEPARATOR.'source'.\DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath);
+        touch($sourcePath.'source');
+        touch($sourcePath.'target');
+
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'target'.\DIRECTORY_SEPARATOR;
+
+        $oldPath = getcwd();
+        chdir($this->workspace);
+
+        $this->filesystem->mirror('source', $targetPath);
+
+        chdir($oldPath);
+
+        $this->assertDirectoryExists($targetPath);
+        $this->assertFileExists($targetPath.'source');
+        $this->assertFileExists($targetPath.'target');
+    }
+
+    public function testMirrorContentsWithSameNameAsSourceOrTargetWithDeleteOption()
+    {
+        $sourcePath = $this->workspace.\DIRECTORY_SEPARATOR.'source'.\DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath);
+        touch($sourcePath.'source');
+
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'target'.\DIRECTORY_SEPARATOR;
+
+        mkdir($targetPath);
+        touch($targetPath.'source');
+        touch($targetPath.'target');
+
+        $oldPath = getcwd();
+        chdir($this->workspace);
+
+        $this->filesystem->mirror('source', 'target', null, ['delete' => true]);
+
+        chdir($oldPath);
+
+        $this->assertDirectoryExists($targetPath);
+        $this->assertFileExists($targetPath.'source');
+        $this->assertFileNotExists($targetPath.'target');
+    }
+
+    public function testMirrorFromSubdirectoryInToParentDirectory()
+    {
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR;
+        $sourcePath = $targetPath.'bar'.\DIRECTORY_SEPARATOR;
+        $file1 = $sourcePath.'file1';
+        $file2 = $sourcePath.'file2';
+
+        $this->filesystem->mkdir($sourcePath);
+        file_put_contents($file1, 'FILE1');
+        file_put_contents($file2, 'FILE2');
+
+        $this->filesystem->mirror($sourcePath, $targetPath);
+
+        $this->assertFileEquals($file1, $targetPath.'file1');
+    }
+
+    /**
+     * @dataProvider providePathsForIsAbsolutePath
+     */
+    public function testIsAbsolutePath($path, $expectedResult)
+    {
+        $result = $this->filesystem->isAbsolutePath($path);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function providePathsForIsAbsolutePath()
+    {
+        return [
+            ['/var/lib', true],
+            ['c:\\\\var\\lib', true],
+            ['\\var\\lib', true],
+            ['var/lib', false],
+            ['../var/lib', false],
+            ['', false],
+            [null, false],
+        ];
+    }
+
+    public function testTempnam()
+    {
+        $dirname = $this->workspace;
+
+        $filename = $this->filesystem->tempnam($dirname, 'foo');
+
+        $this->assertFileExists($filename);
+    }
+
+    public function testTempnamWithFileScheme()
+    {
+        $scheme = 'file://';
+        $dirname = $scheme.$this->workspace;
+
+        $filename = $this->filesystem->tempnam($dirname, 'foo');
+
+        $this->assertStringStartsWith($scheme, $filename);
+        $this->assertFileExists($filename);
+    }
+
+    public function testTempnamWithMockScheme()
+    {
+        stream_wrapper_register('mock', 'Symfony\Component\Filesystem\Tests\Fixtures\MockStream\MockStream');
+
+        $scheme = 'mock://';
+        $dirname = $scheme.$this->workspace;
+
+        $filename = $this->filesystem->tempnam($dirname, 'foo');
+
+        $this->assertStringStartsWith($scheme, $filename);
+        $this->assertFileExists($filename);
+    }
+
+    public function testTempnamWithZlibSchemeFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $scheme = 'compress.zlib://';
+        $dirname = $scheme.$this->workspace;
+
+        // The compress.zlib:// stream does not support mode x: creates the file, errors "failed to open stream: operation failed" and returns false
+        $this->filesystem->tempnam($dirname, 'bar');
+    }
+
+    public function testTempnamWithPHPTempSchemeFails()
+    {
+        $scheme = 'php://temp';
+        $dirname = $scheme;
+
+        $filename = $this->filesystem->tempnam($dirname, 'bar');
+
+        $this->assertStringStartsWith($scheme, $filename);
+
+        // The php://temp stream deletes the file after close
+        $this->assertFileNotExists($filename);
+    }
+
+    public function testTempnamWithPharSchemeFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        // Skip test if Phar disabled phar.readonly must be 0 in php.ini
+        if (!\Phar::canWrite()) {
+            $this->markTestSkipped('This test cannot run when phar.readonly is 1.');
+        }
+
+        $scheme = 'phar://';
+        $dirname = $scheme.$this->workspace;
+        $pharname = 'foo.phar';
+
+        new \Phar($this->workspace.'/'.$pharname, 0, $pharname);
+        // The phar:// stream does not support mode x: fails to create file, errors "failed to open stream: phar error: "$filename" is not a file in phar "$pharname"" and returns false
+        $this->filesystem->tempnam($dirname, $pharname.'/bar');
+    }
+
+    public function testTempnamWithHTTPSchemeFails()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $scheme = 'http://';
+        $dirname = $scheme.$this->workspace;
+
+        // The http:// scheme is read-only
+        $this->filesystem->tempnam($dirname, 'bar');
+    }
+
+    public function testTempnamOnUnwritableFallsBackToSysTmp()
+    {
+        $scheme = 'file://';
+        $dirname = $scheme.$this->workspace.\DIRECTORY_SEPARATOR.'does_not_exist';
+
+        $filename = $this->filesystem->tempnam($dirname, 'bar');
+        $realTempDir = realpath(sys_get_temp_dir());
+        $this->assertStringStartsWith(rtrim($scheme.$realTempDir, \DIRECTORY_SEPARATOR), $filename);
+        $this->assertFileExists($filename);
+
+        // Tear down
+        @unlink($filename);
+    }
+
+    public function testDumpFile()
+    {
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
+
+        // skip mode check on Windows
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $oldMask = umask(0002);
+        }
+
+        $this->filesystem->dumpFile($filename, 'bar');
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'bar');
+
+        // skip mode check on Windows
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $this->assertFilePermissions(664, $filename);
+            umask($oldMask);
+        }
+    }
+
+    public function testDumpFileWithArray()
+    {
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
+
+        $this->filesystem->dumpFile($filename, ['bar']);
+
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'bar');
+    }
+
+    public function testDumpFileWithResource()
+    {
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
+
+        $resource = fopen('php://memory', 'rw');
+        fwrite($resource, 'bar');
+        fseek($resource, 0);
+
+        $this->filesystem->dumpFile($filename, $resource);
+
+        fclose($resource);
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'bar');
+    }
+
+    public function testDumpFileOverwritesAnExistingFile()
+    {
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo.txt';
+        file_put_contents($filename, 'FOO BAR');
+
+        $this->filesystem->dumpFile($filename, 'bar');
+
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'bar');
+    }
+
+    public function testDumpFileWithFileScheme()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM does not handle the file:// scheme correctly');
+        }
+
+        $scheme = 'file://';
+        $filename = $scheme.$this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
+
+        $this->filesystem->dumpFile($filename, 'bar');
+
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'bar');
+    }
+
+    public function testDumpFileWithZlibScheme()
+    {
+        $scheme = 'compress.zlib://';
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
+
+        $this->filesystem->dumpFile($filename, 'bar');
+
+        // Zlib stat uses file:// wrapper so remove scheme
+        $this->assertFileExists(str_replace($scheme, '', $filename));
+        $this->assertStringEqualsFile($filename, 'bar');
+    }
+
+    public function testAppendToFile()
+    {
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'bar.txt';
+
+        // skip mode check on Windows
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $oldMask = umask(0002);
+        }
+
+        $this->filesystem->dumpFile($filename, 'foo');
+
+        $this->filesystem->appendToFile($filename, 'bar');
+
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'foobar');
+
+        // skip mode check on Windows
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $this->assertFilePermissions(664, $filename);
+            umask($oldMask);
+        }
+    }
+
+    public function testAppendToFileWithScheme()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM does not handle the file:// scheme correctly');
+        }
+
+        $scheme = 'file://';
+        $filename = $scheme.$this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
+        $this->filesystem->dumpFile($filename, 'foo');
+
+        $this->filesystem->appendToFile($filename, 'bar');
+
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'foobar');
+    }
+
+    public function testAppendToFileWithZlibScheme()
+    {
+        $scheme = 'compress.zlib://';
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
+        $this->filesystem->dumpFile($filename, 'foo');
+
+        // Zlib stat uses file:// wrapper so remove it
+        $this->assertStringEqualsFile(str_replace($scheme, '', $filename), 'foo');
+
+        $this->filesystem->appendToFile($filename, 'bar');
+
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'foobar');
+    }
+
+    public function testAppendToFileCreateTheFileIfNotExists()
+    {
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'bar.txt';
+
+        // skip mode check on Windows
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $oldMask = umask(0002);
+        }
+
+        $this->filesystem->appendToFile($filename, 'bar');
+
+        // skip mode check on Windows
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $this->assertFilePermissions(664, $filename);
+            umask($oldMask);
+        }
+
+        $this->assertFileExists($filename);
+        $this->assertStringEqualsFile($filename, 'bar');
+    }
+
+    public function testDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo.txt';
+        file_put_contents($filename, 'FOO BAR');
+        chmod($filename, 0745);
+
+        $this->filesystem->dumpFile($filename, 'bar', null);
+
+        $this->assertFilePermissions(745, $filename);
+    }
+
+    public function testCopyShouldKeepExecutionPermission()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
+        $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
+
+        file_put_contents($sourceFilePath, 'SOURCE FILE');
+        chmod($sourceFilePath, 0745);
+
+        $this->filesystem->copy($sourceFilePath, $targetFilePath);
+
+        $this->assertFilePermissions(767, $targetFilePath);
+    }
+
+    /**
+     * Normalize the given path (transform each blackslash into a real directory separator).
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    private function normalize($path)
+    {
+        return str_replace('/', \DIRECTORY_SEPARATOR, $path);
+    }
+}
diff --git a/lib/symfony/filesystem/Tests/FilesystemTestCase.php b/lib/symfony/filesystem/Tests/FilesystemTestCase.php
new file mode 100644
index 000000000..6fb9eba73
--- /dev/null
+++ b/lib/symfony/filesystem/Tests/FilesystemTestCase.php
@@ -0,0 +1,165 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Filesystem\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Filesystem\Filesystem;
+
+class FilesystemTestCase extends TestCase
+{
+    private $umask;
+
+    protected $longPathNamesWindows = [];
+
+    /**
+     * @var Filesystem
+     */
+    protected $filesystem = null;
+
+    /**
+     * @var string
+     */
+    protected $workspace = null;
+
+    /**
+     * @var bool|null Flag for hard links on Windows
+     */
+    private static $linkOnWindows = null;
+
+    /**
+     * @var bool|null Flag for symbolic links on Windows
+     */
+    private static $symlinkOnWindows = null;
+
+    public static function setUpBeforeClass()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            self::$linkOnWindows = true;
+            $originFile = tempnam(sys_get_temp_dir(), 'li');
+            $targetFile = tempnam(sys_get_temp_dir(), 'li');
+            if (true !== @link($originFile, $targetFile)) {
+                $report = error_get_last();
+                if (\is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {
+                    self::$linkOnWindows = false;
+                }
+            } else {
+                @unlink($targetFile);
+            }
+
+            self::$symlinkOnWindows = true;
+            $originDir = tempnam(sys_get_temp_dir(), 'sl');
+            $targetDir = tempnam(sys_get_temp_dir(), 'sl');
+            if (true !== @symlink($originDir, $targetDir)) {
+                $report = error_get_last();
+                if (\is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {
+                    self::$symlinkOnWindows = false;
+                }
+            } else {
+                @unlink($targetDir);
+            }
+        }
+    }
+
+    protected function setUp()
+    {
+        $this->umask = umask(0);
+        $this->filesystem = new Filesystem();
+        $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();
+        mkdir($this->workspace, 0777, true);
+        $this->workspace = realpath($this->workspace);
+    }
+
+    protected function tearDown()
+    {
+        if (!empty($this->longPathNamesWindows)) {
+            foreach ($this->longPathNamesWindows as $path) {
+                exec('DEL '.$path);
+            }
+            $this->longPathNamesWindows = [];
+        }
+
+        $this->filesystem->remove($this->workspace);
+        umask($this->umask);
+    }
+
+    /**
+     * @param int    $expectedFilePerms Expected file permissions as three digits (i.e. 755)
+     * @param string $filePath
+     */
+    protected function assertFilePermissions($expectedFilePerms, $filePath)
+    {
+        $actualFilePerms = (int) substr(sprintf('%o', fileperms($filePath)), -3);
+        $this->assertEquals(
+            $expectedFilePerms,
+            $actualFilePerms,
+            sprintf('File permissions for %s must be %s. Actual %s', $filePath, $expectedFilePerms, $actualFilePerms)
+        );
+    }
+
+    protected function getFileOwner($filepath)
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $infos = stat($filepath);
+
+        return ($datas = posix_getpwuid($infos['uid'])) ? $datas['name'] : null;
+    }
+
+    protected function getFileGroup($filepath)
+    {
+        $this->markAsSkippedIfPosixIsMissing();
+
+        $infos = stat($filepath);
+        if ($datas = posix_getgrgid($infos['gid'])) {
+            return $datas['name'];
+        }
+
+        $this->markTestSkipped('Unable to retrieve file group name');
+    }
+
+    protected function markAsSkippedIfLinkIsMissing()
+    {
+        if (!\function_exists('link')) {
+            $this->markTestSkipped('link is not supported');
+        }
+
+        if ('\\' === \DIRECTORY_SEPARATOR && false === self::$linkOnWindows) {
+            $this->markTestSkipped('link requires "Create hard links" privilege on windows');
+        }
+    }
+
+    protected function markAsSkippedIfSymlinkIsMissing($relative = false)
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR && false === self::$symlinkOnWindows) {
+            $this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');
+        }
+
+        // https://bugs.php.net/69473
+        if ($relative && '\\' === \DIRECTORY_SEPARATOR && 1 === PHP_ZTS) {
+            $this->markTestSkipped('symlink does not support relative paths on thread safe Windows PHP versions');
+        }
+    }
+
+    protected function markAsSkippedIfChmodIsMissing()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('chmod is not supported on Windows');
+        }
+    }
+
+    protected function markAsSkippedIfPosixIsMissing()
+    {
+        if (!\function_exists('posix_isatty')) {
+            $this->markTestSkipped('Function posix_isatty is required.');
+        }
+    }
+}
diff --git a/lib/symfony/filesystem/Tests/Fixtures/MockStream/MockStream.php b/lib/symfony/filesystem/Tests/Fixtures/MockStream/MockStream.php
new file mode 100644
index 000000000..3d80a9058
--- /dev/null
+++ b/lib/symfony/filesystem/Tests/Fixtures/MockStream/MockStream.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Filesystem\Tests\Fixtures\MockStream;
+
+/**
+ * Mock stream class to be used with stream_wrapper_register.
+ * stream_wrapper_register('mock', 'Symfony\Component\Filesystem\Tests\Fixtures\MockStream\MockStream').
+ */
+class MockStream
+{
+    /**
+     * Opens file or URL.
+     *
+     * @param string $path        Specifies the URL that was passed to the original function
+     * @param string $mode        The mode used to open the file, as detailed for fopen()
+     * @param int    $options     Holds additional flags set by the streams API
+     * @param string $opened_path If the path is opened successfully, and STREAM_USE_PATH is set in options,
+     *                            opened_path should be set to the full path of the file/resource that was actually opened
+     *
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+        return true;
+    }
+
+    /**
+     * @param string $path  The file path or URL to stat
+     * @param array  $flags Holds additional flags set by the streams API
+     *
+     * @return array File stats
+     */
+    public function url_stat($path, $flags)
+    {
+        return [];
+    }
+}
diff --git a/lib/symfony/filesystem/Tests/LockHandlerTest.php b/lib/symfony/filesystem/Tests/LockHandlerTest.php
new file mode 100644
index 000000000..d130803d4
--- /dev/null
+++ b/lib/symfony/filesystem/Tests/LockHandlerTest.php
@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Filesystem\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Filesystem\Exception\IOException;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Filesystem\LockHandler;
+
+/**
+ * @group legacy
+ */
+class LockHandlerTest extends TestCase
+{
+    public function testConstructWhenRepositoryDoesNotExist()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $this->expectExceptionMessage('Failed to create "/a/b/c/d/e": mkdir(): Permission denied.');
+        if (!getenv('USER') || 'root' === getenv('USER')) {
+            $this->markTestSkipped('This test will fail if run under superuser');
+        }
+        new LockHandler('lock', '/a/b/c/d/e');
+    }
+
+    public function testConstructWhenRepositoryIsNotWriteable()
+    {
+        $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+        $this->expectExceptionMessage('The directory "/" is not writable.');
+        if (!getenv('USER') || 'root' === getenv('USER')) {
+            $this->markTestSkipped('This test will fail if run under superuser');
+        }
+        new LockHandler('lock', '/');
+    }
+
+    public function testErrorHandlingInLockIfLockPathBecomesUnwritable()
+    {
+        // skip test on Windows; PHP can't easily set file as unreadable on Windows
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test cannot run on Windows.');
+        }
+
+        if (!getenv('USER') || 'root' === getenv('USER')) {
+            $this->markTestSkipped('This test will fail if run under superuser');
+        }
+
+        $lockPath = sys_get_temp_dir().'/'.uniqid('', true);
+        $e = null;
+        $wrongMessage = null;
+
+        try {
+            mkdir($lockPath);
+
+            $lockHandler = new LockHandler('lock', $lockPath);
+
+            chmod($lockPath, 0444);
+
+            $lockHandler->lock();
+        } catch (IOException $e) {
+            if (false === strpos($e->getMessage(), 'Permission denied')) {
+                $wrongMessage = $e->getMessage();
+            } else {
+                $this->addToAssertionCount(1);
+            }
+        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
+        }
+
+        if (is_dir($lockPath)) {
+            $fs = new Filesystem();
+            $fs->remove($lockPath);
+        }
+
+        $this->assertInstanceOf('Symfony\Component\Filesystem\Exception\IOException', $e, sprintf('Expected IOException to be thrown, got %s instead.', \get_class($e)));
+        $this->assertNull($wrongMessage, sprintf('Expected exception message to contain "Permission denied", got "%s" instead.', $wrongMessage));
+    }
+
+    public function testConstructSanitizeName()
+    {
+        $lock = new LockHandler('<?php echo "% hello word ! %" ?>');
+
+        $file = sprintf('%s/sf.-php-echo-hello-word-.4b3d9d0d27ddef3a78a64685dda3a963e478659a9e5240feaf7b4173a8f28d5f.lock', sys_get_temp_dir());
+        // ensure the file does not exist before the lock
+        @unlink($file);
+
+        $lock->lock();
+
+        $this->assertFileExists($file);
+
+        $lock->release();
+    }
+
+    public function testLockRelease()
+    {
+        $name = 'symfony-test-filesystem.lock';
+
+        $l1 = new LockHandler($name);
+        $l2 = new LockHandler($name);
+
+        $this->assertTrue($l1->lock());
+        $this->assertFalse($l2->lock());
+
+        $l1->release();
+
+        $this->assertTrue($l2->lock());
+        $l2->release();
+    }
+
+    public function testLockTwice()
+    {
+        $name = 'symfony-test-filesystem.lock';
+
+        $lockHandler = new LockHandler($name);
+
+        $this->assertTrue($lockHandler->lock());
+        $this->assertTrue($lockHandler->lock());
+
+        $lockHandler->release();
+    }
+
+    public function testLockIsReleased()
+    {
+        $name = 'symfony-test-filesystem.lock';
+
+        $l1 = new LockHandler($name);
+        $l2 = new LockHandler($name);
+
+        $this->assertTrue($l1->lock());
+        $this->assertFalse($l2->lock());
+
+        $l1 = null;
+
+        $this->assertTrue($l2->lock());
+        $l2->release();
+    }
+}
diff --git a/lib/symfony/finder/Tests/Comparator/ComparatorTest.php b/lib/symfony/finder/Tests/Comparator/ComparatorTest.php
new file mode 100644
index 000000000..2f56092ed
--- /dev/null
+++ b/lib/symfony/finder/Tests/Comparator/ComparatorTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Comparator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Finder\Comparator\Comparator;
+
+class ComparatorTest extends TestCase
+{
+    public function testGetSetOperator()
+    {
+        $comparator = new Comparator();
+        try {
+            $comparator->setOperator('foo');
+            $this->fail('->setOperator() throws an \InvalidArgumentException if the operator is not valid.');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('InvalidArgumentException', $e, '->setOperator() throws an \InvalidArgumentException if the operator is not valid.');
+        }
+
+        $comparator = new Comparator();
+        $comparator->setOperator('>');
+        $this->assertEquals('>', $comparator->getOperator(), '->getOperator() returns the current operator');
+    }
+
+    public function testGetSetTarget()
+    {
+        $comparator = new Comparator();
+        $comparator->setTarget(8);
+        $this->assertEquals(8, $comparator->getTarget(), '->getTarget() returns the target');
+    }
+
+    /**
+     * @dataProvider getTestData
+     */
+    public function testTest($operator, $target, $match, $noMatch)
+    {
+        $c = new Comparator();
+        $c->setOperator($operator);
+        $c->setTarget($target);
+
+        foreach ($match as $m) {
+            $this->assertTrue($c->test($m), '->test() tests a string against the expression');
+        }
+
+        foreach ($noMatch as $m) {
+            $this->assertFalse($c->test($m), '->test() tests a string against the expression');
+        }
+    }
+
+    public function getTestData()
+    {
+        return [
+            ['<', '1000', ['500', '999'], ['1000', '1500']],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/Comparator/DateComparatorTest.php b/lib/symfony/finder/Tests/Comparator/DateComparatorTest.php
new file mode 100644
index 000000000..3aebf5244
--- /dev/null
+++ b/lib/symfony/finder/Tests/Comparator/DateComparatorTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Comparator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Finder\Comparator\DateComparator;
+
+class DateComparatorTest extends TestCase
+{
+    public function testConstructor()
+    {
+        try {
+            new DateComparator('foobar');
+            $this->fail('__construct() throws an \InvalidArgumentException if the test expression is not valid.');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('InvalidArgumentException', $e, '__construct() throws an \InvalidArgumentException if the test expression is not valid.');
+        }
+
+        try {
+            new DateComparator('');
+            $this->fail('__construct() throws an \InvalidArgumentException if the test expression is not valid.');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('InvalidArgumentException', $e, '__construct() throws an \InvalidArgumentException if the test expression is not valid.');
+        }
+    }
+
+    /**
+     * @dataProvider getTestData
+     */
+    public function testTest($test, $match, $noMatch)
+    {
+        $c = new DateComparator($test);
+
+        foreach ($match as $m) {
+            $this->assertTrue($c->test($m), '->test() tests a string against the expression');
+        }
+
+        foreach ($noMatch as $m) {
+            $this->assertFalse($c->test($m), '->test() tests a string against the expression');
+        }
+    }
+
+    public function getTestData()
+    {
+        return [
+            ['< 2005-10-10', [strtotime('2005-10-09')], [strtotime('2005-10-15')]],
+            ['until 2005-10-10', [strtotime('2005-10-09')], [strtotime('2005-10-15')]],
+            ['before 2005-10-10', [strtotime('2005-10-09')], [strtotime('2005-10-15')]],
+            ['> 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
+            ['after 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
+            ['since 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
+            ['!= 2005-10-10', [strtotime('2005-10-11')], [strtotime('2005-10-10')]],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/Comparator/NumberComparatorTest.php b/lib/symfony/finder/Tests/Comparator/NumberComparatorTest.php
new file mode 100644
index 000000000..5b49b660a
--- /dev/null
+++ b/lib/symfony/finder/Tests/Comparator/NumberComparatorTest.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Comparator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Finder\Comparator\NumberComparator;
+
+class NumberComparatorTest extends TestCase
+{
+    /**
+     * @dataProvider getConstructorTestData
+     */
+    public function testConstructor($successes, $failures)
+    {
+        foreach ($successes as $s) {
+            new NumberComparator($s);
+        }
+
+        foreach ($failures as $f) {
+            try {
+                new NumberComparator($f);
+                $this->fail('__construct() throws an \InvalidArgumentException if the test expression is not valid.');
+            } catch (\Exception $e) {
+                $this->assertInstanceOf('InvalidArgumentException', $e, '__construct() throws an \InvalidArgumentException if the test expression is not valid.');
+            }
+        }
+    }
+
+    /**
+     * @dataProvider getTestData
+     */
+    public function testTest($test, $match, $noMatch)
+    {
+        $c = new NumberComparator($test);
+
+        foreach ($match as $m) {
+            $this->assertTrue($c->test($m), '->test() tests a string against the expression');
+        }
+
+        foreach ($noMatch as $m) {
+            $this->assertFalse($c->test($m), '->test() tests a string against the expression');
+        }
+    }
+
+    public function getTestData()
+    {
+        return [
+            ['< 1000', ['500', '999'], ['1000', '1500']],
+
+            ['< 1K', ['500', '999'], ['1000', '1500']],
+            ['<1k', ['500', '999'], ['1000', '1500']],
+            ['  < 1 K ', ['500', '999'], ['1000', '1500']],
+            ['<= 1K', ['1000'], ['1001']],
+            ['> 1K', ['1001'], ['1000']],
+            ['>= 1K', ['1000'], ['999']],
+
+            ['< 1KI', ['500', '1023'], ['1024', '1500']],
+            ['<= 1KI', ['1024'], ['1025']],
+            ['> 1KI', ['1025'], ['1024']],
+            ['>= 1KI', ['1024'], ['1023']],
+
+            ['1KI', ['1024'], ['1023', '1025']],
+            ['==1KI', ['1024'], ['1023', '1025']],
+
+            ['==1m', ['1000000'], ['999999', '1000001']],
+            ['==1mi', [1024 * 1024], [1024 * 1024 - 1, 1024 * 1024 + 1]],
+
+            ['==1g', ['1000000000'], ['999999999', '1000000001']],
+            ['==1gi', [1024 * 1024 * 1024], [1024 * 1024 * 1024 - 1, 1024 * 1024 * 1024 + 1]],
+
+            ['!= 1000', ['500', '999'], ['1000']],
+        ];
+    }
+
+    public function getConstructorTestData()
+    {
+        return [
+            [
+                [
+                    '1', '0',
+                    '3.5', '33.55', '123.456', '123456.78',
+                    '.1', '.123',
+                    '.0', '0.0',
+                    '1.', '0.', '123.',
+                    '==1', '!=1', '<1', '>1', '<=1', '>=1',
+                    '==1k', '==1ki', '==1m', '==1mi', '==1g', '==1gi',
+                    '1k', '1ki', '1m', '1mi', '1g', '1gi',
+                ],
+                [
+                    false, null, '',
+                    ' ', 'foobar',
+                    '=1', '===1',
+                    '0 . 1', '123 .45', '234. 567',
+                    '..', '.0.', '0.1.2',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/FinderTest.php b/lib/symfony/finder/Tests/FinderTest.php
new file mode 100644
index 000000000..442186d2b
--- /dev/null
+++ b/lib/symfony/finder/Tests/FinderTest.php
@@ -0,0 +1,752 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests;
+
+use Symfony\Component\Finder\Finder;
+
+class FinderTest extends Iterator\RealIteratorTestCase
+{
+    public function testCreate()
+    {
+        $this->assertInstanceOf('Symfony\Component\Finder\Finder', Finder::create());
+    }
+
+    public function testDirectories()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->directories());
+        $this->assertIterator($this->toAbsolute(['foo', 'toto']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->directories();
+        $finder->files();
+        $finder->directories();
+        $this->assertIterator($this->toAbsolute(['foo', 'toto']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testFiles()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->files());
+        $this->assertIterator($this->toAbsolute(['foo/bar.tmp', 'test.php', 'test.py', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->files();
+        $finder->directories();
+        $finder->files();
+        $this->assertIterator($this->toAbsolute(['foo/bar.tmp', 'test.php', 'test.py', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testRemoveTrailingSlash()
+    {
+        $finder = $this->buildFinder();
+
+        $expected = $this->toAbsolute(['foo/bar.tmp', 'test.php', 'test.py', 'foo bar']);
+        $in = self::$tmpDir.'//';
+
+        $this->assertIterator($expected, $finder->in($in)->files()->getIterator());
+    }
+
+    public function testSymlinksNotResolved()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('symlinks are not supported on Windows');
+        }
+
+        $finder = $this->buildFinder();
+
+        symlink($this->toAbsolute('foo'), $this->toAbsolute('baz'));
+        $expected = $this->toAbsolute(['baz/bar.tmp']);
+        $in = self::$tmpDir.'/baz/';
+        try {
+            $this->assertIterator($expected, $finder->in($in)->files()->getIterator());
+            unlink($this->toAbsolute('baz'));
+        } catch (\Exception $e) {
+            unlink($this->toAbsolute('baz'));
+            throw $e;
+        }
+    }
+
+    public function testBackPathNotNormalized()
+    {
+        $finder = $this->buildFinder();
+
+        $expected = $this->toAbsolute(['foo/../foo/bar.tmp']);
+        $in = self::$tmpDir.'/foo/../foo/';
+        $this->assertIterator($expected, $finder->in($in)->files()->getIterator());
+    }
+
+    public function testDepth()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->depth('< 1'));
+        $this->assertIterator($this->toAbsolute(['foo', 'test.php', 'test.py', 'toto', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->depth('<= 0'));
+        $this->assertIterator($this->toAbsolute(['foo', 'test.php', 'test.py', 'toto', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->depth('>= 1'));
+        $this->assertIterator($this->toAbsolute(['foo/bar.tmp']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->depth('< 1')->depth('>= 1');
+        $this->assertIterator([], $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testName()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->name('*.php'));
+        $this->assertIterator($this->toAbsolute(['test.php']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->name('test.ph*');
+        $finder->name('test.py');
+        $this->assertIterator($this->toAbsolute(['test.php', 'test.py']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->name('~^test~i');
+        $this->assertIterator($this->toAbsolute(['test.php', 'test.py']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->name('~\\.php$~i');
+        $this->assertIterator($this->toAbsolute(['test.php']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->name('test.p{hp,y}');
+        $this->assertIterator($this->toAbsolute(['test.php', 'test.py']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testNotName()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->notName('*.php'));
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.py', 'toto', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->notName('*.php');
+        $finder->notName('*.py');
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'toto', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->name('test.ph*');
+        $finder->name('test.py');
+        $finder->notName('*.php');
+        $finder->notName('*.py');
+        $this->assertIterator([], $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->name('test.ph*');
+        $finder->name('test.py');
+        $finder->notName('*.p{hp,y}');
+        $this->assertIterator([], $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    /**
+     * @dataProvider getRegexNameTestData
+     */
+    public function testRegexName($regex)
+    {
+        $finder = $this->buildFinder();
+        $finder->name($regex);
+        $this->assertIterator($this->toAbsolute(['test.py', 'test.php']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testSize()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->files()->size('< 1K')->size('> 500'));
+        $this->assertIterator($this->toAbsolute(['test.php']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testDate()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->files()->date('until last month'));
+        $this->assertIterator($this->toAbsolute(['foo/bar.tmp', 'test.php']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testExclude()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->exclude('foo'));
+        $this->assertIterator($this->toAbsolute(['test.php', 'test.py', 'toto', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testIgnoreVCS()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->ignoreVCS(false)->ignoreDotFiles(false));
+        $this->assertIterator($this->toAbsolute(['.git', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'toto/.git', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->ignoreVCS(false)->ignoreVCS(false)->ignoreDotFiles(false);
+        $this->assertIterator($this->toAbsolute(['.git', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'toto/.git', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->ignoreVCS(true)->ignoreDotFiles(false));
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testIgnoreVCSCanBeDisabledAfterFirstIteration()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(self::$tmpDir);
+        $finder->ignoreDotFiles(false);
+
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->getIterator());
+
+        $finder->ignoreVCS(false);
+        $this->assertIterator($this->toAbsolute(['.git', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'toto/.git', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->getIterator());
+    }
+
+    public function testIgnoreDotFiles()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->ignoreDotFiles(false)->ignoreVCS(false));
+        $this->assertIterator($this->toAbsolute(['.git', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'toto/.git', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $finder->ignoreDotFiles(false)->ignoreDotFiles(false)->ignoreVCS(false);
+        $this->assertIterator($this->toAbsolute(['.git', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'toto/.git', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->ignoreDotFiles(true)->ignoreVCS(false));
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testIgnoreDotFilesCanBeDisabledAfterFirstIteration()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(self::$tmpDir);
+
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'foo bar']), $finder->getIterator());
+
+        $finder->ignoreDotFiles(false);
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->getIterator());
+    }
+
+    public function testSortByName()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->sortByName());
+        $this->assertIterator($this->toAbsolute(['foo', 'foo bar', 'foo/bar.tmp', 'test.php', 'test.py', 'toto']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testSortByType()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->sortByType());
+        $this->assertIterator($this->toAbsolute(['foo', 'foo bar', 'toto', 'foo/bar.tmp', 'test.php', 'test.py']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testSortByAccessedTime()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->sortByAccessedTime());
+        $this->assertIterator($this->toAbsolute(['foo/bar.tmp', 'test.php', 'toto', 'test.py', 'foo', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testSortByChangedTime()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->sortByChangedTime());
+        $this->assertIterator($this->toAbsolute(['toto', 'test.py', 'test.php', 'foo/bar.tmp', 'foo', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testSortByModifiedTime()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->sortByModifiedTime());
+        $this->assertIterator($this->toAbsolute(['foo/bar.tmp', 'test.php', 'toto', 'test.py', 'foo', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testSort()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->sort(function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealPath(), $b->getRealPath()); }));
+        $this->assertIterator($this->toAbsolute(['foo', 'foo bar', 'foo/bar.tmp', 'test.php', 'test.py', 'toto']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testFilter()
+    {
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) { return false !== strpos($f, 'test'); }));
+        $this->assertIterator($this->toAbsolute(['test.php', 'test.py']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testFollowLinks()
+    {
+        if ('\\' == \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('symlinks are not supported on Windows');
+        }
+
+        $finder = $this->buildFinder();
+        $this->assertSame($finder, $finder->followLinks());
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'foo bar']), $finder->in(self::$tmpDir)->getIterator());
+    }
+
+    public function testIn()
+    {
+        $finder = $this->buildFinder();
+        $iterator = $finder->files()->name('*.php')->depth('< 1')->in([self::$tmpDir, __DIR__])->getIterator();
+
+        $expected = [
+            self::$tmpDir.\DIRECTORY_SEPARATOR.'test.php',
+            __DIR__.\DIRECTORY_SEPARATOR.'FinderTest.php',
+            __DIR__.\DIRECTORY_SEPARATOR.'GlobTest.php',
+        ];
+
+        $this->assertIterator($expected, $iterator);
+    }
+
+    public function testInWithNonExistentDirectory()
+    {
+        $this->expectException('InvalidArgumentException');
+        $finder = new Finder();
+        $finder->in('foobar');
+    }
+
+    public function testInWithGlob()
+    {
+        $finder = $this->buildFinder();
+        $finder->in([__DIR__.'/Fixtures/*/B/C/', __DIR__.'/Fixtures/*/*/B/C/'])->getIterator();
+
+        $this->assertIterator($this->toAbsoluteFixtures(['A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy']), $finder);
+    }
+
+    public function testInWithNonDirectoryGlob()
+    {
+        $this->expectException('InvalidArgumentException');
+        $finder = new Finder();
+        $finder->in(__DIR__.'/Fixtures/A/a*');
+    }
+
+    public function testInWithGlobBrace()
+    {
+        if (!\defined('GLOB_BRACE')) {
+            $this->markTestSkipped('Glob brace is not supported on this system.');
+        }
+
+        $finder = $this->buildFinder();
+        $finder->in([__DIR__.'/Fixtures/{A,copy/A}/B/C'])->getIterator();
+
+        $this->assertIterator($this->toAbsoluteFixtures(['A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy']), $finder);
+    }
+
+    public function testGetIteratorWithoutIn()
+    {
+        $this->expectException('LogicException');
+        $finder = Finder::create();
+        $finder->getIterator();
+    }
+
+    public function testGetIterator()
+    {
+        $finder = $this->buildFinder();
+        $dirs = [];
+        foreach ($finder->directories()->in(self::$tmpDir) as $dir) {
+            $dirs[] = (string) $dir;
+        }
+
+        $expected = $this->toAbsolute(['foo', 'toto']);
+
+        sort($dirs);
+        sort($expected);
+
+        $this->assertEquals($expected, $dirs, 'implements the \IteratorAggregate interface');
+
+        $finder = $this->buildFinder();
+        $this->assertEquals(2, iterator_count($finder->directories()->in(self::$tmpDir)), 'implements the \IteratorAggregate interface');
+
+        $finder = $this->buildFinder();
+        $a = iterator_to_array($finder->directories()->in(self::$tmpDir));
+        $a = array_values(array_map('strval', $a));
+        sort($a);
+        $this->assertEquals($expected, $a, 'implements the \IteratorAggregate interface');
+    }
+
+    public function testRelativePath()
+    {
+        $finder = $this->buildFinder()->in(self::$tmpDir);
+
+        $paths = [];
+
+        foreach ($finder as $file) {
+            $paths[] = $file->getRelativePath();
+        }
+
+        $ref = ['', '', '', '', 'foo', ''];
+
+        sort($ref);
+        sort($paths);
+
+        $this->assertEquals($ref, $paths);
+    }
+
+    public function testRelativePathname()
+    {
+        $finder = $this->buildFinder()->in(self::$tmpDir)->sortByName();
+
+        $paths = [];
+
+        foreach ($finder as $file) {
+            $paths[] = $file->getRelativePathname();
+        }
+
+        $ref = ['test.php', 'toto', 'test.py', 'foo', 'foo'.\DIRECTORY_SEPARATOR.'bar.tmp', 'foo bar'];
+
+        sort($paths);
+        sort($ref);
+
+        $this->assertEquals($ref, $paths);
+    }
+
+    public function testAppendWithAFinder()
+    {
+        $finder = $this->buildFinder();
+        $finder->files()->in(self::$tmpDir.\DIRECTORY_SEPARATOR.'foo');
+
+        $finder1 = $this->buildFinder();
+        $finder1->directories()->in(self::$tmpDir);
+
+        $finder = $finder->append($finder1);
+
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'toto']), $finder->getIterator());
+    }
+
+    public function testAppendWithAnArray()
+    {
+        $finder = $this->buildFinder();
+        $finder->files()->in(self::$tmpDir.\DIRECTORY_SEPARATOR.'foo');
+
+        $finder->append($this->toAbsolute(['foo', 'toto']));
+
+        $this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'toto']), $finder->getIterator());
+    }
+
+    public function testAppendReturnsAFinder()
+    {
+        $this->assertInstanceOf('Symfony\\Component\\Finder\\Finder', Finder::create()->append([]));
+    }
+
+    public function testAppendDoesNotRequireIn()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(self::$tmpDir.\DIRECTORY_SEPARATOR.'foo');
+
+        $finder1 = Finder::create()->append($finder);
+
+        $this->assertIterator(iterator_to_array($finder->getIterator()), $finder1->getIterator());
+    }
+
+    public function testCountDirectories()
+    {
+        $directory = Finder::create()->directories()->in(self::$tmpDir);
+        $i = 0;
+
+        foreach ($directory as $dir) {
+            ++$i;
+        }
+
+        $this->assertCount($i, $directory);
+    }
+
+    public function testCountFiles()
+    {
+        $files = Finder::create()->files()->in(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
+        $i = 0;
+
+        foreach ($files as $file) {
+            ++$i;
+        }
+
+        $this->assertCount($i, $files);
+    }
+
+    public function testCountWithoutIn()
+    {
+        $this->expectException('LogicException');
+        $finder = Finder::create()->files();
+        \count($finder);
+    }
+
+    public function testHasResults()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__);
+        $this->assertTrue($finder->hasResults());
+    }
+
+    public function testNoResults()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__)->name('DoesNotExist');
+        $this->assertFalse($finder->hasResults());
+    }
+
+    /**
+     * @dataProvider getContainsTestData
+     */
+    public function testContains($matchPatterns, $noMatchPatterns, $expected)
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures')
+            ->name('*.txt')->sortByName()
+            ->contains($matchPatterns)
+            ->notContains($noMatchPatterns);
+
+        $this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
+    }
+
+    public function testContainsOnDirectory()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__)
+            ->directories()
+            ->name('Fixtures')
+            ->contains('abc');
+        $this->assertIterator([], $finder);
+    }
+
+    public function testNotContainsOnDirectory()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__)
+            ->directories()
+            ->name('Fixtures')
+            ->notContains('abc');
+        $this->assertIterator([], $finder);
+    }
+
+    /**
+     * Searching in multiple locations involves AppendIterator which does an unnecessary rewind which leaves FilterIterator
+     * with inner FilesystemIterator in an invalid state.
+     *
+     * @see https://bugs.php.net/68557
+     */
+    public function testMultipleLocations()
+    {
+        $locations = [
+            self::$tmpDir.'/',
+            self::$tmpDir.'/toto/',
+        ];
+
+        // it is expected that there are test.py test.php in the tmpDir
+        $finder = new Finder();
+        $finder->in($locations)
+            // the default flag IGNORE_DOT_FILES fixes the problem indirectly
+            // so we set it to false for better isolation
+            ->ignoreDotFiles(false)
+            ->depth('< 1')->name('test.php');
+
+        $this->assertCount(1, $finder);
+    }
+
+    /**
+     * Searching in multiple locations with sub directories involves
+     * AppendIterator which does an unnecessary rewind which leaves
+     * FilterIterator with inner FilesystemIterator in an invalid state.
+     *
+     * @see https://bugs.php.net/68557
+     */
+    public function testMultipleLocationsWithSubDirectories()
+    {
+        $locations = [
+            __DIR__.'/Fixtures/one',
+            self::$tmpDir.\DIRECTORY_SEPARATOR.'toto',
+        ];
+
+        $finder = $this->buildFinder();
+        $finder->in($locations)->depth('< 10')->name('*.neon');
+
+        $expected = [
+            __DIR__.'/Fixtures/one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'c.neon',
+            __DIR__.'/Fixtures/one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'d.neon',
+        ];
+
+        $this->assertIterator($expected, $finder);
+        $this->assertIteratorInForeach($expected, $finder);
+    }
+
+    /**
+     * Iterator keys must be the file pathname.
+     */
+    public function testIteratorKeys()
+    {
+        $finder = $this->buildFinder()->in(self::$tmpDir);
+        foreach ($finder as $key => $file) {
+            $this->assertEquals($file->getPathname(), $key);
+        }
+    }
+
+    public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartFlag()
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')
+            ->path('/^dir/');
+
+        $expected = ['r+e.gex[c]a(r)s'.\DIRECTORY_SEPARATOR.'dir', 'r+e.gex[c]a(r)s'.\DIRECTORY_SEPARATOR.'dir'.\DIRECTORY_SEPARATOR.'bar.dat'];
+        $this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
+    }
+
+    public function getContainsTestData()
+    {
+        return [
+            ['', '', []],
+            ['foo', 'bar', []],
+            ['', 'foobar', ['dolor.txt', 'ipsum.txt', 'lorem.txt']],
+            ['lorem ipsum dolor sit amet', 'foobar', ['lorem.txt']],
+            ['sit', 'bar', ['dolor.txt', 'ipsum.txt', 'lorem.txt']],
+            ['dolor sit amet', '@^L@m', ['dolor.txt', 'ipsum.txt']],
+            ['/^lorem ipsum dolor sit amet$/m', 'foobar', ['lorem.txt']],
+            ['lorem', 'foobar', ['lorem.txt']],
+            ['', 'lorem', ['dolor.txt', 'ipsum.txt']],
+            ['ipsum dolor sit amet', '/^IPSUM/m', ['lorem.txt']],
+        ];
+    }
+
+    public function getRegexNameTestData()
+    {
+        return [
+            ['~.+\\.p.+~i'],
+            ['~t.*s~i'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestPathData
+     */
+    public function testPath($matchPatterns, $noMatchPatterns, array $expected)
+    {
+        $finder = $this->buildFinder();
+        $finder->in(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures')
+            ->path($matchPatterns)
+            ->notPath($noMatchPatterns);
+
+        $this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
+    }
+
+    public function getTestPathData()
+    {
+        return [
+            ['', '', []],
+            ['/^A\/B\/C/', '/C$/',
+                ['A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat'],
+            ],
+            ['/^A\/B/', 'foobar',
+                [
+                    'A'.\DIRECTORY_SEPARATOR.'B',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
+                ],
+            ],
+            ['A/B/C', 'foobar',
+                [
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat.copy',
+                ],
+            ],
+            ['A/B', 'foobar',
+                [
+                    //dirs
+                    'A'.\DIRECTORY_SEPARATOR.'B',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    //files
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat.copy',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat.copy',
+                ],
+            ],
+            ['/^with space\//', 'foobar',
+                [
+                    'with space'.\DIRECTORY_SEPARATOR.'foo.txt',
+                ],
+            ],
+        ];
+    }
+
+    public function testAccessDeniedException()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('chmod is not supported on Windows');
+        }
+
+        $finder = $this->buildFinder();
+        $finder->files()->in(self::$tmpDir);
+
+        // make 'foo' directory non-readable
+        $testDir = self::$tmpDir.\DIRECTORY_SEPARATOR.'foo';
+        chmod($testDir, 0333);
+
+        if (false === $couldRead = is_readable($testDir)) {
+            try {
+                $this->assertIterator($this->toAbsolute(['foo bar', 'test.php', 'test.py']), $finder->getIterator());
+                $this->fail('Finder should throw an exception when opening a non-readable directory.');
+            } catch (\Exception $e) {
+                $expectedExceptionClass = 'Symfony\\Component\\Finder\\Exception\\AccessDeniedException';
+                if ($e instanceof \PHPUnit\Framework\ExpectationFailedException) {
+                    $this->fail(sprintf("Expected exception:\n%s\nGot:\n%s\nWith comparison failure:\n%s", $expectedExceptionClass, 'PHPUnit\Framework\ExpectationFailedException', $e->getComparisonFailure()->getExpectedAsString()));
+                }
+
+                $this->assertInstanceOf($expectedExceptionClass, $e);
+            }
+        }
+
+        // restore original permissions
+        chmod($testDir, 0777);
+        clearstatcache(true, $testDir);
+
+        if ($couldRead) {
+            $this->markTestSkipped('could read test files while test requires unreadable');
+        }
+    }
+
+    public function testIgnoredAccessDeniedException()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('chmod is not supported on Windows');
+        }
+
+        $finder = $this->buildFinder();
+        $finder->files()->ignoreUnreadableDirs()->in(self::$tmpDir);
+
+        // make 'foo' directory non-readable
+        $testDir = self::$tmpDir.\DIRECTORY_SEPARATOR.'foo';
+        chmod($testDir, 0333);
+
+        if (false === ($couldRead = is_readable($testDir))) {
+            $this->assertIterator($this->toAbsolute(['foo bar', 'test.php', 'test.py']), $finder->getIterator());
+        }
+
+        // restore original permissions
+        chmod($testDir, 0777);
+        clearstatcache(true, $testDir);
+
+        if ($couldRead) {
+            $this->markTestSkipped('could read test files while test requires unreadable');
+        }
+    }
+
+    protected function buildFinder()
+    {
+        return Finder::create();
+    }
+}
diff --git a/lib/symfony/finder/Tests/Fixtures/.dot/a b/lib/symfony/finder/Tests/Fixtures/.dot/a
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/.dot/b/c.neon b/lib/symfony/finder/Tests/Fixtures/.dot/b/c.neon
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/.dot/b/d.neon b/lib/symfony/finder/Tests/Fixtures/.dot/b/d.neon
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/A/B/C/abc.dat b/lib/symfony/finder/Tests/Fixtures/A/B/C/abc.dat
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/A/B/ab.dat b/lib/symfony/finder/Tests/Fixtures/A/B/ab.dat
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/A/a.dat b/lib/symfony/finder/Tests/Fixtures/A/a.dat
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/copy/A/B/C/abc.dat.copy b/lib/symfony/finder/Tests/Fixtures/copy/A/B/C/abc.dat.copy
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/copy/A/B/ab.dat.copy b/lib/symfony/finder/Tests/Fixtures/copy/A/B/ab.dat.copy
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/copy/A/a.dat.copy b/lib/symfony/finder/Tests/Fixtures/copy/A/a.dat.copy
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/dolor.txt b/lib/symfony/finder/Tests/Fixtures/dolor.txt
new file mode 100644
index 000000000..658bec698
--- /dev/null
+++ b/lib/symfony/finder/Tests/Fixtures/dolor.txt
@@ -0,0 +1,2 @@
+dolor sit amet
+DOLOR SIT AMET
\ No newline at end of file
diff --git a/lib/symfony/finder/Tests/Fixtures/ipsum.txt b/lib/symfony/finder/Tests/Fixtures/ipsum.txt
new file mode 100644
index 000000000..c7f392d6f
--- /dev/null
+++ b/lib/symfony/finder/Tests/Fixtures/ipsum.txt
@@ -0,0 +1,2 @@
+ipsum dolor sit amet
+IPSUM DOLOR SIT AMET
\ No newline at end of file
diff --git a/lib/symfony/finder/Tests/Fixtures/lorem.txt b/lib/symfony/finder/Tests/Fixtures/lorem.txt
new file mode 100644
index 000000000..2991a2cac
--- /dev/null
+++ b/lib/symfony/finder/Tests/Fixtures/lorem.txt
@@ -0,0 +1,2 @@
+lorem ipsum dolor sit amet
+LOREM IPSUM DOLOR SIT AMET
\ No newline at end of file
diff --git a/lib/symfony/finder/Tests/Fixtures/one/.dot b/lib/symfony/finder/Tests/Fixtures/one/.dot
new file mode 100644
index 000000000..1028065f8
--- /dev/null
+++ b/lib/symfony/finder/Tests/Fixtures/one/.dot
@@ -0,0 +1 @@
+.dot
\ No newline at end of file
diff --git a/lib/symfony/finder/Tests/Fixtures/one/a b/lib/symfony/finder/Tests/Fixtures/one/a
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/one/b/c.neon b/lib/symfony/finder/Tests/Fixtures/one/b/c.neon
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/one/b/d.neon b/lib/symfony/finder/Tests/Fixtures/one/b/d.neon
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat b/lib/symfony/finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/Fixtures/with space/foo.txt b/lib/symfony/finder/Tests/Fixtures/with space/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/finder/Tests/GlobTest.php b/lib/symfony/finder/Tests/GlobTest.php
new file mode 100644
index 000000000..2d48799c5
--- /dev/null
+++ b/lib/symfony/finder/Tests/GlobTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\Glob;
+
+class GlobTest extends TestCase
+{
+    public function testGlobToRegexDelimiters()
+    {
+        $this->assertEquals('#^(?=[^\.])\#$#', Glob::toRegex('#'));
+        $this->assertEquals('#^\.[^/]*$#', Glob::toRegex('.*'));
+        $this->assertEquals('^\.[^/]*$', Glob::toRegex('.*', true, true, ''));
+        $this->assertEquals('/^\.[^/]*$/', Glob::toRegex('.*', true, true, '/'));
+    }
+
+    public function testGlobToRegexDoubleStarStrictDots()
+    {
+        $finder = new Finder();
+        $finder->ignoreDotFiles(false);
+        $regex = Glob::toRegex('/**/*.neon');
+
+        foreach ($finder->in(__DIR__) as $k => $v) {
+            $k = str_replace(\DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, \strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + \strlen(__DIR__));
+            }
+        }
+        sort($match);
+
+        $this->assertSame(['one/b/c.neon', 'one/b/d.neon'], $match);
+    }
+
+    public function testGlobToRegexDoubleStarNonStrictDots()
+    {
+        $finder = new Finder();
+        $finder->ignoreDotFiles(false);
+        $regex = Glob::toRegex('/**/*.neon', false);
+
+        foreach ($finder->in(__DIR__) as $k => $v) {
+            $k = str_replace(\DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, \strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + \strlen(__DIR__));
+            }
+        }
+        sort($match);
+
+        $this->assertSame(['.dot/b/c.neon', '.dot/b/d.neon', 'one/b/c.neon', 'one/b/d.neon'], $match);
+    }
+
+    public function testGlobToRegexDoubleStarWithoutLeadingSlash()
+    {
+        $finder = new Finder();
+        $finder->ignoreDotFiles(false);
+        $regex = Glob::toRegex('/Fixtures/one/**');
+
+        foreach ($finder->in(__DIR__) as $k => $v) {
+            $k = str_replace(\DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, \strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + \strlen(__DIR__));
+            }
+        }
+        sort($match);
+
+        $this->assertSame(['one/a', 'one/b', 'one/b/c.neon', 'one/b/d.neon'], $match);
+    }
+
+    public function testGlobToRegexDoubleStarWithoutLeadingSlashNotStrictLeadingDot()
+    {
+        $finder = new Finder();
+        $finder->ignoreDotFiles(false);
+        $regex = Glob::toRegex('/Fixtures/one/**', false);
+
+        foreach ($finder->in(__DIR__) as $k => $v) {
+            $k = str_replace(\DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, \strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + \strlen(__DIR__));
+            }
+        }
+        sort($match);
+
+        $this->assertSame(['one/.dot', 'one/a', 'one/b', 'one/b/c.neon', 'one/b/d.neon'], $match);
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
new file mode 100644
index 000000000..56d958cb6
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\CustomFilterIterator;
+
+class CustomFilterIteratorTest extends IteratorTestCase
+{
+    public function testWithInvalidFilter()
+    {
+        $this->expectException('InvalidArgumentException');
+        new CustomFilterIterator(new Iterator(), ['foo']);
+    }
+
+    /**
+     * @dataProvider getAcceptData
+     */
+    public function testAccept($filters, $expected)
+    {
+        $inner = new Iterator(['test.php', 'test.py', 'foo.php']);
+
+        $iterator = new CustomFilterIterator($inner, $filters);
+
+        $this->assertIterator($expected, $iterator);
+    }
+
+    public function getAcceptData()
+    {
+        return [
+            [[function (\SplFileInfo $fileinfo) { return false; }], []],
+            [[function (\SplFileInfo $fileinfo) { return 0 === strpos($fileinfo, 'test'); }], ['test.php', 'test.py']],
+            [['is_dir'], []],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
new file mode 100644
index 000000000..7b1800b15
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Comparator\DateComparator;
+use Symfony\Component\Finder\Iterator\DateRangeFilterIterator;
+
+class DateRangeFilterIteratorTest extends RealIteratorTestCase
+{
+    /**
+     * @dataProvider getAcceptData
+     */
+    public function testAccept($size, $expected)
+    {
+        $files = self::$files;
+        $files[] = self::toAbsolute('doesnotexist');
+        $inner = new Iterator($files);
+
+        $iterator = new DateRangeFilterIterator($inner, $size);
+
+        $this->assertIterator($expected, $iterator);
+    }
+
+    public function getAcceptData()
+    {
+        $since20YearsAgo = [
+            '.git',
+            'test.py',
+            'foo',
+            'foo/bar.tmp',
+            'test.php',
+            'toto',
+            'toto/.git',
+            '.bar',
+            '.foo',
+            '.foo/.bar',
+            'foo bar',
+            '.foo/bar',
+        ];
+
+        $since2MonthsAgo = [
+            '.git',
+            'test.py',
+            'foo',
+            'toto',
+            'toto/.git',
+            '.bar',
+            '.foo',
+            '.foo/.bar',
+            'foo bar',
+            '.foo/bar',
+        ];
+
+        $untilLastMonth = [
+            'foo/bar.tmp',
+            'test.php',
+        ];
+
+        return [
+            [[new DateComparator('since 20 years ago')], $this->toAbsolute($since20YearsAgo)],
+            [[new DateComparator('since 2 months ago')], $this->toAbsolute($since2MonthsAgo)],
+            [[new DateComparator('until last month')], $this->toAbsolute($untilLastMonth)],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/DepthRangeFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/DepthRangeFilterIteratorTest.php
new file mode 100644
index 000000000..dab9723d7
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/DepthRangeFilterIteratorTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\DepthRangeFilterIterator;
+
+class DepthRangeFilterIteratorTest extends RealIteratorTestCase
+{
+    /**
+     * @dataProvider getAcceptData
+     */
+    public function testAccept($minDepth, $maxDepth, $expected)
+    {
+        $inner = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->toAbsolute(), \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::SELF_FIRST);
+
+        $iterator = new DepthRangeFilterIterator($inner, $minDepth, $maxDepth);
+
+        $actual = array_keys(iterator_to_array($iterator));
+        sort($expected);
+        sort($actual);
+        $this->assertEquals($expected, $actual);
+    }
+
+    public function getAcceptData()
+    {
+        $lessThan1 = [
+            '.git',
+            'test.py',
+            'foo',
+            'test.php',
+            'toto',
+            '.foo',
+            '.bar',
+            'foo bar',
+        ];
+
+        $lessThanOrEqualTo1 = [
+            '.git',
+            'test.py',
+            'foo',
+            'foo/bar.tmp',
+            'test.php',
+            'toto',
+            'toto/.git',
+            '.foo',
+            '.foo/.bar',
+            '.bar',
+            'foo bar',
+            '.foo/bar',
+        ];
+
+        $graterThanOrEqualTo1 = [
+            'toto/.git',
+            'foo/bar.tmp',
+            '.foo/.bar',
+            '.foo/bar',
+        ];
+
+        $equalTo1 = [
+            'toto/.git',
+            'foo/bar.tmp',
+            '.foo/.bar',
+            '.foo/bar',
+        ];
+
+        return [
+            [0, 0, $this->toAbsolute($lessThan1)],
+            [0, 1, $this->toAbsolute($lessThanOrEqualTo1)],
+            [2, PHP_INT_MAX, []],
+            [1, PHP_INT_MAX, $this->toAbsolute($graterThanOrEqualTo1)],
+            [1, 1, $this->toAbsolute($equalTo1)],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
new file mode 100644
index 000000000..2835ba57c
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\ExcludeDirectoryFilterIterator;
+use Symfony\Component\Finder\Iterator\RecursiveDirectoryIterator;
+
+class ExcludeDirectoryFilterIteratorTest extends RealIteratorTestCase
+{
+    /**
+     * @dataProvider getAcceptData
+     */
+    public function testAccept($directories, $expected)
+    {
+        $inner = new \RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->toAbsolute(), \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::SELF_FIRST);
+
+        $iterator = new ExcludeDirectoryFilterIterator($inner, $directories);
+
+        $this->assertIterator($expected, $iterator);
+    }
+
+    public function getAcceptData()
+    {
+        $foo = [
+            '.bar',
+            '.foo',
+            '.foo/.bar',
+            '.foo/bar',
+            '.git',
+            'test.py',
+            'test.php',
+            'toto',
+            'toto/.git',
+            'foo bar',
+        ];
+
+        $fo = [
+            '.bar',
+            '.foo',
+            '.foo/.bar',
+            '.foo/bar',
+            '.git',
+            'test.py',
+            'foo',
+            'foo/bar.tmp',
+            'test.php',
+            'toto',
+            'toto/.git',
+            'foo bar',
+        ];
+
+        $toto = [
+            '.bar',
+            '.foo',
+            '.foo/.bar',
+            '.foo/bar',
+            '.git',
+            'test.py',
+            'foo',
+            'foo/bar.tmp',
+            'test.php',
+            'foo bar',
+        ];
+
+        return [
+            [['foo'], $this->toAbsolute($foo)],
+            [['fo'], $this->toAbsolute($fo)],
+            [['toto/'], $this->toAbsolute($toto)],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/FileTypeFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/FileTypeFilterIteratorTest.php
new file mode 100644
index 000000000..fe03b434a
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/FileTypeFilterIteratorTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\FileTypeFilterIterator;
+
+class FileTypeFilterIteratorTest extends RealIteratorTestCase
+{
+    /**
+     * @dataProvider getAcceptData
+     */
+    public function testAccept($mode, $expected)
+    {
+        $inner = new InnerTypeIterator(self::$files);
+
+        $iterator = new FileTypeFilterIterator($inner, $mode);
+
+        $this->assertIterator($expected, $iterator);
+    }
+
+    public function getAcceptData()
+    {
+        $onlyFiles = [
+            'test.py',
+            'foo/bar.tmp',
+            'test.php',
+            '.bar',
+            '.foo/.bar',
+            '.foo/bar',
+            'foo bar',
+        ];
+
+        $onlyDirectories = [
+            '.git',
+            'foo',
+            'toto',
+            'toto/.git',
+            '.foo',
+        ];
+
+        return [
+            [FileTypeFilterIterator::ONLY_FILES, $this->toAbsolute($onlyFiles)],
+            [FileTypeFilterIterator::ONLY_DIRECTORIES, $this->toAbsolute($onlyDirectories)],
+        ];
+    }
+}
+
+class InnerTypeIterator extends \ArrayIterator
+{
+    public function current()
+    {
+        return new \SplFileInfo(parent::current());
+    }
+
+    public function isFile()
+    {
+        return $this->current()->isFile();
+    }
+
+    public function isDir()
+    {
+        return $this->current()->isDir();
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/FilecontentFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/FilecontentFilterIteratorTest.php
new file mode 100644
index 000000000..f4f70c8e8
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/FilecontentFilterIteratorTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\FilecontentFilterIterator;
+
+class FilecontentFilterIteratorTest extends IteratorTestCase
+{
+    public function testAccept()
+    {
+        $inner = new MockFileListIterator(['test.txt']);
+        $iterator = new FilecontentFilterIterator($inner, [], []);
+        $this->assertIterator(['test.txt'], $iterator);
+    }
+
+    public function testDirectory()
+    {
+        $inner = new MockFileListIterator(['directory']);
+        $iterator = new FilecontentFilterIterator($inner, ['directory'], []);
+        $this->assertIterator([], $iterator);
+    }
+
+    public function testUnreadableFile()
+    {
+        $inner = new MockFileListIterator(['file r-']);
+        $iterator = new FilecontentFilterIterator($inner, ['file r-'], []);
+        $this->assertIterator([], $iterator);
+    }
+
+    /**
+     * @dataProvider getTestFilterData
+     */
+    public function testFilter(\Iterator $inner, array $matchPatterns, array $noMatchPatterns, array $resultArray)
+    {
+        $iterator = new FilecontentFilterIterator($inner, $matchPatterns, $noMatchPatterns);
+        $this->assertIterator($resultArray, $iterator);
+    }
+
+    public function getTestFilterData()
+    {
+        $inner = new MockFileListIterator();
+
+        $inner[] = new MockSplFileInfo([
+            'name' => 'a.txt',
+            'contents' => 'Lorem ipsum...',
+            'type' => 'file',
+            'mode' => 'r+', ]
+        );
+
+        $inner[] = new MockSplFileInfo([
+            'name' => 'b.yml',
+            'contents' => 'dolor sit...',
+            'type' => 'file',
+            'mode' => 'r+', ]
+        );
+
+        $inner[] = new MockSplFileInfo([
+            'name' => 'some/other/dir/third.php',
+            'contents' => 'amet...',
+            'type' => 'file',
+            'mode' => 'r+', ]
+        );
+
+        $inner[] = new MockSplFileInfo([
+            'name' => 'unreadable-file.txt',
+            'contents' => false,
+            'type' => 'file',
+            'mode' => 'r+', ]
+        );
+
+        return [
+            [$inner, ['.'], [], ['a.txt', 'b.yml', 'some/other/dir/third.php']],
+            [$inner, ['ipsum'], [], ['a.txt']],
+            [$inner, ['i', 'amet'], ['Lorem', 'amet'], ['b.yml']],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/FilenameFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/FilenameFilterIteratorTest.php
new file mode 100644
index 000000000..9270dd1cd
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/FilenameFilterIteratorTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\FilenameFilterIterator;
+
+class FilenameFilterIteratorTest extends IteratorTestCase
+{
+    /**
+     * @dataProvider getAcceptData
+     */
+    public function testAccept($matchPatterns, $noMatchPatterns, $expected)
+    {
+        $inner = new InnerNameIterator(['test.php', 'test.py', 'foo.php']);
+
+        $iterator = new FilenameFilterIterator($inner, $matchPatterns, $noMatchPatterns);
+
+        $this->assertIterator($expected, $iterator);
+    }
+
+    public function getAcceptData()
+    {
+        return [
+            [['test.*'], [], ['test.php', 'test.py']],
+            [[], ['test.*'], ['foo.php']],
+            [['*.php'], ['test.*'], ['foo.php']],
+            [['*.php', '*.py'], ['foo.*'], ['test.php', 'test.py']],
+            [['/\.php$/'], [], ['test.php', 'foo.php']],
+            [[], ['/\.php$/'], ['test.py']],
+        ];
+    }
+}
+
+class InnerNameIterator extends \ArrayIterator
+{
+    public function current()
+    {
+        return new \SplFileInfo(parent::current());
+    }
+
+    public function getFilename()
+    {
+        return parent::current();
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/FilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/FilterIteratorTest.php
new file mode 100644
index 000000000..181b1464f
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/FilterIteratorTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+/**
+ * @author Alex Bogomazov
+ *
+ * @group legacy
+ */
+class FilterIteratorTest extends RealIteratorTestCase
+{
+    public function testFilterFilesystemIterators()
+    {
+        $i = new \FilesystemIterator($this->toAbsolute());
+
+        // it is expected that there are test.py test.php in the tmpDir
+        $i = $this->getMockForAbstractClass('Symfony\Component\Finder\Iterator\FilterIterator', [$i]);
+        $i->expects($this->any())
+            ->method('accept')
+            ->willReturnCallback(function () use ($i) {
+                return (bool) preg_match('/\.php/', (string) $i->current());
+            }
+        );
+
+        $c = 0;
+        foreach ($i as $item) {
+            ++$c;
+        }
+
+        $this->assertEquals(1, $c);
+
+        $i->rewind();
+
+        $c = 0;
+        foreach ($i as $item) {
+            ++$c;
+        }
+
+        // This would fail in php older than 5.5.23/5.6.7 with \FilterIterator
+        // but works with Symfony\Component\Finder\Iterator\FilterIterator
+        // see https://bugs.php.net/68557
+        $this->assertEquals(1, $c);
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/Iterator.php b/lib/symfony/finder/Tests/Iterator/Iterator.php
new file mode 100644
index 000000000..3e21a0700
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/Iterator.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+class Iterator implements \Iterator
+{
+    protected $values = [];
+
+    public function __construct(array $values = [])
+    {
+        foreach ($values as $value) {
+            $this->attach(new \SplFileInfo($value));
+        }
+        $this->rewind();
+    }
+
+    public function attach(\SplFileInfo $fileinfo)
+    {
+        $this->values[] = $fileinfo;
+    }
+
+    public function rewind()
+    {
+        reset($this->values);
+    }
+
+    public function valid()
+    {
+        return false !== $this->current();
+    }
+
+    public function next()
+    {
+        next($this->values);
+    }
+
+    public function current()
+    {
+        return current($this->values);
+    }
+
+    public function key()
+    {
+        return key($this->values);
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/IteratorTestCase.php b/lib/symfony/finder/Tests/Iterator/IteratorTestCase.php
new file mode 100644
index 000000000..c7dfd79e3
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/IteratorTestCase.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use PHPUnit\Framework\TestCase;
+
+abstract class IteratorTestCase extends TestCase
+{
+    protected function assertIterator($expected, \Traversable $iterator)
+    {
+        // set iterator_to_array $use_key to false to avoid values merge
+        // this made FinderTest::testAppendWithAnArray() fail with GnuFinderAdapter
+        $values = array_map(function (\SplFileInfo $fileinfo) { return str_replace('/', \DIRECTORY_SEPARATOR, $fileinfo->getPathname()); }, iterator_to_array($iterator, false));
+
+        $expected = array_map(function ($path) { return str_replace('/', \DIRECTORY_SEPARATOR, $path); }, $expected);
+
+        sort($values);
+        sort($expected);
+
+        $this->assertEquals($expected, array_values($values));
+    }
+
+    protected function assertOrderedIterator($expected, \Traversable $iterator)
+    {
+        $values = array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator));
+
+        $this->assertEquals($expected, array_values($values));
+    }
+
+    /**
+     *  Same as assertOrderedIterator, but checks the order of groups of
+     *  array elements.
+     *
+     *  @param array $expected - an array of arrays. For any two subarrays
+     *      $a and $b such that $a goes before $b in $expected, the method
+     *      asserts that any element of $a goes before any element of $b
+     *      in the sequence generated by $iterator
+     */
+    protected function assertOrderedIteratorForGroups(array $expected, \Traversable $iterator)
+    {
+        $values = array_values(array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator)));
+
+        foreach ($expected as $subarray) {
+            $temp = [];
+            while (\count($values) && \count($temp) < \count($subarray)) {
+                $temp[] = array_shift($values);
+            }
+            sort($temp);
+            sort($subarray);
+            $this->assertEquals($subarray, $temp);
+        }
+    }
+
+    /**
+     * Same as IteratorTestCase::assertIterator with foreach usage.
+     */
+    protected function assertIteratorInForeach(array $expected, \Traversable $iterator)
+    {
+        $values = [];
+        foreach ($iterator as $file) {
+            $this->assertInstanceOf('Symfony\\Component\\Finder\\SplFileInfo', $file);
+            $values[] = $file->getPathname();
+        }
+
+        sort($values);
+        sort($expected);
+
+        $this->assertEquals($expected, array_values($values));
+    }
+
+    /**
+     * Same as IteratorTestCase::assertOrderedIterator with foreach usage.
+     */
+    protected function assertOrderedIteratorInForeach(array $expected, \Traversable $iterator)
+    {
+        $values = [];
+        foreach ($iterator as $file) {
+            $this->assertInstanceOf('Symfony\\Component\\Finder\\SplFileInfo', $file);
+            $values[] = $file->getPathname();
+        }
+
+        $this->assertEquals($expected, array_values($values));
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/MockFileListIterator.php b/lib/symfony/finder/Tests/Iterator/MockFileListIterator.php
new file mode 100644
index 000000000..670478d7a
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/MockFileListIterator.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+class MockFileListIterator extends \ArrayIterator
+{
+    public function __construct(array $filesArray = [])
+    {
+        $files = array_map(function ($file) { return new MockSplFileInfo($file); }, $filesArray);
+        parent::__construct($files);
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/MockSplFileInfo.php b/lib/symfony/finder/Tests/Iterator/MockSplFileInfo.php
new file mode 100644
index 000000000..58bb5979e
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/MockSplFileInfo.php
@@ -0,0 +1,132 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+class MockSplFileInfo extends \SplFileInfo
+{
+    const TYPE_DIRECTORY = 1;
+    const TYPE_FILE = 2;
+    const TYPE_UNKNOWN = 3;
+
+    private $contents = null;
+    private $mode = null;
+    private $type = null;
+    private $relativePath = null;
+    private $relativePathname = null;
+
+    public function __construct($param)
+    {
+        if (\is_string($param)) {
+            parent::__construct($param);
+        } elseif (\is_array($param)) {
+            $defaults = [
+                'name' => 'file.txt',
+                'contents' => null,
+                'mode' => null,
+                'type' => null,
+                'relativePath' => null,
+                'relativePathname' => null,
+            ];
+            $defaults = array_merge($defaults, $param);
+            parent::__construct($defaults['name']);
+            $this->setContents($defaults['contents']);
+            $this->setMode($defaults['mode']);
+            $this->setType($defaults['type']);
+            $this->setRelativePath($defaults['relativePath']);
+            $this->setRelativePathname($defaults['relativePathname']);
+        } else {
+            throw new \RuntimeException(sprintf('Incorrect parameter "%s"', $param));
+        }
+    }
+
+    public function isFile()
+    {
+        if (null === $this->type) {
+            return false !== strpos($this->getFilename(), 'file');
+        }
+
+        return self::TYPE_FILE === $this->type;
+    }
+
+    public function isDir()
+    {
+        if (null === $this->type) {
+            return false !== strpos($this->getFilename(), 'directory');
+        }
+
+        return self::TYPE_DIRECTORY === $this->type;
+    }
+
+    public function isReadable()
+    {
+        if (null === $this->mode) {
+            return preg_match('/r\+/', $this->getFilename());
+        }
+
+        return preg_match('/r\+/', $this->mode);
+    }
+
+    public function getContents()
+    {
+        return $this->contents;
+    }
+
+    public function setContents($contents)
+    {
+        $this->contents = $contents;
+    }
+
+    public function setMode($mode)
+    {
+        $this->mode = $mode;
+    }
+
+    public function setType($type)
+    {
+        if (\is_string($type)) {
+            switch ($type) {
+                case 'directory':
+                case 'd':
+                    $this->type = self::TYPE_DIRECTORY;
+                    break;
+                case 'file':
+                case 'f':
+                    $this->type = self::TYPE_FILE;
+                    break;
+                default:
+                    $this->type = self::TYPE_UNKNOWN;
+            }
+        } else {
+            $this->type = $type;
+        }
+    }
+
+    public function setRelativePath($relativePath)
+    {
+        $this->relativePath = $relativePath;
+    }
+
+    public function setRelativePathname($relativePathname)
+    {
+        $this->relativePathname = $relativePathname;
+    }
+
+    public function getRelativePath()
+    {
+        return $this->relativePath;
+    }
+
+    public function getRelativePathname()
+    {
+        return $this->relativePathname;
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
new file mode 100644
index 000000000..955677695
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Finder\Iterator\MultiplePcreFilterIterator;
+
+class MultiplePcreFilterIteratorTest extends TestCase
+{
+    /**
+     * @dataProvider getIsRegexFixtures
+     */
+    public function testIsRegex($string, $isRegex, $message)
+    {
+        $testIterator = new TestMultiplePcreFilterIterator();
+        $this->assertEquals($isRegex, $testIterator->isRegex($string), $message);
+    }
+
+    public function getIsRegexFixtures()
+    {
+        return [
+            ['foo', false, 'string'],
+            [' foo ', false, '" " is not a valid delimiter'],
+            ['\\foo\\', false, '"\\" is not a valid delimiter'],
+            ['afooa', false, '"a" is not a valid delimiter'],
+            ['//', false, 'the pattern should contain at least 1 character'],
+            ['/a/', true, 'valid regex'],
+            ['/foo/', true, 'valid regex'],
+            ['/foo/i', true, 'valid regex with a single modifier'],
+            ['/foo/imsxu', true, 'valid regex with multiple modifiers'],
+            ['#foo#', true, '"#" is a valid delimiter'],
+            ['{foo}', true, '"{,}" is a valid delimiter pair'],
+            ['[foo]', true, '"[,]" is a valid delimiter pair'],
+            ['(foo)', true, '"(,)" is a valid delimiter pair'],
+            ['<foo>', true, '"<,>" is a valid delimiter pair'],
+            ['*foo.*', false, '"*" is not considered as a valid delimiter'],
+            ['?foo.?', false, '"?" is not considered as a valid delimiter'],
+        ];
+    }
+}
+
+class TestMultiplePcreFilterIterator extends MultiplePcreFilterIterator
+{
+    public function __construct()
+    {
+    }
+
+    public function accept()
+    {
+        throw new \BadFunctionCallException('Not implemented');
+    }
+
+    public function isRegex($str)
+    {
+        return parent::isRegex($str);
+    }
+
+    public function toRegex($str)
+    {
+        throw new \BadFunctionCallException('Not implemented');
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
new file mode 100644
index 000000000..9040ee04c
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\PathFilterIterator;
+
+class PathFilterIteratorTest extends IteratorTestCase
+{
+    /**
+     * @dataProvider getTestFilterData
+     */
+    public function testFilter(\Iterator $inner, array $matchPatterns, array $noMatchPatterns, array $resultArray)
+    {
+        $iterator = new PathFilterIterator($inner, $matchPatterns, $noMatchPatterns);
+        $this->assertIterator($resultArray, $iterator);
+    }
+
+    public function getTestFilterData()
+    {
+        $inner = new MockFileListIterator();
+
+        //PATH:   A/B/C/abc.dat
+        $inner[] = new MockSplFileInfo([
+            'name' => 'abc.dat',
+            'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
+        ]);
+
+        //PATH:   A/B/ab.dat
+        $inner[] = new MockSplFileInfo([
+            'name' => 'ab.dat',
+            'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
+        ]);
+
+        //PATH:   A/a.dat
+        $inner[] = new MockSplFileInfo([
+            'name' => 'a.dat',
+            'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'a.dat',
+        ]);
+
+        //PATH:   copy/A/B/C/abc.dat.copy
+        $inner[] = new MockSplFileInfo([
+            'name' => 'abc.dat.copy',
+            'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
+        ]);
+
+        //PATH:   copy/A/B/ab.dat.copy
+        $inner[] = new MockSplFileInfo([
+            'name' => 'ab.dat.copy',
+            'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
+        ]);
+
+        //PATH:   copy/A/a.dat.copy
+        $inner[] = new MockSplFileInfo([
+            'name' => 'a.dat.copy',
+            'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'a.dat',
+        ]);
+
+        return [
+            [$inner, ['/^A/'],       [], ['abc.dat', 'ab.dat', 'a.dat']],
+            [$inner, ['/^A\/B/'],    [], ['abc.dat', 'ab.dat']],
+            [$inner, ['/^A\/B\/C/'], [], ['abc.dat']],
+            [$inner, ['/A\/B\/C/'], [], ['abc.dat', 'abc.dat.copy']],
+
+            [$inner, ['A'],      [], ['abc.dat', 'ab.dat', 'a.dat', 'abc.dat.copy', 'ab.dat.copy', 'a.dat.copy']],
+            [$inner, ['A/B'],    [], ['abc.dat', 'ab.dat', 'abc.dat.copy', 'ab.dat.copy']],
+            [$inner, ['A/B/C'], [], ['abc.dat', 'abc.dat.copy']],
+
+            [$inner, ['copy/A'],      [], ['abc.dat.copy', 'ab.dat.copy', 'a.dat.copy']],
+            [$inner, ['copy/A/B'],    [], ['abc.dat.copy', 'ab.dat.copy']],
+            [$inner, ['copy/A/B/C'], [], ['abc.dat.copy']],
+        ];
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/RealIteratorTestCase.php b/lib/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
new file mode 100644
index 000000000..70048a5ea
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+abstract class RealIteratorTestCase extends IteratorTestCase
+{
+    protected static $tmpDir;
+    protected static $files;
+
+    public static function setUpBeforeClass()
+    {
+        self::$tmpDir = realpath(sys_get_temp_dir()).\DIRECTORY_SEPARATOR.'symfony_finder';
+
+        self::$files = [
+            '.git/',
+            '.foo/',
+            '.foo/.bar',
+            '.foo/bar',
+            '.bar',
+            'test.py',
+            'foo/',
+            'foo/bar.tmp',
+            'test.php',
+            'toto/',
+            'toto/.git/',
+            'foo bar',
+        ];
+
+        self::$files = self::toAbsolute(self::$files);
+
+        if (is_dir(self::$tmpDir)) {
+            self::tearDownAfterClass();
+        } else {
+            mkdir(self::$tmpDir);
+        }
+
+        foreach (self::$files as $file) {
+            if (\DIRECTORY_SEPARATOR === $file[\strlen($file) - 1]) {
+                mkdir($file);
+            } else {
+                touch($file);
+            }
+        }
+
+        file_put_contents(self::toAbsolute('test.php'), str_repeat(' ', 800));
+        file_put_contents(self::toAbsolute('test.py'), str_repeat(' ', 2000));
+
+        touch(self::toAbsolute('foo/bar.tmp'), strtotime('2005-10-15'));
+        touch(self::toAbsolute('test.php'), strtotime('2005-10-15'));
+    }
+
+    public static function tearDownAfterClass()
+    {
+        $paths = new \RecursiveIteratorIterator(
+             new \RecursiveDirectoryIterator(self::$tmpDir, \RecursiveDirectoryIterator::SKIP_DOTS),
+             \RecursiveIteratorIterator::CHILD_FIRST
+         );
+
+        foreach ($paths as $path) {
+            if ($path->isDir()) {
+                if ($path->isLink()) {
+                    @unlink($path);
+                } else {
+                    @rmdir($path);
+                }
+            } else {
+                @unlink($path);
+            }
+        }
+    }
+
+    protected static function toAbsolute($files = null)
+    {
+        /*
+         * Without the call to setUpBeforeClass() property can be null.
+         */
+        if (!self::$tmpDir) {
+            self::$tmpDir = realpath(sys_get_temp_dir()).\DIRECTORY_SEPARATOR.'symfony_finder';
+        }
+
+        if (\is_array($files)) {
+            $f = [];
+            foreach ($files as $file) {
+                if (\is_array($file)) {
+                    $f[] = self::toAbsolute($file);
+                } else {
+                    $f[] = self::$tmpDir.\DIRECTORY_SEPARATOR.str_replace('/', \DIRECTORY_SEPARATOR, $file);
+                }
+            }
+
+            return $f;
+        }
+
+        if (\is_string($files)) {
+            return self::$tmpDir.\DIRECTORY_SEPARATOR.str_replace('/', \DIRECTORY_SEPARATOR, $files);
+        }
+
+        return self::$tmpDir;
+    }
+
+    protected static function toAbsoluteFixtures($files)
+    {
+        $f = [];
+        foreach ($files as $file) {
+            $f[] = realpath(__DIR__.\DIRECTORY_SEPARATOR.'..'.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.$file);
+        }
+
+        return $f;
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/lib/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
new file mode 100644
index 000000000..037810aea
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\RecursiveDirectoryIterator;
+
+class RecursiveDirectoryIteratorTest extends IteratorTestCase
+{
+    /**
+     * @group network
+     */
+    public function testRewindOnFtp()
+    {
+        try {
+            $i = new RecursiveDirectoryIterator('ftp://speedtest.tele2.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
+        } catch (\UnexpectedValueException $e) {
+            $this->markTestSkipped('Unsupported stream "ftp".');
+        }
+
+        $i->rewind();
+
+        $this->assertTrue(true);
+    }
+
+    /**
+     * @group network
+     */
+    public function testSeekOnFtp()
+    {
+        try {
+            $i = new RecursiveDirectoryIterator('ftp://speedtest.tele2.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
+        } catch (\UnexpectedValueException $e) {
+            $this->markTestSkipped('Unsupported stream "ftp".');
+        }
+
+        $contains = [
+            'ftp://speedtest.tele2.net'.\DIRECTORY_SEPARATOR.'1000GB.zip',
+            'ftp://speedtest.tele2.net'.\DIRECTORY_SEPARATOR.'100GB.zip',
+        ];
+        $actual = [];
+
+        $i->seek(0);
+        $actual[] = $i->getPathname();
+
+        $i->seek(1);
+        $actual[] = $i->getPathname();
+
+        $this->assertEquals($contains, $actual);
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php b/lib/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
new file mode 100644
index 000000000..b1e431ba5
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Comparator\NumberComparator;
+use Symfony\Component\Finder\Iterator\SizeRangeFilterIterator;
+
+class SizeRangeFilterIteratorTest extends RealIteratorTestCase
+{
+    /**
+     * @dataProvider getAcceptData
+     */
+    public function testAccept($size, $expected)
+    {
+        $inner = new InnerSizeIterator(self::$files);
+
+        $iterator = new SizeRangeFilterIterator($inner, $size);
+
+        $this->assertIterator($expected, $iterator);
+    }
+
+    public function getAcceptData()
+    {
+        $lessThan1KGreaterThan05K = [
+            '.foo',
+            '.git',
+            'foo',
+            'test.php',
+            'toto',
+            'toto/.git',
+        ];
+
+        return [
+            [[new NumberComparator('< 1K'), new NumberComparator('> 0.5K')], $this->toAbsolute($lessThan1KGreaterThan05K)],
+        ];
+    }
+}
+
+class InnerSizeIterator extends \ArrayIterator
+{
+    public function current()
+    {
+        return new \SplFileInfo(parent::current());
+    }
+
+    public function getFilename()
+    {
+        return parent::current();
+    }
+
+    public function isFile()
+    {
+        return $this->current()->isFile();
+    }
+
+    public function getSize()
+    {
+        return $this->current()->getSize();
+    }
+}
diff --git a/lib/symfony/finder/Tests/Iterator/SortableIteratorTest.php b/lib/symfony/finder/Tests/Iterator/SortableIteratorTest.php
new file mode 100644
index 000000000..118c4769f
--- /dev/null
+++ b/lib/symfony/finder/Tests/Iterator/SortableIteratorTest.php
@@ -0,0 +1,179 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests\Iterator;
+
+use Symfony\Component\Finder\Iterator\SortableIterator;
+
+class SortableIteratorTest extends RealIteratorTestCase
+{
+    public function testConstructor()
+    {
+        try {
+            new SortableIterator(new Iterator([]), 'foobar');
+            $this->fail('__construct() throws an \InvalidArgumentException exception if the mode is not valid');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('InvalidArgumentException', $e, '__construct() throws an \InvalidArgumentException exception if the mode is not valid');
+        }
+    }
+
+    /**
+     * @dataProvider getAcceptData
+     */
+    public function testAccept($mode, $expected)
+    {
+        if (!\is_callable($mode)) {
+            switch ($mode) {
+                case SortableIterator::SORT_BY_ACCESSED_TIME:
+                    touch(self::toAbsolute('.git'));
+                    sleep(1);
+                    file_get_contents(self::toAbsolute('.bar'));
+                    break;
+                case SortableIterator::SORT_BY_CHANGED_TIME:
+                    file_put_contents(self::toAbsolute('test.php'), 'foo');
+                    sleep(1);
+                    file_put_contents(self::toAbsolute('test.py'), 'foo');
+                    break;
+                case SortableIterator::SORT_BY_MODIFIED_TIME:
+                    file_put_contents(self::toAbsolute('test.php'), 'foo');
+                    sleep(1);
+                    file_put_contents(self::toAbsolute('test.py'), 'foo');
+                    break;
+            }
+        }
+
+        $inner = new Iterator(self::$files);
+
+        $iterator = new SortableIterator($inner, $mode);
+
+        if (SortableIterator::SORT_BY_ACCESSED_TIME === $mode
+            || SortableIterator::SORT_BY_CHANGED_TIME === $mode
+            || SortableIterator::SORT_BY_MODIFIED_TIME === $mode
+        ) {
+            if ('\\' === \DIRECTORY_SEPARATOR && SortableIterator::SORT_BY_MODIFIED_TIME !== $mode) {
+                $this->markTestSkipped('Sorting by atime or ctime is not supported on Windows');
+            }
+            $this->assertOrderedIteratorForGroups($expected, $iterator);
+        } else {
+            $this->assertOrderedIterator($expected, $iterator);
+        }
+    }
+
+    public function getAcceptData()
+    {
+        $sortByName = [
+            '.bar',
+            '.foo',
+            '.foo/.bar',
+            '.foo/bar',
+            '.git',
+            'foo',
+            'foo bar',
+            'foo/bar.tmp',
+            'test.php',
+            'test.py',
+            'toto',
+            'toto/.git',
+        ];
+
+        $sortByType = [
+            '.foo',
+            '.git',
+            'foo',
+            'toto',
+            'toto/.git',
+            '.bar',
+            '.foo/.bar',
+            '.foo/bar',
+            'foo bar',
+            'foo/bar.tmp',
+            'test.php',
+            'test.py',
+        ];
+
+        $customComparison = [
+            '.bar',
+            '.foo',
+            '.foo/.bar',
+            '.foo/bar',
+            '.git',
+            'foo',
+            'foo bar',
+            'foo/bar.tmp',
+            'test.php',
+            'test.py',
+            'toto',
+            'toto/.git',
+        ];
+
+        $sortByAccessedTime = [
+            // For these two files the access time was set to 2005-10-15
+            ['foo/bar.tmp', 'test.php'],
+            // These files were created more or less at the same time
+            [
+                '.git',
+                '.foo',
+                '.foo/.bar',
+                '.foo/bar',
+                'test.py',
+                'foo',
+                'toto',
+                'toto/.git',
+                'foo bar',
+            ],
+            // This file was accessed after sleeping for 1 sec
+            ['.bar'],
+        ];
+
+        $sortByChangedTime = [
+            [
+                '.git',
+                '.foo',
+                '.foo/.bar',
+                '.foo/bar',
+                '.bar',
+                'foo',
+                'foo/bar.tmp',
+                'toto',
+                'toto/.git',
+                'foo bar',
+            ],
+            ['test.php'],
+            ['test.py'],
+        ];
+
+        $sortByModifiedTime = [
+            [
+                '.git',
+                '.foo',
+                '.foo/.bar',
+                '.foo/bar',
+                '.bar',
+                'foo',
+                'foo/bar.tmp',
+                'toto',
+                'toto/.git',
+                'foo bar',
+            ],
+            ['test.php'],
+            ['test.py'],
+        ];
+
+        return [
+            [SortableIterator::SORT_BY_NAME, $this->toAbsolute($sortByName)],
+            [SortableIterator::SORT_BY_TYPE, $this->toAbsolute($sortByType)],
+            [SortableIterator::SORT_BY_ACCESSED_TIME, $this->toAbsolute($sortByAccessedTime)],
+            [SortableIterator::SORT_BY_CHANGED_TIME, $this->toAbsolute($sortByChangedTime)],
+            [SortableIterator::SORT_BY_MODIFIED_TIME, $this->toAbsolute($sortByModifiedTime)],
+            [function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealPath(), $b->getRealPath()); }, $this->toAbsolute($customComparison)],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Test/ForwardCompatTestTrait.php b/lib/symfony/framework-bundle/Test/ForwardCompatTestTrait.php
new file mode 100644
index 000000000..6fb7479e2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Test/ForwardCompatTestTrait.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Test;
+
+use PHPUnit\Framework\TestCase;
+
+// Auto-adapt to PHPUnit 8 that added a `void` return-type to the setUp/tearDown methods
+
+if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
+    eval('
+    namespace Symfony\Bundle\FrameworkBundle\Test;
+
+    /**
+     * @internal
+     */
+    trait ForwardCompatTestTrait
+    {
+        private function doSetUp(): void
+        {
+        }
+
+        private function doTearDown(): void
+        {
+        }
+
+        protected function setUp(): void
+        {
+            $this->doSetUp();
+        }
+
+        protected function tearDown(): void
+        {
+            $this->doTearDown();
+        }
+    }
+');
+} else {
+    /**
+     * @internal
+     */
+    trait ForwardCompatTestTrait
+    {
+        /**
+         * @return void
+         */
+        private function doSetUp()
+        {
+        }
+
+        /**
+         * @return void
+         */
+        private function doTearDown()
+        {
+        }
+
+        /**
+         * @return void
+         */
+        protected function setUp()
+        {
+            $this->doSetUp();
+        }
+
+        /**
+         * @return void
+         */
+        protected function tearDown()
+        {
+            $this->doTearDown();
+        }
+    }
+}
diff --git a/lib/symfony/framework-bundle/Test/KernelTestCase.php b/lib/symfony/framework-bundle/Test/KernelTestCase.php
new file mode 100644
index 000000000..92e92c0fe
--- /dev/null
+++ b/lib/symfony/framework-bundle/Test/KernelTestCase.php
@@ -0,0 +1,231 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Test;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ResettableContainerInterface;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+/**
+ * KernelTestCase is the base class for tests needing a Kernel.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+abstract class KernelTestCase extends TestCase
+{
+    use ForwardCompatTestTrait;
+
+    protected static $class;
+
+    /**
+     * @var KernelInterface
+     */
+    protected static $kernel;
+
+    private function doTearDown()
+    {
+        static::ensureKernelShutdown();
+        static::$kernel = null;
+    }
+
+    /**
+     * Finds the directory where the phpunit.xml(.dist) is stored.
+     *
+     * If you run tests with the PHPUnit CLI tool, everything will work as expected.
+     * If not, override this method in your test classes.
+     *
+     * @return string The directory where phpunit.xml(.dist) is stored
+     *
+     * @throws \RuntimeException
+     *
+     * @deprecated since 3.4 and will be removed in 4.0.
+     */
+    protected static function getPhpUnitXmlDir()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+
+        if (!isset($_SERVER['argv']) || false === strpos($_SERVER['argv'][0], 'phpunit')) {
+            throw new \RuntimeException('You must override the KernelTestCase::createKernel() method.');
+        }
+
+        $dir = static::getPhpUnitCliConfigArgument();
+        if (null === $dir &&
+            (is_file(getcwd().\DIRECTORY_SEPARATOR.'phpunit.xml') ||
+            is_file(getcwd().\DIRECTORY_SEPARATOR.'phpunit.xml.dist'))) {
+            $dir = getcwd();
+        }
+
+        // Can't continue
+        if (null === $dir) {
+            throw new \RuntimeException('Unable to guess the Kernel directory.');
+        }
+
+        if (!is_dir($dir)) {
+            $dir = \dirname($dir);
+        }
+
+        return $dir;
+    }
+
+    /**
+     * Finds the value of the CLI configuration option.
+     *
+     * PHPUnit will use the last configuration argument on the command line, so this only returns
+     * the last configuration argument.
+     *
+     * @return string The value of the PHPUnit CLI configuration option
+     *
+     * @deprecated since 3.4 and will be removed in 4.0.
+     */
+    private static function getPhpUnitCliConfigArgument()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+
+        $dir = null;
+        $reversedArgs = array_reverse($_SERVER['argv']);
+        foreach ($reversedArgs as $argIndex => $testArg) {
+            if (preg_match('/^-[^ \-]*c$/', $testArg) || '--configuration' === $testArg) {
+                $dir = realpath($reversedArgs[$argIndex - 1]);
+                break;
+            } elseif (0 === strpos($testArg, '--configuration=')) {
+                $argPath = substr($testArg, \strlen('--configuration='));
+                $dir = realpath($argPath);
+                break;
+            } elseif (0 === strpos($testArg, '-c')) {
+                $argPath = substr($testArg, \strlen('-c'));
+                $dir = realpath($argPath);
+                break;
+            }
+        }
+
+        return $dir;
+    }
+
+    /**
+     * Attempts to guess the kernel location.
+     *
+     * When the Kernel is located, the file is required.
+     *
+     * @return string The Kernel class name
+     *
+     * @throws \RuntimeException
+     */
+    protected static function getKernelClass()
+    {
+        if (isset($_SERVER['KERNEL_CLASS']) || isset($_ENV['KERNEL_CLASS'])) {
+            $class = isset($_ENV['KERNEL_CLASS']) ? $_ENV['KERNEL_CLASS'] : $_SERVER['KERNEL_CLASS'];
+            if (!class_exists($class)) {
+                throw new \RuntimeException(sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the %s::createKernel() method.', $class, static::class));
+            }
+
+            return $class;
+        } else {
+            @trigger_error(sprintf('Using the KERNEL_DIR environment variable or the automatic guessing based on the phpunit.xml / phpunit.xml.dist file location is deprecated since Symfony 3.4. Set the KERNEL_CLASS environment variable to the fully-qualified class name of your Kernel instead. Not setting the KERNEL_CLASS environment variable will throw an exception on 4.0 unless you override the %1$::createKernel() or %1$::getKernelClass() method.', static::class), E_USER_DEPRECATED);
+        }
+
+        if (isset($_SERVER['KERNEL_DIR']) || isset($_ENV['KERNEL_DIR'])) {
+            $dir = isset($_ENV['KERNEL_DIR']) ? $_ENV['KERNEL_DIR'] : $_SERVER['KERNEL_DIR'];
+
+            if (!is_dir($dir)) {
+                $phpUnitDir = static::getPhpUnitXmlDir();
+                if (is_dir("$phpUnitDir/$dir")) {
+                    $dir = "$phpUnitDir/$dir";
+                }
+            }
+        } else {
+            $dir = static::getPhpUnitXmlDir();
+        }
+
+        $finder = new Finder();
+        $finder->name('*Kernel.php')->depth(0)->in($dir);
+        $results = iterator_to_array($finder);
+        if (!\count($results)) {
+            throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to https://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the WebTestCase::createKernel() method.');
+        }
+
+        $file = current($results);
+        $class = $file->getBasename('.php');
+
+        require_once $file;
+
+        return $class;
+    }
+
+    /**
+     * Boots the Kernel for this test.
+     *
+     * @return KernelInterface A KernelInterface instance
+     */
+    protected static function bootKernel(array $options = [])
+    {
+        static::ensureKernelShutdown();
+
+        static::$kernel = static::createKernel($options);
+        static::$kernel->boot();
+
+        return static::$kernel;
+    }
+
+    /**
+     * Creates a Kernel.
+     *
+     * Available options:
+     *
+     *  * environment
+     *  * debug
+     *
+     * @return KernelInterface A KernelInterface instance
+     */
+    protected static function createKernel(array $options = [])
+    {
+        if (null === static::$class) {
+            static::$class = static::getKernelClass();
+        }
+
+        if (isset($options['environment'])) {
+            $env = $options['environment'];
+        } elseif (isset($_ENV['APP_ENV'])) {
+            $env = $_ENV['APP_ENV'];
+        } elseif (isset($_SERVER['APP_ENV'])) {
+            $env = $_SERVER['APP_ENV'];
+        } else {
+            $env = 'test';
+        }
+
+        if (isset($options['debug'])) {
+            $debug = $options['debug'];
+        } elseif (isset($_ENV['APP_DEBUG'])) {
+            $debug = $_ENV['APP_DEBUG'];
+        } elseif (isset($_SERVER['APP_DEBUG'])) {
+            $debug = $_SERVER['APP_DEBUG'];
+        } else {
+            $debug = true;
+        }
+
+        return new static::$class($env, $debug);
+    }
+
+    /**
+     * Shuts the kernel down if it was used in the test - called by the tearDown method by default.
+     */
+    protected static function ensureKernelShutdown()
+    {
+        if (null !== static::$kernel) {
+            $container = static::$kernel->getContainer();
+            static::$kernel->shutdown();
+            if ($container instanceof ResettableContainerInterface) {
+                $container->reset();
+            }
+        }
+    }
+}
diff --git a/lib/symfony/framework-bundle/Test/WebTestCase.php b/lib/symfony/framework-bundle/Test/WebTestCase.php
new file mode 100644
index 000000000..74d99194a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Test/WebTestCase.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Test;
+
+use Symfony\Bundle\FrameworkBundle\Client;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+
+/**
+ * WebTestCase is the base class for functional tests.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+abstract class WebTestCase extends KernelTestCase
+{
+    /**
+     * Creates a Client.
+     *
+     * @param array $options An array of options to pass to the createKernel method
+     * @param array $server  An array of server parameters
+     *
+     * @return Client A Client instance
+     */
+    protected static function createClient(array $options = [], array $server = [])
+    {
+        $kernel = static::bootKernel($options);
+
+        try {
+            $client = $kernel->getContainer()->get('test.client');
+        } catch (ServiceNotFoundException $e) {
+            if (class_exists(Client::class)) {
+                throw new \LogicException('You cannot create the client used in functional tests if the "framework.test" config is not set to true.');
+            }
+            throw new \LogicException('You cannot create the client used in functional tests if the BrowserKit component is not available. Try running "composer require symfony/browser-kit"');
+        }
+
+        $client->setServerParameters($server);
+
+        return $client;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/lib/symfony/framework-bundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
new file mode 100644
index 000000000..6ead6d746
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
+
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\Annotations\CachedReader;
+use Doctrine\Common\Annotations\Reader;
+use PHPUnit\Framework\MockObject\MockObject;
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+use Symfony\Component\Cache\DoctrineProvider;
+use Symfony\Component\Filesystem\Filesystem;
+
+class AnnotationsCacheWarmerTest extends TestCase
+{
+    private $cacheDir;
+
+    protected function setUp()
+    {
+        $this->cacheDir = sys_get_temp_dir().'/'.uniqid();
+        $fs = new Filesystem();
+        $fs->mkdir($this->cacheDir);
+        parent::setUp();
+    }
+
+    protected function tearDown()
+    {
+        $fs = new Filesystem();
+        $fs->remove($this->cacheDir);
+        parent::tearDown();
+    }
+
+    public function testAnnotationsCacheWarmerWithDebugDisabled()
+    {
+        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([__CLASS__], true)));
+        $cacheFile = tempnam($this->cacheDir, __FUNCTION__);
+        $reader = new AnnotationReader();
+        $fallbackPool = new ArrayAdapter();
+        $warmer = new AnnotationsCacheWarmer(
+            $reader,
+            $cacheFile,
+            $fallbackPool,
+            null
+        );
+        $warmer->warmUp($this->cacheDir);
+        $this->assertFileExists($cacheFile);
+
+        // Assert cache is valid
+        $reader = new CachedReader(
+            $this->getReadOnlyReader(),
+            new DoctrineProvider(new PhpArrayAdapter($cacheFile, new NullAdapter()))
+        );
+        $refClass = new \ReflectionClass($this);
+        $reader->getClassAnnotations($refClass);
+        $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));
+        $reader->getPropertyAnnotations($refClass->getProperty('cacheDir'));
+    }
+
+    public function testAnnotationsCacheWarmerWithDebugEnabled()
+    {
+        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([__CLASS__], true)));
+        $cacheFile = tempnam($this->cacheDir, __FUNCTION__);
+        $reader = new AnnotationReader();
+        $fallbackPool = new ArrayAdapter();
+        $warmer = new AnnotationsCacheWarmer(
+            $reader,
+            $cacheFile,
+            $fallbackPool,
+            null,
+            true
+        );
+        $warmer->warmUp($this->cacheDir);
+        $this->assertFileExists($cacheFile);
+        // Assert cache is valid
+        $reader = new CachedReader(
+            $this->getReadOnlyReader(),
+            new DoctrineProvider(new PhpArrayAdapter($cacheFile, new NullAdapter())),
+            true
+        );
+        $refClass = new \ReflectionClass($this);
+        $reader->getClassAnnotations($refClass);
+        $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));
+        $reader->getPropertyAnnotations($refClass->getProperty('cacheDir'));
+    }
+
+    /**
+     * Test that the cache warming process is not broken if a class loader
+     * throws an exception (on class / file not found for example).
+     */
+    public function testClassAutoloadException()
+    {
+        $this->assertFalse(class_exists($annotatedClass = 'C\C\C', false));
+
+        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([$annotatedClass], true)));
+        $warmer = new AnnotationsCacheWarmer(new AnnotationReader(), tempnam($this->cacheDir, __FUNCTION__), new ArrayAdapter());
+
+        spl_autoload_register($classLoader = function ($class) use ($annotatedClass) {
+            if ($class === $annotatedClass) {
+                throw new \DomainException('This exception should be caught by the warmer.');
+            }
+        }, true, true);
+
+        $warmer->warmUp($this->cacheDir);
+
+        spl_autoload_unregister($classLoader);
+    }
+
+    /**
+     * Test that the cache warming process is broken if a class loader throws an
+     * exception but that is unrelated to the class load.
+     */
+    public function testClassAutoloadExceptionWithUnrelatedException()
+    {
+        $this->expectException(\DomainException::class);
+        $this->expectExceptionMessage('This exception should not be caught by the warmer.');
+
+        $this->assertFalse(class_exists($annotatedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_AnnotationsCacheWarmerTest', false));
+
+        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([$annotatedClass], true)));
+        $warmer = new AnnotationsCacheWarmer(new AnnotationReader(), tempnam($this->cacheDir, __FUNCTION__), new ArrayAdapter());
+
+        spl_autoload_register($classLoader = function ($class) use ($annotatedClass) {
+            if ($class === $annotatedClass) {
+                eval('class '.$annotatedClass.'{}');
+                throw new \DomainException('This exception should not be caught by the warmer.');
+            }
+        }, true, true);
+
+        $warmer->warmUp($this->cacheDir);
+
+        spl_autoload_unregister($classLoader);
+    }
+
+    /**
+     * @return MockObject|Reader
+     */
+    private function getReadOnlyReader()
+    {
+        $readerMock = $this->getMockBuilder('Doctrine\Common\Annotations\Reader')->getMock();
+        $readerMock->expects($this->exactly(0))->method('getClassAnnotations');
+        $readerMock->expects($this->exactly(0))->method('getClassAnnotation');
+        $readerMock->expects($this->exactly(0))->method('getMethodAnnotations');
+        $readerMock->expects($this->exactly(0))->method('getMethodAnnotation');
+        $readerMock->expects($this->exactly(0))->method('getPropertyAnnotations');
+        $readerMock->expects($this->exactly(0))->method('getPropertyAnnotation');
+
+        return $readerMock;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/CacheWarmer/ClassCacheCacheWarmerTest.php b/lib/symfony/framework-bundle/Tests/CacheWarmer/ClassCacheCacheWarmerTest.php
new file mode 100644
index 000000000..20eb58ed7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/CacheWarmer/ClassCacheCacheWarmerTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
+
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\ClassCacheCacheWarmer;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\DeclaredClass;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\WarmedClass;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+
+/**
+ * @group legacy
+ */
+class ClassCacheCacheWarmerTest extends TestCase
+{
+    public function testWithDeclaredClasses()
+    {
+        $this->assertTrue(class_exists(WarmedClass::class, true));
+
+        $dir = sys_get_temp_dir();
+        @unlink($dir.'/classes.php');
+        file_put_contents($dir.'/classes.map', sprintf('<?php return %s;', var_export([WarmedClass::class], true)));
+
+        $warmer = new ClassCacheCacheWarmer([DeclaredClass::class]);
+
+        $warmer->warmUp($dir);
+
+        $this->assertSame(<<<'EOTXT'
+<?php 
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures
+{
+class WarmedClass extends DeclaredClass
+{
+}
+}
+EOTXT
+            , file_get_contents($dir.'/classes.php')
+        );
+
+        @unlink($dir.'/classes.map');
+        @unlink($dir.'/classes.php');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php b/lib/symfony/framework-bundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
new file mode 100644
index 000000000..1a244252f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
+
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\SerializerCacheWarmer;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
+use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
+use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
+
+class SerializerCacheWarmerTest extends TestCase
+{
+    public function testWarmUp()
+    {
+        if (!class_exists(CacheClassMetadataFactory::class) || !method_exists(XmlFileLoader::class, 'getMappedClasses') || !method_exists(YamlFileLoader::class, 'getMappedClasses')) {
+            $this->markTestSkipped('The Serializer default cache warmer has been introduced in the Serializer Component version 3.2.');
+        }
+
+        $loaders = [
+            new XmlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/person.xml'),
+            new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/author.yml'),
+        ];
+
+        $file = sys_get_temp_dir().'/cache-serializer.php';
+        @unlink($file);
+
+        $fallbackPool = new ArrayAdapter();
+
+        $warmer = new SerializerCacheWarmer($loaders, $file, $fallbackPool);
+        $warmer->warmUp(\dirname($file));
+
+        $this->assertFileExists($file);
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
+
+        $values = $fallbackPool->getValues();
+
+        $this->assertIsArray($values);
+        $this->assertCount(2, $values);
+        $this->assertArrayHasKey('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person', $values);
+        $this->assertArrayHasKey('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author', $values);
+    }
+
+    public function testWarmUpWithoutLoader()
+    {
+        if (!class_exists(CacheClassMetadataFactory::class) || !method_exists(XmlFileLoader::class, 'getMappedClasses') || !method_exists(YamlFileLoader::class, 'getMappedClasses')) {
+            $this->markTestSkipped('The Serializer default cache warmer has been introduced in the Serializer Component version 3.2.');
+        }
+
+        $file = sys_get_temp_dir().'/cache-serializer-without-loader.php';
+        @unlink($file);
+
+        $fallbackPool = new ArrayAdapter();
+
+        $warmer = new SerializerCacheWarmer([], $file, $fallbackPool);
+        $warmer->warmUp(\dirname($file));
+
+        $this->assertFileExists($file);
+
+        $values = $fallbackPool->getValues();
+
+        $this->assertIsArray($values);
+        $this->assertCount(0, $values);
+    }
+
+    /**
+     * Test that the cache warming process is not broken if a class loader
+     * throws an exception (on class / file not found for example).
+     */
+    public function testClassAutoloadException()
+    {
+        if (!class_exists(CacheClassMetadataFactory::class) || !method_exists(XmlFileLoader::class, 'getMappedClasses') || !method_exists(YamlFileLoader::class, 'getMappedClasses')) {
+            $this->markTestSkipped('The Serializer default cache warmer has been introduced in the Serializer Component version 3.2.');
+        }
+
+        $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest', false));
+
+        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__), new ArrayAdapter());
+
+        spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
+            if ($class === $mappedClass) {
+                throw new \DomainException('This exception should be caught by the warmer.');
+            }
+        }, true, true);
+
+        $warmer->warmUp('foo');
+
+        spl_autoload_unregister($classLoader);
+    }
+
+    /**
+     * Test that the cache warming process is broken if a class loader throws an
+     * exception but that is unrelated to the class load.
+     */
+    public function testClassAutoloadExceptionWithUnrelatedException()
+    {
+        $this->expectException(\DomainException::class);
+        $this->expectExceptionMessage('This exception should not be caught by the warmer.');
+
+        if (!class_exists(CacheClassMetadataFactory::class) || !method_exists(XmlFileLoader::class, 'getMappedClasses') || !method_exists(YamlFileLoader::class, 'getMappedClasses')) {
+            $this->markTestSkipped('The Serializer default cache warmer has been introduced in the Serializer Component version 3.2.');
+        }
+
+        $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest', false));
+
+        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__), new ArrayAdapter());
+
+        spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
+            if ($class === $mappedClass) {
+                eval('class '.$mappedClass.'{}');
+                throw new \DomainException('This exception should not be caught by the warmer.');
+            }
+        }, true, true);
+
+        $warmer->warmUp('foo');
+
+        spl_autoload_unregister($classLoader);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/CacheWarmer/TemplateFinderTest.php b/lib/symfony/framework-bundle/Tests/CacheWarmer/TemplateFinderTest.php
new file mode 100644
index 000000000..c1b49c34f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/CacheWarmer/TemplateFinderTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
+
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder;
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateFilenameParser;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BaseBundle\BaseBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+
+class TemplateFinderTest extends TestCase
+{
+    public function testFindAllTemplates()
+    {
+        $kernel = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Kernel')
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+
+        $kernel
+            ->expects($this->any())
+            ->method('getBundle')
+        ;
+
+        $kernel
+            ->expects($this->once())
+            ->method('getBundles')
+            ->willReturn(['BaseBundle' => new BaseBundle()])
+        ;
+
+        $parser = new TemplateFilenameParser();
+
+        $finder = new TemplateFinder($kernel, $parser, __DIR__.'/../Fixtures/Resources');
+
+        $templates = array_map(
+            function ($template) { return $template->getLogicalName(); },
+            $finder->findAllTemplates()
+        );
+
+        $this->assertCount(7, $templates, '->findAllTemplates() find all templates in the bundles and global folders');
+        $this->assertContains('BaseBundle::base.format.engine', $templates);
+        $this->assertContains('BaseBundle::this.is.a.template.format.engine', $templates);
+        $this->assertContains('BaseBundle:controller:base.format.engine', $templates);
+        $this->assertContains('BaseBundle:controller:custom.format.engine', $templates);
+        $this->assertContains('::this.is.a.template.format.engine', $templates);
+        $this->assertContains('::resource.format.engine', $templates);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php b/lib/symfony/framework-bundle/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php
new file mode 100644
index 000000000..b63c746eb
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
+
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinderInterface;
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplatePathsCacheWarmer;
+use Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator;
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Filesystem\Filesystem;
+
+class TemplatePathsCacheWarmerTest extends TestCase
+{
+    /** @var Filesystem */
+    private $filesystem;
+
+    /** @var TemplateFinderInterface */
+    private $templateFinder;
+
+    /** @var FileLocator */
+    private $fileLocator;
+
+    /** @var TemplateLocator */
+    private $templateLocator;
+
+    private $tmpDir;
+
+    protected function setUp()
+    {
+        $this->templateFinder = $this
+            ->getMockBuilder(TemplateFinderInterface::class)
+            ->setMethods(['findAllTemplates'])
+            ->getMock();
+
+        $this->fileLocator = $this
+            ->getMockBuilder(FileLocator::class)
+            ->setMethods(['locate'])
+            ->setConstructorArgs(['/path/to/fallback'])
+            ->getMock();
+
+        $this->templateLocator = new TemplateLocator($this->fileLocator);
+
+        $this->tmpDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('cache_template_paths_', true);
+
+        $this->filesystem = new Filesystem();
+        $this->filesystem->mkdir($this->tmpDir);
+    }
+
+    protected function tearDown()
+    {
+        $this->filesystem->remove($this->tmpDir);
+    }
+
+    public function testWarmUp()
+    {
+        $template = new TemplateReference('bundle', 'controller', 'name', 'format', 'engine');
+
+        $this->templateFinder
+            ->expects($this->once())
+            ->method('findAllTemplates')
+            ->willReturn([$template]);
+
+        $this->fileLocator
+            ->expects($this->once())
+            ->method('locate')
+            ->with($template->getPath())
+            ->willReturn(\dirname($this->tmpDir).'/path/to/template.html.twig');
+
+        $warmer = new TemplatePathsCacheWarmer($this->templateFinder, $this->templateLocator);
+        $warmer->warmUp($this->tmpDir);
+
+        $this->assertFileEquals(__DIR__.'/../Fixtures/TemplatePathsCache/templates.php', $this->tmpDir.'/templates.php');
+    }
+
+    public function testWarmUpEmpty()
+    {
+        $this->templateFinder
+            ->expects($this->once())
+            ->method('findAllTemplates')
+            ->willReturn([]);
+
+        $this->fileLocator
+            ->expects($this->never())
+            ->method('locate');
+
+        $warmer = new TemplatePathsCacheWarmer($this->templateFinder, $this->templateLocator);
+        $warmer->warmUp($this->tmpDir);
+
+        $this->assertFileExists($this->tmpDir.'/templates.php');
+        $this->assertSame(file_get_contents(__DIR__.'/../Fixtures/TemplatePathsCache/templates-empty.php'), file_get_contents($this->tmpDir.'/templates.php'));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php b/lib/symfony/framework-bundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
new file mode 100644
index 000000000..33d114035
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
@@ -0,0 +1,155 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
+
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\ValidatorCacheWarmer;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Validator\ValidatorBuilder;
+
+class ValidatorCacheWarmerTest extends TestCase
+{
+    public function testWarmUp()
+    {
+        $validatorBuilder = new ValidatorBuilder();
+        $validatorBuilder->addXmlMapping(__DIR__.'/../Fixtures/Validation/Resources/person.xml');
+        $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/author.yml');
+        $validatorBuilder->addMethodMapping('loadValidatorMetadata');
+        $validatorBuilder->enableAnnotationMapping();
+
+        $file = sys_get_temp_dir().'/cache-validator.php';
+        @unlink($file);
+
+        $fallbackPool = new ArrayAdapter();
+
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, $file, $fallbackPool);
+        $warmer->warmUp(\dirname($file));
+
+        $this->assertFileExists($file);
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
+
+        $values = $fallbackPool->getValues();
+
+        $this->assertIsArray($values);
+        $this->assertCount(2, $values);
+        $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person', $values);
+        $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author', $values);
+    }
+
+    public function testWarmUpWithAnnotations()
+    {
+        $validatorBuilder = new ValidatorBuilder();
+        $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/categories.yml');
+        $validatorBuilder->enableAnnotationMapping();
+
+        $file = sys_get_temp_dir().'/cache-validator-with-annotations.php';
+        @unlink($file);
+
+        $fallbackPool = new ArrayAdapter();
+
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, $file, $fallbackPool);
+        $warmer->warmUp(\dirname($file));
+
+        $this->assertFileExists($file);
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $item = $arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category');
+        $this->assertTrue($item->isHit());
+
+        $this->assertInstanceOf(ClassMetadata::class, $item->get());
+
+        $values = $fallbackPool->getValues();
+
+        $this->assertIsArray($values);
+        $this->assertCount(2, $values);
+        $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category', $values);
+        $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.SubCategory', $values);
+    }
+
+    public function testWarmUpWithoutLoader()
+    {
+        $validatorBuilder = new ValidatorBuilder();
+
+        $file = sys_get_temp_dir().'/cache-validator-without-loaders.php';
+        @unlink($file);
+
+        $fallbackPool = new ArrayAdapter();
+
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, $file, $fallbackPool);
+        $warmer->warmUp(\dirname($file));
+
+        $this->assertFileExists($file);
+
+        $values = $fallbackPool->getValues();
+
+        $this->assertIsArray($values);
+        $this->assertCount(0, $values);
+    }
+
+    /**
+     * Test that the cache warming process is not broken if a class loader
+     * throws an exception (on class / file not found for example).
+     */
+    public function testClassAutoloadException()
+    {
+        $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_ValidatorCacheWarmerTest', false));
+
+        $validatorBuilder = new ValidatorBuilder();
+        $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/does_not_exist.yaml');
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, tempnam(sys_get_temp_dir(), __FUNCTION__), new ArrayAdapter());
+
+        spl_autoload_register($classloader = function ($class) use ($mappedClass) {
+            if ($class === $mappedClass) {
+                throw new \DomainException('This exception should be caught by the warmer.');
+            }
+        }, true, true);
+
+        $warmer->warmUp('foo');
+
+        spl_autoload_unregister($classloader);
+    }
+
+    /**
+     * Test that the cache warming process is broken if a class loader throws an
+     * exception but that is unrelated to the class load.
+     */
+    public function testClassAutoloadExceptionWithUnrelatedException()
+    {
+        $this->expectException(\DomainException::class);
+        $this->expectExceptionMessage('This exception should not be caught by the warmer.');
+
+        $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_ValidatorCacheWarmerTest', false));
+
+        $validatorBuilder = new ValidatorBuilder();
+        $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/does_not_exist.yaml');
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, tempnam(sys_get_temp_dir(), __FUNCTION__), new ArrayAdapter());
+
+        spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
+            if ($class === $mappedClass) {
+                eval('class '.$mappedClass.'{}');
+                throw new \DomainException('This exception should not be caught by the warmer.');
+            }
+        }, true, true);
+
+        $warmer->warmUp('foo');
+
+        spl_autoload_unregister($classLoader);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/ClientTest.php b/lib/symfony/framework-bundle/Tests/ClientTest.php
new file mode 100644
index 000000000..3ff7daac5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/ClientTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests;
+
+use Symfony\Bundle\FrameworkBundle\Client;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\AbstractWebTestCase;
+use Symfony\Component\HttpFoundation\Response;
+
+class ClientTest extends AbstractWebTestCase
+{
+    public function testRebootKernelBetweenRequests()
+    {
+        $mock = $this->getKernelMock();
+        $mock->expects($this->once())->method('shutdown');
+
+        $client = new Client($mock);
+        $client->request('GET', '/');
+        $client->request('GET', '/');
+    }
+
+    public function testDisabledRebootKernel()
+    {
+        $mock = $this->getKernelMock();
+        $mock->expects($this->never())->method('shutdown');
+
+        $client = new Client($mock);
+        $client->disableReboot();
+        $client->request('GET', '/');
+        $client->request('GET', '/');
+    }
+
+    public function testEnableRebootKernel()
+    {
+        $mock = $this->getKernelMock();
+        $mock->expects($this->once())->method('shutdown');
+
+        $client = new Client($mock);
+        $client->disableReboot();
+        $client->request('GET', '/');
+        $client->request('GET', '/');
+        $client->enableReboot();
+        $client->request('GET', '/');
+    }
+
+    private function getKernelMock()
+    {
+        $mock = $this->getMockBuilder($this->getKernelClass())
+            ->setMethods(['shutdown', 'boot', 'handle'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mock->expects($this->any())->method('handle')->willReturn(new Response('foo'));
+
+        return $mock;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
new file mode 100644
index 000000000..c2cded7ab
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand\Fixture\TestAppKernel;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Config\ConfigCacheFactory;
+use Symfony\Component\Config\Resource\ResourceInterface;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Finder\Finder;
+
+class CacheClearCommandTest extends TestCase
+{
+    /** @var TestAppKernel */
+    private $kernel;
+    /** @var Filesystem */
+    private $fs;
+    private $rootDir;
+
+    protected function setUp()
+    {
+        $this->fs = new Filesystem();
+        $this->kernel = new TestAppKernel('test', true);
+        $this->rootDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('sf2_cache_', true);
+        $this->kernel->setRootDir($this->rootDir);
+        $this->fs->mkdir($this->rootDir);
+    }
+
+    protected function tearDown()
+    {
+        $this->fs->remove($this->rootDir);
+    }
+
+    public function testCacheIsFreshAfterCacheClearedWithWarmup()
+    {
+        $input = new ArrayInput(['cache:clear']);
+        $application = new Application($this->kernel);
+        $application->setCatchExceptions(false);
+
+        $application->doRun($input, new NullOutput());
+
+        // Ensure that all *.meta files are fresh
+        $finder = new Finder();
+        $metaFiles = $finder->files()->in($this->kernel->getCacheDir())->name('*.php.meta');
+        // check that cache is warmed up
+        $this->assertNotEmpty($metaFiles);
+        $configCacheFactory = new ConfigCacheFactory(true);
+
+        foreach ($metaFiles as $file) {
+            $configCacheFactory->cache(substr($file, 0, -5), function () use ($file) {
+                $this->fail(sprintf('Meta file "%s" is not fresh', (string) $file));
+            });
+        }
+
+        // check that app kernel file present in meta file of container's cache
+        $containerClass = $this->kernel->getContainer()->getParameter('kernel.container_class');
+        $containerRef = new \ReflectionClass($containerClass);
+        $containerFile = \dirname(\dirname($containerRef->getFileName())).'/'.$containerClass.'.php';
+        $containerMetaFile = $containerFile.'.meta';
+        $kernelRef = new \ReflectionObject($this->kernel);
+        $kernelFile = $kernelRef->getFileName();
+        /** @var ResourceInterface[] $meta */
+        $meta = unserialize(file_get_contents($containerMetaFile));
+        $found = false;
+        foreach ($meta as $resource) {
+            if ((string) $resource === $kernelFile) {
+                $found = true;
+                break;
+            }
+        }
+        $this->assertTrue($found, 'Kernel file should present as resource');
+
+        if (\defined('HHVM_VERSION')) {
+            return;
+        }
+        $containerRef = new \ReflectionClass(require $containerFile);
+        $containerFile = str_replace('tes_'.\DIRECTORY_SEPARATOR, 'test'.\DIRECTORY_SEPARATOR, $containerRef->getFileName());
+        $this->assertRegExp(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php b/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
new file mode 100644
index 000000000..1022b31a4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand\Fixture;
+
+use Psr\Log\NullLogger;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel;
+
+class TestAppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        return [
+            new FrameworkBundle(),
+        ];
+    }
+
+    public function setRootDir($rootDir)
+    {
+        $this->rootDir = $rootDir;
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load(__DIR__.\DIRECTORY_SEPARATOR.'config.yml');
+    }
+
+    protected function build(ContainerBuilder $container)
+    {
+        $container->register('logger', NullLogger::class);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/Fixture/config.yml b/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/Fixture/config.yml
new file mode 100644
index 000000000..68f8d0406
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/CacheClearCommand/Fixture/config.yml
@@ -0,0 +1,2 @@
+framework:
+    secret: test
diff --git a/lib/symfony/framework-bundle/Tests/Command/CachePruneCommandTest.php b/lib/symfony/framework-bundle/Tests/Command/CachePruneCommandTest.php
new file mode 100644
index 000000000..7ce554b3e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/CachePruneCommandTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+class CachePruneCommandTest extends TestCase
+{
+    public function testCommandWithPools()
+    {
+        $tester = $this->getCommandTester($this->getKernel(), $this->getRewindableGenerator());
+        $tester->execute([]);
+    }
+
+    public function testCommandWithNoPools()
+    {
+        $tester = $this->getCommandTester($this->getKernel(), $this->getEmptyRewindableGenerator());
+        $tester->execute([]);
+    }
+
+    /**
+     * @return RewindableGenerator
+     */
+    private function getRewindableGenerator()
+    {
+        return new RewindableGenerator(function () {
+            yield 'foo_pool' => $this->getPruneableInterfaceMock();
+            yield 'bar_pool' => $this->getPruneableInterfaceMock();
+        }, 2);
+    }
+
+    /**
+     * @return RewindableGenerator
+     */
+    private function getEmptyRewindableGenerator()
+    {
+        return new RewindableGenerator(function () {
+            return new \ArrayIterator([]);
+        }, 0);
+    }
+
+    /**
+     * @return MockObject|KernelInterface
+     */
+    private function getKernel()
+    {
+        $container = $this
+            ->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')
+            ->getMock();
+
+        $kernel = $this
+            ->getMockBuilder(KernelInterface::class)
+            ->getMock();
+
+        $kernel
+            ->expects($this->any())
+            ->method('getContainer')
+            ->willReturn($container);
+
+        $kernel
+            ->expects($this->once())
+            ->method('getBundles')
+            ->willReturn([]);
+
+        return $kernel;
+    }
+
+    /**
+     * @return MockObject|PruneableInterface
+     */
+    private function getPruneableInterfaceMock()
+    {
+        $pruneable = $this
+            ->getMockBuilder(PruneableInterface::class)
+            ->getMock();
+
+        $pruneable
+            ->expects($this->atLeastOnce())
+            ->method('prune');
+
+        return $pruneable;
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function getCommandTester(KernelInterface $kernel, RewindableGenerator $generator)
+    {
+        $application = new Application($kernel);
+        $application->add(new CachePoolPruneCommand($generator));
+
+        return new CommandTester($application->find('cache:pool:prune'));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Command/RouterDebugCommandTest.php b/lib/symfony/framework-bundle/Tests/Command/RouterDebugCommandTest.php
new file mode 100644
index 000000000..a4842f239
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/RouterDebugCommandTest.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class RouterDebugCommandTest extends TestCase
+{
+    public function testDebugAllRoutes()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => null], ['decorated' => false]);
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('Name   Method   Scheme   Host   Path', $tester->getDisplay());
+    }
+
+    public function testDebugSingleRoute()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => 'foo'], ['decorated' => false]);
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('Route Name   | foo', $tester->getDisplay());
+    }
+
+    public function testDebugInvalidRoute()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->createCommandTester()->execute(['name' => 'test']);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since Symfony 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
+     */
+    public function testLegacyDebugCommand()
+    {
+        $application = new Application($this->getKernel());
+        $application->add(new RouterDebugCommand());
+
+        $tester = new CommandTester($application->find('debug:router'));
+
+        $tester->execute([]);
+
+        $this->assertRegExp('/foo\s+ANY\s+ANY\s+ANY\s+\\/foo/', $tester->getDisplay());
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function createCommandTester()
+    {
+        $application = new Application($this->getKernel());
+        $application->add(new RouterDebugCommand($this->getRouter()));
+
+        return new CommandTester($application->find('debug:router'));
+    }
+
+    private function getRouter()
+    {
+        $routeCollection = new RouteCollection();
+        $routeCollection->add('foo', new Route('foo'));
+        $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
+        $router
+            ->expects($this->any())
+            ->method('getRouteCollection')
+            ->willReturn($routeCollection);
+
+        return $router;
+    }
+
+    private function getKernel()
+    {
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container
+            ->expects($this->atLeastOnce())
+            ->method('has')
+            ->willReturnCallback(function ($id) {
+                if ('console.command_loader' === $id) {
+                    return false;
+                }
+
+                return true;
+            })
+        ;
+        $container
+            ->expects($this->any())
+            ->method('get')
+            ->with('router')
+            ->willReturn($this->getRouter())
+        ;
+
+        $kernel = $this->getMockBuilder(KernelInterface::class)->getMock();
+        $kernel
+            ->expects($this->any())
+            ->method('getContainer')
+            ->willReturn($container)
+        ;
+        $kernel
+            ->expects($this->once())
+            ->method('getBundles')
+            ->willReturn([])
+        ;
+
+        return $kernel;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Command/RouterMatchCommandTest.php b/lib/symfony/framework-bundle/Tests/Command/RouterMatchCommandTest.php
new file mode 100644
index 000000000..b4748dde0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/RouterMatchCommandTest.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;
+use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class RouterMatchCommandTest extends TestCase
+{
+    public function testWithMatchPath()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['path_info' => '/foo', 'foo'], ['decorated' => false]);
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('Route Name   | foo', $tester->getDisplay());
+    }
+
+    public function testWithNotMatchPath()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['path_info' => '/test', 'foo'], ['decorated' => false]);
+
+        $this->assertEquals(1, $ret, 'Returns 1 in case of failure');
+        $this->assertStringContainsString('None of the routes match the path "/test"', $tester->getDisplay());
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since Symfony 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since Symfony 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
+     */
+    public function testLegacyMatchCommand()
+    {
+        $application = new Application($this->getKernel());
+        $application->add(new RouterMatchCommand());
+        $application->add(new RouterDebugCommand());
+
+        $tester = new CommandTester($application->find('router:match'));
+
+        $tester->execute(['path_info' => '/']);
+
+        $this->assertStringContainsString('None of the routes match the path "/"', $tester->getDisplay());
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function createCommandTester()
+    {
+        $application = new Application($this->getKernel());
+        $application->add(new RouterMatchCommand($this->getRouter()));
+        $application->add(new RouterDebugCommand($this->getRouter()));
+
+        return new CommandTester($application->find('router:match'));
+    }
+
+    private function getRouter()
+    {
+        $routeCollection = new RouteCollection();
+        $routeCollection->add('foo', new Route('foo'));
+        $requestContext = new RequestContext();
+        $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
+        $router
+            ->expects($this->any())
+            ->method('getRouteCollection')
+            ->willReturn($routeCollection);
+        $router
+            ->expects($this->any())
+            ->method('getContext')
+            ->willReturn($requestContext);
+
+        return $router;
+    }
+
+    private function getKernel()
+    {
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container
+            ->expects($this->atLeastOnce())
+            ->method('has')
+            ->willReturnCallback(function ($id) {
+                return 'console.command_loader' !== $id;
+            })
+        ;
+        $container
+            ->expects($this->any())
+            ->method('get')
+            ->with('router')
+            ->willReturn($this->getRouter())
+        ;
+
+        $kernel = $this->getMockBuilder(KernelInterface::class)->getMock();
+        $kernel
+            ->expects($this->any())
+            ->method('getContainer')
+            ->willReturn($container)
+        ;
+        $kernel
+            ->expects($this->once())
+            ->method('getBundles')
+            ->willReturn([])
+        ;
+
+        return $kernel;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Command/TranslationDebugCommandTest.php b/lib/symfony/framework-bundle/Tests/Command/TranslationDebugCommandTest.php
new file mode 100644
index 000000000..b3e849b13
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/TranslationDebugCommandTest.php
@@ -0,0 +1,256 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel;
+
+class TranslationDebugCommandTest extends TestCase
+{
+    private $fs;
+    private $translationDir;
+
+    public function testDebugMissingMessages()
+    {
+        $tester = $this->createCommandTester(['foo' => 'foo']);
+        $tester->execute(['locale' => 'en', 'bundle' => 'foo']);
+
+        $this->assertRegExp('/missing/', $tester->getDisplay());
+    }
+
+    public function testDebugUnusedMessages()
+    {
+        $tester = $this->createCommandTester([], ['foo' => 'foo']);
+        $tester->execute(['locale' => 'en', 'bundle' => 'foo']);
+
+        $this->assertRegExp('/unused/', $tester->getDisplay());
+    }
+
+    public function testDebugFallbackMessages()
+    {
+        $tester = $this->createCommandTester([], ['foo' => 'foo']);
+        $tester->execute(['locale' => 'fr', 'bundle' => 'foo']);
+
+        $this->assertRegExp('/fallback/', $tester->getDisplay());
+    }
+
+    public function testNoDefinedMessages()
+    {
+        $tester = $this->createCommandTester();
+        $tester->execute(['locale' => 'fr', 'bundle' => 'test']);
+
+        $this->assertRegExp('/No defined or extracted messages for locale "fr"/', $tester->getDisplay());
+    }
+
+    public function testDebugDefaultDirectory()
+    {
+        $tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);
+        $tester->execute(['locale' => 'en']);
+
+        $this->assertRegExp('/missing/', $tester->getDisplay());
+        $this->assertRegExp('/unused/', $tester->getDisplay());
+    }
+
+    public function testDebugDefaultRootDirectory()
+    {
+        $this->fs->remove($this->translationDir);
+        $this->fs = new Filesystem();
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->fs->mkdir($this->translationDir.'/translations');
+        $this->fs->mkdir($this->translationDir.'/templates');
+
+        $tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);
+        $tester->execute(['locale' => 'en']);
+
+        $this->assertRegExp('/missing/', $tester->getDisplay());
+        $this->assertRegExp('/unused/', $tester->getDisplay());
+    }
+
+    public function testDebugCustomDirectory()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel->expects($this->once())
+            ->method('getBundle')
+            ->with($this->equalTo($this->translationDir))
+            ->willThrowException(new \InvalidArgumentException());
+
+        $tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar'], $kernel);
+        $tester->execute(['locale' => 'en', 'bundle' => $this->translationDir]);
+
+        $this->assertRegExp('/missing/', $tester->getDisplay());
+        $this->assertRegExp('/unused/', $tester->getDisplay());
+    }
+
+    public function testDebugInvalidDirectory()
+    {
+        $this->expectException('InvalidArgumentException');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel->expects($this->once())
+            ->method('getBundle')
+            ->with($this->equalTo('dir'))
+            ->willThrowException(new \InvalidArgumentException());
+
+        $tester = $this->createCommandTester([], [], $kernel);
+        $tester->execute(['locale' => 'en', 'bundle' => 'dir']);
+    }
+
+    protected function setUp()
+    {
+        $this->fs = new Filesystem();
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->fs->mkdir($this->translationDir.'/Resources/translations');
+        $this->fs->mkdir($this->translationDir.'/Resources/views');
+        $this->fs->mkdir($this->translationDir.'/translations');
+        $this->fs->mkdir($this->translationDir.'/templates');
+    }
+
+    protected function tearDown()
+    {
+        $this->fs->remove($this->translationDir);
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function createCommandTester($extractedMessages = [], $loadedMessages = [], $kernel = null)
+    {
+        $translator = $this->getMockBuilder('Symfony\Component\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $translator
+            ->expects($this->any())
+            ->method('getFallbackLocales')
+            ->willReturn(['en']);
+
+        $extractor = $this->getMockBuilder('Symfony\Component\Translation\Extractor\ExtractorInterface')->getMock();
+        $extractor
+            ->expects($this->any())
+            ->method('extract')
+            ->willReturnCallback(
+                function ($path, $catalogue) use ($extractedMessages) {
+                    $catalogue->add($extractedMessages);
+                }
+            );
+
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Reader\TranslationReader')->getMock();
+        $loader
+            ->expects($this->any())
+            ->method('read')
+            ->willReturnCallback(
+                function ($path, $catalogue) use ($loadedMessages) {
+                    $catalogue->add($loadedMessages);
+                }
+            );
+
+        if (null === $kernel) {
+            $returnValues = [
+                ['foo', $this->getBundle($this->translationDir)],
+                ['test', $this->getBundle('test')],
+            ];
+            if (HttpKernel\Kernel::VERSION_ID < 40000) {
+                $returnValues = [
+                    ['foo', true, $this->getBundle($this->translationDir)],
+                    ['test', true, $this->getBundle('test')],
+                ];
+            }
+            $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+            $kernel
+                ->expects($this->any())
+                ->method('getBundle')
+                ->willReturnMap($returnValues);
+        }
+
+        $kernel
+            ->expects($this->any())
+            ->method('getRootDir')
+            ->willReturn($this->translationDir);
+
+        $kernel
+            ->expects($this->any())
+            ->method('getBundles')
+            ->willReturn([]);
+
+        $kernel
+            ->expects($this->any())
+            ->method('getContainer')
+            ->willReturn($this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock());
+
+        $command = new TranslationDebugCommand($translator, $loader, $extractor, $this->translationDir.'/translations', $this->translationDir.'/templates');
+
+        $application = new Application($kernel);
+        $application->add($command);
+
+        return new CommandTester($application->find('debug:translation'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand::__construct() expects an instance of "Symfony\Component\Translation\TranslatorInterface" as first argument since Symfony 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
+     */
+    public function testLegacyDebugCommand()
+    {
+        $translator = $this->getMockBuilder('Symfony\Component\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $extractor = $this->getMockBuilder('Symfony\Component\Translation\Extractor\ExtractorInterface')->getMock();
+        $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader')->getMock();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel
+            ->expects($this->any())
+            ->method('getBundles')
+            ->willReturn([]);
+
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container
+            ->expects($this->any())
+            ->method('get')
+            ->willReturnMap([
+                ['translation.extractor', 1, $extractor],
+                ['translation.reader', 1, $loader],
+                ['translator', 1, $translator],
+                ['kernel', 1, $kernel],
+            ]);
+
+        $kernel
+            ->expects($this->any())
+            ->method('getContainer')
+            ->willReturn($container);
+
+        $command = new TranslationDebugCommand();
+        $command->setContainer($container);
+
+        $application = new Application($kernel);
+        $application->add($command);
+
+        $tester = new CommandTester($application->find('debug:translation'));
+        $tester->execute(['locale' => 'en']);
+
+        $this->assertStringContainsString('No defined or extracted', $tester->getDisplay());
+    }
+
+    private function getBundle($path)
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
+        $bundle
+            ->expects($this->any())
+            ->method('getPath')
+            ->willReturn($path)
+        ;
+
+        return $bundle;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Command/TranslationUpdateCommandTest.php b/lib/symfony/framework-bundle/Tests/Command/TranslationUpdateCommandTest.php
new file mode 100644
index 000000000..8483f0f0d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -0,0 +1,248 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel;
+
+class TranslationUpdateCommandTest extends TestCase
+{
+    private $fs;
+    private $translationDir;
+
+    public function testDumpMessagesAndClean()
+    {
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
+        $this->assertRegExp('/foo/', $tester->getDisplay());
+        $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
+    }
+
+    public function testDumpMessagesAndCleanInRootDirectory()
+    {
+        $this->fs->remove($this->translationDir);
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->fs->mkdir($this->translationDir.'/translations');
+        $this->fs->mkdir($this->translationDir.'/templates');
+
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', '--dump-messages' => true, '--clean' => true]);
+        $this->assertRegExp('/foo/', $tester->getDisplay());
+        $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
+    }
+
+    public function testDumpTwoMessagesAndClean()
+    {
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'bar' => 'bar']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
+        $this->assertRegExp('/foo/', $tester->getDisplay());
+        $this->assertRegExp('/bar/', $tester->getDisplay());
+        $this->assertRegExp('/2 messages were successfully extracted/', $tester->getDisplay());
+    }
+
+    public function testDumpMessagesForSpecificDomain()
+    {
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--domain' => 'mydomain']);
+        $this->assertRegExp('/bar/', $tester->getDisplay());
+        $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
+    }
+
+    public function testWriteMessages()
+    {
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true]);
+        $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
+    }
+
+    public function testWriteMessagesInRootDirectory()
+    {
+        $this->fs->remove($this->translationDir);
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->fs->mkdir($this->translationDir.'/translations');
+        $this->fs->mkdir($this->translationDir.'/templates');
+
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', '--force' => true]);
+        $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
+    }
+
+    public function testWriteMessagesForSpecificDomain()
+    {
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true, '--domain' => 'mydomain']);
+        $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
+    }
+
+    protected function setUp()
+    {
+        $this->fs = new Filesystem();
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->fs->mkdir($this->translationDir.'/Resources/translations');
+        $this->fs->mkdir($this->translationDir.'/Resources/views');
+        $this->fs->mkdir($this->translationDir.'/translations');
+        $this->fs->mkdir($this->translationDir.'/templates');
+    }
+
+    protected function tearDown()
+    {
+        $this->fs->remove($this->translationDir);
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function createCommandTester($extractedMessages = [], $loadedMessages = [], HttpKernel\KernelInterface $kernel = null)
+    {
+        $translator = $this->getMockBuilder('Symfony\Component\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $translator
+            ->expects($this->any())
+            ->method('getFallbackLocales')
+            ->willReturn(['en']);
+
+        $extractor = $this->getMockBuilder('Symfony\Component\Translation\Extractor\ExtractorInterface')->getMock();
+        $extractor
+            ->expects($this->any())
+            ->method('extract')
+            ->willReturnCallback(
+                function ($path, $catalogue) use ($extractedMessages) {
+                    foreach ($extractedMessages as $domain => $messages) {
+                        $catalogue->add($messages, $domain);
+                    }
+                }
+            );
+
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Reader\TranslationReader')->getMock();
+        $loader
+            ->expects($this->any())
+            ->method('read')
+            ->willReturnCallback(
+                function ($path, $catalogue) use ($loadedMessages) {
+                    $catalogue->add($loadedMessages);
+                }
+            );
+
+        $writer = $this->getMockBuilder('Symfony\Component\Translation\Writer\TranslationWriter')->getMock();
+        $writer
+            ->expects($this->any())
+            ->method('getFormats')
+            ->willReturn(
+                ['xlf', 'yml', 'yaml']
+            );
+
+        if (null === $kernel) {
+            $returnValues = [
+                ['foo', $this->getBundle($this->translationDir)],
+                ['test', $this->getBundle('test')],
+            ];
+            if (HttpKernel\Kernel::VERSION_ID < 40000) {
+                $returnValues = [
+                    ['foo', true, $this->getBundle($this->translationDir)],
+                    ['test', true, $this->getBundle('test')],
+                ];
+            }
+            $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+            $kernel
+                ->expects($this->any())
+                ->method('getBundle')
+                ->willReturnMap($returnValues);
+        }
+
+        $kernel
+            ->expects($this->any())
+            ->method('getRootDir')
+            ->willReturn($this->translationDir);
+
+        $kernel
+            ->expects($this->any())
+            ->method('getBundles')
+            ->willReturn([]);
+
+        $kernel
+            ->expects($this->any())
+            ->method('getContainer')
+            ->willReturn($this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock());
+
+        $command = new TranslationUpdateCommand($writer, $loader, $extractor, 'en', $this->translationDir.'/translations', $this->translationDir.'/templates');
+
+        $application = new Application($kernel);
+        $application->add($command);
+
+        return new CommandTester($application->find('translation:update'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand::__construct() expects an instance of "Symfony\Component\Translation\Writer\TranslationWriterInterface" as first argument since Symfony 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
+     */
+    public function testLegacyUpdateCommand()
+    {
+        $translator = $this->getMockBuilder('Symfony\Component\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $extractor = $this->getMockBuilder('Symfony\Component\Translation\Extractor\ExtractorInterface')->getMock();
+        $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader')->getMock();
+        $writer = $this->getMockBuilder('Symfony\Component\Translation\Writer\TranslationWriter')->getMock();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel
+            ->expects($this->any())
+            ->method('getBundles')
+            ->willReturn([]);
+
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container
+            ->expects($this->any())
+            ->method('get')
+            ->willReturnMap([
+                ['translation.extractor', 1, $extractor],
+                ['translation.reader', 1, $loader],
+                ['translation.writer', 1, $writer],
+                ['translator', 1, $translator],
+                ['kernel', 1, $kernel],
+            ]);
+
+        $kernel
+            ->expects($this->any())
+            ->method('getContainer')
+            ->willReturn($container);
+
+        $command = new TranslationUpdateCommand();
+        $command->setContainer($container);
+
+        $application = new Application($kernel);
+        $application->add($command);
+
+        $tester = new CommandTester($application->find('translation:update'));
+        $tester->execute(['locale' => 'en']);
+
+        $this->assertStringContainsString('You must choose one of --force or --dump-messages', $tester->getDisplay());
+    }
+
+    private function getBundle($path)
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
+        $bundle
+            ->expects($this->any())
+            ->method('getPath')
+            ->willReturn($path)
+        ;
+
+        return $bundle;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Command/YamlLintCommandTest.php b/lib/symfony/framework-bundle/Tests/Command/YamlLintCommandTest.php
new file mode 100644
index 000000000..ba883543c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Command/YamlLintCommandTest.php
@@ -0,0 +1,182 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Application as BaseApplication;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+/**
+ * Tests the YamlLintCommand.
+ *
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+class YamlLintCommandTest extends TestCase
+{
+    private $files;
+
+    public function testLintCorrectFile()
+    {
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile('foo: bar');
+
+        $tester->execute(
+            ['filename' => $filename],
+            ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]
+        );
+
+        $this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
+        $this->assertStringContainsString('OK', trim($tester->getDisplay()));
+    }
+
+    public function testLintIncorrectFile()
+    {
+        $incorrectContent = '
+foo:
+bar';
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile($incorrectContent);
+
+        $tester->execute(['filename' => $filename], ['decorated' => false]);
+
+        $this->assertEquals(1, $tester->getStatusCode(), 'Returns 1 in case of error');
+        $this->assertStringContainsString('Unable to parse at line 3 (near "bar").', trim($tester->getDisplay()));
+    }
+
+    public function testLintFileNotReadable()
+    {
+        $this->expectException('RuntimeException');
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile('');
+        unlink($filename);
+
+        $tester->execute(['filename' => $filename], ['decorated' => false]);
+    }
+
+    public function testGetHelp()
+    {
+        $command = new YamlLintCommand();
+        $expected = <<<EOF
+Or find all files in a bundle:
+
+  <info>php %command.full_name% @AcmeDemoBundle</info>
+EOF;
+
+        $this->assertStringContainsString($expected, $command->getHelp());
+    }
+
+    public function testLintFilesFromBundleDirectory()
+    {
+        $tester = $this->createCommandTester($this->getKernelAwareApplicationMock());
+        $tester->execute(
+            ['filename' => '@AppBundle/Resources'],
+            ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]
+        );
+
+        $this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
+        $this->assertStringContainsString('[OK] All 0 YAML files contain valid syntax', trim($tester->getDisplay()));
+    }
+
+    /**
+     * @return string Path to the new file
+     */
+    private function createFile($content)
+    {
+        $filename = tempnam(sys_get_temp_dir().'/yml-lint-test', 'sf-');
+        file_put_contents($filename, $content);
+
+        $this->files[] = $filename;
+
+        return $filename;
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function createCommandTester($application = null)
+    {
+        if (!$application) {
+            $application = new BaseApplication();
+            $application->add(new YamlLintCommand());
+        }
+
+        $command = $application->find('lint:yaml');
+
+        if ($application) {
+            $command->setApplication($application);
+        }
+
+        return new CommandTester($command);
+    }
+
+    private function getKernelAwareApplicationMock()
+    {
+        $kernel = $this->getMockBuilder(KernelInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $kernel
+            ->expects($this->once())
+            ->method('locateResource')
+            ->with('@AppBundle/Resources')
+            ->willReturn(sys_get_temp_dir().'/yml-lint-test');
+
+        $application = $this->getMockBuilder(Application::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $application
+            ->expects($this->once())
+            ->method('getKernel')
+            ->willReturn($kernel);
+
+        $application
+            ->expects($this->once())
+            ->method('getHelperSet')
+            ->willReturn(new HelperSet());
+
+        $application
+            ->expects($this->any())
+            ->method('getDefinition')
+            ->willReturn(new InputDefinition());
+
+        $application
+            ->expects($this->once())
+            ->method('find')
+            ->with('lint:yaml')
+            ->willReturn(new YamlLintCommand());
+
+        return $application;
+    }
+
+    protected function setUp()
+    {
+        @mkdir(sys_get_temp_dir().'/yml-lint-test');
+        $this->files = [];
+    }
+
+    protected function tearDown()
+    {
+        foreach ($this->files as $file) {
+            if (file_exists($file)) {
+                unlink($file);
+            }
+        }
+        rmdir(sys_get_temp_dir().'/yml-lint-test');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Console/ApplicationTest.php b/lib/symfony/framework-bundle/Tests/Console/ApplicationTest.php
new file mode 100644
index 000000000..50f9478cd
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Console/ApplicationTest.php
@@ -0,0 +1,261 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Console;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\ApplicationTester;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+class ApplicationTest extends TestCase
+{
+    public function testBundleInterfaceImplementation()
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
+
+        $kernel = $this->getKernel([$bundle], true);
+
+        $application = new Application($kernel);
+        $application->doRun(new ArrayInput(['list']), new NullOutput());
+    }
+
+    public function testBundleCommandsAreRegistered()
+    {
+        $bundle = $this->createBundleMock([]);
+
+        $kernel = $this->getKernel([$bundle], true);
+
+        $application = new Application($kernel);
+        $application->doRun(new ArrayInput(['list']), new NullOutput());
+
+        // Calling twice: registration should only be done once.
+        $application->doRun(new ArrayInput(['list']), new NullOutput());
+    }
+
+    public function testBundleCommandsAreRetrievable()
+    {
+        $bundle = $this->createBundleMock([]);
+
+        $kernel = $this->getKernel([$bundle]);
+
+        $application = new Application($kernel);
+        $application->all();
+
+        // Calling twice: registration should only be done once.
+        $application->all();
+    }
+
+    public function testBundleSingleCommandIsRetrievable()
+    {
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock([$command]);
+
+        $kernel = $this->getKernel([$bundle]);
+
+        $application = new Application($kernel);
+
+        $this->assertSame($command, $application->get('example'));
+    }
+
+    public function testBundleCommandCanBeFound()
+    {
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock([$command]);
+
+        $kernel = $this->getKernel([$bundle]);
+
+        $application = new Application($kernel);
+
+        $this->assertSame($command, $application->find('example'));
+    }
+
+    public function testBundleCommandCanBeFoundByAlias()
+    {
+        $command = new Command('example');
+        $command->setAliases(['alias']);
+
+        $bundle = $this->createBundleMock([$command]);
+
+        $kernel = $this->getKernel([$bundle]);
+
+        $application = new Application($kernel);
+
+        $this->assertSame($command, $application->find('alias'));
+    }
+
+    public function testBundleCommandsHaveRightContainer()
+    {
+        $command = $this->getMockForAbstractClass('Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand', ['foo'], '', true, true, true, ['setContainer']);
+        $command->setCode(function () {});
+        $command->expects($this->exactly(2))->method('setContainer');
+
+        $application = new Application($this->getKernel([], true));
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application->add($command);
+        $tester = new ApplicationTester($application);
+
+        // set container is called here
+        $tester->run(['command' => 'foo']);
+
+        // as the container might have change between two runs, setContainer must called again
+        $tester->run(['command' => 'foo']);
+    }
+
+    public function testBundleCommandCanOverriddeAPreExistingCommandWithTheSameName()
+    {
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock([$command]);
+
+        $kernel = $this->getKernel([$bundle]);
+
+        $application = new Application($kernel);
+        $newCommand = new Command('example');
+        $application->add($newCommand);
+
+        $this->assertSame($newCommand, $application->get('example'));
+    }
+
+    public function testRunOnlyWarnsOnUnregistrableCommand()
+    {
+        $container = new ContainerBuilder();
+        $container->register('event_dispatcher', EventDispatcher::class);
+        $container->register(ThrowingCommand::class, ThrowingCommand::class);
+        $container->setParameter('console.command.ids', [ThrowingCommand::class => ThrowingCommand::class]);
+
+        $kernel = $this->getMockBuilder(KernelInterface::class)->getMock();
+        $kernel
+            ->method('getBundles')
+            ->willReturn([$this->createBundleMock(
+                [(new Command('fine'))->setCode(function (InputInterface $input, OutputInterface $output) { $output->write('fine'); })]
+            )]);
+        $kernel
+            ->method('getContainer')
+            ->willReturn($container);
+
+        $application = new Application($kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'fine']);
+        $output = $tester->getDisplay();
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertStringContainsString('Some commands could not be registered:', $output);
+        $this->assertStringContainsString('throwing', $output);
+        $this->assertStringContainsString('fine', $output);
+    }
+
+    public function testRegistrationErrorsAreDisplayedOnCommandNotFound()
+    {
+        $container = new ContainerBuilder();
+        $container->register('event_dispatcher', EventDispatcher::class);
+
+        $kernel = $this->getMockBuilder(KernelInterface::class)->getMock();
+        $kernel
+            ->method('getBundles')
+            ->willReturn([$this->createBundleMock(
+                [(new Command(null))->setCode(function (InputInterface $input, OutputInterface $output) { $output->write('fine'); })]
+            )]);
+        $kernel
+            ->method('getContainer')
+            ->willReturn($container);
+
+        $application = new Application($kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'fine']);
+        $output = $tester->getDisplay();
+
+        $this->assertSame(1, $tester->getStatusCode());
+        $this->assertStringContainsString('Some commands could not be registered:', $output);
+        $this->assertStringContainsString('Command "fine" is not defined.', $output);
+    }
+
+    private function getKernel(array $bundles, $useDispatcher = false)
+    {
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+
+        if ($useDispatcher) {
+            $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+            $dispatcher
+                ->expects($this->atLeastOnce())
+                ->method('dispatch')
+            ;
+            $container
+                ->expects($this->atLeastOnce())
+                ->method('get')
+                ->with($this->equalTo('event_dispatcher'))
+                ->willReturn($dispatcher);
+        }
+
+        $container
+            ->expects($this->exactly(2))
+            ->method('hasParameter')
+            ->withConsecutive(['console.command.ids'], ['console.lazy_command.ids'])
+            ->willReturnOnConsecutiveCalls(true, true)
+        ;
+        $container
+            ->expects($this->exactly(2))
+            ->method('getParameter')
+            ->withConsecutive(['console.lazy_command.ids'], ['console.command.ids'])
+            ->willReturnOnConsecutiveCalls([], [])
+        ;
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel
+            ->expects($this->any())
+            ->method('getBundles')
+            ->willReturn($bundles)
+        ;
+        $kernel
+            ->expects($this->any())
+            ->method('getContainer')
+            ->willReturn($container)
+        ;
+
+        return $kernel;
+    }
+
+    private function createBundleMock(array $commands)
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
+        $bundle
+            ->expects($this->once())
+            ->method('registerCommands')
+            ->willReturnCallback(function (Application $application) use ($commands) {
+                $application->addCommands($commands);
+            })
+        ;
+
+        return $bundle;
+    }
+}
+
+class ThrowingCommand extends Command
+{
+    public function __construct()
+    {
+        throw new \Exception('throwing');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/lib/symfony/framework-bundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
new file mode 100644
index 000000000..248b5396d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -0,0 +1,252 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+abstract class AbstractDescriptorTest extends TestCase
+{
+    /** @dataProvider getDescribeRouteCollectionTestData */
+    public function testDescribeRouteCollection(RouteCollection $routes, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $routes);
+    }
+
+    public function getDescribeRouteCollectionTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getRouteCollections());
+    }
+
+    /** @dataProvider getDescribeRouteTestData */
+    public function testDescribeRoute(Route $route, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $route);
+    }
+
+    public function getDescribeRouteTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getRoutes());
+    }
+
+    /** @dataProvider getDescribeContainerParametersTestData */
+    public function testDescribeContainerParameters(ParameterBag $parameters, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $parameters);
+    }
+
+    public function getDescribeContainerParametersTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getContainerParameters());
+    }
+
+    /** @dataProvider getDescribeContainerBuilderTestData */
+    public function testDescribeContainerBuilder(ContainerBuilder $builder, $expectedDescription, array $options)
+    {
+        $this->assertDescription($expectedDescription, $builder, $options);
+    }
+
+    public function getDescribeContainerBuilderTestData()
+    {
+        return $this->getContainerBuilderDescriptionTestData(ObjectsProvider::getContainerBuilders());
+    }
+
+    /** @dataProvider getDescribeContainerDefinitionTestData */
+    public function testDescribeContainerDefinition(Definition $definition, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $definition);
+    }
+
+    public function getDescribeContainerDefinitionTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getContainerDefinitions());
+    }
+
+    /** @dataProvider getDescribeContainerDefinitionWithArgumentsShownTestData */
+    public function testDescribeContainerDefinitionWithArgumentsShown(Definition $definition, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $definition, ['show_arguments' => true]);
+    }
+
+    public function getDescribeContainerDefinitionWithArgumentsShownTestData()
+    {
+        $definitions = ObjectsProvider::getContainerDefinitions();
+        $definitionsWithArgs = [];
+
+        foreach ($definitions as $key => $definition) {
+            $definitionsWithArgs[str_replace('definition_', 'definition_arguments_', $key)] = $definition;
+        }
+
+        return $this->getDescriptionTestData($definitionsWithArgs);
+    }
+
+    /** @dataProvider getDescribeContainerAliasTestData */
+    public function testDescribeContainerAlias(Alias $alias, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $alias);
+    }
+
+    public function getDescribeContainerAliasTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getContainerAliases());
+    }
+
+    /** @dataProvider getDescribeContainerDefinitionWhichIsAnAliasTestData */
+    public function testDescribeContainerDefinitionWhichIsAnAlias(Alias $alias, $expectedDescription, ContainerBuilder $builder, $options = [])
+    {
+        $this->assertDescription($expectedDescription, $builder, $options);
+    }
+
+    public function getDescribeContainerDefinitionWhichIsAnAliasTestData()
+    {
+        $builder = current(ObjectsProvider::getContainerBuilders());
+        $builder->setDefinition('service_1', $builder->getDefinition('definition_1'));
+        $builder->setDefinition('service_2', $builder->getDefinition('definition_2'));
+
+        $aliases = ObjectsProvider::getContainerAliases();
+        $aliasesWithDefinitions = [];
+        foreach ($aliases as $name => $alias) {
+            $aliasesWithDefinitions[str_replace('alias_', 'alias_with_definition_', $name)] = $alias;
+        }
+
+        $i = 0;
+        $data = $this->getDescriptionTestData($aliasesWithDefinitions);
+        foreach ($aliases as $name => $alias) {
+            $data[$i][] = $builder;
+            $data[$i][] = ['id' => $name];
+            ++$i;
+        }
+
+        return $data;
+    }
+
+    /** @dataProvider getDescribeContainerParameterTestData */
+    public function testDescribeContainerParameter($parameter, $expectedDescription, array $options)
+    {
+        $this->assertDescription($expectedDescription, $parameter, $options);
+    }
+
+    public function getDescribeContainerParameterTestData()
+    {
+        $data = $this->getDescriptionTestData(ObjectsProvider::getContainerParameter());
+
+        $data[0][] = ['parameter' => 'database_name'];
+        $data[1][] = ['parameter' => 'twig.form.resources'];
+
+        return $data;
+    }
+
+    /** @dataProvider getDescribeEventDispatcherTestData */
+    public function testDescribeEventDispatcher(EventDispatcher $eventDispatcher, $expectedDescription, array $options)
+    {
+        $this->assertDescription($expectedDescription, $eventDispatcher, $options);
+    }
+
+    public function getDescribeEventDispatcherTestData()
+    {
+        return $this->getEventDispatcherDescriptionTestData(ObjectsProvider::getEventDispatchers());
+    }
+
+    /** @dataProvider getDescribeCallableTestData */
+    public function testDescribeCallable($callable, $expectedDescription)
+    {
+        $this->assertDescription($expectedDescription, $callable);
+    }
+
+    public function getDescribeCallableTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getCallables());
+    }
+
+    abstract protected function getDescriptor();
+
+    abstract protected function getFormat();
+
+    private function assertDescription($expectedDescription, $describedObject, array $options = [])
+    {
+        $options['is_debug'] = false;
+        $options['raw_output'] = true;
+        $options['raw_text'] = true;
+        $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
+
+        if ('txt' === $this->getFormat()) {
+            $options['output'] = new SymfonyStyle(new ArrayInput([]), $output);
+        }
+
+        $this->getDescriptor()->describe($output, $describedObject, $options);
+
+        if ('json' === $this->getFormat()) {
+            $this->assertEquals(json_encode(json_decode($expectedDescription), JSON_PRETTY_PRINT), json_encode(json_decode($output->fetch()), JSON_PRETTY_PRINT));
+        } else {
+            $this->assertEquals(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $output->fetch())));
+        }
+    }
+
+    private function getDescriptionTestData(array $objects)
+    {
+        $data = [];
+        foreach ($objects as $name => $object) {
+            $description = file_get_contents(sprintf('%s/../../Fixtures/Descriptor/%s.%s', __DIR__, $name, $this->getFormat()));
+            $data[] = [$object, $description];
+        }
+
+        return $data;
+    }
+
+    private function getContainerBuilderDescriptionTestData(array $objects)
+    {
+        $variations = [
+            'services' => ['show_private' => true],
+            'public' => ['show_private' => false],
+            'tag1' => ['show_private' => true, 'tag' => 'tag1'],
+            'tags' => ['group_by' => 'tags', 'show_private' => true],
+            'arguments' => ['show_private' => false, 'show_arguments' => true],
+        ];
+
+        $data = [];
+        foreach ($objects as $name => $object) {
+            foreach ($variations as $suffix => $options) {
+                $description = file_get_contents(sprintf('%s/../../Fixtures/Descriptor/%s_%s.%s', __DIR__, $name, $suffix, $this->getFormat()));
+                $data[] = [$object, $description, $options];
+            }
+        }
+
+        return $data;
+    }
+
+    private function getEventDispatcherDescriptionTestData(array $objects)
+    {
+        $variations = [
+            'events' => [],
+            'event1' => ['event' => 'event1'],
+        ];
+
+        $data = [];
+        foreach ($objects as $name => $object) {
+            foreach ($variations as $suffix => $options) {
+                $description = file_get_contents(sprintf('%s/../../Fixtures/Descriptor/%s_%s.%s', __DIR__, $name, $suffix, $this->getFormat()));
+                $data[] = [$object, $description, $options];
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Console/Descriptor/JsonDescriptorTest.php b/lib/symfony/framework-bundle/Tests/Console/Descriptor/JsonDescriptorTest.php
new file mode 100644
index 000000000..ee03f6539
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Console/Descriptor/JsonDescriptorTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
+
+use Symfony\Bundle\FrameworkBundle\Console\Descriptor\JsonDescriptor;
+
+class JsonDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new JsonDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'json';
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Console/Descriptor/MarkdownDescriptorTest.php b/lib/symfony/framework-bundle/Tests/Console/Descriptor/MarkdownDescriptorTest.php
new file mode 100644
index 000000000..fbb5aaa96
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Console/Descriptor/MarkdownDescriptorTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
+
+use Symfony\Bundle\FrameworkBundle\Console\Descriptor\MarkdownDescriptor;
+
+class MarkdownDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new MarkdownDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'md';
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Console/Descriptor/ObjectsProvider.php b/lib/symfony/framework-bundle/Tests/Console/Descriptor/ObjectsProvider.php
new file mode 100644
index 000000000..c33f603a7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -0,0 +1,204 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
+
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Routing\CompiledRoute;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class ObjectsProvider
+{
+    public static function getRouteCollections()
+    {
+        $collection1 = new RouteCollection();
+        foreach (self::getRoutes() as $name => $route) {
+            $collection1->add($name, $route);
+        }
+
+        return ['route_collection_1' => $collection1];
+    }
+
+    public static function getRoutes()
+    {
+        return [
+            'route_1' => new RouteStub(
+                '/hello/{name}',
+                ['name' => 'Joseph'],
+                ['name' => '[a-z]+'],
+                ['opt1' => 'val1', 'opt2' => 'val2'],
+                'localhost',
+                ['http', 'https'],
+                ['get', 'head']
+            ),
+            'route_2' => new RouteStub(
+                '/name/add',
+                [],
+                [],
+                ['opt1' => 'val1', 'opt2' => 'val2'],
+                'localhost',
+                ['http', 'https'],
+                ['put', 'post']
+            ),
+        ];
+    }
+
+    public static function getContainerParameters()
+    {
+        return [
+            'parameters_1' => new ParameterBag([
+                'integer' => 12,
+                'string' => 'Hello world!',
+                'boolean' => true,
+                'array' => [12, 'Hello world!', true],
+            ]),
+        ];
+    }
+
+    public static function getContainerParameter()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setParameter('database_name', 'symfony');
+        $builder->setParameter('twig.form.resources', [
+            'bootstrap_3_horizontal_layout.html.twig',
+            'bootstrap_3_layout.html.twig',
+            'form_div_layout.html.twig',
+            'form_table_layout.html.twig',
+        ]);
+
+        return [
+            'parameter' => $builder,
+            'array_parameter' => $builder,
+        ];
+    }
+
+    public static function getContainerBuilders()
+    {
+        $builder1 = new ContainerBuilder();
+        $builder1->setDefinitions(self::getContainerDefinitions());
+        $builder1->setAliases(self::getContainerAliases());
+
+        return ['builder_1' => $builder1];
+    }
+
+    public static function getContainerDefinitions()
+    {
+        $definition1 = new Definition('Full\\Qualified\\Class1');
+        $definition2 = new Definition('Full\\Qualified\\Class2');
+
+        return [
+            'definition_1' => $definition1
+                ->setPublic(true)
+                ->setSynthetic(false)
+                ->setLazy(true)
+                ->setAbstract(true)
+                ->addArgument(new Reference('definition2'))
+                ->addArgument('%parameter%')
+                ->addArgument(new Definition('inline_service', ['arg1', 'arg2']))
+                ->addArgument([
+                    'foo',
+                    new Reference('definition2'),
+                    new Definition('inline_service'),
+                ])
+                ->addArgument(new IteratorArgument([
+                    new Reference('definition_1'),
+                    new Reference('definition_2'),
+                ]))
+                ->setFactory(['Full\\Qualified\\FactoryClass', 'get']),
+            'definition_2' => $definition2
+                ->setPublic(false)
+                ->setSynthetic(true)
+                ->setFile('/path/to/file')
+                ->setLazy(false)
+                ->setAbstract(false)
+                ->addTag('tag1', ['attr1' => 'val1', 'attr2' => 'val2'])
+                ->addTag('tag1', ['attr3' => 'val3'])
+                ->addTag('tag2')
+                ->addMethodCall('setMailer', [new Reference('mailer')])
+                ->setFactory([new Reference('factory.service'), 'get']),
+        ];
+    }
+
+    public static function getContainerAliases()
+    {
+        return [
+            'alias_1' => new Alias('service_1', true),
+            'alias_2' => new Alias('service_2', false),
+        ];
+    }
+
+    public static function getEventDispatchers()
+    {
+        $eventDispatcher = new EventDispatcher();
+
+        $eventDispatcher->addListener('event1', 'global_function', 255);
+        $eventDispatcher->addListener('event1', function () { return 'Closure'; }, -1);
+        $eventDispatcher->addListener('event2', new CallableClass());
+
+        return ['event_dispatcher_1' => $eventDispatcher];
+    }
+
+    public static function getCallables()
+    {
+        $callables = [
+            'callable_1' => 'array_key_exists',
+            'callable_2' => ['Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass', 'staticMethod'],
+            'callable_3' => [new CallableClass(), 'method'],
+            'callable_4' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass::staticMethod',
+            'callable_5' => ['Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\ExtendedCallableClass', 'parent::staticMethod'],
+            'callable_6' => function () { return 'Closure'; },
+            'callable_7' => new CallableClass(),
+        ];
+
+        if (\PHP_VERSION_ID >= 70100) {
+            $callables['callable_from_callable'] = \Closure::fromCallable(new CallableClass());
+        }
+
+        return $callables;
+    }
+}
+
+class CallableClass
+{
+    public function __invoke()
+    {
+    }
+
+    public static function staticMethod()
+    {
+    }
+
+    public function method()
+    {
+    }
+}
+
+class ExtendedCallableClass extends CallableClass
+{
+    public static function staticMethod()
+    {
+    }
+}
+
+class RouteStub extends Route
+{
+    public function compile()
+    {
+        return new CompiledRoute('', '#PATH_REGEX#', [], [], '#HOST_REGEX#');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Console/Descriptor/TextDescriptorTest.php b/lib/symfony/framework-bundle/Tests/Console/Descriptor/TextDescriptorTest.php
new file mode 100644
index 000000000..e775ac7cf
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Console/Descriptor/TextDescriptorTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
+
+use Symfony\Bundle\FrameworkBundle\Console\Descriptor\TextDescriptor;
+
+class TextDescriptorTest extends AbstractDescriptorTest
+{
+    protected function setUp()
+    {
+        putenv('COLUMNS=121');
+    }
+
+    protected function tearDown()
+    {
+        putenv('COLUMNS');
+    }
+
+    protected function getDescriptor()
+    {
+        return new TextDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'txt';
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Console/Descriptor/XmlDescriptorTest.php b/lib/symfony/framework-bundle/Tests/Console/Descriptor/XmlDescriptorTest.php
new file mode 100644
index 000000000..8cb9a7169
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Console/Descriptor/XmlDescriptorTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
+
+use Symfony\Bundle\FrameworkBundle\Console\Descriptor\XmlDescriptor;
+
+class XmlDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new XmlDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'xml';
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/AbstractControllerTest.php b/lib/symfony/framework-bundle/Tests/Controller/AbstractControllerTest.php
new file mode 100644
index 000000000..6783ec25c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Controller/AbstractControllerTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Psr\Container\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+class AbstractControllerTest extends ControllerTraitTest
+{
+    protected function createController()
+    {
+        return new TestAbstractController();
+    }
+}
+
+class TestAbstractController extends AbstractController
+{
+    use TestControllerTrait;
+
+    private $throwOnUnexpectedService;
+
+    public function __construct($throwOnUnexpectedService = true)
+    {
+        $this->throwOnUnexpectedService = $throwOnUnexpectedService;
+    }
+
+    public function setContainer(ContainerInterface $container)
+    {
+        if (!$this->throwOnUnexpectedService) {
+            return parent::setContainer($container);
+        }
+
+        $expected = self::getSubscribedServices();
+
+        foreach ($container->getServiceIds() as $id) {
+            if ('service_container' === $id) {
+                continue;
+            }
+            if (!isset($expected[$id])) {
+                throw new \UnexpectedValueException(sprintf('Service "%s" is not expected, as declared by %s::getSubscribedServices()', $id, AbstractController::class));
+            }
+            $type = substr($expected[$id], 1);
+            if (!$container->get($id) instanceof $type) {
+                throw new \UnexpectedValueException(sprintf('Service "%s" is expected to be an instance of "%s", as declared by %s::getSubscribedServices()', $id, $type, AbstractController::class));
+            }
+        }
+
+        return parent::setContainer($container);
+    }
+
+    public function fooAction()
+    {
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/ControllerNameParserTest.php b/lib/symfony/framework-bundle/Tests/Controller/ControllerNameParserTest.php
new file mode 100644
index 000000000..3d4a503f2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Controller/ControllerNameParserTest.php
@@ -0,0 +1,192 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Composer\Autoload\ClassLoader;
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\HttpKernel\Kernel;
+
+class ControllerNameParserTest extends TestCase
+{
+    protected $loader;
+
+    protected function setUp()
+    {
+        $this->loader = new ClassLoader();
+        $this->loader->add('TestBundle', __DIR__.'/../Fixtures');
+        $this->loader->add('TestApplication', __DIR__.'/../Fixtures');
+        $this->loader->register();
+    }
+
+    protected function tearDown()
+    {
+        $this->loader->unregister();
+        $this->loader = null;
+    }
+
+    public function testParse()
+    {
+        $parser = $this->createParser();
+
+        $this->assertEquals('TestBundle\FooBundle\Controller\DefaultController::indexAction', $parser->parse('FooBundle:Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
+        $this->assertEquals('TestBundle\FooBundle\Controller\Sub\DefaultController::indexAction', $parser->parse('FooBundle:Sub\Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
+        $this->assertEquals('TestBundle\Fabpot\FooBundle\Controller\DefaultController::indexAction', $parser->parse('SensioFooBundle:Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
+        $this->assertEquals('TestBundle\Sensio\Cms\FooBundle\Controller\DefaultController::indexAction', $parser->parse('SensioCmsFooBundle:Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
+        $this->assertEquals('TestBundle\FooBundle\Controller\Test\DefaultController::indexAction', $parser->parse('FooBundle:Test\\Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
+        $this->assertEquals('TestBundle\FooBundle\Controller\Test\DefaultController::indexAction', $parser->parse('FooBundle:Test/Default:index'), '->parse() converts a short a:b:c notation string to a class::method string');
+
+        try {
+            $parser->parse('foo:');
+            $this->fail('->parse() throws an \InvalidArgumentException if the controller is not an a:b:c string');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws an \InvalidArgumentException if the controller is not an a:b:c string');
+        }
+    }
+
+    public function testBuild()
+    {
+        $parser = $this->createParser();
+
+        $this->assertEquals('FoooooBundle:Default:index', $parser->build('TestBundle\FooBundle\Controller\DefaultController::indexAction'), '->parse() converts a class::method string to a short a:b:c notation string');
+        $this->assertEquals('FoooooBundle:Sub\Default:index', $parser->build('TestBundle\FooBundle\Controller\Sub\DefaultController::indexAction'), '->parse() converts a class::method string to a short a:b:c notation string');
+
+        try {
+            $parser->build('TestBundle\FooBundle\Controller\DefaultController::index');
+            $this->fail('->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+        }
+
+        try {
+            $parser->build('TestBundle\FooBundle\Controller\Default::indexAction');
+            $this->fail('->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+        }
+
+        try {
+            $parser->build('Foo\Controller\DefaultController::indexAction');
+            $this->fail('->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws an \InvalidArgumentException if the controller is not an aController::cAction string');
+        }
+    }
+
+    /**
+     * @dataProvider getMissingControllersTest
+     */
+    public function testMissingControllers($name)
+    {
+        $parser = $this->createParser();
+
+        try {
+            $parser->parse($name);
+            $this->fail('->parse() throws a \InvalidArgumentException if the class is found but does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws a \InvalidArgumentException if the class is found but does not exist');
+        }
+    }
+
+    public function getMissingControllersTest()
+    {
+        // a normal bundle
+        $bundles = [
+            ['FooBundle:Fake:index'],
+        ];
+
+        // a bundle with children
+        if (Kernel::VERSION_ID < 40000) {
+            $bundles[] = ['SensioFooBundle:Fake:index'];
+        }
+
+        return $bundles;
+    }
+
+    /**
+     * @dataProvider getInvalidBundleNameTests
+     */
+    public function testInvalidBundleName($bundleName, $suggestedBundleName)
+    {
+        $parser = $this->createParser();
+
+        try {
+            $parser->parse($bundleName);
+            $this->fail('->parse() throws a \InvalidArgumentException if the bundle does not exist');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\InvalidArgumentException', $e, '->parse() throws a \InvalidArgumentException if the bundle does not exist');
+
+            if (false === $suggestedBundleName) {
+                // make sure we don't have a suggestion
+                $this->assertStringNotContainsString('Did you mean', $e->getMessage());
+            } else {
+                $this->assertStringContainsString(sprintf('Did you mean "%s"', $suggestedBundleName), $e->getMessage());
+            }
+        }
+    }
+
+    public function getInvalidBundleNameTests()
+    {
+        return [
+            'Alternative will be found using levenshtein' => ['FoodBundle:Default:index', 'FooBundle:Default:index'],
+            'Alternative will be found using partial match' => ['FabpotFooBund:Default:index', 'FabpotFooBundle:Default:index'],
+            'Bundle does not exist at all' => ['CrazyBundle:Default:index', false],
+        ];
+    }
+
+    private function createParser()
+    {
+        $bundles = [
+            'SensioFooBundle' => [$this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'), $this->getBundle('TestBundle\Sensio\FooBundle', 'SensioFooBundle')],
+            'SensioCmsFooBundle' => [$this->getBundle('TestBundle\Sensio\Cms\FooBundle', 'SensioCmsFooBundle')],
+            'FooBundle' => [$this->getBundle('TestBundle\FooBundle', 'FooBundle')],
+            'FabpotFooBundle' => [$this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'), $this->getBundle('TestBundle\Sensio\FooBundle', 'SensioFooBundle')],
+        ];
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel
+            ->expects($this->any())
+            ->method('getBundle')
+            ->willReturnCallback(function ($bundle) use ($bundles) {
+                if (!isset($bundles[$bundle])) {
+                    throw new \InvalidArgumentException(sprintf('Invalid bundle name "%s"', $bundle));
+                }
+
+                return $bundles[$bundle];
+            })
+        ;
+
+        $bundles = [
+            'SensioFooBundle' => $this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'),
+            'SensioCmsFooBundle' => $this->getBundle('TestBundle\Sensio\Cms\FooBundle', 'SensioCmsFooBundle'),
+            'FoooooBundle' => $this->getBundle('TestBundle\FooBundle', 'FoooooBundle'),
+            'FooBundle' => $this->getBundle('TestBundle\FooBundle', 'FooBundle'),
+            'FabpotFooBundle' => $this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'),
+        ];
+        $kernel
+            ->expects($this->any())
+            ->method('getBundles')
+            ->willReturn($bundles)
+        ;
+
+        return new ControllerNameParser($kernel);
+    }
+
+    private function getBundle($namespace, $name)
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
+        $bundle->expects($this->any())->method('getName')->willReturn($name);
+        $bundle->expects($this->any())->method('getNamespace')->willReturn($namespace);
+
+        return $bundle;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/ControllerResolverTest.php b/lib/symfony/framework-bundle/Tests/Controller/ControllerResolverTest.php
new file mode 100644
index 000000000..6af19862e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Controller/ControllerResolverTest.php
@@ -0,0 +1,223 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Psr\Container\ContainerInterface as Psr11ContainerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
+
+class ControllerResolverTest extends ContainerControllerResolverTest
+{
+    public function testGetControllerOnContainerAware()
+    {
+        $resolver = $this->createControllerResolver();
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController::testAction');
+
+        $controller = $resolver->getController($request);
+
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerInterface', $controller[0]->getContainer());
+        $this->assertSame('testAction', $controller[1]);
+    }
+
+    public function testGetControllerOnContainerAwareInvokable()
+    {
+        $resolver = $this->createControllerResolver();
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController');
+
+        $controller = $resolver->getController($request);
+
+        $this->assertInstanceOf('Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController', $controller);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerInterface', $controller->getContainer());
+    }
+
+    public function testGetControllerWithBundleNotation()
+    {
+        $shortName = 'FooBundle:Default:test';
+        $parser = $this->createMockParser();
+        $parser->expects($this->once())
+            ->method('parse')
+            ->with($shortName)
+            ->willReturn('Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController::testAction')
+        ;
+
+        $resolver = $this->createControllerResolver(null, null, $parser);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', $shortName);
+
+        $controller = $resolver->getController($request);
+
+        $this->assertInstanceOf('Symfony\Bundle\FrameworkBundle\Tests\Controller\ContainerAwareController', $controller[0]);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerInterface', $controller[0]->getContainer());
+        $this->assertSame('testAction', $controller[1]);
+    }
+
+    public function testContainerAwareControllerGetsContainerWhenNotSet()
+    {
+        class_exists(AbstractControllerTest::class);
+
+        $controller = new ContainerAwareController();
+
+        $container = new Container();
+        $container->set(TestAbstractController::class, $controller);
+
+        $resolver = $this->createControllerResolver(null, $container);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', TestAbstractController::class.':testAction');
+
+        $this->assertSame([$controller, 'testAction'], $resolver->getController($request));
+        $this->assertSame($container, $controller->getContainer());
+    }
+
+    public function testAbstractControllerGetsContainerWhenNotSet()
+    {
+        class_exists(AbstractControllerTest::class);
+
+        $controller = new TestAbstractController(false);
+
+        $container = new Container();
+        $container->set(TestAbstractController::class, $controller);
+
+        $resolver = $this->createControllerResolver(null, $container);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', TestAbstractController::class.'::fooAction');
+
+        $this->assertSame([$controller, 'fooAction'], $resolver->getController($request));
+        $this->assertSame($container, $controller->setContainer($container));
+    }
+
+    public function testAbstractControllerServiceWithFcqnIdGetsContainerWhenNotSet()
+    {
+        class_exists(AbstractControllerTest::class);
+
+        $controller = new DummyController();
+
+        $container = new Container();
+        $container->set(DummyController::class, $controller);
+
+        $resolver = $this->createControllerResolver(null, $container);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', DummyController::class.':fooAction');
+
+        $this->assertSame([$controller, 'fooAction'], $resolver->getController($request));
+        $this->assertSame($container, $controller->getContainer());
+    }
+
+    public function testAbstractControllerGetsNoContainerWhenSet()
+    {
+        class_exists(AbstractControllerTest::class);
+
+        $controller = new TestAbstractController(false);
+        $controllerContainer = new Container();
+        $controller->setContainer($controllerContainer);
+
+        $container = new Container();
+        $container->set(TestAbstractController::class, $controller);
+
+        $resolver = $this->createControllerResolver(null, $container);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', TestAbstractController::class.'::fooAction');
+
+        $this->assertSame([$controller, 'fooAction'], $resolver->getController($request));
+        $this->assertSame($controllerContainer, $controller->setContainer($container));
+    }
+
+    public function testAbstractControllerServiceWithFcqnIdGetsNoContainerWhenSet()
+    {
+        class_exists(AbstractControllerTest::class);
+
+        $controller = new DummyController();
+        $controllerContainer = new Container();
+        $controller->setContainer($controllerContainer);
+
+        $container = new Container();
+        $container->set(DummyController::class, $controller);
+
+        $resolver = $this->createControllerResolver(null, $container);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', DummyController::class.':fooAction');
+
+        $this->assertSame([$controller, 'fooAction'], $resolver->getController($request));
+        $this->assertSame($controllerContainer, $controller->getContainer());
+    }
+
+    protected function createControllerResolver(LoggerInterface $logger = null, Psr11ContainerInterface $container = null, ControllerNameParser $parser = null)
+    {
+        if (!$parser) {
+            $parser = $this->createMockParser();
+        }
+
+        if (!$container) {
+            $container = $this->createMockContainer();
+        }
+
+        return new ControllerResolver($container, $parser, $logger);
+    }
+
+    protected function createMockParser()
+    {
+        return $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser')->disableOriginalConstructor()->getMock();
+    }
+
+    protected function createMockContainer()
+    {
+        return $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+    }
+}
+
+class ContainerAwareController implements ContainerAwareInterface
+{
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
+    public function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function testAction()
+    {
+    }
+
+    public function __invoke()
+    {
+    }
+}
+
+class DummyController extends AbstractController
+{
+    public function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function fooAction()
+    {
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/ControllerTest.php b/lib/symfony/framework-bundle/Tests/Controller/ControllerTest.php
new file mode 100644
index 000000000..452845cea
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Controller/ControllerTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+class ControllerTest extends ControllerTraitTest
+{
+    protected function createController()
+    {
+        return new TestController();
+    }
+}
+
+class TestController extends Controller
+{
+    use TestControllerTrait;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/ControllerTraitTest.php b/lib/symfony/framework-bundle/Tests/Controller/ControllerTraitTest.php
new file mode 100644
index 000000000..c03934565
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Controller/ControllerTraitTest.php
@@ -0,0 +1,551 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormConfigInterface;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\User\User;
+use Symfony\Component\Serializer\SerializerInterface;
+
+abstract class ControllerTraitTest extends TestCase
+{
+    abstract protected function createController();
+
+    public function testForward()
+    {
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->setRequestFormat('xml');
+
+        $requestStack = new RequestStack();
+        $requestStack->push($request);
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $kernel->expects($this->once())->method('handle')->willReturnCallback(function (Request $request) {
+            return new Response($request->getRequestFormat().'--'.$request->getLocale());
+        });
+
+        $container = new Container();
+        $container->set('request_stack', $requestStack);
+        $container->set('http_kernel', $kernel);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $response = $controller->forward('a_controller');
+        $this->assertEquals('xml--fr', $response->getContent());
+    }
+
+    public function testGetUser()
+    {
+        $user = new User('user', 'pass');
+        $token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']);
+
+        $controller = $this->createController();
+        $controller->setContainer($this->getContainerWithTokenStorage($token));
+
+        $this->assertSame($controller->getUser(), $user);
+    }
+
+    public function testGetUserAnonymousUserConvertedToNull()
+    {
+        $token = new AnonymousToken('default', 'anon.');
+
+        $controller = $this->createController();
+        $controller->setContainer($this->getContainerWithTokenStorage($token));
+
+        $this->assertNull($controller->getUser());
+    }
+
+    public function testGetUserWithEmptyTokenStorage()
+    {
+        $controller = $this->createController();
+        $controller->setContainer($this->getContainerWithTokenStorage(null));
+
+        $this->assertNull($controller->getUser());
+    }
+
+    public function testGetUserWithEmptyContainer()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('The SecurityBundle is not registered in your application.');
+        $controller = $this->createController();
+        $controller->setContainer(new Container());
+
+        $controller->getUser();
+    }
+
+    /**
+     * @param $token
+     *
+     * @return Container
+     */
+    private function getContainerWithTokenStorage($token = null)
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage')->getMock();
+        $tokenStorage
+            ->expects($this->once())
+            ->method('getToken')
+            ->willReturn($token);
+
+        $container = new Container();
+        $container->set('security.token_storage', $tokenStorage);
+
+        return $container;
+    }
+
+    public function testJson()
+    {
+        $controller = $this->createController();
+        $controller->setContainer(new Container());
+
+        $response = $controller->json([]);
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('[]', $response->getContent());
+    }
+
+    public function testJsonWithSerializer()
+    {
+        $container = new Container();
+
+        $serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
+        $serializer
+            ->expects($this->once())
+            ->method('serialize')
+            ->with([], 'json', ['json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS])
+            ->willReturn('[]');
+
+        $container->set('serializer', $serializer);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $response = $controller->json([]);
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('[]', $response->getContent());
+    }
+
+    public function testJsonWithSerializerContextOverride()
+    {
+        $container = new Container();
+
+        $serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
+        $serializer
+            ->expects($this->once())
+            ->method('serialize')
+            ->with([], 'json', ['json_encode_options' => 0, 'other' => 'context'])
+            ->willReturn('[]');
+
+        $container->set('serializer', $serializer);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $response = $controller->json([], 200, [], ['json_encode_options' => 0, 'other' => 'context']);
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('[]', $response->getContent());
+        $response->setEncodingOptions(JSON_FORCE_OBJECT);
+        $this->assertEquals('{}', $response->getContent());
+    }
+
+    public function testFile()
+    {
+        $container = new Container();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $container->set('http_kernel', $kernel);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        /* @var BinaryFileResponse $response */
+        $response = $controller->file(new File(__FILE__));
+        $this->assertInstanceOf(BinaryFileResponse::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        if ($response->headers->get('content-type')) {
+            $this->assertSame('text/x-php', $response->headers->get('content-type'));
+        }
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
+    }
+
+    public function testFileAsInline()
+    {
+        $controller = $this->createController();
+
+        /* @var BinaryFileResponse $response */
+        $response = $controller->file(new File(__FILE__), null, ResponseHeaderBag::DISPOSITION_INLINE);
+
+        $this->assertInstanceOf(BinaryFileResponse::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        if ($response->headers->get('content-type')) {
+            $this->assertSame('text/x-php', $response->headers->get('content-type'));
+        }
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
+    }
+
+    public function testFileWithOwnFileName()
+    {
+        $controller = $this->createController();
+
+        /* @var BinaryFileResponse $response */
+        $fileName = 'test.php';
+        $response = $controller->file(new File(__FILE__), $fileName);
+
+        $this->assertInstanceOf(BinaryFileResponse::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        if ($response->headers->get('content-type')) {
+            $this->assertSame('text/x-php', $response->headers->get('content-type'));
+        }
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString($fileName, $response->headers->get('content-disposition'));
+    }
+
+    public function testFileWithOwnFileNameAsInline()
+    {
+        $controller = $this->createController();
+
+        /* @var BinaryFileResponse $response */
+        $fileName = 'test.php';
+        $response = $controller->file(new File(__FILE__), $fileName, ResponseHeaderBag::DISPOSITION_INLINE);
+
+        $this->assertInstanceOf(BinaryFileResponse::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        if ($response->headers->get('content-type')) {
+            $this->assertSame('text/x-php', $response->headers->get('content-type'));
+        }
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString($fileName, $response->headers->get('content-disposition'));
+    }
+
+    public function testFileFromPath()
+    {
+        $controller = $this->createController();
+
+        /* @var BinaryFileResponse $response */
+        $response = $controller->file(__FILE__);
+
+        $this->assertInstanceOf(BinaryFileResponse::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        if ($response->headers->get('content-type')) {
+            $this->assertSame('text/x-php', $response->headers->get('content-type'));
+        }
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
+    }
+
+    public function testFileFromPathWithCustomizedFileName()
+    {
+        $controller = $this->createController();
+
+        /* @var BinaryFileResponse $response */
+        $response = $controller->file(__FILE__, 'test.php');
+
+        $this->assertInstanceOf(BinaryFileResponse::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        if ($response->headers->get('content-type')) {
+            $this->assertSame('text/x-php', $response->headers->get('content-type'));
+        }
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString('test.php', $response->headers->get('content-disposition'));
+    }
+
+    public function testFileWhichDoesNotExist()
+    {
+        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+        $controller = $this->createController();
+
+        $controller->file('some-file.txt', 'test.php');
+    }
+
+    public function testIsGranted()
+    {
+        $authorizationChecker = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface')->getMock();
+        $authorizationChecker->expects($this->once())->method('isGranted')->willReturn(true);
+
+        $container = new Container();
+        $container->set('security.authorization_checker', $authorizationChecker);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertTrue($controller->isGranted('foo'));
+    }
+
+    public function testdenyAccessUnlessGranted()
+    {
+        $this->expectException('Symfony\Component\Security\Core\Exception\AccessDeniedException');
+        $authorizationChecker = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface')->getMock();
+        $authorizationChecker->expects($this->once())->method('isGranted')->willReturn(false);
+
+        $container = new Container();
+        $container->set('security.authorization_checker', $authorizationChecker);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $controller->denyAccessUnlessGranted('foo');
+    }
+
+    public function testRenderViewTwig()
+    {
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $twig->expects($this->once())->method('render')->willReturn('bar');
+
+        $container = new Container();
+        $container->set('twig', $twig);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertEquals('bar', $controller->renderView('foo'));
+    }
+
+    public function testRenderTwig()
+    {
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $twig->expects($this->once())->method('render')->willReturn('bar');
+
+        $container = new Container();
+        $container->set('twig', $twig);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertEquals('bar', $controller->render('foo')->getContent());
+    }
+
+    public function testStreamTwig()
+    {
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+
+        $container = new Container();
+        $container->set('twig', $twig);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $controller->stream('foo'));
+    }
+
+    public function testRedirectToRoute()
+    {
+        $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
+        $router->expects($this->once())->method('generate')->willReturn('/foo');
+
+        $container = new Container();
+        $container->set('router', $router);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+        $response = $controller->redirectToRoute('foo');
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
+        $this->assertSame('/foo', $response->getTargetUrl());
+        $this->assertSame(302, $response->getStatusCode());
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testAddFlash()
+    {
+        $flashBag = new FlashBag();
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
+        $session->expects($this->once())->method('getFlashBag')->willReturn($flashBag);
+
+        $container = new Container();
+        $container->set('session', $session);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+        $controller->addFlash('foo', 'bar');
+
+        $this->assertSame(['bar'], $flashBag->get('foo'));
+    }
+
+    public function testCreateAccessDeniedException()
+    {
+        $controller = $this->createController();
+
+        $this->assertInstanceOf('Symfony\Component\Security\Core\Exception\AccessDeniedException', $controller->createAccessDeniedException());
+    }
+
+    public function testIsCsrfTokenValid()
+    {
+        $tokenManager = $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock();
+        $tokenManager->expects($this->once())->method('isTokenValid')->willReturn(true);
+
+        $container = new Container();
+        $container->set('security.csrf.token_manager', $tokenManager);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertTrue($controller->isCsrfTokenValid('foo', 'bar'));
+    }
+
+    public function testGenerateUrl()
+    {
+        $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
+        $router->expects($this->once())->method('generate')->willReturn('/foo');
+
+        $container = new Container();
+        $container->set('router', $router);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertEquals('/foo', $controller->generateUrl('foo'));
+    }
+
+    public function testRedirect()
+    {
+        $controller = $this->createController();
+        $response = $controller->redirect('https://dunglas.fr', 301);
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
+        $this->assertSame('https://dunglas.fr', $response->getTargetUrl());
+        $this->assertSame(301, $response->getStatusCode());
+    }
+
+    public function testRenderViewTemplating()
+    {
+        $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
+        $templating->expects($this->once())->method('render')->willReturn('bar');
+
+        $container = new Container();
+        $container->set('templating', $templating);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertEquals('bar', $controller->renderView('foo'));
+    }
+
+    public function testRenderTemplating()
+    {
+        $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
+        $templating->expects($this->once())->method('render')->willReturn('bar');
+
+        $container = new Container();
+        $container->set('templating', $templating);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertEquals('bar', $controller->render('foo')->getContent());
+    }
+
+    public function testStreamTemplating()
+    {
+        $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
+
+        $container = new Container();
+        $container->set('templating', $templating);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $controller->stream('foo'));
+    }
+
+    public function testCreateNotFoundException()
+    {
+        $controller = $this->createController();
+
+        $this->assertInstanceOf('Symfony\Component\HttpKernel\Exception\NotFoundHttpException', $controller->createNotFoundException());
+    }
+
+    public function testCreateForm()
+    {
+        $form = new Form($this->getMockBuilder(FormConfigInterface::class)->getMock());
+
+        $formFactory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
+        $formFactory->expects($this->once())->method('create')->willReturn($form);
+
+        $container = new Container();
+        $container->set('form.factory', $formFactory);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertEquals($form, $controller->createForm('foo'));
+    }
+
+    public function testCreateFormBuilder()
+    {
+        $formBuilder = $this->getMockBuilder('Symfony\Component\Form\FormBuilderInterface')->getMock();
+
+        $formFactory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
+        $formFactory->expects($this->once())->method('createBuilder')->willReturn($formBuilder);
+
+        $container = new Container();
+        $container->set('form.factory', $formFactory);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertEquals($formBuilder, $controller->createFormBuilder('foo'));
+    }
+
+    public function testGetDoctrine()
+    {
+        $doctrine = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
+
+        $container = new Container();
+        $container->set('doctrine', $doctrine);
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $this->assertEquals($doctrine, $controller->getDoctrine());
+    }
+}
+
+trait TestControllerTrait
+{
+    use ControllerTrait {
+        generateUrl as public;
+        redirect as public;
+        forward as public;
+        getUser as public;
+        json as public;
+        file as public;
+        isGranted as public;
+        denyAccessUnlessGranted as public;
+        redirectToRoute as public;
+        addFlash as public;
+        isCsrfTokenValid as public;
+        renderView as public;
+        render as public;
+        stream as public;
+        createNotFoundException as public;
+        createAccessDeniedException as public;
+        createForm as public;
+        createFormBuilder as public;
+        getDoctrine as public;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/RedirectControllerTest.php b/lib/symfony/framework-bundle/Tests/Controller/RedirectControllerTest.php
new file mode 100644
index 000000000..4bd0212e6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Controller/RedirectControllerTest.php
@@ -0,0 +1,321 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\HttpFoundation\ParameterBag;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+/**
+ * @author Marcin Sikon <marcin.sikon@gmail.com>
+ */
+class RedirectControllerTest extends TestCase
+{
+    public function testEmptyRoute()
+    {
+        $request = new Request();
+        $controller = new RedirectController();
+
+        try {
+            $controller->redirectAction($request, '', true);
+            $this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
+        } catch (HttpException $e) {
+            $this->assertSame(410, $e->getStatusCode());
+        }
+
+        try {
+            $controller->redirectAction($request, '', false);
+            $this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
+        } catch (HttpException $e) {
+            $this->assertSame(404, $e->getStatusCode());
+        }
+    }
+
+    /**
+     * @dataProvider provider
+     */
+    public function testRoute($permanent, $ignoreAttributes, $expectedCode, $expectedAttributes)
+    {
+        $request = new Request();
+
+        $route = 'new-route';
+        $url = '/redirect-url';
+        $attributes = [
+            'route' => $route,
+            'permanent' => $permanent,
+            '_route' => 'current-route',
+            '_route_params' => [
+                'route' => $route,
+                'permanent' => $permanent,
+                'additional-parameter' => 'value',
+                'ignoreAttributes' => $ignoreAttributes,
+            ],
+        ];
+
+        $request->attributes = new ParameterBag($attributes);
+
+        $router = $this->getMockBuilder(UrlGeneratorInterface::class)->getMock();
+        $router
+            ->expects($this->once())
+            ->method('generate')
+            ->with($this->equalTo($route), $this->equalTo($expectedAttributes))
+            ->willReturn($url);
+
+        $controller = new RedirectController($router);
+
+        $returnResponse = $controller->redirectAction($request, $route, $permanent, $ignoreAttributes);
+
+        $this->assertRedirectUrl($returnResponse, $url);
+        $this->assertEquals($expectedCode, $returnResponse->getStatusCode());
+    }
+
+    public function provider()
+    {
+        return [
+            [true, false, 301, ['additional-parameter' => 'value']],
+            [false, false, 302, ['additional-parameter' => 'value']],
+            [false, true, 302, []],
+            [false, ['additional-parameter'], 302, []],
+        ];
+    }
+
+    public function testEmptyPath()
+    {
+        $request = new Request();
+        $controller = new RedirectController();
+
+        try {
+            $controller->urlRedirectAction($request, '', true);
+            $this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
+        } catch (HttpException $e) {
+            $this->assertSame(410, $e->getStatusCode());
+        }
+
+        try {
+            $controller->urlRedirectAction($request, '', false);
+            $this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
+        } catch (HttpException $e) {
+            $this->assertSame(404, $e->getStatusCode());
+        }
+    }
+
+    public function testFullURL()
+    {
+        $request = new Request();
+        $controller = new RedirectController();
+        $returnResponse = $controller->urlRedirectAction($request, 'http://foo.bar/');
+
+        $this->assertRedirectUrl($returnResponse, 'http://foo.bar/');
+        $this->assertEquals(302, $returnResponse->getStatusCode());
+    }
+
+    public function testUrlRedirectDefaultPorts()
+    {
+        $host = 'www.example.com';
+        $baseUrl = '/base';
+        $path = '/redirect-path';
+        $httpPort = 1080;
+        $httpsPort = 1443;
+
+        $expectedUrl = "https://$host:$httpsPort$baseUrl$path";
+        $request = $this->createRequestObject('http', $host, $httpPort, $baseUrl);
+        $controller = $this->createRedirectController(null, $httpsPort);
+        $returnValue = $controller->urlRedirectAction($request, $path, false, 'https');
+        $this->assertRedirectUrl($returnValue, $expectedUrl);
+
+        $expectedUrl = "http://$host:$httpPort$baseUrl$path";
+        $request = $this->createRequestObject('https', $host, $httpPort, $baseUrl);
+        $controller = $this->createRedirectController($httpPort);
+        $returnValue = $controller->urlRedirectAction($request, $path, false, 'http');
+        $this->assertRedirectUrl($returnValue, $expectedUrl);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testUrlRedirectDefaultPortParameters()
+    {
+        $host = 'www.example.com';
+        $baseUrl = '/base';
+        $path = '/redirect-path';
+        $httpPort = 1080;
+        $httpsPort = 1443;
+
+        $expectedUrl = "https://$host:$httpsPort$baseUrl$path";
+        $request = $this->createRequestObject('http', $host, $httpPort, $baseUrl);
+        $controller = $this->createLegacyRedirectController(null, $httpsPort);
+        $returnValue = $controller->urlRedirectAction($request, $path, false, 'https');
+        $this->assertRedirectUrl($returnValue, $expectedUrl);
+
+        $expectedUrl = "http://$host:$httpPort$baseUrl$path";
+        $request = $this->createRequestObject('https', $host, $httpPort, $baseUrl);
+        $controller = $this->createLegacyRedirectController($httpPort);
+        $returnValue = $controller->urlRedirectAction($request, $path, false, 'http');
+        $this->assertRedirectUrl($returnValue, $expectedUrl);
+    }
+
+    public function urlRedirectProvider()
+    {
+        return [
+            // Standard ports
+            ['http',  null, null,  'http',  80,   ''],
+            ['http',  80,   null,  'http',  80,   ''],
+            ['https', null, null,  'http',  80,   ''],
+            ['https', 80,   null,  'http',  80,   ''],
+
+            ['http',  null,  null, 'https', 443,  ''],
+            ['http',  null,  443,  'https', 443,  ''],
+            ['https', null,  null, 'https', 443,  ''],
+            ['https', null,  443,  'https', 443,  ''],
+
+            // Non-standard ports
+            ['http',  null,  null, 'http',  8080, ':8080'],
+            ['http',  4080,  null, 'http',  8080, ':4080'],
+            ['http',  80,    null, 'http',  8080, ''],
+            ['https', null,  null, 'http',  8080, ''],
+            ['https', null,  8443, 'http',  8080, ':8443'],
+            ['https', null,  443,  'http',  8080, ''],
+
+            ['https', null,  null, 'https', 8443, ':8443'],
+            ['https', null,  4443, 'https', 8443, ':4443'],
+            ['https', null,  443,  'https', 8443, ''],
+            ['http',  null,  null, 'https', 8443, ''],
+            ['http',  8080,  4443, 'https', 8443, ':8080'],
+            ['http',  80,    4443, 'https', 8443, ''],
+        ];
+    }
+
+    /**
+     * @dataProvider urlRedirectProvider
+     */
+    public function testUrlRedirect($scheme, $httpPort, $httpsPort, $requestScheme, $requestPort, $expectedPort)
+    {
+        $host = 'www.example.com';
+        $baseUrl = '/base';
+        $path = '/redirect-path';
+        $expectedUrl = "$scheme://$host$expectedPort$baseUrl$path";
+
+        $request = $this->createRequestObject($requestScheme, $host, $requestPort, $baseUrl);
+        $controller = $this->createRedirectController();
+
+        $returnValue = $controller->urlRedirectAction($request, $path, false, $scheme, $httpPort, $httpsPort);
+        $this->assertRedirectUrl($returnValue, $expectedUrl);
+    }
+
+    public function pathQueryParamsProvider()
+    {
+        return [
+            ['http://www.example.com/base/redirect-path', '/redirect-path',  ''],
+            ['http://www.example.com/base/redirect-path?foo=bar', '/redirect-path?foo=bar',  ''],
+            ['http://www.example.com/base/redirect-path?foo=bar', '/redirect-path', 'foo=bar'],
+            ['http://www.example.com/base/redirect-path?foo=bar&abc=example', '/redirect-path?foo=bar', 'abc=example'],
+            ['http://www.example.com/base/redirect-path?foo=bar&abc=example&baz=def', '/redirect-path?foo=bar', 'abc=example&baz=def'],
+        ];
+    }
+
+    /**
+     * @dataProvider pathQueryParamsProvider
+     */
+    public function testPathQueryParams($expectedUrl, $path, $queryString)
+    {
+        $scheme = 'http';
+        $host = 'www.example.com';
+        $baseUrl = '/base';
+        $port = 80;
+
+        $request = $this->createRequestObject($scheme, $host, $port, $baseUrl, $queryString);
+
+        $controller = $this->createRedirectController();
+
+        $returnValue = $controller->urlRedirectAction($request, $path, false, $scheme, $port, null);
+        $this->assertRedirectUrl($returnValue, $expectedUrl);
+    }
+
+    private function createRequestObject($scheme, $host, $port, $baseUrl, $queryString = '')
+    {
+        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+        $request
+            ->expects($this->any())
+            ->method('getScheme')
+            ->willReturn($scheme);
+        $request
+            ->expects($this->any())
+            ->method('getHost')
+            ->willReturn($host);
+        $request
+            ->expects($this->any())
+            ->method('getPort')
+            ->willReturn($port);
+        $request
+            ->expects($this->any())
+            ->method('getBaseUrl')
+            ->willReturn($baseUrl);
+        $request
+            ->expects($this->any())
+            ->method('getQueryString')
+            ->willReturn($queryString);
+
+        return $request;
+    }
+
+    private function createRedirectController($httpPort = null, $httpsPort = null)
+    {
+        return new RedirectController(null, $httpPort, $httpsPort);
+    }
+
+    /**
+     * @deprecated
+     */
+    private function createLegacyRedirectController($httpPort = null, $httpsPort = null)
+    {
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+
+        if (null !== $httpPort) {
+            $container
+                ->expects($this->once())
+                ->method('hasParameter')
+                ->with($this->equalTo('request_listener.http_port'))
+                ->willReturn(true);
+            $container
+                ->expects($this->once())
+                ->method('getParameter')
+                ->with($this->equalTo('request_listener.http_port'))
+                ->willReturn($httpPort);
+        }
+        if (null !== $httpsPort) {
+            $container
+                ->expects($this->once())
+                ->method('hasParameter')
+                ->with($this->equalTo('request_listener.https_port'))
+                ->willReturn(true);
+            $container
+                ->expects($this->once())
+                ->method('getParameter')
+                ->with($this->equalTo('request_listener.https_port'))
+                ->willReturn($httpsPort);
+        }
+
+        $controller = new RedirectController();
+        $controller->setContainer($container);
+
+        return $controller;
+    }
+
+    private function assertRedirectUrl(Response $returnResponse, $expectedUrl)
+    {
+        $this->assertTrue($returnResponse->isRedirect($expectedUrl), "Expected: $expectedUrl\nGot:      ".$returnResponse->headers->get('Location'));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Controller/TemplateControllerTest.php b/lib/symfony/framework-bundle/Tests/Controller/TemplateControllerTest.php
new file mode 100644
index 000000000..7b4ed8e51
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Controller/TemplateControllerTest.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class TemplateControllerTest extends TestCase
+{
+    public function testTwig()
+    {
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $twig->expects($this->once())->method('render')->willReturn('bar');
+
+        $controller = new TemplateController($twig);
+
+        $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
+    }
+
+    public function testTemplating()
+    {
+        $templating = $this->getMockBuilder(EngineInterface::class)->getMock();
+        $templating->expects($this->once())->method('render')->willReturn('bar');
+
+        $controller = new TemplateController(null, $templating);
+
+        $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyTwig()
+    {
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $twig->expects($this->once())->method('render')->willReturn('bar');
+
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container->expects($this->at(0))->method('has')->willReturn(false);
+        $container->expects($this->at(1))->method('has')->willReturn(true);
+        $container->expects($this->at(2))->method('get')->willReturn($twig);
+
+        $controller = new TemplateController();
+        $controller->setContainer($container);
+
+        $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyTemplating()
+    {
+        $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
+        $templating->expects($this->once())->method('render')->willReturn('bar');
+
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container->expects($this->at(0))->method('has')->willReturn(true);
+        $container->expects($this->at(1))->method('get')->willReturn($templating);
+
+        $controller = new TemplateController();
+        $controller->setContainer($container);
+
+        $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
+    }
+
+    public function testNoTwigNorTemplating()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('You can not use the TemplateController if the Templating Component or the Twig Bundle are not available.');
+        $controller = new TemplateController();
+
+        $controller->templateAction('mytemplate')->getContent();
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php
new file mode 100644
index 000000000..341994e43
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddCacheWarmerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @group legacy
+ */
+class AddCacheWarmerPassTest extends TestCase
+{
+    public function testThatCacheWarmersAreProcessedInPriorityOrder()
+    {
+        $container = new ContainerBuilder();
+        $cacheWarmerDefinition = $container->register('cache_warmer')->addArgument([]);
+        $container->register('my_cache_warmer_service1')->addTag('kernel.cache_warmer', ['priority' => 100]);
+        $container->register('my_cache_warmer_service2')->addTag('kernel.cache_warmer', ['priority' => 200]);
+        $container->register('my_cache_warmer_service3')->addTag('kernel.cache_warmer');
+
+        $addCacheWarmerPass = new AddCacheWarmerPass();
+        $addCacheWarmerPass->process($container);
+
+        $this->assertEquals(
+            [
+                new Reference('my_cache_warmer_service2'),
+                new Reference('my_cache_warmer_service1'),
+                new Reference('my_cache_warmer_service3'),
+            ],
+            $cacheWarmerDefinition->getArgument(0)
+        );
+    }
+
+    public function testThatCompilerPassIsIgnoredIfThereIsNoCacheWarmerDefinition()
+    {
+        $container = new ContainerBuilder();
+
+        $addCacheWarmerPass = new AddCacheWarmerPass();
+        $addCacheWarmerPass->process($container);
+
+        // we just check that the pass does not break if no cache warmer is registered
+        $this->addToAssertionCount(1);
+    }
+
+    public function testThatCacheWarmersMightBeNotDefined()
+    {
+        $container = new ContainerBuilder();
+        $cacheWarmerDefinition = $container->register('cache_warmer')->addArgument([]);
+
+        $addCacheWarmerPass = new AddCacheWarmerPass();
+        $addCacheWarmerPass->process($container);
+
+        $this->assertSame([], $cacheWarmerDefinition->getArgument(0));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
new file mode 100644
index 000000000..16f0f68d2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
@@ -0,0 +1,120 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConsoleCommandPass;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+/**
+ * @group legacy
+ */
+class AddConsoleCommandPassTest extends TestCase
+{
+    /**
+     * @dataProvider visibilityProvider
+     */
+    public function testProcess($public)
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass());
+        $container->setParameter('my-command.class', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\MyCommand');
+
+        $definition = new Definition('%my-command.class%');
+        $definition->setPublic($public);
+        $definition->addTag('console.command');
+        $container->setDefinition('my-command', $definition);
+
+        $container->compile();
+
+        $alias = 'console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand';
+
+        if ($public) {
+            $this->assertFalse($container->hasAlias($alias));
+            $id = 'my-command';
+        } else {
+            $id = $alias;
+            // The alias is replaced by a Definition by the ReplaceAliasByActualDefinitionPass
+            // in case the original service is private
+            $this->assertFalse($container->hasDefinition('my-command'));
+            $this->assertTrue($container->hasDefinition($alias));
+        }
+
+        $this->assertTrue($container->hasParameter('console.command.ids'));
+        $this->assertSame([$alias => $id], $container->getParameter('console.command.ids'));
+    }
+
+    public function visibilityProvider()
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
+
+    public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The service "my-command" tagged "console.command" must not be abstract.');
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass());
+
+        $definition = new Definition('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\MyCommand');
+        $definition->addTag('console.command');
+        $definition->setAbstract(true);
+        $container->setDefinition('my-command', $definition);
+
+        $container->compile();
+    }
+
+    public function testProcessThrowAnExceptionIfTheServiceIsNotASubclassOfCommand()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The service "my-command" tagged "console.command" must be a subclass of "Symfony\Component\Console\Command\Command".');
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass());
+
+        $definition = new Definition('SplObjectStorage');
+        $definition->addTag('console.command');
+        $container->setDefinition('my-command', $definition);
+
+        $container->compile();
+    }
+
+    public function testProcessPrivateServicesWithSameCommand()
+    {
+        $container = new ContainerBuilder();
+        $className = 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\MyCommand';
+
+        $definition1 = new Definition($className);
+        $definition1->addTag('console.command')->setPublic(false);
+
+        $definition2 = new Definition($className);
+        $definition2->addTag('console.command')->setPublic(false);
+
+        $container->setDefinition('my-command1', $definition1);
+        $container->setDefinition('my-command2', $definition2);
+
+        (new AddConsoleCommandPass())->process($container);
+
+        $alias1 = 'console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand';
+        $alias2 = $alias1.'_my-command2';
+        $this->assertTrue($container->hasAlias($alias1));
+        $this->assertTrue($container->hasAlias($alias2));
+    }
+}
+
+class MyCommand extends Command
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
new file mode 100644
index 000000000..1d998395e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+
+/**
+ * @group legacy
+ */
+class AddConstraintValidatorsPassTest extends TestCase
+{
+    public function testThatConstraintValidatorServicesAreProcessed()
+    {
+        $container = new ContainerBuilder();
+        $validatorFactory = $container->register('validator.validator_factory')
+            ->addArgument([]);
+
+        $container->register('my_constraint_validator_service1', Validator1::class)
+            ->addTag('validator.constraint_validator', ['alias' => 'my_constraint_validator_alias1']);
+        $container->register('my_constraint_validator_service2', Validator2::class)
+            ->addTag('validator.constraint_validator');
+
+        $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
+        $addConstraintValidatorsPass->process($container);
+
+        $expected = (new Definition(ServiceLocator::class, [[
+            Validator1::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
+            'my_constraint_validator_alias1' => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
+            Validator2::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service2')),
+        ]]))->addTag('container.service_locator')->setPublic(false);
+        $this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
+    }
+
+    public function testAbstractConstraintValidator()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The service "my_abstract_constraint_validator" tagged "validator.constraint_validator" must not be abstract.');
+        $container = new ContainerBuilder();
+        $container->register('validator.validator_factory')
+            ->addArgument([]);
+
+        $container->register('my_abstract_constraint_validator')
+            ->setAbstract(true)
+            ->addTag('validator.constraint_validator');
+
+        $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
+        $addConstraintValidatorsPass->process($container);
+    }
+
+    public function testThatCompilerPassIsIgnoredIfThereIsNoConstraintValidatorFactoryDefinition()
+    {
+        $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
+        $addConstraintValidatorsPass->process(new ContainerBuilder());
+
+        // we just check that the pass does not fail if no constraint validator factory is registered
+        $this->addToAssertionCount(1);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
new file mode 100644
index 000000000..7f9724bdd
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class AddExpressionLanguageProvidersPassTest extends TestCase
+{
+    public function testProcessForRouter()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
+
+        $definition = new Definition('\stdClass');
+        $definition->addTag('routing.expression_language_provider');
+        $container->setDefinition('some_routing_provider', $definition->setPublic(true));
+
+        $container->register('router', '\stdClass')->setPublic(true);
+        $container->compile();
+
+        $router = $container->getDefinition('router');
+        $calls = $router->getMethodCalls();
+        $this->assertCount(1, $calls);
+        $this->assertEquals('addExpressionLanguageProvider', $calls[0][0]);
+        $this->assertEquals(new Reference('some_routing_provider'), $calls[0][1][0]);
+    }
+
+    public function testProcessForRouterAlias()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
+
+        $definition = new Definition('\stdClass');
+        $definition->addTag('routing.expression_language_provider');
+        $container->setDefinition('some_routing_provider', $definition->setPublic(true));
+
+        $container->register('my_router', '\stdClass')->setPublic(true);
+        $container->setAlias('router', 'my_router');
+        $container->compile();
+
+        $router = $container->getDefinition('my_router');
+        $calls = $router->getMethodCalls();
+        $this->assertCount(1, $calls);
+        $this->assertEquals('addExpressionLanguageProvider', $calls[0][0]);
+        $this->assertEquals(new Reference('some_routing_provider'), $calls[0][1][0]);
+    }
+
+    public function testProcessForSecurity()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
+
+        $definition = new Definition('\stdClass');
+        $definition->addTag('security.expression_language_provider');
+        $container->setDefinition('some_security_provider', $definition->setPublic(true));
+
+        $container->register('security.expression_language', '\stdClass')->setPublic(true);
+        $container->compile();
+
+        $calls = $container->getDefinition('security.expression_language')->getMethodCalls();
+        $this->assertCount(1, $calls);
+        $this->assertEquals('registerProvider', $calls[0][0]);
+        $this->assertEquals(new Reference('some_security_provider'), $calls[0][1][0]);
+    }
+
+    public function testProcessForSecurityAlias()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
+
+        $definition = new Definition('\stdClass');
+        $definition->addTag('security.expression_language_provider');
+        $container->setDefinition('some_security_provider', $definition->setPublic(true));
+
+        $container->register('my_security.expression_language', '\stdClass')->setPublic(true);
+        $container->setAlias('security.expression_language', 'my_security.expression_language');
+        $container->compile();
+
+        $calls = $container->getDefinition('my_security.expression_language')->getMethodCalls();
+        $this->assertCount(1, $calls);
+        $this->assertEquals('registerProvider', $calls[0][0]);
+        $this->assertEquals(new Reference('some_security_provider'), $calls[0][1][0]);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CacheCollectorPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CacheCollectorPassTest.php
new file mode 100644
index 000000000..992691de6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CacheCollectorPassTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CacheCollectorPass;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
+use Symfony\Component\Cache\Adapter\TraceableAdapter;
+use Symfony\Component\Cache\Adapter\TraceableTagAwareAdapter;
+use Symfony\Component\Cache\DataCollector\CacheDataCollector;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class CacheCollectorPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('fs', FilesystemAdapter::class)
+            ->addTag('cache.pool');
+        $container
+            ->register('tagged_fs', TagAwareAdapter::class)
+            ->addArgument(new Reference('fs'))
+            ->addTag('cache.pool');
+
+        $collector = $container->register('data_collector.cache', CacheDataCollector::class);
+        (new CacheCollectorPass())->process($container);
+
+        $this->assertEquals([
+            ['addInstance', ['fs', new Reference('fs')]],
+            ['addInstance', ['tagged_fs', new Reference('tagged_fs')]],
+        ], $collector->getMethodCalls());
+
+        $this->assertSame(TraceableAdapter::class, $container->findDefinition('fs')->getClass());
+        $this->assertSame(TraceableTagAwareAdapter::class, $container->getDefinition('tagged_fs')->getClass());
+        $this->assertFalse($collector->isPublic(), 'The "data_collector.cache" should be private after processing');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
new file mode 100644
index 000000000..728595ae9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolClearerPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolPass;
+use Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
+
+class CachePoolClearerPassTest extends TestCase
+{
+    public function testPoolRefsAreWeak()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.environment', 'prod');
+        $container->setParameter('kernel.root_dir', 'foo');
+
+        $globalClearer = new Definition(Psr6CacheClearer::class);
+        $container->setDefinition('cache.global_clearer', $globalClearer);
+
+        $publicPool = new Definition();
+        $publicPool->addArgument('namespace');
+        $publicPool->addTag('cache.pool', ['clearer' => 'clearer_alias']);
+        $container->setDefinition('public.pool', $publicPool);
+
+        $privatePool = new Definition();
+        $privatePool->setPublic(false);
+        $privatePool->addArgument('namespace');
+        $privatePool->addTag('cache.pool', ['clearer' => 'clearer_alias']);
+        $container->setDefinition('private.pool', $privatePool);
+
+        $clearer = new Definition();
+        $container->setDefinition('clearer', $clearer);
+        $container->setAlias('clearer_alias', 'clearer');
+
+        $pass = new RemoveUnusedDefinitionsPass();
+        $pass->setRepeatedPass(new RepeatedPass([$pass]));
+        foreach ([new CachePoolPass(), $pass, new CachePoolClearerPass()] as $pass) {
+            $pass->process($container);
+        }
+
+        $this->assertEquals([['public.pool' => new Reference('public.pool')]], $clearer->getArguments());
+        $this->assertEquals([['public.pool' => new Reference('public.pool')]], $globalClearer->getArguments());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
new file mode 100644
index 000000000..53ea1bf68
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolPass;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+class CachePoolPassTest extends TestCase
+{
+    private $cachePoolPass;
+
+    protected function setUp()
+    {
+        $this->cachePoolPass = new CachePoolPass();
+    }
+
+    public function testNamespaceArgumentIsReplaced()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.environment', 'prod');
+        $container->setParameter('kernel.root_dir', 'foo');
+        $adapter = new Definition();
+        $adapter->setAbstract(true);
+        $adapter->addTag('cache.pool');
+        $container->setDefinition('app.cache_adapter', $adapter);
+        $container->setAlias('app.cache_adapter_alias', 'app.cache_adapter');
+        $cachePool = new ChildDefinition('app.cache_adapter_alias');
+        $cachePool->addArgument(null);
+        $cachePool->addTag('cache.pool');
+        $container->setDefinition('app.cache_pool', $cachePool);
+
+        $this->cachePoolPass->process($container);
+
+        $this->assertSame('D07rhFx97S', $cachePool->getArgument(0));
+    }
+
+    public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.environment', 'prod');
+        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.root_dir', 'foo');
+
+        $container->register('cache.adapter.array', ArrayAdapter::class)->addArgument(0);
+
+        $cachePool = new ChildDefinition('cache.adapter.array');
+        $cachePool->addTag('cache.pool');
+        $container->setDefinition('app.cache_pool', $cachePool);
+
+        $this->cachePoolPass->process($container);
+
+        $this->assertCount(0, $container->getDefinition('app.cache_pool')->getArguments());
+    }
+
+    public function testArgsAreReplaced()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.environment', 'prod');
+        $container->setParameter('cache.prefix.seed', 'foo');
+        $cachePool = new Definition();
+        $cachePool->addTag('cache.pool', [
+            'provider' => 'foobar',
+            'default_lifetime' => 3,
+        ]);
+        $cachePool->addArgument(null);
+        $cachePool->addArgument(null);
+        $cachePool->addArgument(null);
+        $container->setDefinition('app.cache_pool', $cachePool);
+
+        $this->cachePoolPass->process($container);
+
+        $this->assertInstanceOf(Reference::class, $cachePool->getArgument(0));
+        $this->assertSame('foobar', (string) $cachePool->getArgument(0));
+        $this->assertSame('itantF+pIq', $cachePool->getArgument(1));
+        $this->assertSame(3, $cachePool->getArgument(2));
+    }
+
+    public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid "cache.pool" tag for service "app.cache_pool": accepted attributes are');
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.environment', 'prod');
+        $container->setParameter('kernel.root_dir', 'foo');
+        $adapter = new Definition();
+        $adapter->setAbstract(true);
+        $adapter->addTag('cache.pool');
+        $container->setDefinition('app.cache_adapter', $adapter);
+        $cachePool = new ChildDefinition('app.cache_adapter');
+        $cachePool->addTag('cache.pool', ['foobar' => 123]);
+        $container->setDefinition('app.cache_pool', $cachePool);
+
+        $this->cachePoolPass->process($container);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
new file mode 100644
index 000000000..1439d36f8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolPrunerPass;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class CachePoolPrunerPassTest extends TestCase
+{
+    public function testCompilerPassReplacesCommandArgument()
+    {
+        $container = new ContainerBuilder();
+        $container->register('console.command.cache_pool_prune')->addArgument([]);
+        $container->register('pool.foo', FilesystemAdapter::class)->addTag('cache.pool');
+        $container->register('pool.bar', PhpFilesAdapter::class)->addTag('cache.pool');
+
+        $pass = new CachePoolPrunerPass();
+        $pass->process($container);
+
+        $expected = [
+            'pool.foo' => new Reference('pool.foo'),
+            'pool.bar' => new Reference('pool.bar'),
+        ];
+        $argument = $container->getDefinition('console.command.cache_pool_prune')->getArgument(0);
+
+        $this->assertInstanceOf(IteratorArgument::class, $argument);
+        $this->assertEquals($expected, $argument->getValues());
+    }
+
+    public function testCompilePassIsIgnoredIfCommandDoesNotExist()
+    {
+        $container = new ContainerBuilder();
+
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
+
+        $pass = new CachePoolPrunerPass();
+        $pass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
+    }
+
+    public function testCompilerPassThrowsOnInvalidDefinitionClass()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Class "Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\NotFound" used for service "pool.not-found" cannot be found.');
+        $container = new ContainerBuilder();
+        $container->register('console.command.cache_pool_prune')->addArgument([]);
+        $container->register('pool.not-found', NotFound::class)->addTag('cache.pool');
+
+        $pass = new CachePoolPrunerPass();
+        $pass->process($container);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php
new file mode 100644
index 000000000..1b69a4283
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigCachePass;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @group legacy
+ */
+class ConfigCachePassTest extends TestCase
+{
+    public function testThatCheckersAreProcessedInPriorityOrder()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register('config_cache_factory')->addArgument(null);
+        $container->register('checker_2')->addTag('config_cache.resource_checker', ['priority' => 100]);
+        $container->register('checker_1')->addTag('config_cache.resource_checker', ['priority' => 200]);
+        $container->register('checker_3')->addTag('config_cache.resource_checker');
+
+        $pass = new ConfigCachePass();
+        $pass->process($container);
+
+        $expected = new IteratorArgument([
+            new Reference('checker_1'),
+            new Reference('checker_2'),
+            new Reference('checker_3'),
+        ]);
+        $this->assertEquals($expected, $definition->getArgument(0));
+    }
+
+    public function testThatCheckersCanBeMissing()
+    {
+        $container = new ContainerBuilder();
+
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
+
+        $pass = new ConfigCachePass();
+        $pass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ControllerArgumentValueResolverPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ControllerArgumentValueResolverPassTest.php
new file mode 100644
index 000000000..06bdd15fb
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ControllerArgumentValueResolverPassTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ControllerArgumentValueResolverPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+
+/**
+ * @group legacy
+ */
+class ControllerArgumentValueResolverPassTest extends TestCase
+{
+    public function testServicesAreOrderedAccordingToPriority()
+    {
+        $services = [
+            'n3' => [[]],
+            'n1' => [['priority' => 200]],
+            'n2' => [['priority' => 100]],
+        ];
+
+        $expected = [
+            new Reference('n1'),
+            new Reference('n2'),
+            new Reference('n3'),
+        ];
+
+        $definition = new Definition(ArgumentResolver::class, [null, []]);
+        $container = new ContainerBuilder();
+        $container->setDefinition('argument_resolver', $definition);
+
+        foreach ($services as $id => list($tag)) {
+            $container->register($id)->addTag('controller.argument_value_resolver', $tag);
+        }
+
+        (new ControllerArgumentValueResolverPass())->process($container);
+        $this->assertEquals($expected, $definition->getArgument(1)->getValues());
+    }
+
+    public function testReturningEmptyArrayWhenNoService()
+    {
+        $definition = new Definition(ArgumentResolver::class, [null, []]);
+        $container = new ContainerBuilder();
+        $container->setDefinition('argument_resolver', $definition);
+
+        (new ControllerArgumentValueResolverPass())->process($container);
+        $this->assertEquals([], $definition->getArgument(1)->getValues());
+    }
+
+    public function testNoArgumentResolver()
+    {
+        $container = new ContainerBuilder();
+
+        (new ControllerArgumentValueResolverPass())->process($container);
+
+        $this->assertFalse($container->hasDefinition('argument_resolver'));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
new file mode 100644
index 000000000..8748d1e9c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Translation\TranslatorInterface;
+
+class DataCollectorTranslatorPassTest extends TestCase
+{
+    private $container;
+    private $dataCollectorTranslatorPass;
+
+    protected function setUp()
+    {
+        $this->container = new ContainerBuilder();
+        $this->dataCollectorTranslatorPass = new DataCollectorTranslatorPass();
+
+        $this->container->setParameter('translator_implementing_bag', 'Symfony\Component\Translation\Translator');
+        $this->container->setParameter('translator_not_implementing_bag', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
+
+        $this->container->register('translator.data_collector', 'Symfony\Component\Translation\DataCollectorTranslator')
+            ->setPublic(false)
+            ->setDecoratedService('translator')
+            ->setArguments([new Reference('translator.data_collector.inner')])
+        ;
+
+        $this->container->register('data_collector.translation', 'Symfony\Component\Translation\DataCollector\TranslationDataCollector')
+            ->setArguments([new Reference('translator.data_collector')])
+        ;
+    }
+
+    /**
+     * @dataProvider getImplementingTranslatorBagInterfaceTranslatorClassNames
+     */
+    public function testProcessKeepsDataCollectorTranslatorIfItImplementsTranslatorBagInterface($class)
+    {
+        $this->container->register('translator', $class);
+
+        $this->dataCollectorTranslatorPass->process($this->container);
+
+        $this->assertTrue($this->container->hasDefinition('translator.data_collector'));
+    }
+
+    /**
+     * @dataProvider getImplementingTranslatorBagInterfaceTranslatorClassNames
+     */
+    public function testProcessKeepsDataCollectorIfTranslatorImplementsTranslatorBagInterface($class)
+    {
+        $this->container->register('translator', $class);
+
+        $this->dataCollectorTranslatorPass->process($this->container);
+
+        $this->assertTrue($this->container->hasDefinition('data_collector.translation'));
+    }
+
+    public function getImplementingTranslatorBagInterfaceTranslatorClassNames()
+    {
+        return [
+            ['Symfony\Component\Translation\Translator'],
+            ['%translator_implementing_bag%'],
+        ];
+    }
+
+    /**
+     * @dataProvider getNotImplementingTranslatorBagInterfaceTranslatorClassNames
+     */
+    public function testProcessRemovesDataCollectorTranslatorIfItDoesNotImplementTranslatorBagInterface($class)
+    {
+        $this->container->register('translator', $class);
+
+        $this->dataCollectorTranslatorPass->process($this->container);
+
+        $this->assertFalse($this->container->hasDefinition('translator.data_collector'));
+    }
+
+    /**
+     * @dataProvider getNotImplementingTranslatorBagInterfaceTranslatorClassNames
+     */
+    public function testProcessRemovesDataCollectorIfTranslatorDoesNotImplementTranslatorBagInterface($class)
+    {
+        $this->container->register('translator', $class);
+
+        $this->dataCollectorTranslatorPass->process($this->container);
+
+        $this->assertFalse($this->container->hasDefinition('data_collector.translation'));
+    }
+
+    public function getNotImplementingTranslatorBagInterfaceTranslatorClassNames()
+    {
+        return [
+            ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag'],
+            ['%translator_not_implementing_bag%'],
+        ];
+    }
+}
+
+class TranslatorWithTranslatorBag implements TranslatorInterface
+{
+    public function trans($id, array $parameters = [], $domain = null, $locale = null)
+    {
+    }
+
+    public function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null)
+    {
+    }
+
+    public function setLocale($locale)
+    {
+    }
+
+    public function getLocale()
+    {
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/FormPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/FormPassTest.php
new file mode 100644
index 000000000..a73093e7c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/FormPassTest.php
@@ -0,0 +1,213 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @group legacy
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class FormPassTest extends TestCase
+{
+    public function testDoNothingIfFormExtensionNotLoaded()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new FormPass());
+
+        $container->compile();
+
+        $this->assertFalse($container->hasDefinition('form.extension'));
+    }
+
+    public function testAddTaggedTypes()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new FormPass());
+
+        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
+        $extDefinition->setPublic(true);
+        $extDefinition->setArguments([
+            new Reference('service_container'),
+            [],
+            [],
+            [],
+        ]);
+
+        $container->setDefinition('form.extension', $extDefinition);
+        $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type')->setPublic(true);
+        $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type')->setPublic(true);
+
+        $container->compile();
+
+        $extDefinition = $container->getDefinition('form.extension');
+
+        $this->assertEquals([
+            __CLASS__.'_Type1' => 'my.type1',
+            __CLASS__.'_Type2' => 'my.type2',
+        ], $extDefinition->getArgument(1));
+    }
+
+    /**
+     * @dataProvider addTaggedTypeExtensionsDataProvider
+     */
+    public function testAddTaggedTypeExtensions(array $extensions, array $expectedRegisteredExtensions)
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new FormPass());
+
+        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension', [
+            new Reference('service_container'),
+            [],
+            [],
+            [],
+        ]);
+        $extDefinition->setPublic(true);
+
+        $container->setDefinition('form.extension', $extDefinition);
+
+        foreach ($extensions as $serviceId => $tag) {
+            $container->register($serviceId, 'stdClass')->addTag('form.type_extension', $tag);
+        }
+
+        $container->compile();
+
+        $extDefinition = $container->getDefinition('form.extension');
+        $this->assertSame($expectedRegisteredExtensions, $extDefinition->getArgument(2));
+    }
+
+    /**
+     * @return array
+     */
+    public function addTaggedTypeExtensionsDataProvider()
+    {
+        return [
+            [
+                [
+                    'my.type_extension1' => ['extended_type' => 'type1'],
+                    'my.type_extension2' => ['extended_type' => 'type1'],
+                    'my.type_extension3' => ['extended_type' => 'type2'],
+                ],
+                [
+                    'type1' => ['my.type_extension1', 'my.type_extension2'],
+                    'type2' => ['my.type_extension3'],
+                ],
+            ],
+            [
+                [
+                    'my.type_extension1' => ['extended_type' => 'type1', 'priority' => 1],
+                    'my.type_extension2' => ['extended_type' => 'type1', 'priority' => 2],
+                    'my.type_extension3' => ['extended_type' => 'type1', 'priority' => -1],
+                    'my.type_extension4' => ['extended_type' => 'type2', 'priority' => 2],
+                    'my.type_extension5' => ['extended_type' => 'type2', 'priority' => 1],
+                    'my.type_extension6' => ['extended_type' => 'type2', 'priority' => 1],
+                ],
+                [
+                    'type1' => ['my.type_extension2', 'my.type_extension1', 'my.type_extension3'],
+                    'type2' => ['my.type_extension4', 'my.type_extension5', 'my.type_extension6'],
+                ],
+            ],
+        ];
+    }
+
+    public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttribute()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('extended-type attribute, none was configured for the "my.type_extension" service');
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new FormPass());
+
+        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension', [
+            new Reference('service_container'),
+            [],
+            [],
+            [],
+        ]);
+        $extDefinition->setPublic(true);
+
+        $container->setDefinition('form.extension', $extDefinition);
+        $container->register('my.type_extension', 'stdClass')
+            ->addTag('form.type_extension');
+
+        $container->compile();
+    }
+
+    public function testAddTaggedGuessers()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new FormPass());
+
+        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
+        $extDefinition->setPublic(true);
+        $extDefinition->setArguments([
+            new Reference('service_container'),
+            [],
+            [],
+            [],
+        ]);
+
+        $definition1 = new Definition('stdClass');
+        $definition1->addTag('form.type_guesser');
+        $definition2 = new Definition('stdClass');
+        $definition2->addTag('form.type_guesser');
+
+        $container->setDefinition('form.extension', $extDefinition);
+        $container->setDefinition('my.guesser1', $definition1);
+        $container->setDefinition('my.guesser2', $definition2);
+
+        $container->compile();
+
+        $extDefinition = $container->getDefinition('form.extension');
+
+        $this->assertSame([
+            'my.guesser1',
+            'my.guesser2',
+        ], $extDefinition->getArgument(3));
+    }
+
+    /**
+     * @dataProvider privateTaggedServicesProvider
+     */
+    public function testPrivateTaggedServices($id, $tagName)
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new FormPass());
+
+        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
+        $extDefinition->setArguments([
+            new Reference('service_container'),
+            [],
+            [],
+            [],
+        ]);
+
+        $container->setDefinition('form.extension', $extDefinition);
+        $container->register($id, 'stdClass')->setPublic(false)->addTag($tagName, ['extended_type' => 'Foo']);
+
+        $container->compile();
+        $this->assertTrue($container->getDefinition($id)->isPublic());
+    }
+
+    public function privateTaggedServicesProvider()
+    {
+        return [
+            ['my.type', 'form.type'],
+            ['my.type_extension', 'form.type_extension'],
+            ['my.guesser', 'form.type_guesser'],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
new file mode 100644
index 000000000..6838d4788
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class LoggingTranslatorPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('translator.logging', true);
+        $container->setParameter('translator.class', 'Symfony\Component\Translation\Translator');
+        $container->register('monolog.logger');
+        $container->setAlias('logger', 'monolog.logger');
+        $container->register('translator.default', '%translator.class%');
+        $container->register('translator.logging', '%translator.class%');
+        $container->setAlias('translator', 'translator.default');
+        $translationWarmerDefinition = $container->register('translation.warmer')
+            ->addArgument(new Reference('translator'))
+            ->addTag('container.service_subscriber', ['id' => 'translator'])
+            ->addTag('container.service_subscriber', ['id' => 'foo']);
+
+        $pass = new LoggingTranslatorPass();
+        $pass->process($container);
+
+        $this->assertEquals(
+            ['container.service_subscriber' => [
+                ['id' => 'foo'],
+                ['key' => 'translator', 'id' => 'translator.logging.inner'],
+            ]],
+            $translationWarmerDefinition->getTags()
+        );
+    }
+
+    public function testThatCompilerPassIsIgnoredIfThereIsNotLoggerDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container->register('identity_translator');
+        $container->setAlias('translator', 'identity_translator');
+
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
+
+        $pass = new LoggingTranslatorPass();
+        $pass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
+    }
+
+    public function testThatCompilerPassIsIgnoredIfThereIsNotTranslatorDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container->register('monolog.logger');
+        $container->setAlias('logger', 'monolog.logger');
+
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
+
+        $pass = new LoggingTranslatorPass();
+        $pass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
new file mode 100644
index 000000000..99299282a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ProfilerPassTest extends TestCase
+{
+    /**
+     * Tests that collectors that specify a template but no "id" will throw
+     * an exception (both are needed if the template is specified).
+     *
+     * Thus, a fully-valid tag looks something like this:
+     *
+     *     <tag name="data_collector" template="YourBundle:Collector:templatename" id="your_collector_name" />
+     */
+    public function testTemplateNoIdThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $builder = new ContainerBuilder();
+        $builder->register('profiler', 'ProfilerClass');
+        $builder->register('my_collector_service')
+            ->addTag('data_collector', ['template' => 'foo']);
+
+        $profilerPass = new ProfilerPass();
+        $profilerPass->process($builder);
+    }
+
+    public function testValidCollector()
+    {
+        $container = new ContainerBuilder();
+        $profilerDefinition = $container->register('profiler', 'ProfilerClass');
+        $container->register('my_collector_service')
+            ->addTag('data_collector', ['template' => 'foo', 'id' => 'my_collector']);
+
+        $profilerPass = new ProfilerPass();
+        $profilerPass->process($container);
+
+        $this->assertSame(['my_collector_service' => ['my_collector', 'foo']], $container->getParameter('data_collector.templates'));
+
+        // grab the method calls off of the "profiler" definition
+        $methodCalls = $profilerDefinition->getMethodCalls();
+        $this->assertCount(1, $methodCalls);
+        $this->assertEquals('add', $methodCalls[0][0]); // grab the method part of the first call
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
new file mode 100644
index 000000000..33fc9cc7f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\PropertyInfoPass;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @group legacy
+ */
+class PropertyInfoPassTest extends TestCase
+{
+    /**
+     * @dataProvider provideTags
+     */
+    public function testServicesAreOrderedAccordingToPriority($index, $tag)
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register('property_info')->setArguments([null, null, null, null]);
+        $container->register('n2')->addTag($tag, ['priority' => 100]);
+        $container->register('n1')->addTag($tag, ['priority' => 200]);
+        $container->register('n3')->addTag($tag);
+
+        $propertyInfoPass = new PropertyInfoPass();
+        $propertyInfoPass->process($container);
+
+        $expected = new IteratorArgument([
+            new Reference('n1'),
+            new Reference('n2'),
+            new Reference('n3'),
+        ]);
+        $this->assertEquals($expected, $definition->getArgument($index));
+    }
+
+    public function provideTags()
+    {
+        return [
+            [0, 'property_info.list_extractor'],
+            [1, 'property_info.type_extractor'],
+            [2, 'property_info.description_extractor'],
+            [3, 'property_info.access_extractor'],
+        ];
+    }
+
+    public function testReturningEmptyArrayWhenNoService()
+    {
+        $container = new ContainerBuilder();
+        $propertyInfoExtractorDefinition = $container->register('property_info')
+            ->setArguments([[], [], [], []]);
+
+        $propertyInfoPass = new PropertyInfoPass();
+        $propertyInfoPass->process($container);
+
+        $this->assertEquals(new IteratorArgument([]), $propertyInfoExtractorDefinition->getArgument(0));
+        $this->assertEquals(new IteratorArgument([]), $propertyInfoExtractorDefinition->getArgument(1));
+        $this->assertEquals(new IteratorArgument([]), $propertyInfoExtractorDefinition->getArgument(2));
+        $this->assertEquals(new IteratorArgument([]), $propertyInfoExtractorDefinition->getArgument(3));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
new file mode 100644
index 000000000..0bc621acb
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Tests for the SerializerPass class.
+ *
+ * @group legacy
+ *
+ * @author Javier Lopez <f12loalf@gmail.com>
+ */
+class SerializerPassTest extends TestCase
+{
+    public function testThrowExceptionWhenNoNormalizers()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('You must tag at least one service as "serializer.normalizer" to use the "serializer" service');
+        $container = new ContainerBuilder();
+        $container->register('serializer');
+
+        $serializerPass = new SerializerPass();
+        $serializerPass->process($container);
+    }
+
+    public function testThrowExceptionWhenNoEncoders()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('You must tag at least one service as "serializer.encoder" to use the "serializer" service');
+        $container = new ContainerBuilder();
+        $container->register('serializer')
+            ->addArgument([])
+            ->addArgument([]);
+        $container->register('normalizer')->addTag('serializer.normalizer');
+
+        $serializerPass = new SerializerPass();
+        $serializerPass->process($container);
+    }
+
+    public function testServicesAreOrderedAccordingToPriority()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register('serializer')->setArguments([null, null]);
+        $container->register('n2')->addTag('serializer.normalizer', ['priority' => 100])->addTag('serializer.encoder', ['priority' => 100]);
+        $container->register('n1')->addTag('serializer.normalizer', ['priority' => 200])->addTag('serializer.encoder', ['priority' => 200]);
+        $container->register('n3')->addTag('serializer.normalizer')->addTag('serializer.encoder');
+
+        $serializerPass = new SerializerPass();
+        $serializerPass->process($container);
+
+        $expected = [
+            new Reference('n1'),
+            new Reference('n2'),
+            new Reference('n3'),
+        ];
+        $this->assertEquals($expected, $definition->getArgument(0));
+        $this->assertEquals($expected, $definition->getArgument(1));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php
new file mode 100644
index 000000000..e654edf66
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslatorPass;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @group legacy
+ */
+class TranslatorPassTest extends TestCase
+{
+    public function testValidCollector()
+    {
+        $loader = (new Definition())
+            ->addTag('translation.loader', ['alias' => 'xliff', 'legacy-alias' => 'xlf']);
+
+        $translator = (new Definition())
+            ->setArguments([null, null, null, null]);
+
+        $container = new ContainerBuilder();
+        $container->setDefinition('translator.default', $translator);
+        $container->setDefinition('translation.loader', $loader);
+
+        $pass = new TranslatorPass();
+        $pass->process($container);
+
+        $expected = (new Definition())
+            ->addTag('translation.loader', ['alias' => 'xliff', 'legacy-alias' => 'xlf'])
+            ->addMethodCall('addLoader', ['xliff', new Reference('translation.loader')])
+            ->addMethodCall('addLoader', ['xlf', new Reference('translation.loader')])
+        ;
+        $this->assertEquals($expected, $loader);
+
+        $this->assertSame(['translation.loader' => ['xliff', 'xlf']], $translator->getArgument(3));
+
+        $expected = ['translation.loader' => new ServiceClosureArgument(new Reference('translation.loader'))];
+        $this->assertEquals($expected, $container->getDefinition((string) $translator->getArgument(0))->getArgument(0));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
new file mode 100644
index 000000000..1377a6288
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class UnusedTagsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $pass = new UnusedTagsPass();
+
+        $container = new ContainerBuilder();
+        $container->register('foo')
+            ->addTag('kenrel.event_subscriber');
+        $container->register('bar')
+            ->addTag('kenrel.event_subscriber');
+
+        $pass->process($container);
+
+        $this->assertSame([sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)], $container->getCompiler()->getLog());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
new file mode 100644
index 000000000..a267908ec
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\WorkflowGuardListenerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Security\Core\Role\RoleHierarchy;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+class WorkflowGuardListenerPassTest extends TestCase
+{
+    private $container;
+    private $compilerPass;
+
+    protected function setUp()
+    {
+        $this->container = new ContainerBuilder();
+        $this->compilerPass = new WorkflowGuardListenerPass();
+    }
+
+    public function testNoExeptionIfParameterIsNotSet()
+    {
+        $this->compilerPass->process($this->container);
+
+        $this->assertFalse($this->container->hasParameter('workflow.has_guard_listeners'));
+    }
+
+    public function testNoExeptionIfAllDependenciesArePresent()
+    {
+        $this->container->setParameter('workflow.has_guard_listeners', true);
+        $this->container->register('security.token_storage', TokenStorageInterface::class);
+        $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
+        $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
+        $this->container->register('security.role_hierarchy', RoleHierarchy::class);
+        $this->container->register('validator', ValidatorInterface::class);
+
+        $this->compilerPass->process($this->container);
+
+        $this->assertFalse($this->container->hasParameter('workflow.has_guard_listeners'));
+    }
+
+    public function testExceptionIfTheTokenStorageServiceIsNotPresent()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectExceptionMessage('The "security.token_storage" service is needed to be able to use the workflow guard listener.');
+        $this->container->setParameter('workflow.has_guard_listeners', true);
+        $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
+        $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
+        $this->container->register('security.role_hierarchy', RoleHierarchy::class);
+
+        $this->compilerPass->process($this->container);
+    }
+
+    public function testExceptionIfTheAuthorizationCheckerServiceIsNotPresent()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectExceptionMessage('The "security.authorization_checker" service is needed to be able to use the workflow guard listener.');
+        $this->container->setParameter('workflow.has_guard_listeners', true);
+        $this->container->register('security.token_storage', TokenStorageInterface::class);
+        $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
+        $this->container->register('security.role_hierarchy', RoleHierarchy::class);
+
+        $this->compilerPass->process($this->container);
+    }
+
+    public function testExceptionIfTheAuthenticationTrustResolverServiceIsNotPresent()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectExceptionMessage('The "security.authentication.trust_resolver" service is needed to be able to use the workflow guard listener.');
+        $this->container->setParameter('workflow.has_guard_listeners', true);
+        $this->container->register('security.token_storage', TokenStorageInterface::class);
+        $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
+        $this->container->register('security.role_hierarchy', RoleHierarchy::class);
+
+        $this->compilerPass->process($this->container);
+    }
+
+    public function testExceptionIfTheRoleHierarchyServiceIsNotPresent()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->expectExceptionMessage('The "security.role_hierarchy" service is needed to be able to use the workflow guard listener.');
+        $this->container->setParameter('workflow.has_guard_listeners', true);
+        $this->container->register('security.token_storage', TokenStorageInterface::class);
+        $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
+        $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
+
+        $this->compilerPass->process($this->container);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/ConfigurationTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/ConfigurationTest.php
new file mode 100644
index 000000000..e66c9ebfc
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -0,0 +1,496 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Configuration;
+use Symfony\Bundle\FullStack;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\Lock\Store\SemaphoreStore;
+
+class ConfigurationTest extends TestCase
+{
+    public function testDefaultConfig()
+    {
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(true), [['secret' => 's3cr3t']]);
+
+        $this->assertEquals(
+            array_merge(['secret' => 's3cr3t', 'trusted_hosts' => []], self::getBundleDefaultConfig()),
+            $config
+        );
+    }
+
+    public function testDoNoDuplicateDefaultFormResources()
+    {
+        $input = ['templating' => [
+            'form' => ['resources' => ['FrameworkBundle:Form']],
+            'engines' => ['php'],
+        ]];
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(true), [$input]);
+
+        $this->assertEquals(['FrameworkBundle:Form'], $config['templating']['form']['resources']);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.trusted_proxies" configuration key has been deprecated in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.
+     */
+    public function testTrustedProxiesSetToNullIsDeprecated()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, [['trusted_proxies' => null]]);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.trusted_proxies" configuration key has been deprecated in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.
+     */
+    public function testTrustedProxiesSetToEmptyArrayIsDeprecated()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, [['trusted_proxies' => []]]);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.trusted_proxies" configuration key has been deprecated in Symfony 3.3. Use the Request::setTrustedProxies() method in your front controller instead.
+     */
+    public function testTrustedProxiesSetToNonEmptyArrayIsInvalid()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, [['trusted_proxies' => ['127.0.0.1']]]);
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getTestValidSessionName
+     */
+    public function testValidSessionName($sessionName)
+    {
+        $processor = new Processor();
+        $config = $processor->processConfiguration(
+            new Configuration(true),
+            [['session' => ['name' => $sessionName]]]
+        );
+
+        $this->assertEquals($sessionName, $config['session']['name']);
+    }
+
+    public function getTestValidSessionName()
+    {
+        return [
+            [null],
+            ['PHPSESSID'],
+            ['a&b'],
+            [',_-!@#$%^*(){}:<>/?'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestInvalidSessionName
+     */
+    public function testInvalidSessionName($sessionName)
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $processor = new Processor();
+        $processor->processConfiguration(
+            new Configuration(true),
+            [['session' => ['name' => $sessionName]]]
+        );
+    }
+
+    public function getTestInvalidSessionName()
+    {
+        return [
+            ['a.b'],
+            ['a['],
+            ['a[]'],
+            ['a[b]'],
+            ['a=b'],
+            ['a+b'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTestValidTrustedProxiesData
+     * @group legacy
+     */
+    public function testValidTrustedProxies($trustedProxies, $processedProxies)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [[
+            'secret' => 's3cr3t',
+            'trusted_proxies' => $trustedProxies,
+        ]]);
+
+        $this->assertEquals($processedProxies, $config['trusted_proxies']);
+    }
+
+    public function getTestValidTrustedProxiesData()
+    {
+        return [
+            [['127.0.0.1'], ['127.0.0.1']],
+            [['::1'], ['::1']],
+            [['127.0.0.1', '::1'], ['127.0.0.1', '::1']],
+            [null, []],
+            [false, []],
+            [[], []],
+            [['10.0.0.0/8'], ['10.0.0.0/8']],
+            [['::ffff:0:0/96'], ['::ffff:0:0/96']],
+            [['0.0.0.0/0'], ['0.0.0.0/0']],
+        ];
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidTypeTrustedProxies()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, [
+            [
+                'secret' => 's3cr3t',
+                'trusted_proxies' => 'Not an IP address',
+            ],
+        ]);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidValueTrustedProxies()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+
+        $processor->processConfiguration($configuration, [
+            [
+                'secret' => 's3cr3t',
+                'trusted_proxies' => ['Not an IP address'],
+            ],
+        ]);
+    }
+
+    public function testAssetsCanBeEnabled()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [['assets' => null]]);
+
+        $defaultConfig = [
+            'enabled' => true,
+            'version_strategy' => null,
+            'version' => null,
+            'version_format' => '%%s?%%s',
+            'base_path' => '',
+            'base_urls' => [],
+            'packages' => [],
+            'json_manifest_path' => null,
+        ];
+
+        $this->assertEquals($defaultConfig, $config['assets']);
+    }
+
+    /**
+     * @dataProvider provideValidAssetsPackageNameConfigurationTests
+     */
+    public function testValidAssetsPackageNameConfiguration($packageName)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [
+            [
+                'assets' => [
+                    'packages' => [
+                        $packageName => [],
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->assertArrayHasKey($packageName, $config['assets']['packages']);
+    }
+
+    public function provideValidAssetsPackageNameConfigurationTests()
+    {
+        return [
+            ['foobar'],
+            ['foo-bar'],
+            ['foo_bar'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideInvalidAssetConfigurationTests
+     */
+    public function testInvalidAssetsConfiguration(array $assetConfig, $expectedMessage)
+    {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage($expectedMessage);
+
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, [
+                [
+                    'assets' => $assetConfig,
+                ],
+            ]);
+    }
+
+    public function provideInvalidAssetConfigurationTests()
+    {
+        // helper to turn config into embedded package config
+        $createPackageConfig = function (array $packageConfig) {
+            return [
+                'base_urls' => '//example.com',
+                'version' => 1,
+                'packages' => [
+                    'foo' => $packageConfig,
+                ],
+            ];
+        };
+
+        $config = [
+            'version' => 1,
+            'version_strategy' => 'foo',
+        ];
+        yield [$config, 'You cannot use both "version_strategy" and "version" at the same time under "assets".'];
+        yield [$createPackageConfig($config), 'You cannot use both "version_strategy" and "version" at the same time under "assets" packages.'];
+
+        $config = [
+            'json_manifest_path' => '/foo.json',
+            'version_strategy' => 'foo',
+        ];
+        yield [$config, 'You cannot use both "version_strategy" and "json_manifest_path" at the same time under "assets".'];
+        yield [$createPackageConfig($config), 'You cannot use both "version_strategy" and "json_manifest_path" at the same time under "assets" packages.'];
+
+        $config = [
+            'json_manifest_path' => '/foo.json',
+            'version' => '1',
+        ];
+        yield [$config, 'You cannot use both "version" and "json_manifest_path" at the same time under "assets".'];
+        yield [$createPackageConfig($config), 'You cannot use both "version" and "json_manifest_path" at the same time under "assets" packages.'];
+    }
+
+    /**
+     * @dataProvider provideValidLockConfigurationTests
+     */
+    public function testValidLockConfiguration($lockConfig, $processedConfig)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [
+            [
+                'lock' => $lockConfig,
+            ],
+        ]);
+
+        $this->assertArrayHasKey('lock', $config);
+
+        $this->assertEquals($processedConfig, $config['lock']);
+    }
+
+    public function provideValidLockConfigurationTests()
+    {
+        yield [null, ['enabled' => true, 'resources' => ['default' => [class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock']]]];
+
+        yield ['flock', ['enabled' => true, 'resources' => ['default' => ['flock']]]];
+        yield [['flock', 'semaphore'], ['enabled' => true, 'resources' => ['default' => ['flock', 'semaphore']]]];
+        yield [['foo' => 'flock', 'bar' => 'semaphore'], ['enabled' => true, 'resources' => ['foo' => ['flock'], 'bar' => ['semaphore']]]];
+        yield [['foo' => ['flock', 'semaphore'], 'bar' => 'semaphore'], ['enabled' => true, 'resources' => ['foo' => ['flock', 'semaphore'], 'bar' => ['semaphore']]]];
+        yield [['default' => 'flock'], ['enabled' => true, 'resources' => ['default' => ['flock']]]];
+
+        yield [['enabled' => false, 'flock'], ['enabled' => false, 'resources' => ['default' => ['flock']]]];
+        yield [['enabled' => false, ['flock', 'semaphore']], ['enabled' => false, 'resources' => ['default' => ['flock', 'semaphore']]]];
+        yield [['enabled' => false, 'foo' => 'flock', 'bar' => 'semaphore'], ['enabled' => false, 'resources' => ['foo' => ['flock'], 'bar' => ['semaphore']]]];
+        yield [['enabled' => false, 'foo' => ['flock', 'semaphore']], ['enabled' => false, 'resources' => ['foo' => ['flock', 'semaphore']]]];
+        yield [['enabled' => false, 'default' => 'flock'], ['enabled' => false, 'resources' => ['default' => ['flock']]]];
+
+        yield [['resources' => 'flock'], ['enabled' => true, 'resources' => ['default' => ['flock']]]];
+        yield [['resources' => ['flock', 'semaphore']], ['enabled' => true, 'resources' => ['default' => ['flock', 'semaphore']]]];
+        yield [['resources' => ['foo' => 'flock', 'bar' => 'semaphore']], ['enabled' => true, 'resources' => ['foo' => ['flock'], 'bar' => ['semaphore']]]];
+        yield [['resources' => ['foo' => ['flock', 'semaphore'], 'bar' => 'semaphore']], ['enabled' => true, 'resources' => ['foo' => ['flock', 'semaphore'], 'bar' => ['semaphore']]]];
+        yield [['resources' => ['default' => 'flock']], ['enabled' => true, 'resources' => ['default' => ['flock']]]];
+
+        yield [['enabled' => false, 'resources' => 'flock'], ['enabled' => false, 'resources' => ['default' => ['flock']]]];
+        yield [['enabled' => false, 'resources' => ['flock', 'semaphore']], ['enabled' => false, 'resources' => ['default' => ['flock', 'semaphore']]]];
+        yield [['enabled' => false, 'resources' => ['foo' => 'flock', 'bar' => 'semaphore']], ['enabled' => false, 'resources' => ['foo' => ['flock'], 'bar' => ['semaphore']]]];
+        yield [['enabled' => false, 'resources' => ['foo' => ['flock', 'semaphore'], 'bar' => 'semaphore']], ['enabled' => false, 'resources' => ['foo' => ['flock', 'semaphore'], 'bar' => ['semaphore']]]];
+        yield [['enabled' => false, 'resources' => ['default' => 'flock']], ['enabled' => false, 'resources' => ['default' => ['flock']]]];
+
+        // xml
+
+        yield [['resource' => ['flock']], ['enabled' => true, 'resources' => ['default' => ['flock']]]];
+        yield [['resource' => ['flock', ['name' => 'foo', 'value' => 'semaphore']]], ['enabled' => true, 'resources' => ['default' => ['flock'], 'foo' => ['semaphore']]]];
+        yield [['resource' => [['name' => 'foo', 'value' => 'flock']]], ['enabled' => true, 'resources' => ['foo' => ['flock']]]];
+        yield [['resource' => [['name' => 'foo', 'value' => 'flock'], ['name' => 'foo', 'value' => 'semaphore']]], ['enabled' => true, 'resources' => ['foo' => ['flock', 'semaphore']]]];
+        yield [['resource' => [['name' => 'foo', 'value' => 'flock'], ['name' => 'bar', 'value' => 'semaphore']]], ['enabled' => true, 'resources' => ['foo' => ['flock'], 'bar' => ['semaphore']]]];
+        yield [['resource' => [['name' => 'foo', 'value' => 'flock'], ['name' => 'foo', 'value' => 'semaphore'], ['name' => 'bar', 'value' => 'semaphore']]], ['enabled' => true, 'resources' => ['foo' => ['flock', 'semaphore'], 'bar' => ['semaphore']]]];
+
+        yield [['enabled' => false, 'resource' => ['flock']], ['enabled' => false, 'resources' => ['default' => ['flock']]]];
+        yield [['enabled' => false, 'resource' => ['flock', ['name' => 'foo', 'value' => 'semaphore']]], ['enabled' => false, 'resources' => ['default' => ['flock'], 'foo' => ['semaphore']]]];
+        yield [['enabled' => false, 'resource' => [['name' => 'foo', 'value' => 'flock']]], ['enabled' => false, 'resources' => ['foo' => ['flock']]]];
+        yield [['enabled' => false, 'resource' => [['name' => 'foo', 'value' => 'flock'], ['name' => 'foo', 'value' => 'semaphore']]], ['enabled' => false, 'resources' => ['foo' => ['flock', 'semaphore']]]];
+        yield [['enabled' => false, 'resource' => [['name' => 'foo', 'value' => 'flock'], ['name' => 'bar', 'value' => 'semaphore']]], ['enabled' => false, 'resources' => ['foo' => ['flock'], 'bar' => ['semaphore']]]];
+        yield [['enabled' => false, 'resource' => [['name' => 'foo', 'value' => 'flock'], ['name' => 'foo', 'value' => 'semaphore'], ['name' => 'bar', 'value' => 'semaphore']]], ['enabled' => false, 'resources' => ['foo' => ['flock', 'semaphore'], 'bar' => ['semaphore']]]];
+    }
+
+    protected static function getBundleDefaultConfig()
+    {
+        return [
+            'http_method_override' => true,
+            'trusted_proxies' => [],
+            'ide' => null,
+            'default_locale' => 'en',
+            'csrf_protection' => [
+                'enabled' => false,
+            ],
+            'form' => [
+                'enabled' => !class_exists(FullStack::class),
+                'csrf_protection' => [
+                    'enabled' => null, // defaults to csrf_protection.enabled
+                    'field_name' => '_token',
+                ],
+            ],
+            'esi' => ['enabled' => false],
+            'ssi' => ['enabled' => false],
+            'fragments' => [
+                'enabled' => false,
+                'path' => '/_fragment',
+            ],
+            'profiler' => [
+                'enabled' => false,
+                'only_exceptions' => false,
+                'only_master_requests' => false,
+                'dsn' => 'file:%kernel.cache_dir%/profiler',
+                'collect' => true,
+                'matcher' => [
+                    'enabled' => false,
+                    'ips' => [],
+                ],
+            ],
+            'translator' => [
+                'enabled' => !class_exists(FullStack::class),
+                'fallbacks' => ['en'],
+                'logging' => true,
+                'formatter' => 'translator.formatter.default',
+                'paths' => [],
+                'default_path' => '%kernel.project_dir%/translations',
+            ],
+            'validation' => [
+                'enabled' => !class_exists(FullStack::class),
+                'enable_annotations' => !class_exists(FullStack::class),
+                'static_method' => ['loadValidatorMetadata'],
+                'translation_domain' => 'validators',
+                'strict_email' => false,
+                'mapping' => [
+                    'paths' => [],
+                ],
+            ],
+            'annotations' => [
+                'cache' => 'php_array',
+                'file_cache_dir' => '%kernel.cache_dir%/annotations',
+                'debug' => true,
+                'enabled' => true,
+            ],
+            'serializer' => [
+                'enabled' => !class_exists(FullStack::class),
+                'enable_annotations' => !class_exists(FullStack::class),
+                'mapping' => ['paths' => []],
+            ],
+            'property_access' => [
+                'magic_call' => false,
+                'throw_exception_on_invalid_index' => false,
+            ],
+            'property_info' => [
+                'enabled' => !class_exists(FullStack::class),
+            ],
+            'router' => [
+                'enabled' => false,
+                'http_port' => 80,
+                'https_port' => 443,
+                'strict_requirements' => true,
+            ],
+            'session' => [
+                'enabled' => false,
+                'storage_id' => 'session.storage.native',
+                'handler_id' => 'session.handler.native_file',
+                'cookie_httponly' => true,
+                'gc_probability' => 1,
+                'save_path' => '%kernel.cache_dir%/sessions',
+                'metadata_update_threshold' => '0',
+                'use_strict_mode' => true,
+            ],
+            'request' => [
+                'enabled' => false,
+                'formats' => [],
+            ],
+            'templating' => [
+                'enabled' => false,
+                'hinclude_default_template' => null,
+                'form' => [
+                    'resources' => ['FrameworkBundle:Form'],
+                ],
+                'engines' => [],
+                'loaders' => [],
+            ],
+            'assets' => [
+                'enabled' => !class_exists(FullStack::class),
+                'version_strategy' => null,
+                'version' => null,
+                'version_format' => '%%s?%%s',
+                'base_path' => '',
+                'base_urls' => [],
+                'packages' => [],
+                'json_manifest_path' => null,
+            ],
+            'cache' => [
+                'pools' => [],
+                'app' => 'cache.adapter.filesystem',
+                'system' => 'cache.adapter.system',
+                'directory' => '%kernel.cache_dir%/pools',
+                'default_redis_provider' => 'redis://localhost',
+                'default_memcached_provider' => 'memcached://localhost',
+            ],
+            'workflows' => [
+                'enabled' => false,
+                'workflows' => [],
+            ],
+            'php_errors' => [
+                'log' => true,
+                'throw' => true,
+            ],
+            'web_link' => [
+                'enabled' => !class_exists(FullStack::class),
+            ],
+            'lock' => [
+                'enabled' => !class_exists(FullStack::class),
+                'resources' => [
+                    'default' => [
+                        class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock',
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php
new file mode 100644
index 000000000..166b606a4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class CustomPathBundle extends Bundle
+{
+    public function getPath()
+    {
+        return __DIR__.'/..';
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serialization.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serialization.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serialization.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serialization.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/files/foo.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/files/foo.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/files/foo.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/files/foo.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/files/foo.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/files/foo.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/files/foo.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/files/foo.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php
new file mode 100644
index 000000000..2f090b2de
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class TestBundle extends Bundle
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets.php
new file mode 100644
index 000000000..c05c6fe3a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets.php
@@ -0,0 +1,32 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'assets' => [
+        'version' => 'SomeVersionScheme',
+        'base_urls' => 'http://cdn.example.com',
+        'version_format' => '%%s?version=%%s',
+        'packages' => [
+            'images_path' => [
+                'base_path' => '/foo',
+            ],
+            'images' => [
+                'version' => '1.0.0',
+                'base_urls' => ['http://images1.example.com', 'http://images2.example.com'],
+            ],
+            'foo' => [
+                'version' => '1.0.0',
+                'version_format' => '%%s-%%s',
+            ],
+            'bar' => [
+                'base_urls' => ['https://bar2.example.com'],
+            ],
+            'bar_version_strategy' => [
+                'base_urls' => ['https://bar2.example.com'],
+                'version_strategy' => 'assets.custom_version_strategy',
+            ],
+            'json_manifest_strategy' => [
+                'json_manifest_path' => '/path/to/manifest.json',
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php
new file mode 100644
index 000000000..d10595fba
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'assets' => [
+        'enabled' => false,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php
new file mode 100644
index 000000000..b57f78ba4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'assets' => [
+        'version_strategy' => 'assets.custom_version_strategy',
+        'base_urls' => 'http://cdn.example.com',
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/cache.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/cache.php
new file mode 100644
index 000000000..2a85f849f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/cache.php
@@ -0,0 +1,29 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'cache' => [
+        'pools' => [
+            'cache.foo' => [
+                'adapter' => 'cache.adapter.apcu',
+                'default_lifetime' => 30,
+            ],
+            'cache.bar' => [
+                'adapter' => 'cache.adapter.doctrine',
+                'default_lifetime' => 5,
+                'provider' => 'app.doctrine_cache_provider',
+            ],
+            'cache.baz' => [
+                'adapter' => 'cache.adapter.filesystem',
+                'default_lifetime' => 7,
+            ],
+            'cache.foobar' => [
+                'adapter' => 'cache.adapter.psr6',
+                'default_lifetime' => 10,
+                'provider' => 'app.cache_pool',
+            ],
+            'cache.def' => [
+                'default_lifetime' => 11,
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
new file mode 100644
index 000000000..4f819e720
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
@@ -0,0 +1,9 @@
+<?php
+
+$container->setParameter('env(REDIS_URL)', 'redis://paas.com');
+
+$container->loadFromExtension('framework', [
+    'cache' => [
+        'default_redis_provider' => '%env(REDIS_URL)%',
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/csrf.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/csrf.php
new file mode 100644
index 000000000..886cb657b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/csrf.php
@@ -0,0 +1,9 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'csrf_protection' => true,
+    'form' => true,
+    'session' => [
+        'handler_id' => null,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php
new file mode 100644
index 000000000..34fdb4c1f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'csrf_protection' => [
+        'enabled' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/default_config.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/default_config.php
new file mode 100644
index 000000000..4b2021df7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/default_config.php
@@ -0,0 +1,3 @@
+<?php
+
+$container->loadFromExtension('framework', []);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php
new file mode 100644
index 000000000..beada36b8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php
@@ -0,0 +1,13 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'fragments' => [
+        'enabled' => false,
+    ],
+    'esi' => [
+        'enabled' => true,
+    ],
+    'ssi' => [
+        'enabled' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php
new file mode 100644
index 000000000..a24cd8158
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'esi' => [
+        'enabled' => false,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php
new file mode 100644
index 000000000..e0befdb32
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php
@@ -0,0 +1,9 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'form' => [
+        'csrf_protection' => [
+            'enabled' => false,
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/full.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/full.php
new file mode 100644
index 000000000..e3b9014e4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -0,0 +1,84 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'secret' => 's3cr3t',
+    'default_locale' => 'fr',
+    'csrf_protection' => true,
+    'form' => [
+        'csrf_protection' => [
+            'field_name' => '_csrf',
+        ],
+    ],
+    'http_method_override' => false,
+    'esi' => [
+        'enabled' => true,
+    ],
+    'ssi' => [
+        'enabled' => true,
+    ],
+    'profiler' => [
+        'only_exceptions' => true,
+        'enabled' => false,
+    ],
+    'router' => [
+        'resource' => '%kernel.project_dir%/config/routing.xml',
+        'type' => 'xml',
+    ],
+    'session' => [
+        'storage_id' => 'session.storage.native',
+        'handler_id' => 'session.handler.native_file',
+        'name' => '_SYMFONY',
+        'cookie_lifetime' => 86400,
+        'cookie_path' => '/',
+        'cookie_domain' => 'example.com',
+        'cookie_secure' => true,
+        'cookie_httponly' => false,
+        'use_cookies' => true,
+        'gc_maxlifetime' => 90000,
+        'gc_divisor' => 108,
+        'gc_probability' => 1,
+        'save_path' => '/path/to/sessions',
+    ],
+    'templating' => [
+        'cache' => '/path/to/cache',
+        'engines' => ['php', 'twig'],
+        'loader' => ['loader.foo', 'loader.bar'],
+        'form' => [
+            'resources' => ['theme1', 'theme2'],
+        ],
+        'hinclude_default_template' => 'global_hinclude_template',
+    ],
+    'assets' => [
+        'version' => 'v1',
+    ],
+    'translator' => [
+        'enabled' => true,
+        'fallback' => 'fr',
+        'paths' => ['%kernel.project_dir%/Fixtures/translations'],
+    ],
+    'validation' => [
+        'enabled' => true,
+    ],
+    'annotations' => [
+        'cache' => 'file',
+        'debug' => true,
+        'file_cache_dir' => '%kernel.cache_dir%/annotations',
+    ],
+    'serializer' => [
+        'enabled' => true,
+        'enable_annotations' => true,
+        'name_converter' => 'serializer.name_converter.camel_case_to_snake_case',
+        'circular_reference_handler' => 'my.circular.reference.handler',
+    ],
+    'property_info' => true,
+    'ide' => 'file%%link%%format',
+    'request' => [
+        'formats' => [
+            'csv' => [
+                'text/csv',
+                'text/plain',
+            ],
+            'pdf' => 'application/pdf',
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/php_errors_disabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/php_errors_disabled.php
new file mode 100644
index 000000000..cff0582bf
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/php_errors_disabled.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'php_errors' => [
+        'log' => false,
+        'throw' => false,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/php_errors_enabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/php_errors_enabled.php
new file mode 100644
index 000000000..9afa5d1c0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/php_errors_enabled.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'php_errors' => [
+        'log' => true,
+        'throw' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/profiler.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/profiler.php
new file mode 100644
index 000000000..552c95e13
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/profiler.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'profiler' => [
+        'enabled' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/property_accessor.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/property_accessor.php
new file mode 100644
index 000000000..b5b060c1b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/property_accessor.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'property_access' => [
+        'magic_call' => true,
+        'throw_exception_on_invalid_index' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/property_info.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/property_info.php
new file mode 100644
index 000000000..bff8d4115
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/property_info.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'property_info' => [
+        'enabled' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/request.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/request.php
new file mode 100644
index 000000000..d69d7512a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/request.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'request' => [
+        'formats' => [],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_disabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_disabled.php
new file mode 100644
index 000000000..937a07c22
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'serializer' => [
+        'enabled' => false,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_enabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_enabled.php
new file mode 100644
index 000000000..de3381c21
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_enabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'serializer' => [
+        'enabled' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
new file mode 100644
index 000000000..9636b1d66
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'serializer' => [
+        'enabled' => true,
+        'cache' => 'foo',
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php
new file mode 100644
index 000000000..2f6f48e95
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php
@@ -0,0 +1,15 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'annotations' => ['enabled' => true],
+    'serializer' => [
+        'enable_annotations' => true,
+        'mapping' => [
+            'paths' => [
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml',
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/session.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/session.php
new file mode 100644
index 000000000..375008c7d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/session.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'session' => [
+        'handler_id' => null,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php
new file mode 100644
index 000000000..32e1bf0c5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'ssi' => [
+        'enabled' => false,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_disabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_disabled.php
new file mode 100644
index 000000000..2d5e6d779
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_disabled.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'templating' => false,
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php
new file mode 100644
index 000000000..f4d5a28aa
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'templating' => [
+        'engines' => ['php', 'twig'],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_assets_disabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_assets_disabled.php
new file mode 100644
index 000000000..851a7e140
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_assets_disabled.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'assets' => false,
+    'templating' => [
+        'engines' => ['php'],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_disabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_disabled.php
new file mode 100644
index 000000000..1d65c0caa
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_disabled.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'translator' => false,
+    'templating' => [
+        'engines' => ['php'],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_enabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_enabled.php
new file mode 100644
index 000000000..2d4710ba3
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_enabled.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'translator' => true,
+    'templating' => [
+        'engines' => ['php'],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/translator_fallbacks.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/translator_fallbacks.php
new file mode 100644
index 000000000..592a61de6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/translator_fallbacks.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'translator' => [
+        'fallbacks' => ['en', 'fr'],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_annotations.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_annotations.php
new file mode 100644
index 000000000..dff03e398
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_annotations.php
@@ -0,0 +1,9 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'secret' => 's3cr3t',
+    'validation' => [
+        'enabled' => true,
+        'enable_annotations' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_mapping.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_mapping.php
new file mode 100644
index 000000000..f8b19e348
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_mapping.php
@@ -0,0 +1,13 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'validation' => [
+        'mapping' => [
+            'paths' => [
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml',
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php
new file mode 100644
index 000000000..ad2bd817a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php
@@ -0,0 +1,9 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'secret' => 's3cr3t',
+    'validation' => [
+        'enabled' => true,
+        'static_method' => ['loadFoo', 'loadBar'],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php
new file mode 100644
index 000000000..a9d98e17c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php
@@ -0,0 +1,9 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'secret' => 's3cr3t',
+    'validation' => [
+        'enabled' => true,
+        'static_method' => false,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email.php
new file mode 100644
index 000000000..caa47d747
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'validation' => [
+        'strict_email' => true,
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php
new file mode 100644
index 000000000..42ea07130
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'validation' => [
+        'translation_domain' => 'messages',
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/web_link.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/web_link.php
new file mode 100644
index 000000000..44d52e402
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/web_link.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'web_link' => ['enabled' => true],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_arguments_and_service.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_arguments_and_service.php
new file mode 100644
index 000000000..003b99f21
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_arguments_and_service.php
@@ -0,0 +1,31 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'my_workflow' => [
+            'marking_store' => [
+                'arguments' => ['a', 'b'],
+                'service' => 'workflow_service',
+            ],
+            'supports' => [
+                FrameworkExtensionTest::class,
+            ],
+            'places' => [
+                'first',
+                'last',
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => [
+                        'first',
+                    ],
+                    'to' => [
+                        'last',
+                    ],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
new file mode 100644
index 000000000..19de6363e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
@@ -0,0 +1,51 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'article' => [
+            'type' => 'workflow',
+            'marking_store' => [
+                'type' => 'multiple_state',
+            ],
+            'supports' => [
+                FrameworkExtensionTest::class,
+            ],
+            'initial_place' => 'draft',
+            'places' => [
+                'draft',
+                'wait_for_journalist',
+                'approved_by_journalist',
+                'wait_for_spellchecker',
+                'approved_by_spellchecker',
+                'published',
+            ],
+            'transitions' => [
+                'request_review' => [
+                    'from' => 'draft',
+                    'to' => ['wait_for_journalist', 'wait_for_spellchecker'],
+                ],
+                'journalist_approval' => [
+                    'from' => 'wait_for_journalist',
+                    'to' => 'approved_by_journalist',
+                ],
+                'spellchecker_approval' => [
+                    'from' => 'wait_for_spellchecker',
+                    'to' => 'approved_by_spellchecker',
+                ],
+                'publish' => [
+                    'from' => ['approved_by_journalist', 'approved_by_spellchecker'],
+                    'to' => 'published',
+                    'guard' => '!!true',
+                ],
+                'publish_editor_in_chief' => [
+                    'name' => 'publish',
+                    'from' => 'draft',
+                    'to' => 'published',
+                    'guard' => '!!false',
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
new file mode 100644
index 000000000..c1a525db0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
@@ -0,0 +1,49 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'article' => [
+            'type' => 'workflow',
+            'marking_store' => [
+                'type' => 'multiple_state',
+            ],
+            'supports' => [
+                FrameworkExtensionTest::class,
+            ],
+            'initial_place' => 'draft',
+            'places' => [
+                'draft',
+                'wait_for_journalist',
+                'approved_by_journalist',
+                'wait_for_spellchecker',
+                'approved_by_spellchecker',
+                'published',
+            ],
+            'transitions' => [
+                'request_review' => [
+                    'from' => 'draft',
+                    'to' => ['wait_for_journalist', 'wait_for_spellchecker'],
+                ],
+                'journalist_approval' => [
+                    'from' => 'wait_for_journalist',
+                    'to' => 'approved_by_journalist',
+                ],
+                'spellchecker_approval' => [
+                    'from' => 'wait_for_spellchecker',
+                    'to' => 'approved_by_spellchecker',
+                ],
+                'publish' => [
+                    'from' => ['approved_by_journalist', 'approved_by_spellchecker'],
+                    'to' => 'published',
+                ],
+                'publish_editor_in_chief' => [
+                    'name' => 'publish',
+                    'from' => 'draft',
+                    'to' => 'published',
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
new file mode 100644
index 000000000..4b38093a3
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
@@ -0,0 +1,31 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'my_workflow' => [
+            'marking_store' => [
+                'type' => 'multiple_state',
+            ],
+            'supports' => [
+                FrameworkExtensionTest::class,
+            ],
+            'support_strategy' => 'foobar',
+            'places' => [
+                'first',
+                'last',
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => [
+                        'first',
+                    ],
+                    'to' => [
+                        'last',
+                    ],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_type_and_service.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_type_and_service.php
new file mode 100644
index 000000000..eca1e29c4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_with_type_and_service.php
@@ -0,0 +1,31 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'my_workflow' => [
+            'marking_store' => [
+                'type' => 'multiple_state',
+                'service' => 'workflow_service',
+            ],
+            'supports' => [
+                FrameworkExtensionTest::class,
+            ],
+            'places' => [
+                'first',
+                'last',
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => [
+                        'first',
+                    ],
+                    'to' => [
+                        'last',
+                    ],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_without_support_and_support_strategy.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_without_support_and_support_strategy.php
new file mode 100644
index 000000000..dd2a92dc2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflow_without_support_and_support_strategy.php
@@ -0,0 +1,27 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'my_workflow' => [
+            'marking_store' => [
+                'type' => 'multiple_state',
+            ],
+            'places' => [
+                'first',
+                'last',
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => [
+                        'first',
+                    ],
+                    'to' => [
+                        'last',
+                    ],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows.php
new file mode 100644
index 000000000..69728496c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows.php
@@ -0,0 +1,111 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'article' => [
+            'type' => 'workflow',
+            'marking_store' => [
+                'type' => 'multiple_state',
+            ],
+            'supports' => [
+                FrameworkExtensionTest::class,
+            ],
+            'initial_place' => 'draft',
+            'places' => [
+                'draft',
+                'wait_for_journalist',
+                'approved_by_journalist',
+                'wait_for_spellchecker',
+                'approved_by_spellchecker',
+                'published',
+            ],
+            'transitions' => [
+                'request_review' => [
+                    'from' => 'draft',
+                    'to' => ['wait_for_journalist', 'wait_for_spellchecker'],
+                ],
+                'journalist_approval' => [
+                    'from' => 'wait_for_journalist',
+                    'to' => 'approved_by_journalist',
+                ],
+                'spellchecker_approval' => [
+                    'from' => 'wait_for_spellchecker',
+                    'to' => 'approved_by_spellchecker',
+                ],
+                'publish' => [
+                    'from' => ['approved_by_journalist', 'approved_by_spellchecker'],
+                    'to' => 'published',
+                ],
+            ],
+        ],
+        'pull_request' => [
+            'type' => 'state_machine',
+            'marking_store' => [
+                'type' => 'single_state',
+            ],
+            'supports' => [
+                FrameworkExtensionTest::class,
+            ],
+            'initial_place' => 'start',
+            'places' => [
+                'start',
+                'coding',
+                'travis',
+                'review',
+                'merged',
+                'closed',
+            ],
+            'transitions' => [
+                'submit' => [
+                    'from' => 'start',
+                    'to' => 'travis',
+                ],
+                'update' => [
+                    'from' => ['coding', 'travis', 'review'],
+                    'to' => 'travis',
+                ],
+                'wait_for_review' => [
+                    'from' => 'travis',
+                    'to' => 'review',
+                ],
+                'request_change' => [
+                    'from' => 'review',
+                    'to' => 'coding',
+                ],
+                'accept' => [
+                    'from' => 'review',
+                    'to' => 'merged',
+                ],
+                'reject' => [
+                    'from' => 'review',
+                    'to' => 'closed',
+                ],
+                'reopen' => [
+                    'from' => 'closed',
+                    'to' => 'review',
+                ],
+            ],
+        ],
+        'service_marking_store_workflow' => [
+            'type' => 'workflow',
+            'marking_store' => [
+                'service' => 'workflow_service',
+            ],
+            'supports' => [
+                FrameworkExtensionTest::class,
+            ],
+            'places' => [
+                'first',
+                'last',
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => 'first',
+                    'to' => 'last',
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php
new file mode 100644
index 000000000..eb1773194
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'workflows' => null,
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
new file mode 100644
index 000000000..165d0daa1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
@@ -0,0 +1,19 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'enabled' => true,
+        'foo' => [
+            'type' => 'workflow',
+            'supports' => ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest'],
+            'initial_place' => 'bar',
+            'places' => ['bar', 'baz'],
+            'transitions' => [
+                'bar_baz' => [
+                    'from' => ['foo'],
+                    'to' => ['bar'],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
new file mode 100644
index 000000000..17055ec16
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
@@ -0,0 +1,19 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'enabled' => true,
+        'workflows' => [
+            'type' => 'workflow',
+            'supports' => ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest'],
+            'initial_place' => 'bar',
+            'places' => ['bar', 'baz'],
+            'transitions' => [
+                'bar_baz' => [
+                    'from' => ['foo'],
+                    'to' => ['bar'],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_without_type.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_without_type.php
new file mode 100644
index 000000000..4f25a7f80
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/php/workflows_without_type.php
@@ -0,0 +1,26 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'missing_type' => [
+            'marking_store' => [
+                'service' => 'workflow_service',
+            ],
+            'supports' => [
+                \stdClass::class,
+            ],
+            'places' => [
+                'first',
+                'last',
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => 'first',
+                    'to' => 'last',
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/translations/test_paths.en.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/translations/test_paths.en.yml
new file mode 100644
index 000000000..d4e682c47
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/translations/test_paths.en.yml
@@ -0,0 +1,2 @@
+custom:
+    paths: test
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
new file mode 100644
index 000000000..7ae57afaa
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:assets version="SomeVersionScheme" version-format="%%s?version=%%s">
+            <framework:base-url>http://cdn.example.com</framework:base-url>
+            <framework:package name="images_path" base-path="/foo" version-format="%%s-%%s" />
+            <framework:package name="images" version="1.0.0">
+                <framework:base-url>http://images1.example.com</framework:base-url>
+                <framework:base-url>http://images2.example.com</framework:base-url>
+            </framework:package>
+            <framework:package name="foo" version="1.0.0" version-format="%%s-%%s" />
+            <framework:package name="bar">
+                <framework:base-url>https://bar2.example.com</framework:base-url>
+            </framework:package>
+            <framework:package name="bar_version_strategy" version-strategy="assets.custom_version_strategy">
+                <framework:base-url>https://bar_version_strategy.example.com</framework:base-url>
+            </framework:package>
+            <framework:package name="json_manifest_strategy" json-manifest-path="/path/to/manifest.json" />
+        </framework:assets>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml
new file mode 100644
index 000000000..3c1303144
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets_disabled.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:assets enabled="false" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets_version_strategy_as_service.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets_version_strategy_as_service.xml
new file mode 100644
index 000000000..7bc70332b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/assets_version_strategy_as_service.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:assets version-strategy="assets.custom_version_strategy">
+            <framework:base-url>http://cdn.example.com</framework:base-url>
+        </framework:assets>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/cache.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/cache.xml
new file mode 100644
index 000000000..0ebf2a960
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/cache.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:cache>
+            <framework:pool name="cache.foo" adapter="cache.adapter.apcu" default-lifetime="30" />
+            <framework:pool name="cache.bar" adapter="cache.adapter.doctrine" default-lifetime="5" provider="app.doctrine_cache_provider" />
+            <framework:pool name="cache.baz" adapter="cache.adapter.filesystem" default-lifetime="7" />
+            <framework:pool name="cache.foobar" adapter="cache.adapter.psr6" default-lifetime="10" provider="app.cache_pool" />
+            <framework:pool name="cache.def" default-lifetime="11" />
+        </framework:cache>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
new file mode 100644
index 000000000..81c96b3a7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:framework="http://symfony.com/schema/dic/symfony"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <parameters>
+        <parameter key="env(REDIS_URL)">redis://paas.com</parameter>
+    </parameters>
+
+    <framework:config>
+        <framework:cache>
+            <framework:default-redis-provider>%env(REDIS_URL)%</framework:default-redis-provider>
+        </framework:cache>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf.xml
new file mode 100644
index 000000000..4cd628ead
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:csrf-protection />
+        <framework:form />
+        <framework:session />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf_disabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf_disabled.xml
new file mode 100644
index 000000000..63a26d384
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf_disabled.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:csrf-protection enabled="false" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf_needs_session.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf_needs_session.xml
new file mode 100644
index 000000000..a9e168638
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/csrf_needs_session.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:csrf-protection />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/default_config.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/default_config.xml
new file mode 100644
index 000000000..d98c43d99
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/default_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config />
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml
new file mode 100644
index 000000000..5fe9be69b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:fragments enabled="false" />
+        <framework:esi enabled="true" />
+        <framework:ssi enabled="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml
new file mode 100644
index 000000000..d4a46b62f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:esi enabled="false" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_sets_field_name.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_sets_field_name.xml
new file mode 100644
index 000000000..1bdf2e528
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_sets_field_name.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:csrf-protection field-name="_custom" />
+        <framework:session />
+        <framework:form />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml
new file mode 100644
index 000000000..c04193e83
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:csrf-protection field-name="_custom_form" />
+        <framework:form />
+        <framework:session />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
new file mode 100644
index 000000000..092174a2d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:form enabled="true">
+            <framework:csrf-protection enabled="false" />
+        </framework:form>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/full.xml
new file mode 100644
index 000000000..0f1ebec41
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config secret="s3cr3t" ide="file%%link%%format" default-locale="fr" http-method-override="false">
+        <framework:csrf-protection />
+        <framework:form>
+            <framework:csrf-protection field-name="_csrf"/>
+        </framework:form>
+        <framework:esi enabled="true" />
+        <framework:ssi enabled="true" />
+        <framework:profiler only-exceptions="true" enabled="false" />
+        <framework:router resource="%kernel.project_dir%/config/routing.xml" type="xml" />
+        <framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-id="session.storage.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-httponly="false" use-cookies="true" save-path="/path/to/sessions" />
+        <framework:request>
+            <framework:format name="csv">
+                <framework:mime-type>text/csv</framework:mime-type>
+                <framework:mime-type>text/plain</framework:mime-type>
+            </framework:format>
+            <framework:format name="pdf">
+                <framework:mime-type>application/pdf</framework:mime-type>
+            </framework:format>
+        </framework:request>
+        <framework:templating cache="/path/to/cache" hinclude-default-template="global_hinclude_template">
+            <framework:loader>loader.foo</framework:loader>
+            <framework:loader>loader.bar</framework:loader>
+            <framework:engine>php</framework:engine>
+            <framework:engine>twig</framework:engine>
+            <framework:form>
+                 <framework:resource>theme1</framework:resource>
+                 <framework:resource>theme2</framework:resource>
+            </framework:form>
+        </framework:templating>
+        <framework:assets version="v1" />
+        <framework:translator enabled="true" fallback="fr" logging="true">
+            <framework:path>%kernel.project_dir%/Fixtures/translations</framework:path>
+        </framework:translator>
+        <framework:validation enabled="true" />
+        <framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
+        <framework:serializer enabled="true" enable-annotations="true" name-converter="serializer.name_converter.camel_case_to_snake_case" circular-reference-handler="my.circular.reference.handler" />
+        <framework:property-info />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/lock.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
new file mode 100644
index 000000000..d531fbaba
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/lock.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:lock/>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
new file mode 100644
index 000000000..72e583a90
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+
+    <parameters>
+        <parameter key="env(REDIS_URL)">redis://paas.com</parameter>
+    </parameters>
+
+    <framework:config>
+        <framework:lock>
+            <framework:resource name="foo">semaphore</framework:resource>
+            <framework:resource name="bar">flock</framework:resource>
+            <framework:resource name="baz">semaphore</framework:resource>
+            <framework:resource name="baz">flock</framework:resource>
+            <framework:resource name="qux">%env(REDIS_URL)%</framework:resource>
+        </framework:lock>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/php_errors_disabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/php_errors_disabled.xml
new file mode 100644
index 000000000..cb50daa65
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/php_errors_disabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:php-errors log="false" throw="false" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/php_errors_enabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/php_errors_enabled.xml
new file mode 100644
index 000000000..db6a8a9bf
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/php_errors_enabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:php-errors log="true" throw="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/profiler.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/profiler.xml
new file mode 100644
index 000000000..a5f5448e1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/profiler.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:profiler enabled="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/property_accessor.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/property_accessor.xml
new file mode 100644
index 000000000..95ddef828
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/property_accessor.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:property-access magic-call="true" throw-exception-on-invalid-index="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/property_info.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/property_info.xml
new file mode 100644
index 000000000..7bf63b654
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/property_info.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:framework="http://symfony.com/schema/dic/symfony"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:property-info enabled="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/request.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/request.xml
new file mode 100644
index 000000000..f1e8184c1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/request.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+    <framework:config>
+        <framework:request />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_disabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_disabled.xml
new file mode 100644
index 000000000..0c62272c5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_disabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:serializer enabled="false" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_enabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_enabled.xml
new file mode 100644
index 000000000..3d59d6283
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_enabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:serializer enabled="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
new file mode 100644
index 000000000..b76ceb86b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:serializer enabled="true" cache="foo"/>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_mapping.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_mapping.xml
new file mode 100644
index 000000000..1ae06c85e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/serializer_mapping.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony">
+
+    <framework:config>
+        <framework:annotations enabled="true" />
+        <framework:serializer enable-annotations="true">
+            <framework:mapping>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml</framework:path>
+            </framework:mapping>
+        </framework:serializer>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/session.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/session.xml
new file mode 100644
index 000000000..599cbdee1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/session.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:session handler-id="null"/>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml
new file mode 100644
index 000000000..6aa752a46
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:ssi enabled="false" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_disabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_disabled.xml
new file mode 100644
index 000000000..8fda04d92
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_disabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:templating enabled="false" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml
new file mode 100644
index 000000000..7bba936c5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:templating>
+            <framework:engine>php</framework:engine>
+            <framework:engine>twig</framework:engine>
+        </framework:templating>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_disabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_disabled.xml
new file mode 100644
index 000000000..8e0a8cc03
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_disabled.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:translator enabled="false" />
+        <framework:templating>
+            <framework:engine>php</framework:engine>
+        </framework:templating>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_enabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_enabled.xml
new file mode 100644
index 000000000..d1cb1fad8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/templating_php_translator_enabled.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:translator enabled="true" />
+        <framework:templating>
+            <framework:engine>php</framework:engine>
+        </framework:templating>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/translator_fallbacks.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/translator_fallbacks.xml
new file mode 100644
index 000000000..521f8e381
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/translator_fallbacks.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config secret="s3cr3t">
+        <framework:translator enabled="true">
+            <framework:fallback>en</framework:fallback>
+            <framework:fallback>fr</framework:fallback>
+        </framework:translator>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_annotations.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_annotations.xml
new file mode 100644
index 000000000..f993a20d9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_annotations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config secret="s3cr3t">
+        <framework:validation enabled="true" enable-annotations="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_mapping.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_mapping.xml
new file mode 100644
index 000000000..8d74ebb21
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_mapping.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony">
+
+    <framework:config>
+        <framework:validation>
+            <framework:mapping>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml</framework:path>
+            </framework:mapping>
+        </framework:validation>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_multiple_static_methods.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_multiple_static_methods.xml
new file mode 100644
index 000000000..c2e84c3b9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_multiple_static_methods.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config secret="s3cr3t">
+        <framework:validation enabled="true">
+            <framework:static-method>loadFoo</framework:static-method>
+            <framework:static-method>loadBar</framework:static-method>
+        </framework:validation>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_no_static_method.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_no_static_method.xml
new file mode 100644
index 000000000..61770d88a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_no_static_method.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config secret="s3cr3t">
+        <framework:validation enabled="true" static-method="false" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email.xml
new file mode 100644
index 000000000..ec5c6b94e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:validation strict-email="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml
new file mode 100644
index 000000000..3690f9e10
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:validation translation-domain="messages" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/web_link.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/web_link.xml
new file mode 100644
index 000000000..718ceb31a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/web_link.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:framework="http://symfony.com/schema/dic/symfony"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:web-link enabled="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_arguments_and_service.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_arguments_and_service.xml
new file mode 100644
index 000000000..cab687c5b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_arguments_and_service.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow name="my_workflow">
+            <framework:marking-store service="workflow_service">
+                <framework:argument>a</framework:argument>
+                <framework:argument>a</framework:argument>
+            </framework:marking-store>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>first</framework:place>
+            <framework:place>last</framework:place>
+            <framework:transition name="foobar">
+                <framework:from>a</framework:from>
+                <framework:to>a</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
new file mode 100644
index 000000000..fa5a96ab1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:framework="http://symfony.com/schema/dic/symfony"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow name="article" type="workflow" initial-place="draft">
+            <framework:marking-store type="multiple_state">
+                <framework:argument>a</framework:argument>
+                <framework:argument>a</framework:argument>
+            </framework:marking-store>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>draft</framework:place>
+            <framework:place>wait_for_journalist</framework:place>
+            <framework:place>approved_by_journalist</framework:place>
+            <framework:place>wait_for_spellchecker</framework:place>
+            <framework:place>approved_by_spellchecker</framework:place>
+            <framework:place>published</framework:place>
+            <framework:transition name="request_review">
+                <framework:from>draft</framework:from>
+                <framework:to>wait_for_journalist</framework:to>
+                <framework:to>wait_for_spellchecker</framework:to>
+            </framework:transition>
+            <framework:transition name="journalist_approval">
+                <framework:from>wait_for_journalist</framework:from>
+                <framework:to>approved_by_journalist</framework:to>
+            </framework:transition>
+            <framework:transition name="spellchecker_approval">
+                <framework:from>wait_for_spellchecker</framework:from>
+                <framework:to>approved_by_spellchecker</framework:to>
+            </framework:transition>
+            <framework:transition name="publish">
+                <framework:from>approved_by_journalist</framework:from>
+                <framework:from>approved_by_spellchecker</framework:from>
+                <framework:to>published</framework:to>
+                <framework:guard>!!true</framework:guard>
+            </framework:transition>
+            <framework:transition name="publish">
+                <framework:from>draft</framework:from>
+                <framework:to>published</framework:to>
+                <framework:guard>!!false</framework:guard>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
new file mode 100644
index 000000000..a300d3e8e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow name="article" type="workflow" initial-place="draft">
+            <framework:marking-store type="multiple_state">
+                <framework:argument>a</framework:argument>
+                <framework:argument>a</framework:argument>
+            </framework:marking-store>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>draft</framework:place>
+            <framework:place>wait_for_journalist</framework:place>
+            <framework:place>approved_by_journalist</framework:place>
+            <framework:place>wait_for_spellchecker</framework:place>
+            <framework:place>approved_by_spellchecker</framework:place>
+            <framework:place>published</framework:place>
+            <framework:transition name="request_review">
+                <framework:from>draft</framework:from>
+                <framework:to>wait_for_journalist</framework:to>
+                <framework:to>wait_for_spellchecker</framework:to>
+            </framework:transition>
+            <framework:transition name="journalist_approval">
+                <framework:from>wait_for_journalist</framework:from>
+                <framework:to>approved_by_journalist</framework:to>
+            </framework:transition>
+            <framework:transition name="spellchecker_approval">
+                <framework:from>wait_for_spellchecker</framework:from>
+                <framework:to>approved_by_spellchecker</framework:to>
+            </framework:transition>
+            <framework:transition name="publish">
+                <framework:from>approved_by_journalist</framework:from>
+                <framework:from>approved_by_spellchecker</framework:from>
+                <framework:to>published</framework:to>
+            </framework:transition>
+            <framework:transition name="publish">
+                <framework:from>draft</framework:from>
+                <framework:to>published</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
new file mode 100644
index 000000000..a4f7ce858
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow name="my_workflow" support-strategy="foobar">
+            <framework:marking-store type="multiple_state"/>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>first</framework:place>
+            <framework:place>last</framework:place>
+            <framework:transition name="foobar">
+                <framework:from>a</framework:from>
+                <framework:to>a</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_type_and_service.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_type_and_service.xml
new file mode 100644
index 000000000..7d9122074
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_type_and_service.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow name="my_workflow">
+            <framework:marking-store type="multiple_state" service="workflow_service" />
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>first</framework:place>
+            <framework:place>last</framework:place>
+            <framework:transition name="foobar">
+                <framework:from>a</framework:from>
+                <framework:to>a</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_without_support_and_support_strategy.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_without_support_and_support_strategy.xml
new file mode 100644
index 000000000..17a4b5854
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflow_without_support_and_support_strategy.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow name="my_workflow">
+            <framework:marking-store type="multiple_state"/>
+            <framework:place>first</framework:place>
+            <framework:place>last</framework:place>
+            <framework:transition name="foobar">
+                <framework:from>a</framework:from>
+                <framework:to>a</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
new file mode 100644
index 000000000..0b410d47d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow name="article" type="workflow" initial-place="draft">
+            <framework:marking-store type="multiple_state">
+                <framework:argument>a</framework:argument>
+                <framework:argument>a</framework:argument>
+            </framework:marking-store>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>draft</framework:place>
+            <framework:place>wait_for_journalist</framework:place>
+            <framework:place>approved_by_journalist</framework:place>
+            <framework:place>wait_for_spellchecker</framework:place>
+            <framework:place>approved_by_spellchecker</framework:place>
+            <framework:place>published</framework:place>
+            <framework:transition name="request_review">
+                <framework:from>draft</framework:from>
+                <framework:to>wait_for_journalist</framework:to>
+                <framework:to>wait_for_spellchecker</framework:to>
+            </framework:transition>
+            <framework:transition name="journalist_approval">
+                <framework:from>wait_for_journalist</framework:from>
+                <framework:to>approved_by_journalist</framework:to>
+            </framework:transition>
+            <framework:transition name="spellchecker_approval">
+                <framework:from>wait_for_spellcheker</framework:from>
+                <framework:to>approved_by_spellchker</framework:to>
+            </framework:transition>
+            <framework:transition name="publish">
+                <framework:from>approved_by_journalist</framework:from>
+                <framework:from>approved_by_spellchker</framework:from>
+                <framework:to>published</framework:to>
+            </framework:transition>
+        </framework:workflow>
+
+        <framework:workflow name="pull_request" type="state_machine" initial-place="start">
+            <framework:marking-store type="single_state"/>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>start</framework:place>
+            <framework:place>coding</framework:place>
+            <framework:place>travis</framework:place>
+            <framework:place>review</framework:place>
+            <framework:place>merged</framework:place>
+            <framework:place>closed</framework:place>
+            <framework:transition name="submit">
+                <framework:from>start</framework:from>
+                <framework:to>travis</framework:to>
+            </framework:transition>
+            <framework:transition name="update">
+                <framework:from>coding</framework:from>
+                <framework:from>travis</framework:from>
+                <framework:from>review</framework:from>
+                <framework:to>travis</framework:to>
+            </framework:transition>
+            <framework:transition name="wait_for_review">
+                <framework:from>travis</framework:from>
+                <framework:to>review</framework:to>
+            </framework:transition>
+            <framework:transition name="request_change">
+                <framework:from>review</framework:from>
+                <framework:to>coding</framework:to>
+            </framework:transition>
+            <framework:transition name="accept">
+                <framework:from>review</framework:from>
+                <framework:to>merged</framework:to>
+            </framework:transition>
+            <framework:transition name="reject">
+                <framework:from>review</framework:from>
+                <framework:to>closed</framework:to>
+            </framework:transition>
+            <framework:transition name="reopen">
+                <framework:from>closed</framework:from>
+                <framework:to>review</framework:to>
+            </framework:transition>
+        </framework:workflow>
+
+        <framework:workflow name="service_marking_store_workflow" type="workflow">
+            <framework:marking-store service="workflow_service"/>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>first</framework:place>
+            <framework:place>last</framework:place>
+            <framework:transition name="go">
+                <framework:from>first</framework:from>
+                <framework:to>last</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml
new file mode 100644
index 000000000..26e622e9e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_enabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow enabled="true" />
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
new file mode 100644
index 000000000..08855f756
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow enabled="true" name="foo" type="workflow" initial-place="bar">
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>bar</framework:place>
+            <framework:place>baz</framework:place>
+            <framework:transition name="bar_baz">
+                <framework:from>bar</framework:from>
+                <framework:to>baz</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
new file mode 100644
index 000000000..8415c9c28
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:workflow enabled="true" name="workflows" type="workflow" initial-place="bar">
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>bar</framework:place>
+            <framework:place>baz</framework:place>
+            <framework:transition name="bar_baz">
+                <framework:from>bar</framework:from>
+                <framework:to>baz</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_without_type.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_without_type.xml
new file mode 100644
index 000000000..838d3d767
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/xml/workflows_without_type.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+            <framework:workflow name="missing_type">
+            <framework:marking-store service="workflow_service"/>
+            <framework:support>stdClass</framework:support>
+            <framework:place>first</framework:place>
+            <framework:place>last</framework:place>
+            <framework:transition name="go">
+                <framework:from>first</framework:from>
+                <framework:to>last</framework:to>
+            </framework:transition>
+        </framework:workflow>
+    </framework:config>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets.yml
new file mode 100644
index 000000000..a1679e389
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets.yml
@@ -0,0 +1,21 @@
+framework:
+    assets:
+        version: SomeVersionScheme
+        version_format: '%%s?version=%%s'
+        base_urls: http://cdn.example.com
+        packages:
+            images_path:
+                base_path: '/foo'
+            images:
+                version: 1.0.0
+                base_urls: ["http://images1.example.com", "http://images2.example.com"]
+            foo:
+                version: 1.0.0
+                version_format: '%%s-%%s'
+            bar:
+                base_urls: ["https://bar2.example.com"]
+            bar_version_strategy:
+                base_urls: ["https://bar_version_strategy.example.com"]
+                version_strategy: assets.custom_version_strategy
+            json_manifest_strategy:
+                json_manifest_path: '/path/to/manifest.json'
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets_disabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets_disabled.yml
new file mode 100644
index 000000000..17ba4e90a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    assets:
+        enabled: false
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets_version_strategy_as_service.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets_version_strategy_as_service.yml
new file mode 100644
index 000000000..2528462f8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/assets_version_strategy_as_service.yml
@@ -0,0 +1,4 @@
+framework:
+    assets:
+        version_strategy: assets.custom_version_strategy
+        base_urls: http://cdn.example.com
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/cache.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/cache.yml
new file mode 100644
index 000000000..514e782e6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/cache.yml
@@ -0,0 +1,19 @@
+framework:
+    cache:
+        pools:
+            cache.foo:
+                adapter: cache.adapter.apcu
+                default_lifetime: 30
+            cache.bar:
+                adapter: cache.adapter.doctrine
+                default_lifetime: 5
+                provider: app.doctrine_cache_provider
+            cache.baz:
+                adapter: cache.adapter.filesystem
+                default_lifetime: 7
+            cache.foobar:
+                adapter: cache.adapter.psr6
+                default_lifetime: 10
+                provider: app.cache_pool
+            cache.def:
+                default_lifetime: 11
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/cache_env_var.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/cache_env_var.yml
new file mode 100644
index 000000000..1d9ce5f7f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/cache_env_var.yml
@@ -0,0 +1,6 @@
+parameters:
+    env(REDIS_URL): redis://paas.com
+
+framework:
+    cache:
+        default_redis_provider: "%env(REDIS_URL)%"
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/csrf.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/csrf.yml
new file mode 100644
index 000000000..dbdd49519
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/csrf.yml
@@ -0,0 +1,5 @@
+framework:
+    secret: s3cr3t
+    csrf_protection: ~
+    form: ~
+    session: ~
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/csrf_needs_session.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/csrf_needs_session.yml
new file mode 100644
index 000000000..b8065b6fb
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/csrf_needs_session.yml
@@ -0,0 +1,2 @@
+framework:
+    csrf_protection: ~
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/default_config.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/default_config.yml
new file mode 100644
index 000000000..00874fbe8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/default_config.yml
@@ -0,0 +1 @@
+framework: ~
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/esi_and_ssi_without_fragments.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/esi_and_ssi_without_fragments.yml
new file mode 100644
index 000000000..49d63c8d6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/esi_and_ssi_without_fragments.yml
@@ -0,0 +1,7 @@
+framework:
+    fragments:
+        enabled: false
+    esi:
+        enabled: true
+    ssi:
+        enabled: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/esi_disabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/esi_disabled.yml
new file mode 100644
index 000000000..2a78e6da0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/esi_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    esi:
+        enabled: false
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/form_no_csrf.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/form_no_csrf.yml
new file mode 100644
index 000000000..e3ac7e8da
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/form_no_csrf.yml
@@ -0,0 +1,4 @@
+framework:
+    form:
+        csrf_protection:
+            enabled: false
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/full.yml
new file mode 100644
index 000000000..f54c3e6eb
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -0,0 +1,63 @@
+framework:
+    secret: s3cr3t
+    default_locale: fr
+    csrf_protection: true
+    form:
+        csrf_protection:
+            field_name: _csrf
+    http_method_override: false
+    esi:
+        enabled: true
+    ssi:
+        enabled: true
+    profiler:
+        only_exceptions: true
+        enabled: false
+    router:
+        resource:     '%kernel.project_dir%/config/routing.xml'
+        type:         xml
+    session:
+        storage_id:      session.storage.native
+        handler_id:      session.handler.native_file
+        name:            _SYMFONY
+        cookie_lifetime:  86400
+        cookie_path:      /
+        cookie_domain:    example.com
+        cookie_secure:    true
+        cookie_httponly:  false
+        use_cookies:      true
+        gc_probability:  1
+        gc_divisor:      108
+        gc_maxlifetime:  90000
+        save_path:       /path/to/sessions
+    templating:
+        engines:          [php, twig]
+        loader:           [loader.foo, loader.bar]
+        cache:            /path/to/cache
+        form:
+            resources:    [theme1, theme2]
+        hinclude_default_template: global_hinclude_template
+    assets:
+        version: v1
+    translator:
+        enabled:  true
+        fallback: fr
+        default_path: '%kernel.project_dir%/translations'
+        paths: ['%kernel.project_dir%/Fixtures/translations']
+    validation:
+        enabled: true
+    annotations:
+        cache:   file
+        debug:   true
+        file_cache_dir: '%kernel.cache_dir%/annotations'
+    serializer:
+         enabled:                    true
+         enable_annotations:         true
+         name_converter:             serializer.name_converter.camel_case_to_snake_case
+         circular_reference_handler: my.circular.reference.handler
+    property_info: ~
+    ide: file%%link%%format
+    request:
+        formats:
+            csv: ['text/csv', 'text/plain']
+            pdf: 'application/pdf'
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/lock.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/lock.yml
new file mode 100644
index 000000000..70f578a14
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/lock.yml
@@ -0,0 +1,2 @@
+framework:
+    lock: ~
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
new file mode 100644
index 000000000..6d0cb5ca6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
@@ -0,0 +1,9 @@
+parameters:
+    env(REDIS_DSN): redis://paas.com
+
+framework:
+    lock:
+        foo: semaphore
+        bar: flock
+        baz: [semaphore, flock]
+        qux: "%env(REDIS_DSN)%"
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/php_errors_disabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/php_errors_disabled.yml
new file mode 100644
index 000000000..958f75638
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/php_errors_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    php_errors:
+        throw: false
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/php_errors_enabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/php_errors_enabled.yml
new file mode 100644
index 000000000..f48531014
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/php_errors_enabled.yml
@@ -0,0 +1,4 @@
+framework:
+    php_errors:
+        log: true
+        throw: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/profiler.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/profiler.yml
new file mode 100644
index 000000000..9052a2bdf
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/profiler.yml
@@ -0,0 +1,3 @@
+framework:
+    profiler:
+        enabled: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/property_accessor.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/property_accessor.yml
new file mode 100644
index 000000000..b5fd2718a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/property_accessor.yml
@@ -0,0 +1,4 @@
+framework:
+    property_access:
+        magic_call: true
+        throw_exception_on_invalid_index: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/property_info.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/property_info.yml
new file mode 100644
index 000000000..fbdf7a7b0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/property_info.yml
@@ -0,0 +1,3 @@
+framework:
+    property_info:
+        enabled: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/request.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/request.yml
new file mode 100644
index 000000000..9beae1dc5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/request.yml
@@ -0,0 +1,3 @@
+framework:
+    request:
+        formats: ~
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_disabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_disabled.yml
new file mode 100644
index 000000000..330e19a69
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    serializer:
+        enabled: false
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_enabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_enabled.yml
new file mode 100644
index 000000000..40a1ff7d6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_enabled.yml
@@ -0,0 +1,3 @@
+framework:
+    serializer:
+        enabled: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_legacy_cache.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_legacy_cache.yml
new file mode 100644
index 000000000..5fadc886a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_legacy_cache.yml
@@ -0,0 +1,4 @@
+framework:
+    serializer:
+        enabled: true
+        cache: foo
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_mapping.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_mapping.yml
new file mode 100644
index 000000000..77c9d517a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/serializer_mapping.yml
@@ -0,0 +1,10 @@
+framework:
+    annotations:
+        enabled: true
+    serializer:
+        enable_annotations: true
+        mapping:
+            paths:
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files"
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml"
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml"
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/session.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/session.yml
new file mode 100644
index 000000000..d91b0c314
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/session.yml
@@ -0,0 +1,3 @@
+framework:
+    session:
+        handler_id: null
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/ssi_disabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/ssi_disabled.yml
new file mode 100644
index 000000000..3a8a820c7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/ssi_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    ssi:
+        enabled: false
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_disabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_disabled.yml
new file mode 100644
index 000000000..1e548b859
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_disabled.yml
@@ -0,0 +1,2 @@
+framework:
+    templating: false
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml
new file mode 100644
index 000000000..393477aeb
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml
@@ -0,0 +1,3 @@
+framework:
+    templating:
+        engines: [php, twig]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_assets_disabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_assets_disabled.yml
new file mode 100644
index 000000000..7ef6b3e57
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_assets_disabled.yml
@@ -0,0 +1,4 @@
+framework:
+    assets: false
+    templating:
+        engines: [php]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_translator_disabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_translator_disabled.yml
new file mode 100644
index 000000000..fe0f3e83b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_translator_disabled.yml
@@ -0,0 +1,4 @@
+framework:
+    translator: false
+    templating:
+        engines: [php]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_translator_enabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_translator_enabled.yml
new file mode 100644
index 000000000..0991a2007
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/templating_php_translator_enabled.yml
@@ -0,0 +1,4 @@
+framework:
+    translator: true
+    templating:
+        engines: [php]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/translator_fallbacks.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/translator_fallbacks.yml
new file mode 100644
index 000000000..271d78118
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/translator_fallbacks.yml
@@ -0,0 +1,3 @@
+framework:
+    translator:
+        fallbacks: [en, fr]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_annotations.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_annotations.yml
new file mode 100644
index 000000000..41f17969b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_annotations.yml
@@ -0,0 +1,5 @@
+framework:
+    secret: s3cr3t
+    validation:
+        enabled:     true
+        enable_annotations: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_mapping.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_mapping.yml
new file mode 100644
index 000000000..f05e33bb6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_mapping.yml
@@ -0,0 +1,7 @@
+framework:
+  validation:
+    mapping:
+      paths:
+        - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files"
+        - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml"
+        - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml"
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_multiple_static_methods.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_multiple_static_methods.yml
new file mode 100644
index 000000000..6ca343351
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_multiple_static_methods.yml
@@ -0,0 +1,5 @@
+framework:
+    secret: s3cr3t
+    validation:
+        enabled:       true
+        static_method: [loadFoo, loadBar]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_no_static_method.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_no_static_method.yml
new file mode 100644
index 000000000..ca5214964
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_no_static_method.yml
@@ -0,0 +1,5 @@
+framework:
+    secret: s3cr3t
+    validation:
+        enabled:       true
+        static_method: false
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email.yml
new file mode 100644
index 000000000..1c805f9b9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email.yml
@@ -0,0 +1,3 @@
+framework:
+    validation:
+        strict_email: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_translation_domain.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_translation_domain.yml
new file mode 100644
index 000000000..167b5fcce
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/validation_translation_domain.yml
@@ -0,0 +1,3 @@
+framework:
+    validation:
+        translation_domain: messages
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/web_link.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/web_link.yml
new file mode 100644
index 000000000..4276aacbe
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/web_link.yml
@@ -0,0 +1,3 @@
+framework:
+    web_link:
+        enabled: true
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_arguments_and_service.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_arguments_and_service.yml
new file mode 100644
index 000000000..a46d4b67e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_arguments_and_service.yml
@@ -0,0 +1,19 @@
+framework:
+    workflows:
+        my_workflow:
+            marking_store:
+                arguments:
+                    - a
+                    - b
+                service: workflow_service
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            places:
+                - first
+                - last
+            transitions:
+                go:
+                    from:
+                        - first
+                    to:
+                        - last
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml
new file mode 100644
index 000000000..458cb4ae1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml
@@ -0,0 +1,35 @@
+framework:
+    workflows:
+        article:
+            type: workflow
+            marking_store:
+                type: multiple_state
+            supports:
+            - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            initial_place: draft
+            places:
+            - draft
+            - wait_for_journalist
+            - approved_by_journalist
+            - wait_for_spellchecker
+            - approved_by_spellchecker
+            - published
+            transitions:
+                request_review:
+                    from: [draft]
+                    to: [wait_for_journalist, wait_for_spellchecker]
+                journalist_approval:
+                    from: [wait_for_journalist]
+                    to: [approved_by_journalist]
+                spellchecker_approval:
+                    from: [wait_for_spellchecker]
+                    to: [approved_by_spellchecker]
+                publish:
+                    from: [approved_by_journalist, approved_by_spellchecker]
+                    to: [published]
+                    guard: "!!true"
+                publish_editor_in_chief:
+                    name: publish
+                    from: [draft]
+                    to: [published]
+                    guard: "!!false"
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml
new file mode 100644
index 000000000..36d00de46
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml
@@ -0,0 +1,33 @@
+framework:
+    workflows:
+        article:
+            type: workflow
+            marking_store:
+                type: multiple_state
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            initial_place: draft
+            places:
+                - draft
+                - wait_for_journalist
+                - approved_by_journalist
+                - wait_for_spellchecker
+                - approved_by_spellchecker
+                - published
+            transitions:
+                request_review:
+                    from: [draft]
+                    to: [wait_for_journalist, wait_for_spellchecker]
+                journalist_approval:
+                    from: [wait_for_journalist]
+                    to: [approved_by_journalist]
+                spellchecker_approval:
+                    from: [wait_for_spellchecker]
+                    to: [approved_by_spellchecker]
+                publish:
+                    from: [approved_by_journalist, approved_by_spellchecker]
+                    to: [published]
+                publish_editor_in_chief:
+                    name: publish
+                    from: [draft]
+                    to: [published]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml
new file mode 100644
index 000000000..743708485
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml
@@ -0,0 +1,17 @@
+framework:
+    workflows:
+        my_workflow:
+            marking_store:
+                type: multiple_state
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            support_strategy: foobar
+            places:
+                - first
+                - last
+            transitions:
+                go:
+                    from:
+                        - first
+                    to:
+                        - last
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_type_and_service.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_type_and_service.yml
new file mode 100644
index 000000000..000ba10df
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_type_and_service.yml
@@ -0,0 +1,17 @@
+framework:
+    workflows:
+        my_workflow:
+            marking_store:
+                type: multiple_state
+                service: workflow_service
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            places:
+                - first
+                - last
+            transitions:
+                go:
+                    from:
+                        - first
+                    to:
+                        - last
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_without_support_and_support_strategy.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_without_support_and_support_strategy.yml
new file mode 100644
index 000000000..6dc848d93
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflow_without_support_and_support_strategy.yml
@@ -0,0 +1,14 @@
+framework:
+    workflows:
+        my_workflow:
+            marking_store:
+                type: multiple_state
+            places:
+                - first
+                - last
+            transitions:
+                go:
+                    from:
+                        - first
+                    to:
+                        - last
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
new file mode 100644
index 000000000..36b84f71e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
@@ -0,0 +1,80 @@
+framework:
+    workflows:
+        article:
+            type: workflow
+            marking_store:
+                type: multiple_state
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            initial_place: draft
+            places:
+                - draft
+                - wait_for_journalist
+                - approved_by_journalist
+                - wait_for_spellchecker
+                - approved_by_spellchecker
+                - published
+            transitions:
+                request_review:
+                    from: [draft]
+                    to: [wait_for_journalist, wait_for_spellchecker]
+                journalist_approval:
+                    from: [wait_for_journalist]
+                    to: [approved_by_journalist]
+                spellchecker_approval:
+                    from: [wait_for_spellchecker]
+                    to: [approved_by_spellchecker]
+                publish:
+                    from: [approved_by_journalist, approved_by_spellchecker]
+                    to: [published]
+        pull_request:
+            type: state_machine
+            marking_store:
+                type: single_state
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            initial_place: start
+            places:
+                - start
+                - coding
+                - travis
+                - review
+                - merged
+                - closed
+            transitions:
+                submit:
+                    from: start
+                    to: travis
+                update:
+                    from: [coding, travis, review]
+                    to: travis
+                wait_for_review:
+                    from: travis
+                    to: review
+                request_change:
+                    from: review
+                    to: coding
+                accept:
+                    from: review
+                    to: merged
+                reject:
+                    from: review
+                    to: closed
+                reopen:
+                    from: closed
+                    to: review
+        service_marking_store_workflow:
+            type: workflow
+            marking_store:
+                service: workflow_service
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            places:
+                - first
+                - last
+            transitions:
+                go:
+                    from:
+                        - first
+                    to:
+                        - last
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_enabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_enabled.yml
new file mode 100644
index 000000000..2a716ff0a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_enabled.yml
@@ -0,0 +1,2 @@
+framework:
+    workflows: ~
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled.yml
new file mode 100644
index 000000000..21abbf030
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled.yml
@@ -0,0 +1,16 @@
+framework:
+    workflows:
+        enabled: true
+        workflows:
+            foo:
+                type: workflow
+                supports:
+                    - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                initial_place: bar
+                places:
+                    - bar
+                    - baz
+                transitions:
+                    bar_baz:
+                        from: [foo]
+                        to: [bar]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled_named_workflows.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled_named_workflows.yml
new file mode 100644
index 000000000..a6c03de95
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled_named_workflows.yml
@@ -0,0 +1,15 @@
+framework:
+    workflows:
+        enabled: true
+        workflows:
+            type: workflow
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            initial_place: bar
+            places:
+                - bar
+                - baz
+            transitions:
+                bar_baz:
+                    from: [foo]
+                    to: [bar]
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_without_type.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_without_type.yml
new file mode 100644
index 000000000..41b81683b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/Fixtures/yml/workflows_without_type.yml
@@ -0,0 +1,7 @@
+framework:
+    workflows:
+        missing_type:
+            supports: stdClass
+            places: [ first, second ]
+            transitions:
+                go: {from: first, to: last }
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/FrameworkExtensionTest.php
new file mode 100644
index 000000000..556fd9afd
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -0,0 +1,1263 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
+
+use Doctrine\Common\Annotations\Annotation;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\FullStack;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Adapter\ApcuAdapter;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\DoctrineAdapter;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\ProxyAdapter;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
+use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
+use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
+use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
+use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
+use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
+use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
+use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Translation\DependencyInjection\TranslatorPass;
+use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
+use Symfony\Component\Workflow\Registry;
+
+abstract class FrameworkExtensionTest extends TestCase
+{
+    private static $containerCache = [];
+
+    abstract protected function loadFromFile(ContainerBuilder $container, $file);
+
+    public function testFormCsrfProtection()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $def = $container->getDefinition('form.type_extension.csrf');
+
+        $this->assertTrue($container->getParameter('form.type_extension.csrf.enabled'));
+        $this->assertEquals('%form.type_extension.csrf.enabled%', $def->getArgument(1));
+        $this->assertEquals('_csrf', $container->getParameter('form.type_extension.csrf.field_name'));
+        $this->assertEquals('%form.type_extension.csrf.field_name%', $def->getArgument(2));
+    }
+
+    public function testPropertyAccessWithDefaultValue()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $def = $container->getDefinition('property_accessor');
+        $this->assertFalse($def->getArgument(0));
+        $this->assertFalse($def->getArgument(1));
+    }
+
+    public function testPropertyAccessWithOverriddenValues()
+    {
+        $container = $this->createContainerFromFile('property_accessor');
+        $def = $container->getDefinition('property_accessor');
+        $this->assertTrue($def->getArgument(0));
+        $this->assertTrue($def->getArgument(1));
+    }
+
+    public function testPropertyAccessCache()
+    {
+        $container = $this->createContainerFromFile('property_accessor');
+
+        if (!method_exists(PropertyAccessor::class, 'createCache')) {
+            $this->assertFalse($container->hasDefinition('cache.property_access'));
+
+            return;
+        }
+
+        $cache = $container->getDefinition('cache.property_access');
+        $this->assertSame([PropertyAccessor::class, 'createCache'], $cache->getFactory(), 'PropertyAccessor::createCache() should be used in non-debug mode');
+        $this->assertSame(AdapterInterface::class, $cache->getClass());
+    }
+
+    public function testPropertyAccessCacheWithDebug()
+    {
+        $container = $this->createContainerFromFile('property_accessor', ['kernel.debug' => true]);
+
+        if (!method_exists(PropertyAccessor::class, 'createCache')) {
+            $this->assertFalse($container->hasDefinition('cache.property_access'));
+
+            return;
+        }
+
+        $cache = $container->getDefinition('cache.property_access');
+        $this->assertNull($cache->getFactory());
+        $this->assertSame(ArrayAdapter::class, $cache->getClass(), 'ArrayAdapter should be used in debug mode');
+    }
+
+    public function testCsrfProtectionNeedsSessionToBeEnabled()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('CSRF protection needs sessions to be enabled.');
+        $this->createContainerFromFile('csrf_needs_session');
+    }
+
+    public function testCsrfProtectionForFormsEnablesCsrfProtectionAutomatically()
+    {
+        $container = $this->createContainerFromFile('csrf');
+
+        $this->assertTrue($container->hasDefinition('security.csrf.token_manager'));
+    }
+
+    public function testHttpMethodOverride()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertFalse($container->getParameter('kernel.http_method_override'));
+    }
+
+    public function testEsi()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertTrue($container->hasDefinition('esi'), '->registerEsiConfiguration() loads esi.xml');
+        $this->assertTrue($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is registered');
+    }
+
+    public function testEsiDisabled()
+    {
+        $container = $this->createContainerFromFile('esi_disabled');
+
+        $this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered');
+        $this->assertFalse($container->hasDefinition('esi'));
+    }
+
+    public function testSsi()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertTrue($container->hasDefinition('ssi'), '->registerSsiConfiguration() loads ssi.xml');
+        $this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
+    }
+
+    public function testSsiDisabled()
+    {
+        $container = $this->createContainerFromFile('ssi_disabled');
+
+        $this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
+        $this->assertFalse($container->hasDefinition('ssi'));
+    }
+
+    public function testEsiAndSsiWithoutFragments()
+    {
+        $container = $this->createContainerFromFile('esi_and_ssi_without_fragments');
+
+        $this->assertFalse($container->hasDefinition('fragment.renderer.hinclude'), 'The HInclude fragment renderer is not registered');
+        $this->assertTrue($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is registered');
+        $this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
+    }
+
+    public function testEnabledProfiler()
+    {
+        $container = $this->createContainerFromFile('profiler');
+
+        $this->assertTrue($container->hasDefinition('profiler'), '->registerProfilerConfiguration() loads profiling.xml');
+        $this->assertTrue($container->hasDefinition('data_collector.config'), '->registerProfilerConfiguration() loads collectors.xml');
+    }
+
+    public function testDisabledProfiler()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertFalse($container->hasDefinition('profiler'), '->registerProfilerConfiguration() does not load profiling.xml');
+        $this->assertFalse($container->hasDefinition('data_collector.config'), '->registerProfilerConfiguration() does not load collectors.xml');
+    }
+
+    public function testWorkflows()
+    {
+        $container = $this->createContainerFromFile('workflows');
+
+        $this->assertTrue($container->hasDefinition('workflow.article'), 'Workflow is registered as a service');
+        $this->assertTrue($container->hasDefinition('workflow.article.definition'), 'Workflow definition is registered as a service');
+
+        $workflowDefinition = $container->getDefinition('workflow.article.definition');
+
+        $this->assertSame(
+            [
+                'draft',
+                'wait_for_journalist',
+                'approved_by_journalist',
+                'wait_for_spellchecker',
+                'approved_by_spellchecker',
+                'published',
+            ],
+            $workflowDefinition->getArgument(0),
+            'Places are passed to the workflow definition'
+        );
+        $this->assertSame(['workflow.definition' => [['name' => 'article', 'type' => 'workflow', 'marking_store' => 'multiple_state']]], $workflowDefinition->getTags());
+
+        $this->assertTrue($container->hasDefinition('state_machine.pull_request'), 'State machine is registered as a service');
+        $this->assertTrue($container->hasDefinition('state_machine.pull_request.definition'), 'State machine definition is registered as a service');
+        $this->assertCount(4, $workflowDefinition->getArgument(1));
+        $this->assertSame('draft', $workflowDefinition->getArgument(2));
+
+        $stateMachineDefinition = $container->getDefinition('state_machine.pull_request.definition');
+
+        $this->assertSame(
+            [
+                'start',
+                'coding',
+                'travis',
+                'review',
+                'merged',
+                'closed',
+            ],
+            $stateMachineDefinition->getArgument(0),
+            'Places are passed to the state machine definition'
+        );
+        $this->assertSame(['workflow.definition' => [['name' => 'pull_request', 'type' => 'state_machine', 'marking_store' => 'single_state']]], $stateMachineDefinition->getTags());
+        $this->assertCount(9, $stateMachineDefinition->getArgument(1));
+        $this->assertSame('start', $stateMachineDefinition->getArgument(2));
+
+        $serviceMarkingStoreWorkflowDefinition = $container->getDefinition('workflow.service_marking_store_workflow');
+        /** @var Reference $markingStoreRef */
+        $markingStoreRef = $serviceMarkingStoreWorkflowDefinition->getArgument(1);
+        $this->assertInstanceOf(Reference::class, $markingStoreRef);
+        $this->assertEquals('workflow_service', (string) $markingStoreRef);
+
+        $this->assertTrue($container->hasDefinition('workflow.registry', 'Workflow registry is registered as a service'));
+        $registryDefinition = $container->getDefinition('workflow.registry');
+        $this->assertGreaterThan(0, \count($registryDefinition->getMethodCalls()));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "type" option of the "framework.workflows.missing_type" configuration entry must be defined since Symfony 3.3. The default value will be "state_machine" in Symfony 4.0.
+     */
+    public function testDeprecatedWorkflowMissingType()
+    {
+        $this->createContainerFromFile('workflows_without_type');
+    }
+
+    public function testWorkflowCannotHaveBothTypeAndService()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('"type" and "service" cannot be used together.');
+        $this->createContainerFromFile('workflow_with_type_and_service');
+    }
+
+    public function testWorkflowCannotHaveBothSupportsAndSupportStrategy()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('"supports" and "support_strategy" cannot be used together.');
+        $this->createContainerFromFile('workflow_with_support_and_support_strategy');
+    }
+
+    public function testWorkflowShouldHaveOneOfSupportsAndSupportStrategy()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('"supports" or "support_strategy" should be configured.');
+        $this->createContainerFromFile('workflow_without_support_and_support_strategy');
+    }
+
+    public function testWorkflowCannotHaveBothArgumentsAndService()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $this->expectExceptionMessage('"arguments" and "service" cannot be used together.');
+        $this->createContainerFromFile('workflow_with_arguments_and_service');
+    }
+
+    public function testWorkflowMultipleTransitionsWithSameName()
+    {
+        $container = $this->createContainerFromFile('workflow_with_multiple_transitions_with_same_name');
+
+        $this->assertTrue($container->hasDefinition('workflow.article'), 'Workflow is registered as a service');
+        $this->assertTrue($container->hasDefinition('workflow.article.definition'), 'Workflow definition is registered as a service');
+
+        $workflowDefinition = $container->getDefinition('workflow.article.definition');
+
+        $transitions = $workflowDefinition->getArgument(1);
+
+        $this->assertCount(5, $transitions);
+
+        $this->assertSame('workflow.article.transition.0', (string) $transitions[0]);
+        $this->assertSame([
+            'request_review',
+            [
+                'draft',
+            ],
+            [
+                'wait_for_journalist', 'wait_for_spellchecker',
+            ],
+        ], $container->getDefinition($transitions[0])->getArguments());
+
+        $this->assertSame('workflow.article.transition.1', (string) $transitions[1]);
+        $this->assertSame([
+            'journalist_approval',
+            [
+                'wait_for_journalist',
+            ],
+            [
+                'approved_by_journalist',
+            ],
+        ], $container->getDefinition($transitions[1])->getArguments());
+
+        $this->assertSame('workflow.article.transition.2', (string) $transitions[2]);
+        $this->assertSame([
+            'spellchecker_approval',
+            [
+                'wait_for_spellchecker',
+            ],
+            [
+                'approved_by_spellchecker',
+            ],
+        ], $container->getDefinition($transitions[2])->getArguments());
+
+        $this->assertSame('workflow.article.transition.3', (string) $transitions[3]);
+        $this->assertSame([
+            'publish',
+            [
+                'approved_by_journalist',
+                'approved_by_spellchecker',
+            ],
+            [
+                'published',
+            ],
+        ], $container->getDefinition($transitions[3])->getArguments());
+
+        $this->assertSame('workflow.article.transition.4', (string) $transitions[4]);
+        $this->assertSame([
+            'publish',
+            [
+                'draft',
+            ],
+            [
+                'published',
+            ],
+        ], $container->getDefinition($transitions[4])->getArguments());
+    }
+
+    public function testGuardExpressions()
+    {
+        $container = $this->createContainerFromFile('workflow_with_guard_expression');
+
+        $this->assertTrue($container->hasDefinition('workflow.article.listener.guard'), 'Workflow guard listener is registered as a service');
+        $this->assertTrue($container->hasParameter('workflow.has_guard_listeners'), 'Workflow guard listeners parameter exists');
+        $this->assertTrue(true === $container->getParameter('workflow.has_guard_listeners'), 'Workflow guard listeners parameter is enabled');
+        $guardDefinition = $container->getDefinition('workflow.article.listener.guard');
+        $this->assertSame([
+            [
+                'event' => 'workflow.article.guard.publish',
+                'method' => 'onTransition',
+            ],
+        ], $guardDefinition->getTag('kernel.event_listener'));
+        $guardsConfiguration = $guardDefinition->getArgument(0);
+        $this->assertTrue(1 === \count($guardsConfiguration), 'Workflow guard configuration contains one element per transition name');
+        $transitionGuardExpressions = $guardsConfiguration['workflow.article.guard.publish'];
+        $this->assertSame('workflow.article.transition.3', (string) $transitionGuardExpressions[0]->getArgument(0));
+        $this->assertSame('!!true', $transitionGuardExpressions[0]->getArgument(1));
+        $this->assertSame('workflow.article.transition.4', (string) $transitionGuardExpressions[1]->getArgument(0));
+        $this->assertSame('!!false', $transitionGuardExpressions[1]->getArgument(1));
+    }
+
+    public function testWorkflowServicesCanBeEnabled()
+    {
+        $container = $this->createContainerFromFile('workflows_enabled');
+
+        $this->assertTrue($container->has(Registry::class));
+        $this->assertTrue($container->hasDefinition('console.command.workflow_dump'));
+    }
+
+    public function testExplicitlyEnabledWorkflows()
+    {
+        $container = $this->createContainerFromFile('workflows_explicitly_enabled');
+
+        $this->assertTrue($container->hasDefinition('workflow.foo.definition'));
+    }
+
+    public function testExplicitlyEnabledWorkflowNamedWorkflows()
+    {
+        $container = $this->createContainerFromFile('workflows_explicitly_enabled_named_workflows');
+
+        $this->assertTrue($container->hasDefinition('workflow.workflows.definition'));
+    }
+
+    public function testEnabledPhpErrorsConfig()
+    {
+        $container = $this->createContainerFromFile('php_errors_enabled');
+
+        $this->assertEquals(new Reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE), $container->getDefinition('debug.debug_handlers_listener')->getArgument(1));
+        $this->assertSame(-1, $container->getParameter('debug.error_handler.throw_at'));
+    }
+
+    public function testDisabledPhpErrorsConfig()
+    {
+        $container = $this->createContainerFromFile('php_errors_disabled');
+
+        $this->assertNull($container->getDefinition('debug.debug_handlers_listener')->getArgument(1));
+        $this->assertSame(0, $container->getParameter('debug.error_handler.throw_at'));
+    }
+
+    public function testRouter()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertTrue($container->has('router'), '->registerRouterConfiguration() loads routing.xml');
+        $arguments = $container->findDefinition('router')->getArguments();
+        $this->assertEquals($container->getParameter('kernel.project_dir').'/config/routing.xml', $container->getParameter('router.resource'), '->registerRouterConfiguration() sets routing resource');
+        $this->assertEquals('%router.resource%', $arguments[1], '->registerRouterConfiguration() sets routing resource');
+        $this->assertEquals('xml', $arguments[2]['resource_type'], '->registerRouterConfiguration() sets routing resource type');
+    }
+
+    public function testRouterRequiresResourceOption()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $container = $this->createContainer();
+        $loader = new FrameworkExtension();
+        $loader->load([['router' => true]], $container);
+    }
+
+    public function testSession()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertTrue($container->hasDefinition('session'), '->registerSessionConfiguration() loads session.xml');
+        $this->assertEquals('fr', $container->getParameter('kernel.default_locale'));
+        $this->assertEquals('session.storage.native', (string) $container->getAlias('session.storage'));
+        $this->assertEquals('session.handler.native_file', (string) $container->getAlias('session.handler'));
+
+        $options = $container->getParameter('session.storage.options');
+        $this->assertEquals('_SYMFONY', $options['name']);
+        $this->assertEquals(86400, $options['cookie_lifetime']);
+        $this->assertEquals('/', $options['cookie_path']);
+        $this->assertEquals('example.com', $options['cookie_domain']);
+        $this->assertTrue($options['cookie_secure']);
+        $this->assertFalse($options['cookie_httponly']);
+        $this->assertTrue($options['use_cookies']);
+        $this->assertEquals(108, $options['gc_divisor']);
+        $this->assertEquals(1, $options['gc_probability']);
+        $this->assertEquals(90000, $options['gc_maxlifetime']);
+
+        $this->assertEquals('/path/to/sessions', $container->getParameter('session.save_path'));
+    }
+
+    public function testNullSessionHandler()
+    {
+        $container = $this->createContainerFromFile('session');
+
+        $this->assertTrue($container->hasDefinition('session'), '->registerSessionConfiguration() loads session.xml');
+        $this->assertNull($container->getDefinition('session.storage.native')->getArgument(1));
+        $this->assertNull($container->getDefinition('session.storage.php_bridge')->getArgument(0));
+    }
+
+    public function testRequest()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertTrue($container->hasDefinition('request.add_request_formats_listener'), '->registerRequestConfiguration() loads request.xml');
+        $listenerDef = $container->getDefinition('request.add_request_formats_listener');
+        $this->assertEquals(['csv' => ['text/csv', 'text/plain'], 'pdf' => ['application/pdf']], $listenerDef->getArgument(0));
+    }
+
+    public function testEmptyRequestFormats()
+    {
+        $container = $this->createContainerFromFile('request');
+
+        $this->assertFalse($container->hasDefinition('request.add_request_formats_listener'), '->registerRequestConfiguration() does not load request.xml when no request formats are defined');
+    }
+
+    public function testTemplating()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertTrue($container->hasDefinition('templating.name_parser'), '->registerTemplatingConfiguration() loads templating.xml');
+
+        $this->assertEquals('templating.engine.delegating', (string) $container->getAlias('templating'), '->registerTemplatingConfiguration() configures delegating loader if multiple engines are provided');
+
+        $this->assertEquals($container->getDefinition('templating.loader.chain'), $container->getDefinition('templating.loader.wrapped'), '->registerTemplatingConfiguration() configures loader chain if multiple loaders are provided');
+
+        $this->assertEquals($container->getDefinition('templating.loader'), $container->getDefinition('templating.loader.cache'), '->registerTemplatingConfiguration() configures the loader to use cache');
+
+        $this->assertEquals('%templating.loader.cache.path%', $container->getDefinition('templating.loader.cache')->getArgument(1));
+        $this->assertEquals('/path/to/cache', $container->getParameter('templating.loader.cache.path'));
+
+        $this->assertEquals(['php', 'twig'], $container->getParameter('templating.engines'), '->registerTemplatingConfiguration() sets a templating.engines parameter');
+
+        $this->assertEquals(['FrameworkBundle:Form', 'theme1', 'theme2'], $container->getParameter('templating.helper.form.resources'), '->registerTemplatingConfiguration() registers the theme and adds the base theme');
+        $this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'), '->registerTemplatingConfiguration() registers the global hinclude.js template');
+    }
+
+    public function testTemplatingCanBeDisabled()
+    {
+        $container = $this->createContainerFromFile('templating_disabled');
+
+        $this->assertFalse($container->hasParameter('templating.engines'), '"templating.engines" container parameter is not registered when templating is disabled.');
+    }
+
+    public function testAssets()
+    {
+        $container = $this->createContainerFromFile('assets');
+        $packages = $container->getDefinition('assets.packages');
+
+        // default package
+        $defaultPackage = $container->getDefinition((string) $packages->getArgument(0));
+        $this->assertUrlPackage($container, $defaultPackage, ['http://cdn.example.com'], 'SomeVersionScheme', '%%s?version=%%s');
+
+        // packages
+        $packages = $packages->getArgument(1);
+        $this->assertCount(6, $packages);
+
+        $package = $container->getDefinition((string) $packages['images_path']);
+        $this->assertPathPackage($container, $package, '/foo', 'SomeVersionScheme', '%%s?version=%%s');
+
+        $package = $container->getDefinition((string) $packages['images']);
+        $this->assertUrlPackage($container, $package, ['http://images1.example.com', 'http://images2.example.com'], '1.0.0', '%%s?version=%%s');
+
+        $package = $container->getDefinition((string) $packages['foo']);
+        $this->assertPathPackage($container, $package, '', '1.0.0', '%%s-%%s');
+
+        $package = $container->getDefinition((string) $packages['bar']);
+        $this->assertUrlPackage($container, $package, ['https://bar2.example.com'], 'SomeVersionScheme', '%%s?version=%%s');
+
+        $package = $container->getDefinition((string) $packages['bar_version_strategy']);
+        $this->assertEquals('assets.custom_version_strategy', (string) $package->getArgument(1));
+
+        $package = $container->getDefinition((string) $packages['json_manifest_strategy']);
+        $versionStrategy = $container->getDefinition((string) $package->getArgument(1));
+        $this->assertEquals('assets.json_manifest_version_strategy', $versionStrategy->getParent());
+        $this->assertEquals('/path/to/manifest.json', $versionStrategy->getArgument(0));
+    }
+
+    public function testAssetsDefaultVersionStrategyAsService()
+    {
+        $container = $this->createContainerFromFile('assets_version_strategy_as_service');
+        $packages = $container->getDefinition('assets.packages');
+
+        // default package
+        $defaultPackage = $container->getDefinition((string) $packages->getArgument(0));
+        $this->assertEquals('assets.custom_version_strategy', (string) $defaultPackage->getArgument(1));
+    }
+
+    public function testAssetsCanBeDisabled()
+    {
+        $container = $this->createContainerFromFile('assets_disabled');
+
+        $this->assertFalse($container->has('templating.helper.assets'), 'The templating.helper.assets helper service is removed when assets are disabled.');
+    }
+
+    public function testWebLink()
+    {
+        $container = $this->createContainerFromFile('web_link');
+        $this->assertTrue($container->hasDefinition('web_link.add_link_header_listener'));
+    }
+
+    public function testTranslator()
+    {
+        $container = $this->createContainerFromFile('full');
+        $this->assertTrue($container->hasDefinition('translator.default'), '->registerTranslatorConfiguration() loads translation.xml');
+        $this->assertEquals('translator.default', (string) $container->getAlias('translator'), '->registerTranslatorConfiguration() redefines translator service from identity to real translator');
+        $options = $container->getDefinition('translator.default')->getArgument(4);
+
+        $files = array_map('realpath', $options['resource_files']['en']);
+        $ref = new \ReflectionClass('Symfony\Component\Validator\Validation');
+        $this->assertContains(
+            strtr(\dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', \DIRECTORY_SEPARATOR),
+            $files,
+            '->registerTranslatorConfiguration() finds Validator translation resources'
+        );
+        $ref = new \ReflectionClass('Symfony\Component\Form\Form');
+        $this->assertContains(
+            strtr(\dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', \DIRECTORY_SEPARATOR),
+            $files,
+            '->registerTranslatorConfiguration() finds Form translation resources'
+        );
+        $ref = new \ReflectionClass('Symfony\Component\Security\Core\Security');
+        $this->assertContains(
+            strtr(\dirname($ref->getFileName()).'/Resources/translations/security.en.xlf', '/', \DIRECTORY_SEPARATOR),
+            $files,
+            '->registerTranslatorConfiguration() finds Security translation resources'
+        );
+        $this->assertContains(
+            strtr(__DIR__.'/Fixtures/translations/test_paths.en.yml', '/', \DIRECTORY_SEPARATOR),
+            $files,
+            '->registerTranslatorConfiguration() finds translation resources in custom paths'
+        );
+        $this->assertContains(
+            strtr(__DIR__.'/translations/test_default.en.xlf', '/', \DIRECTORY_SEPARATOR),
+            $files,
+            '->registerTranslatorConfiguration() finds translation resources in default path'
+        );
+
+        $calls = $container->getDefinition('translator.default')->getMethodCalls();
+        $this->assertEquals(['fr'], $calls[1][1][0]);
+    }
+
+    public function testTranslatorMultipleFallbacks()
+    {
+        $container = $this->createContainerFromFile('translator_fallbacks');
+
+        $calls = $container->getDefinition('translator.default')->getMethodCalls();
+        $this->assertEquals(['en', 'fr'], $calls[1][1][0]);
+    }
+
+    public function testTranslatorHelperIsRegisteredWhenTranslatorIsEnabled()
+    {
+        $container = $this->createContainerFromFile('templating_php_translator_enabled');
+
+        $this->assertTrue($container->has('templating.helper.translator'));
+    }
+
+    public function testTranslatorHelperIsNotRegisteredWhenTranslatorIsDisabled()
+    {
+        $container = $this->createContainerFromFile('templating_php_translator_disabled');
+
+        $this->assertFalse($container->has('templating.helper.translator'));
+    }
+
+    public function testTemplatingRequiresAtLeastOneEngine()
+    {
+        $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+        $container = $this->createContainer();
+        $loader = new FrameworkExtension();
+        $loader->load([['templating' => null]], $container);
+    }
+
+    public function testValidation()
+    {
+        $container = $this->createContainerFromFile('full');
+        $projectDir = $container->getParameter('kernel.project_dir');
+
+        $ref = new \ReflectionClass('Symfony\Component\Form\Form');
+        $xmlMappings = [
+            \dirname($ref->getFileName()).'/Resources/config/validation.xml',
+            strtr($projectDir.'/config/validator/foo.xml', '/', \DIRECTORY_SEPARATOR),
+        ];
+
+        $calls = $container->getDefinition('validator.builder')->getMethodCalls();
+
+        $annotations = !class_exists(FullStack::class) && class_exists(Annotation::class);
+
+        $this->assertCount($annotations ? 7 : 6, $calls);
+        $this->assertSame('setConstraintValidatorFactory', $calls[0][0]);
+        $this->assertEquals([new Reference('validator.validator_factory')], $calls[0][1]);
+        $this->assertSame('setTranslator', $calls[1][0]);
+        $this->assertEquals([new Reference('translator', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)], $calls[1][1]);
+        $this->assertSame('setTranslationDomain', $calls[2][0]);
+        $this->assertSame(['%validator.translation_domain%'], $calls[2][1]);
+        $this->assertSame('addXmlMappings', $calls[3][0]);
+        $this->assertSame([$xmlMappings], $calls[3][1]);
+        $i = 3;
+        if ($annotations) {
+            $this->assertSame('enableAnnotationMapping', $calls[++$i][0]);
+        }
+        $this->assertSame('addMethodMapping', $calls[++$i][0]);
+        $this->assertSame(['loadValidatorMetadata'], $calls[$i][1]);
+        $this->assertSame('setMetadataCache', $calls[++$i][0]);
+        $this->assertEquals([new Reference('validator.mapping.cache.symfony')], $calls[$i][1]);
+    }
+
+    public function testValidationService()
+    {
+        $container = $this->createContainerFromFile('validation_annotations', ['kernel.charset' => 'UTF-8'], false);
+
+        $this->assertInstanceOf('Symfony\Component\Validator\Validator\ValidatorInterface', $container->get('validator'));
+    }
+
+    public function testAnnotations()
+    {
+        $container = $this->createContainerFromFile('full', [], true, false);
+        $container->addCompilerPass(new TestAnnotationsPass());
+        $container->compile();
+
+        $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache')->getArgument(0));
+        $this->assertSame('annotations.filesystem_cache', (string) $container->getDefinition('annotation_reader')->getArgument(1));
+    }
+
+    public function testFileLinkFormat()
+    {
+        if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
+            $this->markTestSkipped('A custom file_link_format is defined.');
+        }
+
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertEquals('file%link%format', $container->getParameter('debug.file_link_format'));
+    }
+
+    public function testValidationAnnotations()
+    {
+        $container = $this->createContainerFromFile('validation_annotations');
+
+        $calls = $container->getDefinition('validator.builder')->getMethodCalls();
+
+        $this->assertCount(7, $calls);
+        $this->assertSame('enableAnnotationMapping', $calls[4][0]);
+        $this->assertEquals([new Reference('annotation_reader')], $calls[4][1]);
+        $this->assertSame('addMethodMapping', $calls[5][0]);
+        $this->assertSame(['loadValidatorMetadata'], $calls[5][1]);
+        $this->assertSame('setMetadataCache', $calls[6][0]);
+        $this->assertEquals([new Reference('validator.mapping.cache.symfony')], $calls[6][1]);
+        // no cache this time
+    }
+
+    public function testValidationPaths()
+    {
+        require_once __DIR__.'/Fixtures/TestBundle/TestBundle.php';
+
+        $container = $this->createContainerFromFile('validation_annotations', [
+            'kernel.bundles' => ['TestBundle' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\TestBundle'],
+            'kernel.bundles_metadata' => ['TestBundle' => ['namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'parent' => null, 'path' => __DIR__.'/Fixtures/TestBundle']],
+        ]);
+
+        $calls = $container->getDefinition('validator.builder')->getMethodCalls();
+
+        $this->assertCount(8, $calls);
+        $this->assertSame('addXmlMappings', $calls[3][0]);
+        $this->assertSame('addYamlMappings', $calls[4][0]);
+        $this->assertSame('enableAnnotationMapping', $calls[5][0]);
+        $this->assertSame('addMethodMapping', $calls[6][0]);
+        $this->assertSame(['loadValidatorMetadata'], $calls[6][1]);
+        $this->assertSame('setMetadataCache', $calls[7][0]);
+        $this->assertEquals([new Reference('validator.mapping.cache.symfony')], $calls[7][1]);
+
+        $xmlMappings = $calls[3][1][0];
+        $this->assertCount(3, $xmlMappings);
+        try {
+            // Testing symfony/symfony
+            $this->assertStringEndsWith('Component'.\DIRECTORY_SEPARATOR.'Form/Resources/config/validation.xml', $xmlMappings[0]);
+        } catch (\Exception $e) {
+            // Testing symfony/framework-bundle with deps=high
+            $this->assertStringEndsWith('symfony'.\DIRECTORY_SEPARATOR.'form/Resources/config/validation.xml', $xmlMappings[0]);
+        }
+        $this->assertStringEndsWith('TestBundle/Resources/config/validation.xml', $xmlMappings[1]);
+
+        $yamlMappings = $calls[4][1][0];
+        $this->assertCount(1, $yamlMappings);
+        $this->assertStringEndsWith('TestBundle/Resources/config/validation.yml', $yamlMappings[0]);
+    }
+
+    public function testValidationPathsUsingCustomBundlePath()
+    {
+        require_once __DIR__.'/Fixtures/CustomPathBundle/src/CustomPathBundle.php';
+
+        $container = $this->createContainerFromFile('validation_annotations', [
+            'kernel.bundles' => ['CustomPathBundle' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\CustomPathBundle'],
+            'kernel.bundles_metadata' => ['TestBundle' => ['namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'parent' => null, 'path' => __DIR__.'/Fixtures/CustomPathBundle']],
+        ]);
+
+        $calls = $container->getDefinition('validator.builder')->getMethodCalls();
+        $xmlMappings = $calls[3][1][0];
+        $this->assertCount(3, $xmlMappings);
+
+        try {
+            // Testing symfony/symfony
+            $this->assertStringEndsWith('Component'.\DIRECTORY_SEPARATOR.'Form/Resources/config/validation.xml', $xmlMappings[0]);
+        } catch (\Exception $e) {
+            // Testing symfony/framework-bundle with deps=high
+            $this->assertStringEndsWith('symfony'.\DIRECTORY_SEPARATOR.'form/Resources/config/validation.xml', $xmlMappings[0]);
+        }
+        $this->assertStringEndsWith('CustomPathBundle/Resources/config/validation.xml', $xmlMappings[1]);
+
+        $yamlMappings = $calls[4][1][0];
+        $this->assertCount(1, $yamlMappings);
+        $this->assertStringEndsWith('CustomPathBundle/Resources/config/validation.yml', $yamlMappings[0]);
+    }
+
+    public function testValidationNoStaticMethod()
+    {
+        $container = $this->createContainerFromFile('validation_no_static_method');
+
+        $calls = $container->getDefinition('validator.builder')->getMethodCalls();
+
+        $annotations = !class_exists(FullStack::class) && class_exists(Annotation::class);
+
+        $this->assertCount($annotations ? 6 : 5, $calls);
+        $this->assertSame('addXmlMappings', $calls[3][0]);
+        $i = 3;
+        if ($annotations) {
+            $this->assertSame('enableAnnotationMapping', $calls[++$i][0]);
+        }
+        $this->assertSame('setMetadataCache', $calls[++$i][0]);
+        $this->assertEquals([new Reference('validator.mapping.cache.symfony')], $calls[$i][1]);
+        // no cache, no annotations, no static methods
+    }
+
+    public function testValidationTranslationDomain()
+    {
+        $container = $this->createContainerFromFile('validation_translation_domain');
+
+        $this->assertSame('messages', $container->getParameter('validator.translation_domain'));
+    }
+
+    public function testValidationStrictEmail()
+    {
+        $container = $this->createContainerFromFile('validation_strict_email');
+
+        $this->assertTrue($container->getDefinition('validator.email')->getArgument(0));
+    }
+
+    public function testValidationMapping()
+    {
+        $container = $this->createContainerFromFile('validation_mapping');
+
+        $calls = $container->getDefinition('validator.builder')->getMethodCalls();
+
+        $this->assertSame('addXmlMappings', $calls[3][0]);
+        $this->assertCount(3, $calls[3][1][0]);
+
+        $this->assertSame('addYamlMappings', $calls[4][0]);
+        $this->assertCount(3, $calls[4][1][0]);
+        $this->assertStringContainsString('foo.yml', $calls[4][1][0][0]);
+        $this->assertStringContainsString('validation.yml', $calls[4][1][0][1]);
+        $this->assertStringContainsString('validation.yaml', $calls[4][1][0][2]);
+    }
+
+    public function testFormsCanBeEnabledWithoutCsrfProtection()
+    {
+        $container = $this->createContainerFromFile('form_no_csrf');
+
+        $this->assertFalse($container->getParameter('form.type_extension.csrf.enabled'));
+    }
+
+    public function testStopwatchEnabledWithDebugModeEnabled()
+    {
+        $container = $this->createContainerFromFile('default_config', [
+            'kernel.container_class' => 'foo',
+            'kernel.debug' => true,
+        ]);
+
+        $this->assertTrue($container->has('debug.stopwatch'));
+    }
+
+    public function testStopwatchEnabledWithDebugModeDisabled()
+    {
+        $container = $this->createContainerFromFile('default_config', [
+            'kernel.container_class' => 'foo',
+        ]);
+
+        $this->assertTrue($container->has('debug.stopwatch'));
+    }
+
+    public function testSerializerDisabled()
+    {
+        $container = $this->createContainerFromFile('default_config');
+        $this->assertSame(!class_exists(FullStack::class) && class_exists(Serializer::class), $container->has('serializer'));
+    }
+
+    public function testSerializerEnabled()
+    {
+        $container = $this->createContainerFromFile('full');
+        $this->assertTrue($container->has('serializer'));
+
+        $argument = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);
+
+        $this->assertCount(2, $argument);
+        $this->assertEquals('Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader', $argument[0]->getClass());
+        $this->assertNull($container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1));
+        $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.normalizer.object')->getArgument(1));
+        $this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));
+        $this->assertEquals(['setCircularReferenceHandler', [new Reference('my.circular.reference.handler')]], $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[0]);
+    }
+
+    public function testRegisterSerializerExtractor()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $serializerExtractorDefinition = $container->getDefinition('property_info.serializer_extractor');
+
+        $this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());
+        $this->assertFalse($serializerExtractorDefinition->isPublic());
+        $tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');
+        $this->assertEquals(['priority' => -999], $tag[0]);
+    }
+
+    public function testDataUriNormalizerRegistered()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $definition = $container->getDefinition('serializer.normalizer.data_uri');
+        $tag = $definition->getTag('serializer.normalizer');
+
+        $this->assertEquals(DataUriNormalizer::class, $definition->getClass());
+        $this->assertEquals(-920, $tag[0]['priority']);
+    }
+
+    public function testDateIntervalNormalizerRegistered()
+    {
+        if (!class_exists(DateIntervalNormalizer::class)) {
+            $this->markTestSkipped('The DateIntervalNormalizer has been introduced in the Serializer Component version 3.4.');
+        }
+
+        $container = $this->createContainerFromFile('full');
+
+        $definition = $container->getDefinition('serializer.normalizer.dateinterval');
+        $tag = $definition->getTag('serializer.normalizer');
+
+        $this->assertEquals(DateIntervalNormalizer::class, $definition->getClass());
+        $this->assertEquals(-915, $tag[0]['priority']);
+    }
+
+    public function testDateTimeNormalizerRegistered()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $definition = $container->getDefinition('serializer.normalizer.datetime');
+        $tag = $definition->getTag('serializer.normalizer');
+
+        $this->assertEquals(DateTimeNormalizer::class, $definition->getClass());
+        $this->assertEquals(-910, $tag[0]['priority']);
+    }
+
+    public function testJsonSerializableNormalizerRegistered()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $definition = $container->getDefinition('serializer.normalizer.json_serializable');
+        $tag = $definition->getTag('serializer.normalizer');
+
+        $this->assertEquals(JsonSerializableNormalizer::class, $definition->getClass());
+        $this->assertEquals(-900, $tag[0]['priority']);
+    }
+
+    public function testObjectNormalizerRegistered()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $definition = $container->getDefinition('serializer.normalizer.object');
+        $tag = $definition->getTag('serializer.normalizer');
+
+        $this->assertEquals('Symfony\Component\Serializer\Normalizer\ObjectNormalizer', $definition->getClass());
+        $this->assertEquals(-1000, $tag[0]['priority']);
+    }
+
+    public function testSerializerCacheActivated()
+    {
+        $container = $this->createContainerFromFile('serializer_enabled');
+
+        $this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
+
+        $cache = $container->getDefinition('serializer.mapping.cache_class_metadata_factory')->getArgument(1);
+        $this->assertEquals(new Reference('serializer.mapping.cache.symfony'), $cache);
+    }
+
+    public function testSerializerCacheDisabled()
+    {
+        $container = $this->createContainerFromFile('serializer_enabled', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
+        $this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "framework.serializer.cache" option is deprecated %s.
+     */
+    public function testDeprecatedSerializerCacheOption()
+    {
+        $container = $this->createContainerFromFile('serializer_legacy_cache', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
+
+        $this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
+        $this->assertTrue($container->hasDefinition('serializer.mapping.class_metadata_factory'));
+
+        $cache = $container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1);
+        $this->assertEquals(new Reference('foo'), $cache);
+    }
+
+    public function testSerializerMapping()
+    {
+        $container = $this->createContainerFromFile('serializer_mapping', ['kernel.bundles_metadata' => ['TestBundle' => ['namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'path' => __DIR__.'/Fixtures/TestBundle', 'parent' => null]]]);
+        $projectDir = $container->getParameter('kernel.project_dir');
+        $configDir = __DIR__.'/Fixtures/TestBundle/Resources/config';
+        $expectedLoaders = [
+            new Definition(AnnotationLoader::class, [new Reference('annotation_reader')]),
+            new Definition(XmlFileLoader::class, [$configDir.'/serialization.xml']),
+            new Definition(YamlFileLoader::class, [$configDir.'/serialization.yml']),
+            new Definition(YamlFileLoader::class, [$projectDir.'/config/serializer/foo.yml']),
+            new Definition(XmlFileLoader::class, [$configDir.'/serializer_mapping/files/foo.xml']),
+            new Definition(YamlFileLoader::class, [$configDir.'/serializer_mapping/files/foo.yml']),
+            new Definition(YamlFileLoader::class, [$configDir.'/serializer_mapping/serialization.yml']),
+            new Definition(YamlFileLoader::class, [$configDir.'/serializer_mapping/serialization.yaml']),
+        ];
+
+        foreach ($expectedLoaders as $definition) {
+            if (is_file($arg = $definition->getArgument(0))) {
+                $definition->replaceArgument(0, strtr($arg, '/', \DIRECTORY_SEPARATOR));
+            }
+            $definition->setPublic(false);
+        }
+
+        $loaders = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);
+        foreach ($loaders as $loader) {
+            if (is_file($arg = $loader->getArgument(0))) {
+                $loader->replaceArgument(0, strtr($arg, '/', \DIRECTORY_SEPARATOR));
+            }
+        }
+        $this->assertEquals($expectedLoaders, $loaders);
+    }
+
+    public function testAssetHelperWhenAssetsAreEnabled()
+    {
+        $container = $this->createContainerFromFile('full');
+        $packages = $container->getDefinition('templating.helper.assets')->getArgument(0);
+
+        $this->assertSame('assets.packages', (string) $packages);
+    }
+
+    public function testAssetHelperWhenTemplatesAreEnabledAndNoAssetsConfiguration()
+    {
+        $container = $this->createContainerFromFile('templating_no_assets');
+        $packages = $container->getDefinition('templating.helper.assets')->getArgument(0);
+
+        $this->assertSame('assets.packages', (string) $packages);
+    }
+
+    public function testAssetsHelperIsRemovedWhenPhpTemplatingEngineIsEnabledAndAssetsAreDisabled()
+    {
+        $container = $this->createContainerFromFile('templating_php_assets_disabled');
+
+        $this->assertTrue(!$container->has('templating.helper.assets'), 'The templating.helper.assets helper service is removed when assets are disabled.');
+    }
+
+    public function testAssetHelperWhenAssetsAndTemplatesAreDisabled()
+    {
+        $container = $this->createContainerFromFile('default_config');
+
+        $this->assertFalse($container->hasDefinition('templating.helper.assets'));
+    }
+
+    public function testSerializerServiceIsRegisteredWhenEnabled()
+    {
+        $container = $this->createContainerFromFile('serializer_enabled');
+
+        $this->assertTrue($container->hasDefinition('serializer'));
+    }
+
+    public function testSerializerServiceIsNotRegisteredWhenDisabled()
+    {
+        $container = $this->createContainerFromFile('serializer_disabled');
+
+        $this->assertFalse($container->hasDefinition('serializer'));
+    }
+
+    public function testPropertyInfoEnabled()
+    {
+        $container = $this->createContainerFromFile('property_info');
+        $this->assertTrue($container->has('property_info'));
+    }
+
+    public function testEventDispatcherService()
+    {
+        $container = $this->createContainer(['kernel.charset' => 'UTF-8', 'kernel.secret' => 'secret']);
+        $container->registerExtension(new FrameworkExtension());
+        $this->loadFromFile($container, 'default_config');
+        $container
+            ->register('foo', \stdClass::class)
+            ->setPublic(true)
+            ->setProperty('dispatcher', new Reference('event_dispatcher'));
+        $container->compile();
+        $this->assertInstanceOf(EventDispatcherInterface::class, $container->get('foo')->dispatcher);
+    }
+
+    public function testCacheDefaultRedisProvider()
+    {
+        $container = $this->createContainerFromFile('cache');
+
+        $redisUrl = 'redis://localhost';
+        $providerId = 'cache_connection.'.ContainerBuilder::hash($redisUrl);
+
+        $this->assertTrue($container->hasDefinition($providerId));
+
+        $url = $container->getDefinition($providerId)->getArgument(0);
+
+        $this->assertSame($redisUrl, $url);
+    }
+
+    public function testCacheDefaultRedisProviderWithEnvVar()
+    {
+        $container = $this->createContainerFromFile('cache_env_var');
+
+        $redisUrl = 'redis://paas.com';
+        $providerId = 'cache_connection.'.ContainerBuilder::hash($redisUrl);
+
+        $this->assertTrue($container->hasDefinition($providerId));
+
+        $url = $container->getDefinition($providerId)->getArgument(0);
+
+        $this->assertSame($redisUrl, $url);
+    }
+
+    public function testCachePoolServices()
+    {
+        $container = $this->createContainerFromFile('cache');
+
+        $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.foo', 'cache.adapter.apcu', 30);
+        $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.bar', 'cache.adapter.doctrine', 5);
+        $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.baz', 'cache.adapter.filesystem', 7);
+        $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.foobar', 'cache.adapter.psr6', 10);
+        $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.def', 'cache.app', 11);
+    }
+
+    public function testRemovesResourceCheckerConfigCacheFactoryArgumentOnlyIfNoDebug()
+    {
+        $container = $this->createContainer(['kernel.debug' => true]);
+        (new FrameworkExtension())->load([], $container);
+        $this->assertCount(1, $container->getDefinition('config_cache_factory')->getArguments());
+
+        $container = $this->createContainer(['kernel.debug' => false]);
+        (new FrameworkExtension())->load([], $container);
+        $this->assertEmpty($container->getDefinition('config_cache_factory')->getArguments());
+    }
+
+    protected function createContainer(array $data = [])
+    {
+        return new ContainerBuilder(new ParameterBag(array_merge([
+            'kernel.bundles' => ['FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'],
+            'kernel.bundles_metadata' => ['FrameworkBundle' => ['namespace' => 'Symfony\\Bundle\\FrameworkBundle', 'path' => __DIR__.'/../..', 'parent' => null]],
+            'kernel.cache_dir' => __DIR__,
+            'kernel.project_dir' => __DIR__,
+            'kernel.debug' => false,
+            'kernel.environment' => 'test',
+            'kernel.name' => 'kernel',
+            'kernel.root_dir' => __DIR__,
+            'kernel.container_class' => 'testContainer',
+            'container.build_hash' => 'Abc1234',
+            'container.build_id' => hash('crc32', 'Abc123423456789'),
+            'container.build_time' => 23456789,
+        ], $data)));
+    }
+
+    protected function createContainerFromFile($file, $data = [], $resetCompilerPasses = true, $compile = true)
+    {
+        $cacheKey = md5(\get_class($this).$file.serialize($data));
+        if ($compile && isset(self::$containerCache[$cacheKey])) {
+            return self::$containerCache[$cacheKey];
+        }
+        $container = $this->createContainer($data);
+        $container->registerExtension(new FrameworkExtension());
+        $this->loadFromFile($container, $file);
+
+        if ($resetCompilerPasses) {
+            $container->getCompilerPassConfig()->setOptimizationPasses([]);
+            $container->getCompilerPassConfig()->setRemovingPasses([]);
+            $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
+        }
+        $container->getCompilerPassConfig()->setBeforeRemovingPasses([new AddConstraintValidatorsPass(), new TranslatorPass('translator.default', 'translation.reader')]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([new AddAnnotationsCachedReaderPass()]);
+
+        if (!$compile) {
+            return $container;
+        }
+        $container->compile();
+
+        return self::$containerCache[$cacheKey] = $container;
+    }
+
+    protected function createContainerFromClosure($closure, $data = [])
+    {
+        $container = $this->createContainer($data);
+        $container->registerExtension(new FrameworkExtension());
+        $loader = new ClosureLoader($container);
+        $loader->load($closure);
+
+        $container->getCompilerPassConfig()->setOptimizationPasses([]);
+        $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
+        $container->compile();
+
+        return $container;
+    }
+
+    private function assertPathPackage(ContainerBuilder $container, ChildDefinition $package, $basePath, $version, $format)
+    {
+        $this->assertEquals('assets.path_package', $package->getParent());
+        $this->assertEquals($basePath, $package->getArgument(0));
+        $this->assertVersionStrategy($container, $package->getArgument(1), $version, $format);
+    }
+
+    private function assertUrlPackage(ContainerBuilder $container, ChildDefinition $package, $baseUrls, $version, $format)
+    {
+        $this->assertEquals('assets.url_package', $package->getParent());
+        $this->assertEquals($baseUrls, $package->getArgument(0));
+        $this->assertVersionStrategy($container, $package->getArgument(1), $version, $format);
+    }
+
+    private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format)
+    {
+        $versionStrategy = $container->getDefinition((string) $reference);
+        if (null === $version) {
+            $this->assertEquals('assets.empty_version_strategy', (string) $reference);
+        } else {
+            $this->assertEquals('assets.static_version_strategy', $versionStrategy->getParent());
+            $this->assertEquals($version, $versionStrategy->getArgument(0));
+            $this->assertEquals($format, $versionStrategy->getArgument(1));
+        }
+    }
+
+    private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $container, $id, $adapter, $defaultLifetime)
+    {
+        $this->assertTrue($container->has($id), sprintf('Service definition "%s" for cache pool of type "%s" is registered', $id, $adapter));
+
+        $poolDefinition = $container->getDefinition($id);
+
+        $this->assertInstanceOf(ChildDefinition::class, $poolDefinition, sprintf('Cache pool "%s" is based on an abstract cache pool.', $id));
+
+        $this->assertTrue($poolDefinition->hasTag('cache.pool'), sprintf('Service definition "%s" is tagged with the "cache.pool" tag.', $id));
+        $this->assertFalse($poolDefinition->isAbstract(), sprintf('Service definition "%s" is not abstract.', $id));
+
+        $tag = $poolDefinition->getTag('cache.pool');
+        $this->assertArrayHasKey('default_lifetime', $tag[0], 'The default lifetime is stored as an attribute of the "cache.pool" tag.');
+        $this->assertSame($defaultLifetime, $tag[0]['default_lifetime'], 'The default lifetime is stored as an attribute of the "cache.pool" tag.');
+
+        $parentDefinition = $poolDefinition;
+        do {
+            $parentId = $parentDefinition->getParent();
+            $parentDefinition = $container->findDefinition($parentId);
+        } while ($parentDefinition instanceof ChildDefinition);
+
+        switch ($adapter) {
+            case 'cache.adapter.apcu':
+                $this->assertSame(ApcuAdapter::class, $parentDefinition->getClass());
+                break;
+            case 'cache.adapter.doctrine':
+                $this->assertSame(DoctrineAdapter::class, $parentDefinition->getClass());
+                break;
+            case 'cache.app':
+            case 'cache.adapter.filesystem':
+                $this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass());
+                break;
+            case 'cache.adapter.psr6':
+                $this->assertSame(ProxyAdapter::class, $parentDefinition->getClass());
+                break;
+            case 'cache.adapter.redis':
+                $this->assertSame(RedisAdapter::class, $parentDefinition->getClass());
+                break;
+            default:
+                $this->fail('Unresolved adapter: '.$adapter);
+        }
+    }
+}
+
+/**
+ * Simulates ReplaceAliasByActualDefinitionPass.
+ */
+class TestAnnotationsPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        $container->setDefinition('annotation_reader', $container->getDefinition('annotations.cached_reader'));
+        $container->removeDefinition('annotations.cached_reader');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
new file mode 100644
index 000000000..afccc84d5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+class PhpFrameworkExtensionTest extends FrameworkExtensionTest
+{
+    protected function loadFromFile(ContainerBuilder $container, $file)
+    {
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/Fixtures/php'));
+        $loader->load($file.'.php');
+    }
+
+    public function testAssetsCannotHavePathAndUrl()
+    {
+        $this->expectException('LogicException');
+        $this->createContainerFromClosure(function ($container) {
+            $container->loadFromExtension('framework', [
+                'assets' => [
+                    'base_urls' => 'http://cdn.example.com',
+                    'base_path' => '/foo',
+                ],
+            ]);
+        });
+    }
+
+    public function testAssetPackageCannotHavePathAndUrl()
+    {
+        $this->expectException('LogicException');
+        $this->createContainerFromClosure(function ($container) {
+            $container->loadFromExtension('framework', [
+                'assets' => [
+                    'packages' => [
+                        'impossible' => [
+                            'base_urls' => 'http://cdn.example.com',
+                            'base_path' => '/foo',
+                        ],
+                    ],
+                ],
+            ]);
+        });
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
new file mode 100644
index 000000000..ac1ba2431
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+
+class XmlFrameworkExtensionTest extends FrameworkExtensionTest
+{
+    protected function loadFromFile(ContainerBuilder $container, $file)
+    {
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/Fixtures/xml'));
+        $loader->load($file.'.xml');
+    }
+
+    public function testAssetsHelperIsRemovedWhenPhpTemplatingEngineIsEnabledAndAssetsAreDisabled()
+    {
+        $this->markTestSkipped('The assets key cannot be set to false using the XML configuration format.');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/YamlFrameworkExtensionTest.php b/lib/symfony/framework-bundle/Tests/DependencyInjection/YamlFrameworkExtensionTest.php
new file mode 100644
index 000000000..457467aa1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/DependencyInjection/YamlFrameworkExtensionTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+class YamlFrameworkExtensionTest extends FrameworkExtensionTest
+{
+    protected function loadFromFile(ContainerBuilder $container, $file)
+    {
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/Fixtures/yml'));
+        $loader->load($file.'.yml');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/config/serializer/foo.yml b/lib/symfony/framework-bundle/Tests/DependencyInjection/config/serializer/foo.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/config/validator/foo.xml b/lib/symfony/framework-bundle/Tests/DependencyInjection/config/validator/foo.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/DependencyInjection/translations/test_default.en.xlf b/lib/symfony/framework-bundle/Tests/DependencyInjection/translations/test_default.en.xlf
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php b/lib/symfony/framework-bundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
new file mode 100644
index 000000000..92211dc34
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\EventListener;
+
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
+use Symfony\Bundle\FrameworkBundle\EventListener\ResolveControllerNameSubscriber;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class ResolveControllerNameSubscriberTest extends TestCase
+{
+    public function testReplacesControllerAttribute()
+    {
+        $parser = $this->getMockBuilder(ControllerNameParser::class)->disableOriginalConstructor()->getMock();
+        $parser->expects($this->any())
+            ->method('parse')
+            ->with('AppBundle:Starting:format')
+            ->willReturn('App\\Final\\Format::methodName');
+        $httpKernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
+
+        $request = new Request();
+        $request->attributes->set('_controller', 'AppBundle:Starting:format');
+
+        $subscriber = new ResolveControllerNameSubscriber($parser);
+        $subscriber->onKernelRequest(new GetResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST));
+        $this->assertEquals('App\\Final\\Format::methodName', $request->attributes->get('_controller'));
+    }
+
+    /**
+     * @dataProvider provideSkippedControllers
+     */
+    public function testSkipsOtherControllerFormats($controller)
+    {
+        $parser = $this->getMockBuilder(ControllerNameParser::class)->disableOriginalConstructor()->getMock();
+        $parser->expects($this->never())
+            ->method('parse');
+        $httpKernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
+
+        $request = new Request();
+        $request->attributes->set('_controller', $controller);
+
+        $subscriber = new ResolveControllerNameSubscriber($parser);
+        $subscriber->onKernelRequest(new GetResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST));
+        $this->assertEquals($controller, $request->attributes->get('_controller'));
+    }
+
+    public function provideSkippedControllers()
+    {
+        yield ['Other:format'];
+        yield [function () {}];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/BaseBundle.php b/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/BaseBundle.php
new file mode 100644
index 000000000..494a18dff
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/BaseBundle.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BaseBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class BaseBundle extends Bundle
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/base.format.engine b/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/base.format.engine
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/controller/base.format.engine b/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/controller/base.format.engine
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/this.is.a.template.format.engine b/lib/symfony/framework-bundle/Tests/Fixtures/BaseBundle/Resources/views/this.is.a.template.format.engine
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/DeclaredClass.php b/lib/symfony/framework-bundle/Tests/Fixtures/DeclaredClass.php
new file mode 100644
index 000000000..3831d0dc2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/DeclaredClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+class DeclaredClass
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.json
new file mode 100644
index 000000000..283ed13fa
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.json
@@ -0,0 +1,4 @@
+{
+    "service": "service_1",
+    "public": true
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.md
new file mode 100644
index 000000000..3220d5f13
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.md
@@ -0,0 +1,2 @@
+- Service: `service_1`
+- Public: yes
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.txt
new file mode 100644
index 000000000..4be149bff
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.txt
@@ -0,0 +1,3 @@
+
+ // This service is an alias for the service service_1                                                                  
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.xml
new file mode 100644
index 000000000..759f8a22a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_1.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<alias service="service_1" public="true"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.json
new file mode 100644
index 000000000..6998dae28
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.json
@@ -0,0 +1,4 @@
+{
+    "service": "service_2",
+    "public": false
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.md
new file mode 100644
index 000000000..73a4101d8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.md
@@ -0,0 +1,2 @@
+- Service: `service_2`
+- Public: no
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.txt
new file mode 100644
index 000000000..0dbee6ac6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.txt
@@ -0,0 +1,3 @@
+
+ // This service is an alias for the service service_2                                                                  
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.xml
new file mode 100644
index 000000000..847050b33
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_2.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<alias service="service_2" public="false"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.json
new file mode 100644
index 000000000..efcf34d06
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.json
@@ -0,0 +1,20 @@
+[
+    {
+        "service": "service_1",
+        "public": true
+    },
+    {
+        "class": "Full\\Qualified\\Class1",
+        "public": true,
+        "synthetic": false,
+        "lazy": true,
+        "shared": true,
+        "abstract": true,
+        "autowire": false,
+        "autoconfigure": false,
+        "file": null,
+        "factory_class": "Full\\Qualified\\FactoryClass",
+        "factory_method": "get",
+        "tags": []
+    }
+]
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.md
new file mode 100644
index 000000000..ac56c0d4a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.md
@@ -0,0 +1,17 @@
+### alias_1
+
+- Service: `service_1`
+- Public: yes
+
+### service_1
+
+- Class: `Full\Qualified\Class1`
+- Public: yes
+- Synthetic: no
+- Lazy: yes
+- Shared: yes
+- Abstract: yes
+- Autowired: no
+- Autoconfigured: no
+- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Method: `get`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.txt
new file mode 100644
index 000000000..011ae4209
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.txt
@@ -0,0 +1,21 @@
+ // This service is an alias for the service service_1                                                                  
+
+Information for Service "service_1"
+===================================
+
+ ---------------- ----------------------------- 
+  Option           Value                        
+ ---------------- ----------------------------- 
+  Service ID       service_1                    
+  Class            Full\Qualified\Class1        
+  Tags             -                            
+  Public           yes                          
+  Synthetic        no                           
+  Lazy             yes                          
+  Shared           yes                          
+  Abstract         yes                          
+  Autowired        no                           
+  Autoconfigured   no                           
+  Factory Class    Full\Qualified\FactoryClass  
+  Factory Method   get                          
+ ---------------- -----------------------------
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.xml
new file mode 100644
index 000000000..19f5a0434
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<alias id="alias_1" service="service_1" public="true"/>
+<definition id="service_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
+  <factory class="Full\Qualified\FactoryClass" method="get"/>
+</definition>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.json
new file mode 100644
index 000000000..03780e3ee
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.json
@@ -0,0 +1,41 @@
+[
+    {
+        "service": "service_2",
+        "public": false
+    },
+    {
+        "class": "Full\\Qualified\\Class2",
+        "public": false,
+        "synthetic": true,
+        "lazy": false,
+        "shared": true,
+        "abstract": false,
+        "autowire": false,
+        "autoconfigure": false,
+        "file": "\/path\/to\/file",
+        "factory_service": "factory.service",
+        "factory_method": "get",
+        "calls": [
+            "setMailer"
+        ],
+        "tags": [
+            {
+                "name": "tag1",
+                "parameters": {
+                    "attr1": "val1",
+                    "attr2": "val2"
+                }
+            },
+            {
+                "name": "tag1",
+                "parameters": {
+                    "attr3": "val3"
+                }
+            },
+            {
+                "name": "tag2",
+                "parameters": []
+            }
+        ]
+    }
+]
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.md
new file mode 100644
index 000000000..406c5dcad
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.md
@@ -0,0 +1,25 @@
+### alias_2
+
+- Service: `service_2`
+- Public: no
+
+### service_2
+
+- Class: `Full\Qualified\Class2`
+- Public: no
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- File: `/path/to/file`
+- Factory Service: `factory.service`
+- Factory Method: `get`
+- Call: `setMailer`
+- Tag: `tag1`
+    - Attr1: val1
+    - Attr2: val2
+- Tag: `tag1`
+    - Attr3: val3
+- Tag: `tag2`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt
new file mode 100644
index 000000000..735fe0130
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt
@@ -0,0 +1,25 @@
+ // This service is an alias for the service service_2                                                                  
+
+Information for Service "service_2"
+===================================
+
+ ----------------- --------------------------------- 
+  Option            Value                            
+ ----------------- --------------------------------- 
+  Service ID        service_2                        
+  Class             Full\Qualified\Class2            
+  Tags              tag1 (attr1: val1, attr2: val2)  
+                    tag1 (attr3: val3)               
+                    tag2                             
+  Calls             setMailer                        
+  Public            no                               
+  Synthetic         yes                              
+  Lazy              no                               
+  Shared            yes                              
+  Abstract          no                               
+  Autowired         no                               
+  Autoconfigured    no                               
+  Required File     /path/to/file                    
+  Factory Service   factory.service                  
+  Factory Method    get                              
+ ----------------- ---------------------------------
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.xml
new file mode 100644
index 000000000..3c15460be
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/alias_with_definition_2.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<alias id="alias_2" service="service_2" public="false"/>
+<definition id="service_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+  <factory service="factory.service" method="get"/>
+  <calls>
+    <call method="setMailer"/>
+  </calls>
+  <tags>
+    <tag name="tag1">
+      <parameter name="attr1">val1</parameter>
+      <parameter name="attr2">val2</parameter>
+    </tag>
+    <tag name="tag1">
+      <parameter name="attr3">val3</parameter>
+    </tag>
+    <tag name="tag2"/>
+  </tags>
+</definition>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.json
new file mode 100644
index 000000000..cb6809159
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.json
@@ -0,0 +1,3 @@
+{
+  "twig.form.resources": ["bootstrap_3_horizontal_layout.html.twig", "bootstrap_3_layout.html.twig", "form_div_layout.html.twig", "form_table_layout.html.twig"]
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.md
new file mode 100644
index 000000000..593be0cab
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.md
@@ -0,0 +1,4 @@
+twig.form.resources
+===================
+
+["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.txt
new file mode 100644
index 000000000..903717b62
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.txt
@@ -0,0 +1,5 @@
+ --------------------- ----------------------------------------------------------------- 
+  Parameter             Value                                                            
+ --------------------- ----------------------------------------------------------------- 
+  twig.form.resources   ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...  
+ --------------------- -----------------------------------------------------------------
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.xml
new file mode 100644
index 000000000..0e16f57fc
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/array_parameter.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<parameter key="twig.form.resources">["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...</parameter>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.json
new file mode 100644
index 000000000..df76274db
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.json
@@ -0,0 +1,80 @@
+{
+    "definitions": {
+        "definition_1": {
+            "class": "Full\\Qualified\\Class1",
+            "public": true,
+            "synthetic": false,
+            "lazy": true,
+            "shared": true,
+            "abstract": true,
+            "autowire": false,
+            "autoconfigure": false,
+            "arguments": [
+                {
+                    "type": "service",
+                    "id": "definition2"
+                },
+                "%parameter%",
+                {
+                    "class": "inline_service",
+                    "public": false,
+                    "synthetic": false,
+                    "lazy": false,
+                    "shared": true,
+                    "abstract": false,
+                    "autowire": false,
+                    "autoconfigure": false,
+                    "arguments": [
+                        "arg1",
+                        "arg2"
+                    ],
+                    "file": null,
+                    "tags": []
+                },
+                [
+                    "foo",
+                    {
+                        "type": "service",
+                        "id": "definition2"
+                    },
+                    {
+                        "class": "inline_service",
+                        "public": false,
+                        "synthetic": false,
+                        "lazy": false,
+                        "shared": true,
+                        "abstract": false,
+                        "autowire": false,
+                        "autoconfigure": false,
+                        "arguments": [],
+                        "file": null,
+                        "tags": []
+                    }
+                ],
+                [
+                    {
+                        "type": "service",
+                        "id": "definition_1"
+                    },
+                    {
+                        "type": "service",
+                        "id": "definition_2"
+                    }
+                ]
+            ],
+            "file": null,
+            "factory_class": "Full\\Qualified\\FactoryClass",
+            "factory_method": "get",
+            "tags": []
+        }
+    },
+    "aliases": {
+        "alias_1": {
+            "service": "service_1",
+            "public": true
+        }
+    },
+    "services": {
+        "service_container": "Symfony\\Component\\DependencyInjection\\ContainerBuilder"
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.md
new file mode 100644
index 000000000..757da8278
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.md
@@ -0,0 +1,34 @@
+Public services
+===============
+
+Definitions
+-----------
+
+### definition_1
+
+- Class: `Full\Qualified\Class1`
+- Public: yes
+- Synthetic: no
+- Lazy: yes
+- Shared: yes
+- Abstract: yes
+- Autowired: no
+- Autoconfigured: no
+- Arguments: yes
+- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Method: `get`
+
+
+Aliases
+-------
+
+### alias_1
+
+- Service: `service_1`
+- Public: yes
+
+
+Services
+--------
+
+- `service_container`: `Symfony\Component\DependencyInjection\ContainerBuilder`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt
new file mode 100644
index 000000000..87f6b2125
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt
@@ -0,0 +1,12 @@
+
+Symfony Container Public Services
+=================================
+
+ ------------------- -------------------------------------------------------- 
+  Service ID          Class name                                              
+ ------------------- -------------------------------------------------------- 
+  alias_1             alias for "service_1"                                   
+  definition_1        Full\Qualified\Class1                                   
+  service_container   Symfony\Component\DependencyInjection\ContainerBuilder  
+ ------------------- -------------------------------------------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml
new file mode 100644
index 000000000..59811b00d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container>
+  <alias id="alias_1" service="service_1" public="true"/>
+  <definition id="definition_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
+    <factory class="Full\Qualified\FactoryClass" method="get"/>
+    <argument type="service" id="definition2"/>
+    <argument>%parameter%</argument>
+    <argument>
+      <definition class="inline_service" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="">
+        <argument>arg1</argument>
+        <argument>arg2</argument>
+      </definition>
+    </argument>
+    <argument type="collection">
+      <argument>foo</argument>
+      <argument type="service" id="definition2"/>
+      <argument>
+        <definition class="inline_service" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file=""/>
+      </argument>
+    </argument>
+    <argument type="iterator">
+      <argument type="service" id="definition_1"/>
+      <argument type="service" id="definition_2"/>
+    </argument>
+  </definition>
+  <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerBuilder"/>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.json
new file mode 100644
index 000000000..3419083f5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.json
@@ -0,0 +1,27 @@
+{
+    "definitions": {
+        "definition_1": {
+            "class": "Full\\Qualified\\Class1",
+            "public": true,
+            "synthetic": false,
+            "lazy": true,
+            "shared": true,
+            "abstract": true,
+            "autowire": false,
+            "autoconfigure": false,
+            "file": null,
+            "factory_class": "Full\\Qualified\\FactoryClass",
+            "factory_method": "get",
+            "tags": []
+        }
+    },
+    "aliases": {
+        "alias_1": {
+            "service": "service_1",
+            "public": true
+        }
+    },
+    "services": {
+        "service_container": "Symfony\\Component\\DependencyInjection\\ContainerBuilder"
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.md
new file mode 100644
index 000000000..b8c62be4b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.md
@@ -0,0 +1,33 @@
+Public services
+===============
+
+Definitions
+-----------
+
+### definition_1
+
+- Class: `Full\Qualified\Class1`
+- Public: yes
+- Synthetic: no
+- Lazy: yes
+- Shared: yes
+- Abstract: yes
+- Autowired: no
+- Autoconfigured: no
+- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Method: `get`
+
+
+Aliases
+-------
+
+### alias_1
+
+- Service: `service_1`
+- Public: yes
+
+
+Services
+--------
+
+- `service_container`: `Symfony\Component\DependencyInjection\ContainerBuilder`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.txt
new file mode 100644
index 000000000..87f6b2125
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.txt
@@ -0,0 +1,12 @@
+
+Symfony Container Public Services
+=================================
+
+ ------------------- -------------------------------------------------------- 
+  Service ID          Class name                                              
+ ------------------- -------------------------------------------------------- 
+  alias_1             alias for "service_1"                                   
+  definition_1        Full\Qualified\Class1                                   
+  service_container   Symfony\Component\DependencyInjection\ContainerBuilder  
+ ------------------- -------------------------------------------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.xml
new file mode 100644
index 000000000..ac92a28ef
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container>
+  <alias id="alias_1" service="service_1" public="true"/>
+  <definition id="definition_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
+    <factory class="Full\Qualified\FactoryClass" method="get"/>
+  </definition>
+  <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerBuilder"/>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.json
new file mode 100644
index 000000000..becd607b7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.json
@@ -0,0 +1,66 @@
+{
+    "definitions": {
+        "definition_1": {
+            "class": "Full\\Qualified\\Class1",
+            "public": true,
+            "synthetic": false,
+            "lazy": true,
+            "shared": true,
+            "abstract": true,
+            "autowire": false,
+            "autoconfigure": false,
+            "file": null,
+            "factory_class": "Full\\Qualified\\FactoryClass",
+            "factory_method": "get",
+            "tags": []
+        },
+        "definition_2": {
+            "class": "Full\\Qualified\\Class2",
+            "public": false,
+            "synthetic": true,
+            "lazy": false,
+            "shared": true,
+            "abstract": false,
+            "autowire": false,
+            "autoconfigure": false,
+            "file": "\/path\/to\/file",
+            "factory_service": "factory.service",
+            "factory_method": "get",
+            "calls": [
+                "setMailer"
+            ],
+            "tags": [
+                {
+                    "name": "tag1",
+                    "parameters": {
+                        "attr1": "val1",
+                        "attr2": "val2"
+                    }
+                },
+                {
+                    "name": "tag1",
+                    "parameters": {
+                        "attr3": "val3"
+                    }
+                },
+                {
+                    "name": "tag2",
+                    "parameters": []
+                }
+            ]
+        }
+    },
+    "aliases": {
+        "alias_1": {
+            "service": "service_1",
+            "public": true
+        },
+        "alias_2": {
+            "service": "service_2",
+            "public": false
+        }
+    },
+    "services": {
+        "service_container": "Symfony\\Component\\DependencyInjection\\ContainerBuilder"
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.md
new file mode 100644
index 000000000..54655668b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.md
@@ -0,0 +1,59 @@
+Public and private services
+===========================
+
+Definitions
+-----------
+
+### definition_1
+
+- Class: `Full\Qualified\Class1`
+- Public: yes
+- Synthetic: no
+- Lazy: yes
+- Shared: yes
+- Abstract: yes
+- Autowired: no
+- Autoconfigured: no
+- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Method: `get`
+
+### definition_2
+
+- Class: `Full\Qualified\Class2`
+- Public: no
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- File: `/path/to/file`
+- Factory Service: `factory.service`
+- Factory Method: `get`
+- Call: `setMailer`
+- Tag: `tag1`
+    - Attr1: val1
+    - Attr2: val2
+- Tag: `tag1`
+    - Attr3: val3
+- Tag: `tag2`
+
+
+Aliases
+-------
+
+### alias_1
+
+- Service: `service_1`
+- Public: yes
+
+### alias_2
+
+- Service: `service_2`
+- Public: no
+
+
+Services
+--------
+
+- `service_container`: `Symfony\Component\DependencyInjection\ContainerBuilder`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.txt
new file mode 100644
index 000000000..e23ea6d81
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.txt
@@ -0,0 +1,14 @@
+
+Symfony Container Public and Private Services
+=============================================
+
+ ------------------- -------------------------------------------------------- 
+  Service ID          Class name                                              
+ ------------------- -------------------------------------------------------- 
+  alias_1             alias for "service_1"                                   
+  alias_2             alias for "service_2"                                   
+  definition_1        Full\Qualified\Class1                                   
+  definition_2        Full\Qualified\Class2                                   
+  service_container   Symfony\Component\DependencyInjection\ContainerBuilder  
+ ------------------- -------------------------------------------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.xml
new file mode 100644
index 000000000..54da4f4f4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container>
+  <alias id="alias_1" service="service_1" public="true"/>
+  <alias id="alias_2" service="service_2" public="false"/>
+  <definition id="definition_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
+    <factory class="Full\Qualified\FactoryClass" method="get"/>
+  </definition>
+  <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+    <factory service="factory.service" method="get"/>
+    <calls>
+      <call method="setMailer"/>
+    </calls>
+    <tags>
+      <tag name="tag1">
+        <parameter name="attr1">val1</parameter>
+        <parameter name="attr2">val2</parameter>
+      </tag>
+      <tag name="tag1">
+        <parameter name="attr3">val3</parameter>
+      </tag>
+      <tag name="tag2"/>
+    </tags>
+  </definition>
+  <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerBuilder"/>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
new file mode 100644
index 000000000..fb9634f67
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
@@ -0,0 +1,41 @@
+{
+    "definitions": {
+        "definition_2": {
+            "class": "Full\\Qualified\\Class2",
+            "public": false,
+            "synthetic": true,
+            "lazy": false,
+            "shared": true,
+            "abstract": false,
+            "autowire": false,
+            "autoconfigure": false,
+            "file": "\/path\/to\/file",
+            "factory_service": "factory.service",
+            "factory_method": "get",
+            "calls": [
+                "setMailer"
+            ],
+            "tags": [
+                {
+                    "name": "tag1",
+                    "parameters": {
+                        "attr1": "val1",
+                        "attr2": "val2"
+                    }
+                },
+                {
+                    "name": "tag1",
+                    "parameters": {
+                        "attr3": "val3"
+                    }
+                },
+                {
+                    "name": "tag2",
+                    "parameters": []
+                }
+            ]
+        }
+    },
+    "aliases": [],
+    "services": []
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
new file mode 100644
index 000000000..9895f1fb5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
@@ -0,0 +1,26 @@
+Public and private services with tag `tag1`
+===========================================
+
+Definitions
+-----------
+
+### definition_2
+
+- Class: `Full\Qualified\Class2`
+- Public: no
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- File: `/path/to/file`
+- Factory Service: `factory.service`
+- Factory Method: `get`
+- Call: `setMailer`
+- Tag: `tag1`
+    - Attr1: val1
+    - Attr2: val2
+- Tag: `tag1`
+    - Attr3: val3
+- Tag: `tag2`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt
new file mode 100644
index 000000000..b8b393266
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt
@@ -0,0 +1,11 @@
+
+Symfony Container Public and Private Services Tagged with "tag1" Tag
+====================================================================
+
+ -------------- ------- ------- ------- ----------------------- 
+  Service ID     attr1   attr2   attr3   Class name             
+ -------------- ------- ------- ------- ----------------------- 
+  definition_2   val1    val2            Full\Qualified\Class2  
+    "                            val3                           
+ -------------- ------- ------- ------- ----------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
new file mode 100644
index 000000000..9c39b653d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container>
+  <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+    <factory service="factory.service" method="get"/>
+    <calls>
+      <call method="setMailer"/>
+    </calls>
+    <tags>
+      <tag name="tag1">
+        <parameter name="attr1">val1</parameter>
+        <parameter name="attr2">val2</parameter>
+      </tag>
+      <tag name="tag1">
+        <parameter name="attr3">val3</parameter>
+      </tag>
+      <tag name="tag2"/>
+    </tags>
+  </definition>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.json
new file mode 100644
index 000000000..7f49ac241
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.json
@@ -0,0 +1,38 @@
+{
+    "tag1": [
+        {
+            "class": "Full\\Qualified\\Class2",
+            "public": false,
+            "synthetic": true,
+            "lazy": false,
+            "shared": true,
+            "abstract": false,
+            "autowire": false,
+            "autoconfigure": false,
+            "file": "\/path\/to\/file",
+            "factory_service": "factory.service",
+            "factory_method": "get",
+            "calls": [
+                "setMailer"
+            ]
+        }
+    ],
+    "tag2": [
+        {
+            "class": "Full\\Qualified\\Class2",
+            "public": false,
+            "synthetic": true,
+            "lazy": false,
+            "shared": true,
+            "abstract": false,
+            "autowire": false,
+            "autoconfigure": false,
+            "file": "\/path\/to\/file",
+            "factory_service": "factory.service",
+            "factory_method": "get",
+            "calls": [
+                "setMailer"
+            ]
+        }
+    ]
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.md
new file mode 100644
index 000000000..205596259
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.md
@@ -0,0 +1,39 @@
+Container tags
+==============
+
+tag1
+----
+
+### definition_2
+
+- Class: `Full\Qualified\Class2`
+- Public: no
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- File: `/path/to/file`
+- Factory Service: `factory.service`
+- Factory Method: `get`
+- Call: `setMailer`
+
+
+tag2
+----
+
+### definition_2
+
+- Class: `Full\Qualified\Class2`
+- Public: no
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- File: `/path/to/file`
+- Factory Service: `factory.service`
+- Factory Method: `get`
+- Call: `setMailer`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.txt
new file mode 100644
index 000000000..45523dcb6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.txt
@@ -0,0 +1,14 @@
+
+Symfony Container Public and Private Tags
+=========================================
+
+"tag1" tag
+----------
+
+ * definition_2
+
+"tag2" tag
+----------
+
+ * definition_2
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
new file mode 100644
index 000000000..4e98e77a1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container>
+  <tag name="tag1">
+    <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+      <factory service="factory.service" method="get"/>
+      <calls>
+        <call method="setMailer"/>
+      </calls>
+    </definition>
+  </tag>
+  <tag name="tag2">
+    <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+      <factory service="factory.service" method="get"/>
+      <calls>
+        <call method="setMailer"/>
+      </calls>
+    </definition>
+  </tag>
+</container>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.json
new file mode 100644
index 000000000..10eccf38f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.json
@@ -0,0 +1,4 @@
+{
+    "type": "function",
+    "name": "array_key_exists"
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.md
new file mode 100644
index 000000000..9cf31352e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.md
@@ -0,0 +1,3 @@
+
+- Type: `function`
+- Name: `array_key_exists`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.txt
new file mode 100644
index 000000000..09901c3c4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.txt
@@ -0,0 +1 @@
+array_key_exists()
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.xml
new file mode 100644
index 000000000..28d100dfd
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_1.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<callable type="function" name="array_key_exists"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.json
new file mode 100644
index 000000000..63972540d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.json
@@ -0,0 +1,6 @@
+{
+    "type": "function",
+    "name": "staticMethod",
+    "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass",
+    "static": true
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.md
new file mode 100644
index 000000000..c041ee8ea
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.md
@@ -0,0 +1,5 @@
+
+- Type: `function`
+- Name: `staticMethod`
+- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`
+- Static: yes
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.txt
new file mode 100644
index 000000000..5e3101e1b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.txt
@@ -0,0 +1 @@
+Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::staticMethod()
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.xml
new file mode 100644
index 000000000..df4931005
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_2.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<callable type="function" name="staticMethod" class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass" static="true"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.json
new file mode 100644
index 000000000..f77f13ad2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.json
@@ -0,0 +1,5 @@
+{
+    "type": "function",
+    "name": "method",
+    "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass"
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.md
new file mode 100644
index 000000000..3b61c0da2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.md
@@ -0,0 +1,4 @@
+
+- Type: `function`
+- Name: `method`
+- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.txt
new file mode 100644
index 000000000..dde0dbba2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.txt
@@ -0,0 +1 @@
+Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::method()
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.xml
new file mode 100644
index 000000000..367e8b21a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_3.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<callable type="function" name="method" class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.json
new file mode 100644
index 000000000..63972540d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.json
@@ -0,0 +1,6 @@
+{
+    "type": "function",
+    "name": "staticMethod",
+    "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass",
+    "static": true
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.md
new file mode 100644
index 000000000..c041ee8ea
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.md
@@ -0,0 +1,5 @@
+
+- Type: `function`
+- Name: `staticMethod`
+- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`
+- Static: yes
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.txt
new file mode 100644
index 000000000..5e3101e1b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.txt
@@ -0,0 +1 @@
+Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::staticMethod()
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.xml
new file mode 100644
index 000000000..df4931005
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_4.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<callable type="function" name="staticMethod" class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass" static="true"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.json
new file mode 100644
index 000000000..249b59f3c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.json
@@ -0,0 +1,7 @@
+{
+    "type": "function",
+    "name": "staticMethod",
+    "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\ExtendedCallableClass",
+    "static": true,
+    "parent": true
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.md
new file mode 100644
index 000000000..fc69e9baf
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.md
@@ -0,0 +1,6 @@
+
+- Type: `function`
+- Name: `staticMethod`
+- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\ExtendedCallableClass`
+- Static: yes
+- Parent: yes
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.txt
new file mode 100644
index 000000000..1c06a7e9a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.txt
@@ -0,0 +1 @@
+Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\ExtendedCallableClass::parent::staticMethod()
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.xml
new file mode 100644
index 000000000..05fbb3de7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_5.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<callable type="function" name="staticMethod" class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\ExtendedCallableClass" static="true" parent="true"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.json
new file mode 100644
index 000000000..1798fddc4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.json
@@ -0,0 +1,3 @@
+{
+    "type": "closure"
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.md
new file mode 100644
index 000000000..474a9ddc2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.md
@@ -0,0 +1,2 @@
+
+- Type: `closure`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.txt
new file mode 100644
index 000000000..8bf37d37b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.txt
@@ -0,0 +1 @@
+Closure()
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.xml
new file mode 100644
index 000000000..b0f2ab56b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_6.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<callable type="closure"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.json
new file mode 100644
index 000000000..0d4d1e861
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.json
@@ -0,0 +1,4 @@
+{
+    "type": "object",
+    "name": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass"
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.md
new file mode 100644
index 000000000..c9ad7af95
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.md
@@ -0,0 +1,3 @@
+
+- Type: `object`
+- Name: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.txt
new file mode 100644
index 000000000..78ef6a652
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.txt
@@ -0,0 +1 @@
+Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke()
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.xml
new file mode 100644
index 000000000..7a5d812c0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_7.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<callable type="object" name="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.json
new file mode 100644
index 000000000..fc0b749d9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.json
@@ -0,0 +1,5 @@
+{
+    "type": "closure",
+    "name": "__invoke",
+    "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass"
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.md
new file mode 100644
index 000000000..caf4193b4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.md
@@ -0,0 +1,4 @@
+
+- Type: `closure`
+- Name: `__invoke`
+- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.txt
new file mode 100644
index 000000000..78ef6a652
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.txt
@@ -0,0 +1 @@
+Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke()
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.xml
new file mode 100644
index 000000000..1ad2ee8f4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/callable_from_callable.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<callable type="closure" name="__invoke" class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass"/>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.json
new file mode 100644
index 000000000..940bab126
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.json
@@ -0,0 +1,14 @@
+{
+    "class": "Full\\Qualified\\Class1",
+    "public": true,
+    "synthetic": false,
+    "lazy": true,
+    "shared": true,
+    "abstract": true,
+    "autowire": false,
+    "autoconfigure": false,
+    "file": null,
+    "factory_class": "Full\\Qualified\\FactoryClass",
+    "factory_method": "get",
+    "tags": []
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.md
new file mode 100644
index 000000000..e4d0429b9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.md
@@ -0,0 +1,10 @@
+- Class: `Full\Qualified\Class1`
+- Public: yes
+- Synthetic: no
+- Lazy: yes
+- Shared: yes
+- Abstract: yes
+- Autowired: no
+- Autoconfigured: no
+- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Method: `get`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.txt
new file mode 100644
index 000000000..88cf4cd55
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.txt
@@ -0,0 +1,17 @@
+ ---------------- ----------------------------- 
+  Option           Value                        
+ ---------------- ----------------------------- 
+  Service ID       -                            
+  Class            Full\Qualified\Class1        
+  Tags             -                            
+  Public           yes                          
+  Synthetic        no                           
+  Lazy             yes                          
+  Shared           yes                          
+  Abstract         yes                          
+  Autowired        no                           
+  Autoconfigured   no                           
+  Factory Class    Full\Qualified\FactoryClass  
+  Factory Method   get                          
+ ---------------- ----------------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.xml
new file mode 100644
index 000000000..d5015fdde
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
+  <factory class="Full\Qualified\FactoryClass" method="get"/>
+</definition>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.json
new file mode 100644
index 000000000..1c7b1ae14
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.json
@@ -0,0 +1,35 @@
+{
+    "class": "Full\\Qualified\\Class2",
+    "public": false,
+    "synthetic": true,
+    "lazy": false,
+    "shared": true,
+    "abstract": false,
+    "autowire": false,
+    "autoconfigure": false,
+    "file": "\/path\/to\/file",
+    "factory_service": "factory.service",
+    "factory_method": "get",
+    "calls": [
+        "setMailer"
+    ],
+    "tags": [
+        {
+            "name": "tag1",
+            "parameters": {
+                "attr1": "val1",
+                "attr2": "val2"
+            }
+        },
+        {
+            "name": "tag1",
+            "parameters": {
+                "attr3": "val3"
+            }
+        },
+        {
+            "name": "tag2",
+            "parameters": []
+        }
+    ]
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.md
new file mode 100644
index 000000000..6ff6d60b3
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.md
@@ -0,0 +1,18 @@
+- Class: `Full\Qualified\Class2`
+- Public: no
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- File: `/path/to/file`
+- Factory Service: `factory.service`
+- Factory Method: `get`
+- Call: `setMailer`
+- Tag: `tag1`
+    - Attr1: val1
+    - Attr2: val2
+- Tag: `tag1`
+    - Attr3: val3
+- Tag: `tag2`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.txt
new file mode 100644
index 000000000..2d5b03794
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.txt
@@ -0,0 +1,21 @@
+ ----------------- --------------------------------- 
+  Option            Value                            
+ ----------------- --------------------------------- 
+  Service ID        -                                
+  Class             Full\Qualified\Class2            
+  Tags              tag1 (attr1: val1, attr2: val2)  
+                    tag1 (attr3: val3)               
+                    tag2                             
+  Calls             setMailer                        
+  Public            no                               
+  Synthetic         yes                              
+  Lazy              no                               
+  Shared            yes                              
+  Abstract          no                               
+  Autowired         no                               
+  Autoconfigured    no                               
+  Required File     /path/to/file                    
+  Factory Service   factory.service                  
+  Factory Method    get                              
+ ----------------- --------------------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.xml
new file mode 100644
index 000000000..72319eca9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+  <factory service="factory.service" method="get"/>
+  <calls>
+    <call method="setMailer"/>
+  </calls>
+  <tags>
+    <tag name="tag1">
+      <parameter name="attr1">val1</parameter>
+      <parameter name="attr2">val2</parameter>
+    </tag>
+    <tag name="tag1">
+      <parameter name="attr3">val3</parameter>
+    </tag>
+    <tag name="tag2"/>
+  </tags>
+</definition>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.json
new file mode 100644
index 000000000..2568b87de
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.json
@@ -0,0 +1,67 @@
+{
+    "class": "Full\\Qualified\\Class1",
+    "public": true,
+    "synthetic": false,
+    "lazy": true,
+    "shared": true,
+    "abstract": true,
+    "autowire": false,
+    "autoconfigure": false,
+    "arguments": [
+        {
+            "type": "service",
+            "id": "definition2"
+        },
+        "%parameter%",
+        {
+            "class": "inline_service",
+            "public": false,
+            "synthetic": false,
+            "lazy": false,
+            "shared": true,
+            "abstract": false,
+            "autowire": false,
+            "autoconfigure": false,
+            "arguments": [
+                "arg1",
+                "arg2"
+            ],
+            "file": null,
+            "tags": []
+        },
+        [
+            "foo",
+            {
+                "type": "service",
+                "id": "definition2"
+            },
+            {
+                "class": "inline_service",
+                "public": false,
+                "synthetic": false,
+                "lazy": false,
+                "shared": true,
+                "abstract": false,
+                "autowire": false,
+                "autoconfigure": false,
+                "arguments": [],
+                "file": null,
+                "tags": []
+            }
+        ],
+        [
+            {
+                "type": "service",
+                "id": "definition_1"
+            },
+            {
+                "type": "service",
+                "id": "definition_2"
+            }
+        ]
+    ],
+    "file": null,
+    "factory_class": "Full\\Qualified\\FactoryClass",
+    "factory_method": "get",
+    "tags": []
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.md
new file mode 100644
index 000000000..7cee17ad9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.md
@@ -0,0 +1,11 @@
+- Class: `Full\Qualified\Class1`
+- Public: yes
+- Synthetic: no
+- Lazy: yes
+- Shared: yes
+- Abstract: yes
+- Autowired: no
+- Autoconfigured: no
+- Arguments: yes
+- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Method: `get`
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt
new file mode 100644
index 000000000..989f96ee1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt
@@ -0,0 +1,22 @@
+ ---------------- ----------------------------- 
+  Option           Value                        
+ ---------------- ----------------------------- 
+  Service ID       -                            
+  Class            Full\Qualified\Class1        
+  Tags             -                            
+  Public           yes                          
+  Synthetic        no                           
+  Lazy             yes                          
+  Shared           yes                          
+  Abstract         yes                          
+  Autowired        no                           
+  Autoconfigured   no                           
+  Factory Class    Full\Qualified\FactoryClass  
+  Factory Method   get                          
+  Arguments        Service(definition2)         
+                   %parameter%                  
+                   Inlined Service              
+                   Array (3 element(s))         
+                   Iterator (2 element(s))      
+ ---------------- ----------------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.xml
new file mode 100644
index 000000000..e250060d7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_1.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
+  <factory class="Full\Qualified\FactoryClass" method="get"/>
+  <argument type="service" id="definition2"/>
+  <argument>%parameter%</argument>
+  <argument>
+    <definition class="inline_service" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="">
+      <argument>arg1</argument>
+      <argument>arg2</argument>
+    </definition>
+  </argument>
+  <argument type="collection">
+    <argument>foo</argument>
+    <argument type="service" id="definition2"/>
+    <argument>
+      <definition class="inline_service" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file=""/>
+    </argument>
+  </argument>
+  <argument type="iterator">
+    <argument type="service" id="definition_1"/>
+    <argument type="service" id="definition_2"/>
+  </argument>
+</definition>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.json
new file mode 100644
index 000000000..8f65d27b8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.json
@@ -0,0 +1,36 @@
+{
+    "class": "Full\\Qualified\\Class2",
+    "public": false,
+    "synthetic": true,
+    "lazy": false,
+    "shared": true,
+    "abstract": false,
+    "autowire": false,
+    "autoconfigure": false,
+    "arguments": [],
+    "file": "\/path\/to\/file",
+    "factory_service": "factory.service",
+    "factory_method": "get",
+    "calls": [
+        "setMailer"
+    ],
+    "tags": [
+        {
+            "name": "tag1",
+            "parameters": {
+                "attr1": "val1",
+                "attr2": "val2"
+            }
+        },
+        {
+            "name": "tag1",
+            "parameters": {
+                "attr3": "val3"
+            }
+        },
+        {
+            "name": "tag2",
+            "parameters": []
+        }
+    ]
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.md
new file mode 100644
index 000000000..abe7dd475
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.md
@@ -0,0 +1,19 @@
+- Class: `Full\Qualified\Class2`
+- Public: no
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- Arguments: no
+- File: `/path/to/file`
+- Factory Service: `factory.service`
+- Factory Method: `get`
+- Call: `setMailer`
+- Tag: `tag1`
+    - Attr1: val1
+    - Attr2: val2
+- Tag: `tag1`
+    - Attr3: val3
+- Tag: `tag2`
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt
new file mode 100644
index 000000000..2d5b03794
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt
@@ -0,0 +1,21 @@
+ ----------------- --------------------------------- 
+  Option            Value                            
+ ----------------- --------------------------------- 
+  Service ID        -                                
+  Class             Full\Qualified\Class2            
+  Tags              tag1 (attr1: val1, attr2: val2)  
+                    tag1 (attr3: val3)               
+                    tag2                             
+  Calls             setMailer                        
+  Public            no                               
+  Synthetic         yes                              
+  Lazy              no                               
+  Shared            yes                              
+  Abstract          no                               
+  Autowired         no                               
+  Autoconfigured    no                               
+  Required File     /path/to/file                    
+  Factory Service   factory.service                  
+  Factory Method    get                              
+ ----------------- --------------------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.xml
new file mode 100644
index 000000000..72319eca9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_arguments_2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+  <factory service="factory.service" method="get"/>
+  <calls>
+    <call method="setMailer"/>
+  </calls>
+  <tags>
+    <tag name="tag1">
+      <parameter name="attr1">val1</parameter>
+      <parameter name="attr2">val2</parameter>
+    </tag>
+    <tag name="tag1">
+      <parameter name="attr3">val3</parameter>
+    </tag>
+    <tag name="tag2"/>
+  </tags>
+</definition>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.json
new file mode 100644
index 000000000..4b68f0cef
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.json
@@ -0,0 +1,11 @@
+[
+    {
+        "type": "function",
+        "name": "global_function",
+        "priority": 255
+    },
+    {
+        "type": "closure",
+        "priority": -1
+    }
+]
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.md
new file mode 100644
index 000000000..98b81ecdc
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.md
@@ -0,0 +1,12 @@
+# Registered listeners for event `event1` ordered by descending priority
+
+## Listener 1
+
+- Type: `function`
+- Name: `global_function`
+- Priority: `255`
+
+## Listener 2
+
+- Type: `closure`
+- Priority: `-1`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
new file mode 100644
index 000000000..f7a3cb0bd
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
@@ -0,0 +1,11 @@
+
+Registered Listeners for "event1" Event
+=======================================
+
+ ------- ------------------- ---------- 
+  Order   Callable            Priority  
+ ------- ------------------- ---------- 
+  #1      global_function()   255       
+  #2      Closure()           -1        
+ ------- ------------------- ---------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml
new file mode 100644
index 000000000..bc03189af
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<event-dispatcher>
+  <callable type="function" name="global_function" priority="255"/>
+  <callable type="closure" priority="-1"/>
+</event-dispatcher>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json
new file mode 100644
index 000000000..30772d9a4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json
@@ -0,0 +1,20 @@
+{
+    "event1": [
+        {
+            "type": "function",
+            "name": "global_function",
+            "priority": 255
+        },
+        {
+            "type": "closure",
+            "priority": -1
+        }
+    ],
+    "event2": [
+        {
+            "type": "object",
+            "name": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass",
+            "priority": 0
+        }
+    ]
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md
new file mode 100644
index 000000000..eb809789d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md
@@ -0,0 +1,22 @@
+# Registered listeners
+
+## event1
+
+### Listener 1
+
+- Type: `function`
+- Name: `global_function`
+- Priority: `255`
+
+### Listener 2
+
+- Type: `closure`
+- Priority: `-1`
+
+## event2
+
+### Listener 1
+
+- Type: `object`
+- Name: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`
+- Priority: `0`
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
new file mode 100644
index 000000000..475ad24cf
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
@@ -0,0 +1,23 @@
+
+Registered Listeners Grouped by Event
+=====================================
+
+"event1" event
+--------------
+
+ ------- ------------------- ---------- 
+  Order   Callable            Priority  
+ ------- ------------------- ---------- 
+  #1      global_function()   255       
+  #2      Closure()           -1        
+ ------- ------------------- ---------- 
+
+"event2" event
+--------------
+
+ ------- ----------------------------------------------------------------------------------- ---------- 
+  Order   Callable                                                                            Priority  
+ ------- ----------------------------------------------------------------------------------- ---------- 
+  #1      Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke()   0         
+ ------- ----------------------------------------------------------------------------------- ---------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml
new file mode 100644
index 000000000..d7443f974
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<event-dispatcher>
+  <event name="event1">
+    <callable type="function" name="global_function" priority="255"/>
+    <callable type="closure" priority="-1"/>
+  </event>
+  <event name="event2">
+    <callable type="object" name="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass" priority="0"/>
+  </event>
+</event-dispatcher>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.json
new file mode 100644
index 000000000..069fdbc5d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.json
@@ -0,0 +1,3 @@
+{
+    "database_name": "symfony"
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.md
new file mode 100644
index 000000000..239e98d6a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.md
@@ -0,0 +1,4 @@
+database_name
+=============
+
+symfony
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.txt
new file mode 100644
index 000000000..a3d4404f4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.txt
@@ -0,0 +1,6 @@
+ --------------- --------- 
+  Parameter       Value    
+ --------------- --------- 
+  database_name   symfony  
+ --------------- --------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.xml
new file mode 100644
index 000000000..8465522c1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameter.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<parameter key="database_name">symfony</parameter>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.json
new file mode 100644
index 000000000..686cbc9e5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.json
@@ -0,0 +1,10 @@
+{
+    "array": [
+        12,
+        "Hello world!",
+        true
+    ],
+    "boolean": true,
+    "integer": 12,
+    "string": "Hello world!"
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.md
new file mode 100644
index 000000000..c1eb4dc90
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.md
@@ -0,0 +1,7 @@
+Container parameters
+====================
+
+- `array`: `[12,"Hello world!",true]`
+- `boolean`: `true`
+- `integer`: `12`
+- `string`: `Hello world!`
\ No newline at end of file
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.txt
new file mode 100644
index 000000000..f5b8f1b22
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.txt
@@ -0,0 +1,13 @@
+
+Symfony Container Parameters
+============================
+
+ ----------- -------------------------- 
+  Parameter   Value                     
+ ----------- -------------------------- 
+  array       [12,"Hello world!",true]  
+  boolean     true                      
+  integer     12                        
+  string      Hello world!              
+ ----------- -------------------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.xml
new file mode 100644
index 000000000..e97f89573
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/parameters_1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<parameters>
+  <parameter key="array">[12,"Hello world!",true]</parameter>
+  <parameter key="boolean">true</parameter>
+  <parameter key="integer">12</parameter>
+  <parameter key="string">Hello world!</parameter>
+</parameters>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.json
new file mode 100644
index 000000000..1108109fb
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.json
@@ -0,0 +1,20 @@
+{
+    "path": "\/hello\/{name}",
+    "pathRegex": "#PATH_REGEX#",
+    "host": "localhost",
+    "hostRegex": "#HOST_REGEX#",
+    "scheme": "http|https",
+    "method": "GET|HEAD",
+    "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\RouteStub",
+    "defaults": {
+        "name": "Joseph"
+    },
+    "requirements": {
+        "name": "[a-z]+"
+    },
+    "options": {
+        "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",
+        "opt1": "val1",
+        "opt2": "val2"
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.md
new file mode 100644
index 000000000..c36d35c83
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.md
@@ -0,0 +1,15 @@
+- Path: /hello/{name}
+- Path Regex: #PATH_REGEX#
+- Host: localhost
+- Host Regex: #HOST_REGEX#
+- Scheme: http|https
+- Method: GET|HEAD
+- Class: Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub
+- Defaults: 
+    - `name`: Joseph
+- Requirements: 
+    - `name`: [a-z]+
+- Options: 
+    - `compiler_class`: Symfony\Component\Routing\RouteCompiler
+    - `opt1`: val1
+    - `opt2`: val2
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.txt
new file mode 100644
index 000000000..25074dfd1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.txt
@@ -0,0 +1,17 @@
++--------------+-------------------------------------------------------------------+
+| Property     | Value                                                             |
++--------------+-------------------------------------------------------------------+
+| Route Name   |                                                                   |
+| Path         | /hello/{name}                                                     |
+| Path Regex   | #PATH_REGEX#                                                      |
+| Host         | localhost                                                         |
+| Host Regex   | #HOST_REGEX#                                                      |
+| Scheme       | http|https                                                        |
+| Method       | GET|HEAD                                                          |
+| Requirements | name: [a-z]+                                                      |
+| Class        | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
+| Defaults     | name: Joseph                                                      |
+| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler           |
+|              | opt1: val1                                                        |
+|              | opt2: val2                                                        |
++--------------+-------------------------------------------------------------------+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.xml
new file mode 100644
index 000000000..9ff531c92
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<route class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub">
+  <path regex="#PATH_REGEX#">/hello/{name}</path>
+  <host regex="#HOST_REGEX#">localhost</host>
+  <scheme>http</scheme>
+  <scheme>https</scheme>
+  <method>GET</method>
+  <method>HEAD</method>
+  <defaults>
+    <default key="name">Joseph</default>
+  </defaults>
+  <requirements>
+    <requirement key="name">[a-z]+</requirement>
+  </requirements>
+  <options>
+    <option key="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
+    <option key="opt1">val1</option>
+    <option key="opt2">val2</option>
+  </options>
+</route>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.json
new file mode 100644
index 000000000..e190ef0cb
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.json
@@ -0,0 +1,16 @@
+{
+    "path": "\/name\/add",
+    "pathRegex": "#PATH_REGEX#",
+    "host": "localhost",
+    "hostRegex": "#HOST_REGEX#",
+    "scheme": "http|https",
+    "method": "PUT|POST",
+    "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\RouteStub",
+    "defaults": [],
+    "requirements": "NO CUSTOM",
+    "options": {
+        "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",
+        "opt1": "val1",
+        "opt2": "val2"
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.md
new file mode 100644
index 000000000..1d776c5ff
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.md
@@ -0,0 +1,13 @@
+- Path: /name/add
+- Path Regex: #PATH_REGEX#
+- Host: localhost
+- Host Regex: #HOST_REGEX#
+- Scheme: http|https
+- Method: PUT|POST
+- Class: Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub
+- Defaults: NONE
+- Requirements: NO CUSTOM
+- Options: 
+    - `compiler_class`: Symfony\Component\Routing\RouteCompiler
+    - `opt1`: val1
+    - `opt2`: val2
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.txt
new file mode 100644
index 000000000..5593cc0d8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.txt
@@ -0,0 +1,17 @@
++--------------+-------------------------------------------------------------------+
+| Property     | Value                                                             |
++--------------+-------------------------------------------------------------------+
+| Route Name   |                                                                   |
+| Path         | /name/add                                                         |
+| Path Regex   | #PATH_REGEX#                                                      |
+| Host         | localhost                                                         |
+| Host Regex   | #HOST_REGEX#                                                      |
+| Scheme       | http|https                                                        |
+| Method       | PUT|POST                                                          |
+| Requirements | NO CUSTOM                                                         |
+| Class        | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
+| Defaults     | NONE                                                              |
+| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler           |
+|              | opt1: val1                                                        |
+|              | opt2: val2                                                        |
++--------------+-------------------------------------------------------------------+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.xml
new file mode 100644
index 000000000..584ab1b12
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<route class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub">
+  <path regex="#PATH_REGEX#">/name/add</path>
+  <host regex="#HOST_REGEX#">localhost</host>
+  <scheme>http</scheme>
+  <scheme>https</scheme>
+  <method>PUT</method>
+  <method>POST</method>
+  <options>
+    <option key="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
+    <option key="opt1">val1</option>
+    <option key="opt2">val2</option>
+  </options>
+</route>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.json b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.json
new file mode 100644
index 000000000..bd60070ed
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.json
@@ -0,0 +1,38 @@
+{
+    "route_1": {
+        "path": "\/hello\/{name}",
+        "pathRegex": "#PATH_REGEX#",
+        "host": "localhost",
+        "hostRegex": "#HOST_REGEX#",
+        "scheme": "http|https",
+        "method": "GET|HEAD",
+        "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\RouteStub",
+        "defaults": {
+            "name": "Joseph"
+        },
+        "requirements": {
+            "name": "[a-z]+"
+        },
+        "options": {
+            "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",
+            "opt1": "val1",
+            "opt2": "val2"
+        }
+    },
+    "route_2": {
+        "path": "\/name\/add",
+        "pathRegex": "#PATH_REGEX#",
+        "host": "localhost",
+        "hostRegex": "#HOST_REGEX#",
+        "scheme": "http|https",
+        "method": "PUT|POST",
+        "class": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\RouteStub",
+        "defaults": [],
+        "requirements": "NO CUSTOM",
+        "options": {
+            "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",
+            "opt1": "val1",
+            "opt2": "val2"
+        }
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.md b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.md
new file mode 100644
index 000000000..cbb70b4d3
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.md
@@ -0,0 +1,37 @@
+route_1
+-------
+
+- Path: /hello/{name}
+- Path Regex: #PATH_REGEX#
+- Host: localhost
+- Host Regex: #HOST_REGEX#
+- Scheme: http|https
+- Method: GET|HEAD
+- Class: Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub
+- Defaults: 
+    - `name`: Joseph
+- Requirements: 
+    - `name`: [a-z]+
+- Options: 
+    - `compiler_class`: Symfony\Component\Routing\RouteCompiler
+    - `opt1`: val1
+    - `opt2`: val2
+
+
+route_2
+-------
+
+- Path: /name/add
+- Path Regex: #PATH_REGEX#
+- Host: localhost
+- Host Regex: #HOST_REGEX#
+- Scheme: http|https
+- Method: PUT|POST
+- Class: Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub
+- Defaults: NONE
+- Requirements: NO CUSTOM
+- Options: 
+    - `compiler_class`: Symfony\Component\Routing\RouteCompiler
+    - `opt1`: val1
+    - `opt2`: val2
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.txt b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.txt
new file mode 100644
index 000000000..9d0656232
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.txt
@@ -0,0 +1,7 @@
+ --------- ---------- ------------ ----------- --------------- 
+  Name      Method     Scheme       Host        Path           
+ --------- ---------- ------------ ----------- --------------- 
+  route_1   GET|HEAD   http|https   localhost   /hello/{name}  
+  route_2   PUT|POST   http|https   localhost   /name/add      
+ --------- ---------- ------------ ----------- --------------- 
+
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.xml
new file mode 100644
index 000000000..666a53730
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<routes>
+  <route name="route_1" class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub">
+    <path regex="#PATH_REGEX#">/hello/{name}</path>
+    <host regex="#HOST_REGEX#">localhost</host>
+    <scheme>http</scheme>
+    <scheme>https</scheme>
+    <method>GET</method>
+    <method>HEAD</method>
+    <defaults>
+      <default key="name">Joseph</default>
+    </defaults>
+    <requirements>
+      <requirement key="name">[a-z]+</requirement>
+    </requirements>
+    <options>
+      <option key="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
+      <option key="opt1">val1</option>
+      <option key="opt2">val2</option>
+    </options>
+  </route>
+  <route name="route_2" class="Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub">
+    <path regex="#PATH_REGEX#">/name/add</path>
+    <host regex="#HOST_REGEX#">localhost</host>
+    <scheme>http</scheme>
+    <scheme>https</scheme>
+    <method>PUT</method>
+    <method>POST</method>
+    <options>
+      <option key="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
+      <option key="opt1">val1</option>
+      <option key="opt2">val2</option>
+    </options>
+  </route>
+</routes>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Resources/BaseBundle/views/base.format.engine b/lib/symfony/framework-bundle/Tests/Fixtures/Resources/BaseBundle/views/base.format.engine
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Resources/BaseBundle/views/controller/custom.format.engine b/lib/symfony/framework-bundle/Tests/Fixtures/Resources/BaseBundle/views/controller/custom.format.engine
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Resources/translations/messages.fr.yml b/lib/symfony/framework-bundle/Tests/Fixtures/Resources/translations/messages.fr.yml
new file mode 100644
index 000000000..767141de6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Resources/translations/messages.fr.yml
@@ -0,0 +1 @@
+folder: répertoire
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/resource.format.engine b/lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/resource.format.engine
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/this.is.a.template.format.engine b/lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/this.is.a.template.format.engine
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/translation.html.php b/lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/translation.html.php
new file mode 100644
index 000000000..b8a20d246
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Resources/views/translation.html.php
@@ -0,0 +1,49 @@
+This template is used for translation message extraction tests
+<?php echo $view['translator']->trans('single-quoted key') ?>
+<?php echo $view['translator']->trans('double-quoted key') ?>
+<?php echo $view['translator']->trans(<<<'EOF'
+heredoc key
+EOF
+) ?>
+<?php echo $view['translator']->trans(<<<'EOF'
+nowdoc key
+EOF
+) ?>
+<?php echo $view['translator']->trans(
+    "double-quoted key with whitespace and escaped \$\n\" sequences"
+) ?>
+<?php echo $view['translator']->trans(
+    'single-quoted key with whitespace and nonescaped \$\n\' sequences'
+) ?>
+<?php echo $view['translator']->trans(<<<EOF
+heredoc key with whitespace and escaped \$\n sequences
+EOF
+) ?>
+<?php echo $view['translator']->trans(<<<'EOF'
+nowdoc key with whitespace and nonescaped \$\n sequences
+EOF
+) ?>
+
+<?php echo $view['translator']->trans('single-quoted key with "quote mark at the end"') ?>
+
+<?php echo $view['translator']->transChoice(
+    '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
+    10,
+    ['%count%' => 10]
+) ?>
+
+<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', [], 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-no-params-long-array', [], 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-params-short-array', ['foo' => 'bar'], 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-params-long-array', ['foo' => 'bar'], 'not_messages'); ?>
+
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, ['%count%' => 10], 'not_messages'); ?>
+
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-long-array-%count%', 10, ['%count%' => 10], 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('typecast', ['a' => (int) '123'], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg1', 10 + 1, [], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg2', ceil(4.5), [], 'not_messages'); ?>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Author.php b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Author.php
new file mode 100644
index 000000000..e54d37aac
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Author.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serialization;
+
+class Author
+{
+    public $eyeColor;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Person.php b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Person.php
new file mode 100644
index 000000000..1da3e02fa
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Person.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serialization;
+
+class Person
+{
+    public $eyeColor;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/author.yml b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/author.yml
new file mode 100644
index 000000000..a7f8f6fec
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/author.yml
@@ -0,0 +1,4 @@
+Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serialization\Author:
+    attributes:
+        eyeColor:
+            groups: ['group1', 'group2']
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/does_not_exist.yaml b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/does_not_exist.yaml
new file mode 100644
index 000000000..061691224
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/does_not_exist.yaml
@@ -0,0 +1 @@
+AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest: ~
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/person.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/person.xml
new file mode 100644
index 000000000..2d2ab3dd3
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Serialization/Resources/person.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
+        https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
+>
+    <class name="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serialization\Person">
+        <attribute name="eyeColor">
+            <group>group1</group>
+            <group>group2</group>
+        </attribute>
+    </class>
+</serializer>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TemplatePathsCache/templates-empty.php b/lib/symfony/framework-bundle/Tests/Fixtures/TemplatePathsCache/templates-empty.php
new file mode 100644
index 000000000..9ba223074
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TemplatePathsCache/templates-empty.php
@@ -0,0 +1,2 @@
+<?php return array (
+);
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TemplatePathsCache/templates.php b/lib/symfony/framework-bundle/Tests/Fixtures/TemplatePathsCache/templates.php
new file mode 100644
index 000000000..0263003e0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TemplatePathsCache/templates.php
@@ -0,0 +1,3 @@
+<?php return array (
+  'bundle:controller:name.format.engine' => __DIR__.'/../path/to/template.html.twig',
+);
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/Controller/DefaultController.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/Controller/DefaultController.php
new file mode 100644
index 000000000..c4bee6c03
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/Controller/DefaultController.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\Fabpot\FooBundle\Controller;
+
+/**
+ * DefaultController.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DefaultController
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/FabpotFooBundle.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/FabpotFooBundle.php
new file mode 100644
index 000000000..17894ba34
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/FabpotFooBundle.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\Fabpot\FooBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * Bundle.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class FabpotFooBundle extends Bundle
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return 'SensioFooBundle';
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/DefaultController.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/DefaultController.php
new file mode 100644
index 000000000..ddda38cb1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/DefaultController.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\FooBundle\Controller;
+
+/**
+ * DefaultController.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DefaultController
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/Sub/DefaultController.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/Sub/DefaultController.php
new file mode 100644
index 000000000..3c889e730
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/Sub/DefaultController.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\FooBundle\Controller\Sub;
+
+/**
+ * DefaultController.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DefaultController
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/Test/DefaultController.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/Test/DefaultController.php
new file mode 100644
index 000000000..1bffc7fbd
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/Controller/Test/DefaultController.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\FooBundle\Controller\Test;
+
+/**
+ * DefaultController.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DefaultController
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/FooBundle.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/FooBundle.php
new file mode 100644
index 000000000..656f17c52
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/FooBundle/FooBundle.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\FooBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * Bundle.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class FooBundle extends Bundle
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/Controller/DefaultController.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/Controller/DefaultController.php
new file mode 100644
index 000000000..1bb803848
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/Controller/DefaultController.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\Sensio\Cms\FooBundle\Controller;
+
+/**
+ * DefaultController.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DefaultController
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/SensioCmsFooBundle.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/SensioCmsFooBundle.php
new file mode 100644
index 000000000..58967d866
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/SensioCmsFooBundle.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\Sensio\Cms\FooBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * Bundle.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class SensioCmsFooBundle extends Bundle
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/Controller/DefaultController.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/Controller/DefaultController.php
new file mode 100644
index 000000000..86486f05c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/Controller/DefaultController.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\Sensio\FooBundle\Controller;
+
+/**
+ * DefaultController.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DefaultController
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/SensioFooBundle.php b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/SensioFooBundle.php
new file mode 100644
index 000000000..d1bc5dccc
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/SensioFooBundle.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TestBundle\Sensio\FooBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * Bundle.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class SensioFooBundle extends Bundle
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Article.php b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Article.php
new file mode 100644
index 000000000..a1ecee6d0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Article.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
+
+class Article implements NotExistingInterface
+{
+    public $category;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Author.php b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Author.php
new file mode 100644
index 000000000..b02ba30c2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Author.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
+
+class Author
+{
+    public $eyeColor;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Category.php b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Category.php
new file mode 100644
index 000000000..115320f66
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Category.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
+
+use Symfony\Component\Validator\Constraints as Assert;
+
+class Category
+{
+    const NAME_PATTERN = '/\w+/';
+
+    public $id;
+
+    /**
+     * @Assert\Type("string")
+     */
+    public $name;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Person.php b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Person.php
new file mode 100644
index 000000000..b8543ba44
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Person.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
+
+class Person
+{
+    public $eyeColor;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/author.yml b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/author.yml
new file mode 100644
index 000000000..62d42b288
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/author.yml
@@ -0,0 +1,4 @@
+Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\Author:
+    properties:
+        eyeColor:
+            - Choice: { choices: [brown, green, blue], message: Choose a valid eye color. }
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/categories.yml b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/categories.yml
new file mode 100644
index 000000000..5a0f0da28
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/categories.yml
@@ -0,0 +1,9 @@
+Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\Category:
+    properties:
+        id:
+            - Type: int
+
+Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\SubCategory:
+    properties:
+        id:
+            - Type: int
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/does_not_exist.yaml b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/does_not_exist.yaml
new file mode 100644
index 000000000..69b1635e4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/does_not_exist.yaml
@@ -0,0 +1 @@
+AClassThatDoesNotExist_FWB_CacheWarmer_ValidatorCacheWarmerTest: ~
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/person.xml b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/person.xml
new file mode 100644
index 000000000..71e6b7991
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/Resources/person.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\Person">
+        <property name="eyeColor">
+            <constraint name="Choice">
+                <option name="choices">
+                    <value>brown</value>
+                    <value>green</value>
+                    <value>blue</value>
+                </option>
+                <option name="message">Choose a valid eye color.</option>
+            </constraint>
+        </property>
+    </class>
+
+    <class name="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\Article">
+        <property name="category">
+            <constraint name="Choice">
+                <option name="choices">
+                    <value>other</value>
+                </option>
+                <option name="message">This should be ignored.</option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/Validation/SubCategory.php b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/SubCategory.php
new file mode 100644
index 000000000..7fc982b1d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/Validation/SubCategory.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
+
+// Missing "use" for Assert\Type is on purpose
+
+class SubCategory extends Category
+{
+    /**
+     * @Assert\Type("string")
+     */
+    public $main;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/WarmedClass.php b/lib/symfony/framework-bundle/Tests/Fixtures/WarmedClass.php
new file mode 100644
index 000000000..4a65b176d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/WarmedClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+class WarmedClass extends DeclaredClass
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Fixtures/templates.php b/lib/symfony/framework-bundle/Tests/Fixtures/templates.php
new file mode 100644
index 000000000..c9a7ad7a1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Fixtures/templates.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'bundle:controller:name.format.engine' => __DIR__.'/../Fixtures/Resources/views/this.is.a.template.format.engine',
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/AbstractWebTestCase.php b/lib/symfony/framework-bundle/Tests/Functional/AbstractWebTestCase.php
new file mode 100644
index 000000000..03c6bdcbd
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/AbstractWebTestCase.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
+use Symfony\Component\Filesystem\Filesystem;
+
+abstract class AbstractWebTestCase extends BaseWebTestCase
+{
+    public static function assertRedirect($response, $location)
+    {
+        self::assertTrue($response->isRedirect(), 'Response is not a redirect, got status code: '.$response->getStatusCode());
+        self::assertEquals('http://localhost'.$location, $response->headers->get('Location'));
+    }
+
+    public static function setUpBeforeClass()
+    {
+        static::deleteTmpDir();
+    }
+
+    public static function tearDownAfterClass()
+    {
+        static::deleteTmpDir();
+    }
+
+    protected static function deleteTmpDir()
+    {
+        if (!file_exists($dir = sys_get_temp_dir().'/'.static::getVarDir())) {
+            return;
+        }
+
+        $fs = new Filesystem();
+        $fs->remove($dir);
+    }
+
+    protected static function getKernelClass()
+    {
+        require_once __DIR__.'/app/AppKernel.php';
+
+        return 'Symfony\Bundle\FrameworkBundle\Tests\Functional\app\AppKernel';
+    }
+
+    protected static function createKernel(array $options = [])
+    {
+        $class = self::getKernelClass();
+
+        if (!isset($options['test_case'])) {
+            throw new \InvalidArgumentException('The option "test_case" must be set.');
+        }
+
+        return new $class(
+            static::getVarDir(),
+            $options['test_case'],
+            isset($options['root_config']) ? $options['root_config'] : 'config.yml',
+            isset($options['environment']) ? $options['environment'] : strtolower(static::getVarDir().$options['test_case']),
+            isset($options['debug']) ? $options['debug'] : false
+        );
+    }
+
+    protected static function getVarDir()
+    {
+        return 'FB'.substr(strrchr(\get_called_class(), '\\'), 1);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/AnnotatedControllerTest.php b/lib/symfony/framework-bundle/Tests/Functional/AnnotatedControllerTest.php
new file mode 100644
index 000000000..c9ede7a9c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/AnnotatedControllerTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+class AnnotatedControllerTest extends AbstractWebTestCase
+{
+    /**
+     * @dataProvider getRoutes
+     */
+    public function testAnnotatedController($path, $expectedValue)
+    {
+        $client = $this->createClient(['test_case' => 'AnnotatedController', 'root_config' => 'config.yml']);
+        $client->request('GET', '/annotated'.$path);
+
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->assertSame($expectedValue, $client->getResponse()->getContent());
+    }
+
+    public function getRoutes()
+    {
+        return [
+            ['/null_request', 'Symfony\Component\HttpFoundation\Request'],
+            ['/null_argument', ''],
+            ['/null_argument_with_route_param', ''],
+            ['/null_argument_with_route_param/value', 'value'],
+            ['/argument_with_route_param_and_default', 'value'],
+            ['/argument_with_route_param_and_default/custom', 'custom'],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/AutowiringTypesTest.php b/lib/symfony/framework-bundle/Tests/Functional/AutowiringTypesTest.php
new file mode 100644
index 000000000..95fb5f938
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/AutowiringTypesTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\Annotations\CachedReader;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
+use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface;
+
+class AutowiringTypesTest extends AbstractWebTestCase
+{
+    public function testAnnotationReaderAutowiring()
+    {
+        static::bootKernel(['root_config' => 'no_annotations_cache.yml', 'environment' => 'no_annotations_cache']);
+        $container = static::$kernel->getContainer();
+
+        $annotationReader = $container->get('test.autowiring_types.autowired_services')->getAnnotationReader();
+        $this->assertInstanceOf(AnnotationReader::class, $annotationReader);
+    }
+
+    public function testCachedAnnotationReaderAutowiring()
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $annotationReader = $container->get('test.autowiring_types.autowired_services')->getAnnotationReader();
+        $this->assertInstanceOf(CachedReader::class, $annotationReader);
+    }
+
+    public function testTemplatingAutowiring()
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $autowiredServices = $container->get('test.autowiring_types.autowired_services');
+        $this->assertInstanceOf(FrameworkBundleEngineInterface::class, $autowiredServices->getFrameworkBundleEngine());
+        $this->assertInstanceOf(ComponentEngineInterface::class, $autowiredServices->getEngine());
+    }
+
+    public function testEventDispatcherAutowiring()
+    {
+        static::bootKernel(['debug' => false]);
+        $container = static::$kernel->getContainer();
+
+        $autowiredServices = $container->get('test.autowiring_types.autowired_services');
+
+        if (class_exists(ContainerAwareEventDispatcher::class)) {
+            $this->assertInstanceOf(ContainerAwareEventDispatcher::class, $autowiredServices->getDispatcher(), 'The event_dispatcher service should be injected if the debug is not enabled');
+        } else {
+            $this->assertInstanceOf(EventDispatcher::class, $autowiredServices->getDispatcher(), 'The event_dispatcher service should be injected if the debug is not enabled');
+        }
+
+        static::bootKernel(['debug' => true]);
+        $container = static::$kernel->getContainer();
+
+        $autowiredServices = $container->get('test.autowiring_types.autowired_services');
+        $this->assertInstanceOf(TraceableEventDispatcher::class, $autowiredServices->getDispatcher(), 'The debug.event_dispatcher service should be injected if the debug is enabled');
+    }
+
+    public function testCacheAutowiring()
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $autowiredServices = $container->get('test.autowiring_types.autowired_services');
+        $this->assertInstanceOf(FilesystemAdapter::class, $autowiredServices->getCachePool());
+    }
+
+    protected static function createKernel(array $options = [])
+    {
+        return parent::createKernel(['test_case' => 'AutowiringTypes'] + $options);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php
new file mode 100644
index 000000000..a62cdf64d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\AutowiringTypes;
+
+use Doctrine\Common\Annotations\Reader;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Templating\EngineInterface;
+
+class AutowiredServices
+{
+    private $annotationReader;
+    private $frameworkBundleEngine;
+    private $engine;
+    private $dispatcher;
+    private $cachePool;
+
+    public function __construct(Reader $annotationReader = null, FrameworkBundleEngineInterface $frameworkBundleEngine, EngineInterface $engine, EventDispatcherInterface $dispatcher, CacheItemPoolInterface $cachePool)
+    {
+        $this->annotationReader = $annotationReader;
+        $this->frameworkBundleEngine = $frameworkBundleEngine;
+        $this->engine = $engine;
+        $this->dispatcher = $dispatcher;
+        $this->cachePool = $cachePool;
+    }
+
+    public function getAnnotationReader()
+    {
+        return $this->annotationReader;
+    }
+
+    public function getFrameworkBundleEngine()
+    {
+        return $this->frameworkBundleEngine;
+    }
+
+    public function getEngine()
+    {
+        return $this->engine;
+    }
+
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
+    }
+
+    public function getCachePool()
+    {
+        return $this->cachePool;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php
new file mode 100644
index 000000000..96543ce10
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+class AnnotatedController
+{
+    /**
+     * @Route("/null_request", name="null_request")
+     */
+    public function requestDefaultNullAction(Request $request = null)
+    {
+        return new Response($request ? \get_class($request) : null);
+    }
+
+    /**
+     * @Route("/null_argument", name="null_argument")
+     */
+    public function argumentDefaultNullWithoutRouteParamAction($value = null)
+    {
+        return new Response($value);
+    }
+
+    /**
+     * @Route("/null_argument_with_route_param/{value}", name="null_argument_with_route_param")
+     */
+    public function argumentDefaultNullWithRouteParamAction($value = null)
+    {
+        return new Response($value);
+    }
+
+    /**
+     * @Route("/argument_with_route_param_and_default/{value}", defaults={"value": "value"}, name="argument_with_route_param_and_default")
+     */
+    public function argumentWithoutDefaultWithRouteParamAndDefaultAction($value)
+    {
+        return new Response($value);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php
new file mode 100644
index 000000000..aa78c8719
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
+
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class FragmentController implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function indexAction(Request $request)
+    {
+        return $this->container->get('templating')->renderResponse('fragment.html.php', ['bar' => new Bar()]);
+    }
+
+    public function inlinedAction($options, $_format)
+    {
+        return new Response($options['bar']->getBar().' '.$_format);
+    }
+
+    public function customFormatAction($_format)
+    {
+        return new Response($_format);
+    }
+
+    public function customLocaleAction(Request $request)
+    {
+        return new Response($request->getLocale());
+    }
+
+    public function forwardLocaleAction(Request $request)
+    {
+        return new Response($request->getLocale());
+    }
+}
+
+class Bar
+{
+    private $bar = 'bar';
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php
new file mode 100644
index 000000000..dd518a12a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
+
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\HttpFoundation\Response;
+
+class ProfilerController implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function indexAction()
+    {
+        return new Response('Hello');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
new file mode 100644
index 000000000..e4d856083
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
+
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class SessionController implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function welcomeAction(Request $request, $name = null)
+    {
+        $session = $request->getSession();
+
+        // new session case
+        if (!$session->has('name')) {
+            if (!$name) {
+                return new Response('You are new here and gave no name.');
+            }
+
+            // remember name
+            $session->set('name', $name);
+
+            return new Response(sprintf('Hello %s, nice to meet you.', $name));
+        }
+
+        // existing session
+        $name = $session->get('name');
+
+        return new Response(sprintf('Welcome back %s, nice to meet you.', $name));
+    }
+
+    public function cacheableAction()
+    {
+        $response = new Response('all good');
+        $response->setSharedMaxAge(100);
+
+        return $response;
+    }
+
+    public function logoutAction(Request $request)
+    {
+        $request->getSession()->invalidate();
+
+        return new Response('Session cleared.');
+    }
+
+    public function setFlashAction(Request $request, $message)
+    {
+        $session = $request->getSession();
+        $session->getFlashBag()->set('notice', $message);
+
+        return new RedirectResponse($this->container->get('router')->generate('session_showflash'));
+    }
+
+    public function showFlashAction(Request $request)
+    {
+        $session = $request->getSession();
+
+        if ($session->getFlashBag()->has('notice')) {
+            list($output) = $session->getFlashBag()->get('notice');
+        } else {
+            $output = 'No flash was set.';
+        }
+
+        return new Response($output);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
new file mode 100644
index 000000000..54ae9c19e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
+
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
+
+class SubRequestController implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function indexAction($handler)
+    {
+        $errorUrl = $this->generateUrl('subrequest_fragment_error', ['_locale' => 'fr', '_format' => 'json']);
+        $altUrl = $this->generateUrl('subrequest_fragment', ['_locale' => 'fr', '_format' => 'json']);
+
+        // simulates a failure during the rendering of a fragment...
+        // should render fr/json
+        $content = $handler->render($errorUrl, 'inline', ['alt' => $altUrl]);
+
+        // ...to check that the FragmentListener still references the right Request
+        // when rendering another fragment after the error occurred
+        // should render en/html instead of fr/json
+        $content .= $handler->render(new ControllerReference('TestBundle:SubRequest:fragment'));
+
+        // forces the LocaleListener to set fr for the locale...
+        // should render fr/json
+        $content .= $handler->render($altUrl);
+
+        // ...and check that after the rendering, the original Request is back
+        // and en is used as a locale
+        // should use en/html instead of fr/json
+        $content .= '--'.$this->generateUrl('subrequest_fragment');
+
+        // The RouterListener is also tested as if it does not keep the right
+        // Request in the context, a 301 would be generated
+        return new Response($content);
+    }
+
+    public function fragmentAction(Request $request)
+    {
+        return new Response('--'.$request->getLocale().'/'.$request->getRequestFormat());
+    }
+
+    public function fragmentErrorAction()
+    {
+        throw new \RuntimeException('error');
+    }
+
+    protected function generateUrl($name, $arguments = [])
+    {
+        return $this->container->get('router')->generate($name, $arguments);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestServiceResolutionController.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestServiceResolutionController.php
new file mode 100644
index 000000000..7d7d6565c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestServiceResolutionController.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class SubRequestServiceResolutionController implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function indexAction()
+    {
+        $request = $this->container->get('request_stack')->getCurrentRequest();
+        $path['_forwarded'] = $request->attributes;
+        $path['_controller'] = 'TestBundle:SubRequestServiceResolution:fragment';
+        $subRequest = $request->duplicate([], null, $path);
+
+        return $this->container->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+    }
+
+    public function fragmentAction(LoggerInterface $logger)
+    {
+        return new Response('---');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php
new file mode 100644
index 000000000..53555fd66
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class AnnotationReaderPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        // simulate using "annotation_reader" in a compiler pass
+        $container->get('test.annotation_reader');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/Config/CustomConfig.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/Config/CustomConfig.php
new file mode 100644
index 000000000..d3a9b2a1b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/Config/CustomConfig.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\Config;
+
+class CustomConfig
+{
+    public function addConfiguration($rootNode)
+    {
+        $rootNode
+            ->children()
+                ->scalarNode('custom')->end()
+                ->arrayNode('array')
+                    ->children()
+                        ->scalarNode('child1')->end()
+                        ->scalarNode('child2')->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/Configuration.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/Configuration.php
new file mode 100644
index 000000000..2f45cd985
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/Configuration.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    private $customConfig;
+
+    public function __construct($customConfig = null)
+    {
+        $this->customConfig = $customConfig;
+    }
+
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('test');
+
+        if ($this->customConfig) {
+            $this->customConfig->addConfiguration($rootNode);
+        }
+
+        return $treeBuilder;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
new file mode 100644
index 000000000..0ae7669ce
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+
+class TestExtension extends Extension implements PrependExtensionInterface
+{
+    private $customConfig;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = $this->getConfiguration($configs, $container);
+        $this->processConfiguration($configuration, $configs);
+
+        $container->setAlias('test.annotation_reader', new Alias('annotation_reader', true));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prepend(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('test', ['custom' => 'foo']);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new Configuration($this->customConfig);
+    }
+
+    public function setCustomConfig($customConfig)
+    {
+        $this->customConfig = $customConfig;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
new file mode 100644
index 000000000..923204ab0
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
@@ -0,0 +1,54 @@
+session_welcome:
+    path:     /session
+    defaults: { _controller: TestBundle:Session:welcome }
+
+session_cacheable:
+    path:     /cacheable
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SessionController::cacheableAction }
+
+session_welcome_name:
+    path:     /session/{name}
+    defaults: { _controller: TestBundle:Session:welcome }
+
+session_logout:
+    path:     /session_logout
+    defaults: { _controller: TestBundle:Session:logout}
+
+session_setflash:
+    path:     /session_setflash/{message}
+    defaults: { _controller: TestBundle:Session:setFlash}
+
+session_showflash:
+    path:     /session_showflash
+    defaults: { _controller: TestBundle:Session:showFlash}
+
+profiler:
+    path:     /profiler
+    defaults: { _controller: TestBundle:Profiler:index }
+
+subrequest_index:
+    path:     /subrequest/{_locale}.{_format}
+    defaults: { _controller: TestBundle:SubRequest:index, _format: "html" }
+    schemes:  [https]
+
+subrequest_fragment_error:
+    path:     /subrequest/fragment/error/{_locale}.{_format}
+    defaults: { _controller: TestBundle:SubRequest:fragmentError, _format: "html" }
+    schemes:  [http]
+
+subrequest_fragment:
+    path:     /subrequest/fragment/{_locale}.{_format}
+    defaults: { _controller: TestBundle:SubRequest:fragment, _format: "html" }
+    schemes:  [http]
+
+fragment_home:
+    path:     /fragment_home
+    defaults: { _controller: TestBundle:Fragment:index, _format: txt }
+
+fragment_inlined:
+    path:     /fragment_inlined
+    defaults: { _controller: TestBundle:Fragment:inlined }
+
+array_controller:
+    path:     /array_controller
+    defaults: { _controller: [ArrayController, someAction] }
diff --git a/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/TestBundle.php b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
new file mode 100644
index 000000000..83dd4dc78
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle;
+
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\AnnotationReaderPass;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\Config\CustomConfig;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class TestBundle extends Bundle
+{
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+
+        /** @var $extension DependencyInjection\TestExtension */
+        $extension = $container->getExtension('test');
+
+        $extension->setCustomConfig(new CustomConfig());
+
+        $container->addCompilerPass(new AnnotationReaderPass(), PassConfig::TYPE_AFTER_REMOVING);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/CachePoolClearCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/CachePoolClearCommandTest.php
new file mode 100644
index 000000000..8a0f6593d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/CachePoolClearCommandTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * @group functional
+ */
+class CachePoolClearCommandTest extends AbstractWebTestCase
+{
+    protected function setUp()
+    {
+        static::bootKernel(['test_case' => 'CachePoolClear', 'root_config' => 'config.yml']);
+    }
+
+    public function testClearPrivatePool()
+    {
+        $tester = $this->createCommandTester();
+        $tester->execute(['pools' => ['cache.private_pool']], ['decorated' => false]);
+
+        $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
+        $this->assertStringContainsString('Clearing cache pool: cache.private_pool', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
+    }
+
+    public function testClearPublicPool()
+    {
+        $tester = $this->createCommandTester();
+        $tester->execute(['pools' => ['cache.public_pool']], ['decorated' => false]);
+
+        $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
+        $this->assertStringContainsString('Clearing cache pool: cache.public_pool', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
+    }
+
+    public function testClearPoolWithCustomClearer()
+    {
+        $tester = $this->createCommandTester();
+        $tester->execute(['pools' => ['cache.pool_with_clearer']], ['decorated' => false]);
+
+        $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
+        $this->assertStringContainsString('Clearing cache pool: cache.pool_with_clearer', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
+    }
+
+    public function testCallClearer()
+    {
+        $tester = $this->createCommandTester();
+        $tester->execute(['pools' => ['cache.app_clearer']], ['decorated' => false]);
+
+        $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
+        $this->assertStringContainsString('Calling cache clearer: cache.app_clearer', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
+    }
+
+    public function testClearUnexistingPool()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $this->expectExceptionMessage('You have requested a non-existent service "unknown_pool"');
+        $this->createCommandTester()
+            ->execute(['pools' => ['unknown_pool']], ['decorated' => false]);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand::__construct() expects an instance of "Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer" as first argument since Symfony 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
+     */
+    public function testLegacyClearCommand()
+    {
+        $application = new Application(static::$kernel);
+        $application->add(new CachePoolClearCommand());
+
+        $tester = new CommandTester($application->find('cache:pool:clear'));
+
+        $tester->execute(['pools' => []]);
+
+        $this->assertStringContainsString('Cache was successfully cleared', $tester->getDisplay());
+    }
+
+    private function createCommandTester()
+    {
+        $container = static::$kernel->getContainer();
+        $application = new Application(static::$kernel);
+        $application->add(new CachePoolClearCommand($container->get('cache.global_clearer')));
+
+        return new CommandTester($application->find('cache:pool:clear'));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/CachePoolsTest.php b/lib/symfony/framework-bundle/Tests/Functional/CachePoolsTest.php
new file mode 100644
index 000000000..13815b959
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/CachePoolsTest.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
+
+class CachePoolsTest extends AbstractWebTestCase
+{
+    public function testCachePools()
+    {
+        $this->doTestCachePools([], AdapterInterface::class);
+    }
+
+    /**
+     * @requires extension redis
+     */
+    public function testRedisCachePools()
+    {
+        try {
+            $this->doTestCachePools(['root_config' => 'redis_config.yml', 'environment' => 'redis_cache'], RedisAdapter::class);
+        } catch (\PHPUnit\Framework\Error\Warning $e) {
+            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
+        } catch (\PHPUnit\Framework\Error\Warning $e) {
+            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
+        } catch (InvalidArgumentException $e) {
+            if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
+        }
+    }
+
+    /**
+     * @requires extension redis
+     */
+    public function testRedisCustomCachePools()
+    {
+        try {
+            $this->doTestCachePools(['root_config' => 'redis_custom_config.yml', 'environment' => 'custom_redis_cache'], RedisAdapter::class);
+        } catch (\PHPUnit\Framework\Error\Warning $e) {
+            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
+        } catch (\PHPUnit\Framework\Error\Warning $e) {
+            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
+        }
+    }
+
+    private function doTestCachePools($options, $adapterClass)
+    {
+        static::bootKernel($options);
+        $container = static::$kernel->getContainer();
+
+        $pool1 = $container->get('cache.pool1');
+        $this->assertInstanceOf($adapterClass, $pool1);
+
+        $key = 'foobar';
+        $pool1->deleteItem($key);
+        $item = $pool1->getItem($key);
+        $this->assertFalse($item->isHit());
+
+        $item->set('baz');
+        $pool1->save($item);
+        $item = $pool1->getItem($key);
+        $this->assertTrue($item->isHit());
+
+        $pool2 = $container->get('cache.pool2');
+        $pool2->save($item);
+
+        $container->get('cache_clearer')->clear($container->getParameter('kernel.cache_dir'));
+        $item = $pool1->getItem($key);
+        $this->assertFalse($item->isHit());
+
+        $item = $pool2->getItem($key);
+        $this->assertTrue($item->isHit());
+    }
+
+    protected static function createKernel(array $options = [])
+    {
+        return parent::createKernel(['test_case' => 'CachePools'] + $options);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ConfigDebugCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/ConfigDebugCommandTest.php
new file mode 100644
index 000000000..a2e88f003
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * @group functional
+ */
+class ConfigDebugCommandTest extends AbstractWebTestCase
+{
+    private $application;
+
+    protected function setUp()
+    {
+        $kernel = static::createKernel(['test_case' => 'ConfigDump', 'root_config' => 'config.yml']);
+        $this->application = new Application($kernel);
+        $this->application->doRun(new ArrayInput([]), new NullOutput());
+    }
+
+    public function testDumpBundleName()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => 'TestBundle']);
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('custom: foo', $tester->getDisplay());
+    }
+
+    public function testDumpBundleOption()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => 'TestBundle', 'path' => 'custom']);
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('foo', $tester->getDisplay());
+    }
+
+    public function testParametersValuesAreResolved()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => 'framework']);
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString("locale: '%env(LOCALE)%'", $tester->getDisplay());
+        $this->assertStringContainsString('secret: test', $tester->getDisplay());
+    }
+
+    public function testDumpUndefinedBundleOption()
+    {
+        $tester = $this->createCommandTester();
+        $tester->execute(['name' => 'TestBundle', 'path' => 'foo']);
+
+        $this->assertStringContainsString('Unable to find configuration for "test.foo"', $tester->getDisplay());
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function createCommandTester()
+    {
+        $command = $this->application->find('debug:config');
+
+        return new CommandTester($command);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ConfigDumpReferenceCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
new file mode 100644
index 000000000..aa5dba65c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * @group functional
+ */
+class ConfigDumpReferenceCommandTest extends AbstractWebTestCase
+{
+    private $application;
+
+    protected function setUp()
+    {
+        $kernel = static::createKernel(['test_case' => 'ConfigDump', 'root_config' => 'config.yml']);
+        $this->application = new Application($kernel);
+        $this->application->doRun(new ArrayInput([]), new NullOutput());
+    }
+
+    public function testDumpBundleName()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => 'TestBundle']);
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('test:', $tester->getDisplay());
+        $this->assertStringContainsString('    custom:', $tester->getDisplay());
+    }
+
+    public function testDumpAtPath()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute([
+            'name' => 'test',
+            'path' => 'array',
+        ]);
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertSame(<<<'EOL'
+# Default configuration for extension with alias: "test" at path "array"
+array:
+    child1:               ~
+    child2:               ~
+
+
+EOL
+            , $tester->getDisplay(true));
+    }
+
+    public function testDumpAtPathXml()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute([
+            'name' => 'test',
+            'path' => 'array',
+            '--format' => 'xml',
+        ]);
+
+        $this->assertSame(1, $ret);
+        $this->assertStringContainsString('[ERROR] The "path" option is only available for the "yaml" format.', $tester->getDisplay());
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function createCommandTester()
+    {
+        $command = $this->application->find('config:dump-reference');
+
+        return new CommandTester($command);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ContainerDebugCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/ContainerDebugCommandTest.php
new file mode 100644
index 000000000..6f936c796
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\ApplicationTester;
+
+/**
+ * @group functional
+ */
+class ContainerDebugCommandTest extends AbstractWebTestCase
+{
+    public function testDumpContainerIfNotExists()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => true]);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        @unlink(static::$kernel->getContainer()->getParameter('debug.container.dump'));
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'debug:container']);
+
+        $this->assertFileExists(static::$kernel->getContainer()->getParameter('debug.container.dump'));
+    }
+
+    public function testNoDebug()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => false]);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'debug:container']);
+
+        $this->assertStringContainsString('public', $tester->getDisplay());
+    }
+
+    public function testPrivateAlias()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'debug:container', '--show-private' => true]);
+        $this->assertStringContainsString('public', $tester->getDisplay());
+        $this->assertStringContainsString('private_alias', $tester->getDisplay());
+
+        $tester->run(['command' => 'debug:container']);
+        $this->assertStringContainsString('public', $tester->getDisplay());
+        $this->assertStringNotContainsString('private_alias', $tester->getDisplay());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ContainerDumpTest.php b/lib/symfony/framework-bundle/Tests/Functional/ContainerDumpTest.php
new file mode 100644
index 000000000..ad2a3662c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/ContainerDumpTest.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+/**
+ * Checks that the container compiles correctly when all the bundle features are enabled.
+ */
+class ContainerDumpTest extends AbstractWebTestCase
+{
+    public function testContainerCompilationInDebug()
+    {
+        $client = $this->createClient(['test_case' => 'ContainerDump', 'root_config' => 'config.yml']);
+
+        $this->assertTrue($client->getContainer()->has('serializer'));
+    }
+
+    public function testContainerCompilation()
+    {
+        $client = $this->createClient(['test_case' => 'ContainerDump', 'root_config' => 'config.yml', 'debug' => false]);
+
+        $this->assertTrue($client->getContainer()->has('serializer'));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/DebugAutowiringCommandTest.php b/lib/symfony/framework-bundle/Tests/Functional/DebugAutowiringCommandTest.php
new file mode 100644
index 000000000..6d163b783
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/DebugAutowiringCommandTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Tester\ApplicationTester;
+
+/**
+ * @group functional
+ */
+class DebugAutowiringCommandTest extends AbstractWebTestCase
+{
+    public function testBasicFunctionality()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'debug:autowiring']);
+
+        $this->assertStringContainsString('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+        $this->assertStringContainsString('alias to http_kernel', $tester->getDisplay());
+    }
+
+    public function testSearchArgument()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'debug:autowiring', 'search' => 'kern']);
+
+        $this->assertStringContainsString('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+        $this->assertStringNotContainsString('Symfony\Component\Routing\RouterInterface', $tester->getDisplay());
+    }
+
+    public function testSearchNoResults()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'debug:autowiring', 'search' => 'foo_fake'], ['capture_stderr_separately' => true]);
+
+        $this->assertStringContainsString('No autowirable classes or interfaces found matching "foo_fake"', $tester->getErrorOutput());
+        $this->assertEquals(1, $tester->getStatusCode());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/FragmentTest.php b/lib/symfony/framework-bundle/Tests/Functional/FragmentTest.php
new file mode 100644
index 000000000..3e7472af9
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/FragmentTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+class FragmentTest extends AbstractWebTestCase
+{
+    /**
+     * @dataProvider getConfigs
+     */
+    public function testFragment($insulate)
+    {
+        $client = $this->createClient(['test_case' => 'Fragment', 'root_config' => 'config.yml']);
+        if ($insulate) {
+            $client->insulate();
+        }
+
+        $client->request('GET', '/fragment_home');
+
+        $this->assertEquals('bar txt--html--es--fr', $client->getResponse()->getContent());
+    }
+
+    public function getConfigs()
+    {
+        return [
+            [false],
+            [true],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/ProfilerTest.php b/lib/symfony/framework-bundle/Tests/Functional/ProfilerTest.php
new file mode 100644
index 000000000..35c2e63b7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/ProfilerTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+class ProfilerTest extends AbstractWebTestCase
+{
+    /**
+     * @dataProvider getConfigs
+     */
+    public function testProfilerIsDisabled($insulate)
+    {
+        $client = $this->createClient(['test_case' => 'Profiler', 'root_config' => 'config.yml']);
+        if ($insulate) {
+            $client->insulate();
+        }
+
+        $client->request('GET', '/profiler');
+        $this->assertNull($client->getProfile());
+
+        // enable the profiler for the next request
+        $client->enableProfiler();
+        $this->assertNull($client->getProfile());
+        $client->request('GET', '/profiler');
+        $this->assertIsObject($client->getProfile());
+
+        $client->request('GET', '/profiler');
+        $this->assertNull($client->getProfile());
+    }
+
+    public function getConfigs()
+    {
+        return [
+            [false],
+            [true],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/PropertyInfoTest.php b/lib/symfony/framework-bundle/Tests/Functional/PropertyInfoTest.php
new file mode 100644
index 000000000..23a9cf18d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/PropertyInfoTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Component\PropertyInfo\Type;
+
+class PropertyInfoTest extends AbstractWebTestCase
+{
+    public function testPhpDocPriority()
+    {
+        static::bootKernel(['test_case' => 'Serializer']);
+        $container = static::$kernel->getContainer();
+
+        $this->assertEquals([new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_INT))], $container->get('test.property_info')->getTypes('Symfony\Bundle\FrameworkBundle\Tests\Functional\Dummy', 'codes'));
+    }
+}
+
+class Dummy
+{
+    /**
+     * @param int[] $codes
+     */
+    public function setCodes(array $codes)
+    {
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/SerializerTest.php b/lib/symfony/framework-bundle/Tests/Functional/SerializerTest.php
new file mode 100644
index 000000000..c1159ff56
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/SerializerTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class SerializerTest extends AbstractWebTestCase
+{
+    public function testDeserializeArrayOfObject()
+    {
+        static::bootKernel(['test_case' => 'Serializer']);
+        $container = static::$kernel->getContainer();
+
+        $result = $container->get('serializer')->deserialize('{"bars": [{"id": 1}, {"id": 2}]}', Foo::class, 'json');
+
+        $bar1 = new Bar();
+        $bar1->id = 1;
+        $bar2 = new Bar();
+        $bar2->id = 2;
+
+        $expected = new Foo();
+        $expected->bars = [$bar1, $bar2];
+
+        $this->assertEquals($expected, $result);
+    }
+}
+
+class Foo
+{
+    /**
+     * @var Bar[]
+     */
+    public $bars;
+}
+
+class Bar
+{
+    /**
+     * @var int
+     */
+    public $id;
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/SessionTest.php b/lib/symfony/framework-bundle/Tests/Functional/SessionTest.php
new file mode 100644
index 000000000..3a87f7e4e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/SessionTest.php
@@ -0,0 +1,153 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+class SessionTest extends AbstractWebTestCase
+{
+    /**
+     * Tests session attributes persist.
+     *
+     * @dataProvider getConfigs
+     */
+    public function testWelcome($config, $insulate)
+    {
+        $client = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
+        if ($insulate) {
+            $client->insulate();
+        }
+
+        // no session
+        $crawler = $client->request('GET', '/session');
+        $this->assertStringContainsString('You are new here and gave no name.', $crawler->text());
+
+        // remember name
+        $crawler = $client->request('GET', '/session/drak');
+        $this->assertStringContainsString('Hello drak, nice to meet you.', $crawler->text());
+
+        // prove remembered name
+        $crawler = $client->request('GET', '/session');
+        $this->assertStringContainsString('Welcome back drak, nice to meet you.', $crawler->text());
+
+        // clear session
+        $crawler = $client->request('GET', '/session_logout');
+        $this->assertStringContainsString('Session cleared.', $crawler->text());
+
+        // prove cleared session
+        $crawler = $client->request('GET', '/session');
+        $this->assertStringContainsString('You are new here and gave no name.', $crawler->text());
+    }
+
+    /**
+     * Tests flash messages work in practice.
+     *
+     * @dataProvider getConfigs
+     */
+    public function testFlash($config, $insulate)
+    {
+        $client = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
+        if ($insulate) {
+            $client->insulate();
+        }
+
+        // set flash
+        $client->request('GET', '/session_setflash/Hello%20world.');
+
+        // check flash displays on redirect
+        $this->assertStringContainsString('Hello world.', $client->followRedirect()->text());
+
+        // check flash is gone
+        $crawler = $client->request('GET', '/session_showflash');
+        $this->assertStringContainsString('No flash was set.', $crawler->text());
+    }
+
+    /**
+     * See if two separate insulated clients can run without
+     * polluting each other's session data.
+     *
+     * @dataProvider getConfigs
+     */
+    public function testTwoClients($config, $insulate)
+    {
+        // start first client
+        $client1 = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
+        if ($insulate) {
+            $client1->insulate();
+        }
+
+        // start second client
+        $client2 = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
+        if ($insulate) {
+            $client2->insulate();
+        }
+
+        // new session, so no name set.
+        $crawler1 = $client1->request('GET', '/session');
+        $this->assertStringContainsString('You are new here and gave no name.', $crawler1->text());
+
+        // set name of client1
+        $crawler1 = $client1->request('GET', '/session/client1');
+        $this->assertStringContainsString('Hello client1, nice to meet you.', $crawler1->text());
+
+        // no session for client2
+        $crawler2 = $client2->request('GET', '/session');
+        $this->assertStringContainsString('You are new here and gave no name.', $crawler2->text());
+
+        // remember name client2
+        $crawler2 = $client2->request('GET', '/session/client2');
+        $this->assertStringContainsString('Hello client2, nice to meet you.', $crawler2->text());
+
+        // prove remembered name of client1
+        $crawler1 = $client1->request('GET', '/session');
+        $this->assertStringContainsString('Welcome back client1, nice to meet you.', $crawler1->text());
+
+        // prove remembered name of client2
+        $crawler2 = $client2->request('GET', '/session');
+        $this->assertStringContainsString('Welcome back client2, nice to meet you.', $crawler2->text());
+
+        // clear client1
+        $crawler1 = $client1->request('GET', '/session_logout');
+        $this->assertStringContainsString('Session cleared.', $crawler1->text());
+
+        // prove client1 data is cleared
+        $crawler1 = $client1->request('GET', '/session');
+        $this->assertStringContainsString('You are new here and gave no name.', $crawler1->text());
+
+        // prove remembered name of client2 remains untouched.
+        $crawler2 = $client2->request('GET', '/session');
+        $this->assertStringContainsString('Welcome back client2, nice to meet you.', $crawler2->text());
+    }
+
+    /**
+     * @dataProvider getConfigs
+     */
+    public function testCorrectCacheControlHeadersForCacheableAction($config, $insulate)
+    {
+        $client = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
+        if ($insulate) {
+            $client->insulate();
+        }
+
+        $client->request('GET', '/cacheable');
+
+        $response = $client->getResponse();
+        $this->assertSame('public, s-maxage=100', $response->headers->get('cache-control'));
+    }
+
+    public function getConfigs()
+    {
+        return [
+            // configfile, insulate
+            ['config.yml', true],
+            ['config.yml', false],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/SubRequestsTest.php b/lib/symfony/framework-bundle/Tests/Functional/SubRequestsTest.php
new file mode 100644
index 000000000..d32b6b7b1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/SubRequestsTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+class SubRequestsTest extends AbstractWebTestCase
+{
+    public function testStateAfterSubRequest()
+    {
+        $client = $this->createClient(['test_case' => 'Session', 'root_config' => 'config.yml']);
+        $client->request('GET', 'https://localhost/subrequest/en');
+
+        $this->assertEquals('--fr/json--en/html--fr/json--http://localhost/subrequest/fragment/en', $client->getResponse()->getContent());
+    }
+
+    public function testSubRequestControllerServicesAreResolved()
+    {
+        $client = $this->createClient(['test_case' => 'ControllerServiceResolution', 'root_config' => 'config.yml']);
+        $client->request('GET', 'https://localhost/subrequest');
+
+        $this->assertEquals('---', $client->getResponse()->getContent());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/config.yml
new file mode 100644
index 000000000..377d3e785
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/config.yml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: ../config/default.yml }
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/routing.yml b/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/routing.yml
new file mode 100644
index 000000000..ebd18a0a4
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/AnnotatedController/routing.yml
@@ -0,0 +1,4 @@
+annotated_controller:
+    prefix:   /annotated
+    resource: "@TestBundle/Controller/AnnotatedController.php"
+    type:     annotation
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/AppKernel.php b/lib/symfony/framework-bundle/Tests/Functional/app/AppKernel.php
new file mode 100644
index 000000000..11457f6a7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/AppKernel.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\app;
+
+use Psr\Log\NullLogger;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel\Kernel;
+
+/**
+ * App Test Kernel for functional tests.
+ *
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ */
+class AppKernel extends Kernel
+{
+    private $varDir;
+    private $testCase;
+    private $rootConfig;
+
+    public function __construct($varDir, $testCase, $rootConfig, $environment, $debug)
+    {
+        if (!is_dir(__DIR__.'/'.$testCase)) {
+            throw new \InvalidArgumentException(sprintf('The test case "%s" does not exist.', $testCase));
+        }
+        $this->varDir = $varDir;
+        $this->testCase = $testCase;
+
+        $fs = new Filesystem();
+        if (!$fs->isAbsolutePath($rootConfig) && !file_exists($rootConfig = __DIR__.'/'.$testCase.'/'.$rootConfig)) {
+            throw new \InvalidArgumentException(sprintf('The root config "%s" does not exist.', $rootConfig));
+        }
+        $this->rootConfig = $rootConfig;
+
+        parent::__construct($environment, $debug);
+    }
+
+    public function registerBundles()
+    {
+        if (!file_exists($filename = $this->getRootDir().'/'.$this->testCase.'/bundles.php')) {
+            throw new \RuntimeException(sprintf('The bundles file "%s" does not exist.', $filename));
+        }
+
+        return include $filename;
+    }
+
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/cache/'.$this->environment;
+    }
+
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/logs';
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->rootConfig);
+    }
+
+    protected function build(ContainerBuilder $container)
+    {
+        $container->register('logger', NullLogger::class);
+    }
+
+    public function serialize()
+    {
+        return serialize([$this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()]);
+    }
+
+    public function unserialize($str)
+    {
+        $a = unserialize($str);
+        $this->__construct($a[0], $a[1], $a[2], $a[3], $a[4]);
+    }
+
+    protected function getKernelParameters()
+    {
+        $parameters = parent::getKernelParameters();
+        $parameters['kernel.test_case'] = $this->testCase;
+
+        return $parameters;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/config.yml
new file mode 100644
index 000000000..1b47c1100
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/config.yml
@@ -0,0 +1,11 @@
+imports:
+    - { resource: ../config/default.yml }
+
+services:
+    _defaults: { public: true }
+    test.autowiring_types.autowired_services:
+        class: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\AutowiringTypes\AutowiredServices
+        autowire: true
+framework:
+    templating:
+        engines: ['php']
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/no_annotations_cache.yml b/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/no_annotations_cache.yml
new file mode 100644
index 000000000..fec387d87
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/AutowiringTypes/no_annotations_cache.yml
@@ -0,0 +1,6 @@
+imports:
+    - { resource: config.yml }
+
+framework:
+    annotations:
+        cache: none
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/CachePoolClear/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/CachePoolClear/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/CachePoolClear/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/CachePoolClear/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/CachePoolClear/config.yml
new file mode 100644
index 000000000..b991dd593
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/CachePoolClear/config.yml
@@ -0,0 +1,22 @@
+imports:
+    - { resource: ../config/default.yml }
+
+services:
+    dummy:
+        class: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\DeclaredClass
+        arguments: ['@cache.private_pool']
+        public: true
+    custom_clearer:
+        parent: cache.default_clearer
+        tags:
+            - name: kernel.cache_clearer
+
+framework:
+    cache:
+        pools:
+            cache.private_pool: ~
+            cache.public_pool:
+                public: true
+            cache.pool_with_clearer:
+                public: true
+                clearer: custom_clearer
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/config.yml
new file mode 100644
index 000000000..de1e144da
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/config.yml
@@ -0,0 +1,14 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    cache:
+        pools:
+            cache.pool1:
+                public: true
+                adapter: cache.system
+            cache.pool2:
+                public: true
+                adapter: cache.pool3
+            cache.pool3:
+                clearer: ~
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/redis_config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/redis_config.yml
new file mode 100644
index 000000000..3bf10f448
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/redis_config.yml
@@ -0,0 +1,17 @@
+imports:
+    - { resource: ../config/default.yml }
+
+parameters:
+    env(REDIS_HOST): 'localhost'
+
+framework:
+    cache:
+        app: cache.adapter.redis
+        default_redis_provider: "redis://%env(REDIS_HOST)%"
+        pools:
+            cache.pool1:
+                public: true
+                clearer: cache.system_clearer
+            cache.pool2:
+                public: true
+                clearer: ~
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/redis_custom_config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/redis_custom_config.yml
new file mode 100644
index 000000000..d0a219753
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/CachePools/redis_custom_config.yml
@@ -0,0 +1,28 @@
+imports:
+    - { resource: ../config/default.yml }
+
+parameters:
+    env(REDIS_HOST): 'localhost'
+
+services:
+    cache.test_redis_connection:
+        public: false
+        class: Redis
+        calls:
+            - [connect, ['%env(REDIS_HOST)%']]
+
+    cache.app:
+        parent: cache.adapter.redis
+        tags:
+            - name: cache.pool
+              provider: cache.test_redis_connection
+
+framework:
+    cache:
+        pools:
+            cache.pool1:
+                public: true
+                clearer: cache.system_clearer
+            cache.pool2:
+                public: true
+                clearer: ~
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ConfigDump/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/ConfigDump/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ConfigDump/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ConfigDump/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/ConfigDump/config.yml
new file mode 100644
index 000000000..c1d128804
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ConfigDump/config.yml
@@ -0,0 +1,10 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    secret: '%secret%'
+    default_locale: '%env(LOCALE)%'
+
+parameters:
+    env(LOCALE): en
+    secret: test
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDebug/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDebug/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDebug/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDebug/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDebug/config.yml
new file mode 100644
index 000000000..d00d6f235
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDebug/config.yml
@@ -0,0 +1,10 @@
+imports:
+    - { resource: ../config/default.yml }
+
+services:
+    _defaults: { public: true }
+    public:
+        class: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\DeclaredClass
+    private_alias:
+        alias: public
+        public: false
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDump/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDump/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDump/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDump/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDump/config.yml
new file mode 100644
index 000000000..29f1e32ff
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ContainerDump/config.yml
@@ -0,0 +1,21 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    esi: true
+    ssi: true
+    fragments: true
+    profiler: true
+    router: true
+    session: true
+    request: true
+    templating:
+        enabled: true
+        engines: ['php']
+    assets: true
+    translator: true
+    validation: true
+    serializer: true
+    property_info: true
+    csrf_protection: true
+    form: true
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/config.yml
new file mode 100644
index 000000000..d196ce950
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/config.yml
@@ -0,0 +1,10 @@
+imports:
+    - { resource: ../config/default.yml }
+
+services:
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SubRequestServiceResolutionController:
+        public: true
+        tags: [controller.service_arguments]
+
+    logger: { class: Psr\Log\NullLogger }
+    Psr\Log\LoggerInterface: '@logger'
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/routing.yml b/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/routing.yml
new file mode 100644
index 000000000..ffd947152
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/ControllerServiceResolution/routing.yml
@@ -0,0 +1,4 @@
+sub_request_page:
+    path:   /subrequest
+    defaults:
+        _controller: 'TestBundle:SubRequestServiceResolution:index'
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/config.yml
new file mode 100644
index 000000000..f7ea83dfa
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/config.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    fragments: ~
+    templating:
+        engines: ['php']
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/routing.yml b/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/routing.yml
new file mode 100644
index 000000000..8a9bd84b1
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Fragment/routing.yml
@@ -0,0 +1,2 @@
+_fragmenttest_bundle:
+    resource: '@TestBundle/Resources/config/routing.yml'
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/config.yml
new file mode 100644
index 000000000..12ce67e54
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/config.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    profiler:
+        enabled: true
+        collect: false
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/routing.yml b/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/routing.yml
new file mode 100644
index 000000000..d4b77c3f7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Profiler/routing.yml
@@ -0,0 +1,2 @@
+_sessiontest_bundle:
+    resource: '@TestBundle/Resources/config/routing.yml'
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Resources/views/fragment.html.php b/lib/symfony/framework-bundle/Tests/Functional/app/Resources/views/fragment.html.php
new file mode 100644
index 000000000..a474be431
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Resources/views/fragment.html.php
@@ -0,0 +1,14 @@
+<?php echo $this->get('actions')->render($this->get('actions')->controller('TestBundle:Fragment:inlined', [
+            'options' => [
+                'bar' => $bar,
+                'eleven' => 11,
+            ],
+        ]));
+?>--<?php
+        echo $this->get('actions')->render($this->get('actions')->controller('TestBundle:Fragment:customformat', ['_format' => 'html']));
+?>--<?php
+        echo $this->get('actions')->render($this->get('actions')->controller('TestBundle:Fragment:customlocale', ['_locale' => 'es']));
+?>--<?php
+        $app->getRequest()->setLocale('fr');
+        echo $this->get('actions')->render($this->get('actions')->controller('TestBundle:Fragment:forwardlocale'));
+?>
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Serializer/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/Serializer/bundles.php
new file mode 100644
index 000000000..13ab9fdde
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Serializer/bundles.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return [
+    new FrameworkBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Serializer/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/Serializer/config.yml
new file mode 100644
index 000000000..e4090041b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Serializer/config.yml
@@ -0,0 +1,10 @@
+imports:
+    - { resource: ../config/default.yml }
+
+services:
+    _defaults: { public: true }
+    test.property_info: '@property_info'
+
+framework:
+    serializer: { enabled: true }
+    property_info: { enabled: true }
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Session/bundles.php b/lib/symfony/framework-bundle/Tests/Functional/app/Session/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Session/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Session/config.yml b/lib/symfony/framework-bundle/Tests/Functional/app/Session/config.yml
new file mode 100644
index 000000000..ad6bdb691
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Session/config.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: ./../config/default.yml }
+
+services:
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SubRequestController:
+        tags:
+            - { name: controller.service_arguments, action: indexAction, argument: handler, id: fragment.handler }
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/Session/routing.yml b/lib/symfony/framework-bundle/Tests/Functional/app/Session/routing.yml
new file mode 100644
index 000000000..d4b77c3f7
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/Session/routing.yml
@@ -0,0 +1,2 @@
+_sessiontest_bundle:
+    resource: '@TestBundle/Resources/config/routing.yml'
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/config/default.yml b/lib/symfony/framework-bundle/Tests/Functional/app/config/default.yml
new file mode 100644
index 000000000..8ddd7ed92
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/config/default.yml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: framework.yml }
diff --git a/lib/symfony/framework-bundle/Tests/Functional/app/config/framework.yml b/lib/symfony/framework-bundle/Tests/Functional/app/config/framework.yml
new file mode 100644
index 000000000..a313b3339
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Functional/app/config/framework.yml
@@ -0,0 +1,13 @@
+framework:
+    secret:        test
+    router:        { resource: "%kernel.root_dir%/%kernel.test_case%/routing.yml" }
+    validation:    { enabled: true, enable_annotations: true }
+    csrf_protection: true
+    form: true
+    test: ~
+    default_locale: en
+    session:
+        storage_id:     session.storage.mock_file
+
+services:
+    logger: { class: Psr\Log\NullLogger }
diff --git a/lib/symfony/framework-bundle/Tests/Kernel/ConcreteMicroKernel.php b/lib/symfony/framework-bundle/Tests/Kernel/ConcreteMicroKernel.php
new file mode 100644
index 000000000..12669620a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Kernel/ConcreteMicroKernel.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
+
+use Psr\Log\NullLogger;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Routing\RouteCollectionBuilder;
+
+class ConcreteMicroKernel extends Kernel implements EventSubscriberInterface
+{
+    use MicroKernelTrait;
+
+    private $cacheDir;
+
+    public function onKernelException(GetResponseForExceptionEvent $event)
+    {
+        if ($event->getException() instanceof Danger) {
+            $event->setResponse(Response::create('It\'s dangerous to go alone. Take this ⚔'));
+        }
+    }
+
+    public function halloweenAction()
+    {
+        return new Response('halloween');
+    }
+
+    public function dangerousAction()
+    {
+        throw new Danger();
+    }
+
+    public function registerBundles()
+    {
+        return [
+            new FrameworkBundle(),
+        ];
+    }
+
+    public function getCacheDir()
+    {
+        return $this->cacheDir = sys_get_temp_dir().'/sf_micro_kernel';
+    }
+
+    public function getLogDir()
+    {
+        return $this->cacheDir;
+    }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
+
+    public function __destruct()
+    {
+        $fs = new Filesystem();
+        $fs->remove($this->cacheDir);
+    }
+
+    protected function configureRoutes(RouteCollectionBuilder $routes)
+    {
+        $routes->add('/', 'kernel:halloweenAction');
+        $routes->add('/danger', 'kernel:dangerousAction');
+    }
+
+    protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
+    {
+        $c->register('logger', NullLogger::class);
+        $c->loadFromExtension('framework', [
+            'secret' => '$ecret',
+        ]);
+
+        $c->setParameter('halloween', 'Have a great day!');
+        $c->register('halloween', 'stdClass')->setPublic(true);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return [
+            KernelEvents::EXCEPTION => 'onKernelException',
+        ];
+    }
+}
+
+class Danger extends \RuntimeException
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Kernel/MicroKernelTraitTest.php b/lib/symfony/framework-bundle/Tests/Kernel/MicroKernelTraitTest.php
new file mode 100644
index 000000000..539306fce
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Kernel/MicroKernelTraitTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+class MicroKernelTraitTest extends TestCase
+{
+    public function test()
+    {
+        $kernel = new ConcreteMicroKernel('test', false);
+        $kernel->boot();
+
+        $request = Request::create('/');
+        $response = $kernel->handle($request);
+
+        $this->assertEquals('halloween', $response->getContent());
+        $this->assertEquals('Have a great day!', $kernel->getContainer()->getParameter('halloween'));
+        $this->assertInstanceOf('stdClass', $kernel->getContainer()->get('halloween'));
+    }
+
+    public function testAsEventSubscriber()
+    {
+        $kernel = new ConcreteMicroKernel('test', false);
+        $kernel->boot();
+
+        $request = Request::create('/danger');
+        $response = $kernel->handle($request);
+
+        $this->assertSame('It\'s dangerous to go alone. Take this ⚔', $response->getContent());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Routing/DelegatingLoaderTest.php b/lib/symfony/framework-bundle/Tests/Routing/DelegatingLoaderTest.php
new file mode 100644
index 000000000..407158333
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Routing/DelegatingLoaderTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Routing;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
+use Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader;
+use Symfony\Component\Config\Loader\LoaderResolver;
+
+class DelegatingLoaderTest extends TestCase
+{
+    public function testConstructorApi()
+    {
+        $controllerNameParser = $this->getMockBuilder(ControllerNameParser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        new DelegatingLoader($controllerNameParser, new LoaderResolver());
+        $this->assertTrue(true, '__construct() takes a ControllerNameParser and LoaderResolverInterface respectively as its first and second argument.');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Routing/RedirectableUrlMatcherTest.php b/lib/symfony/framework-bundle/Tests/Routing/RedirectableUrlMatcherTest.php
new file mode 100644
index 000000000..d87eee58c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Routing/RedirectableUrlMatcherTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Routing;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Routing\RedirectableUrlMatcher;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class RedirectableUrlMatcherTest extends TestCase
+{
+    public function testRedirectWhenNoSlash()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/'));
+
+        $matcher = new RedirectableUrlMatcher($coll, $context = new RequestContext());
+
+        $this->assertEquals([
+                '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
+                'path' => '/foo/',
+                'permanent' => true,
+                'scheme' => null,
+                'httpPort' => $context->getHttpPort(),
+                'httpsPort' => $context->getHttpsPort(),
+                '_route' => 'foo',
+            ],
+            $matcher->match('/foo')
+        );
+    }
+
+    public function testSchemeRedirect()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
+
+        $matcher = new RedirectableUrlMatcher($coll, $context = new RequestContext());
+
+        $this->assertEquals([
+                '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
+                'path' => '/foo',
+                'permanent' => true,
+                'scheme' => 'https',
+                'httpPort' => $context->getHttpPort(),
+                'httpsPort' => $context->getHttpsPort(),
+                '_route' => 'foo',
+            ],
+            $matcher->match('/foo')
+        );
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Routing/RouterTest.php b/lib/symfony/framework-bundle/Tests/Routing/RouterTest.php
new file mode 100644
index 000000000..414eed17d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Routing/RouterTest.php
@@ -0,0 +1,275 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Routing;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Routing\Router;
+use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class RouterTest extends TestCase
+{
+    public function testGenerateWithServiceParam()
+    {
+        $routes = new RouteCollection();
+
+        $routes->add('foo', new Route(
+            ' /{_locale}',
+            [
+                '_locale' => '%locale%',
+            ],
+            [
+                '_locale' => 'en|es',
+            ], [], '', [], [], '"%foo%" == "bar"'
+        ));
+
+        $sc = $this->getServiceContainer($routes);
+        $sc->setParameter('locale', 'es');
+        $sc->setParameter('foo', 'bar');
+
+        $router = new Router($sc, 'foo');
+
+        $this->assertSame('/en', $router->generate('foo', ['_locale' => 'en']));
+        $this->assertSame('/', $router->generate('foo', ['_locale' => 'es']));
+        $this->assertSame('"bar" == "bar"', $router->getRouteCollection()->get('foo')->getCondition());
+    }
+
+    public function testDefaultsPlaceholders()
+    {
+        $routes = new RouteCollection();
+
+        $routes->add('foo', new Route(
+            '/foo',
+            [
+                'foo' => 'before_%parameter.foo%',
+                'bar' => '%parameter.bar%_after',
+                'baz' => '%%escaped%%',
+                'boo' => ['%parameter%', '%%escaped_parameter%%', ['%bee_parameter%', 'bee']],
+                'bee' => ['bee', 'bee'],
+            ],
+            [
+            ]
+        ));
+
+        $sc = $this->getServiceContainer($routes);
+
+        $sc->setParameter('parameter.foo', 'foo');
+        $sc->setParameter('parameter.bar', 'bar');
+        $sc->setParameter('parameter', 'boo');
+        $sc->setParameter('bee_parameter', 'foo_bee');
+
+        $router = new Router($sc, 'foo');
+        $route = $router->getRouteCollection()->get('foo');
+
+        $this->assertEquals(
+            [
+                'foo' => 'before_foo',
+                'bar' => 'bar_after',
+                'baz' => '%escaped%',
+                'boo' => ['boo', '%escaped_parameter%', ['foo_bee', 'bee']],
+                'bee' => ['bee', 'bee'],
+            ],
+            $route->getDefaults()
+        );
+    }
+
+    public function testRequirementsPlaceholders()
+    {
+        $routes = new RouteCollection();
+
+        $routes->add('foo', new Route(
+            '/foo',
+            [
+            ],
+            [
+                'foo' => 'before_%parameter.foo%',
+                'bar' => '%parameter.bar%_after',
+                'baz' => '%%escaped%%',
+            ]
+        ));
+
+        $sc = $this->getServiceContainer($routes);
+        $sc->setParameter('parameter.foo', 'foo');
+        $sc->setParameter('parameter.bar', 'bar');
+
+        $router = new Router($sc, 'foo');
+        $route = $router->getRouteCollection()->get('foo');
+
+        $this->assertEquals(
+            [
+                'foo' => 'before_foo',
+                'bar' => 'bar_after',
+                'baz' => '%escaped%',
+            ],
+            $route->getRequirements()
+        );
+    }
+
+    public function testPatternPlaceholders()
+    {
+        $routes = new RouteCollection();
+
+        $routes->add('foo', new Route('/before/%parameter.foo%/after/%%escaped%%'));
+
+        $sc = $this->getServiceContainer($routes);
+        $sc->setParameter('parameter.foo', 'foo-%%escaped%%');
+
+        $router = new Router($sc, 'foo');
+        $route = $router->getRouteCollection()->get('foo');
+
+        $this->assertEquals(
+            '/before/foo-%escaped%/after/%escaped%',
+            $route->getPath()
+        );
+    }
+
+    public function testEnvPlaceholders()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Using "%env(FOO)%" is not allowed in routing configuration.');
+        $routes = new RouteCollection();
+
+        $routes->add('foo', new Route('/%env(FOO)%'));
+
+        $router = new Router($this->getServiceContainer($routes), 'foo');
+        $router->getRouteCollection();
+    }
+
+    public function testIndirectEnvPlaceholders()
+    {
+        $routes = new RouteCollection();
+
+        $routes->add('foo', new Route('/%foo%'));
+
+        $router = new Router($container = $this->getServiceContainer($routes), 'foo');
+        $container->setParameter('foo', 'foo-%bar%');
+        $container->setParameter('bar', '%env(string:FOO)%');
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Using "%env(string:FOO)%" is not allowed in routing configuration.');
+
+        $router->getRouteCollection();
+    }
+
+    public function testHostPlaceholders()
+    {
+        $routes = new RouteCollection();
+
+        $route = new Route('foo');
+        $route->setHost('/before/%parameter.foo%/after/%%escaped%%');
+
+        $routes->add('foo', $route);
+
+        $sc = $this->getServiceContainer($routes);
+        $sc->setParameter('parameter.foo', 'foo');
+
+        $router = new Router($sc, 'foo');
+        $route = $router->getRouteCollection()->get('foo');
+
+        $this->assertEquals(
+            '/before/foo/after/%escaped%',
+            $route->getHost()
+        );
+    }
+
+    public function testExceptionOnNonExistentParameter()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException');
+        $this->expectExceptionMessage('You have requested a non-existent parameter "nope".');
+        $routes = new RouteCollection();
+
+        $routes->add('foo', new Route('/%nope%'));
+
+        $sc = $this->getServiceContainer($routes);
+
+        $router = new Router($sc, 'foo');
+        $router->getRouteCollection()->get('foo');
+    }
+
+    public function testExceptionOnNonStringParameter()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type object.');
+        $routes = new RouteCollection();
+
+        $routes->add('foo', new Route('/%object%'));
+
+        $sc = $this->getServiceContainer($routes);
+        $sc->setParameter('object', new \stdClass());
+
+        $router = new Router($sc, 'foo');
+        $router->getRouteCollection()->get('foo');
+    }
+
+    /**
+     * @dataProvider getNonStringValues
+     */
+    public function testDefaultValuesAsNonStrings($value)
+    {
+        $routes = new RouteCollection();
+        $routes->add('foo', new Route('foo', ['foo' => $value], ['foo' => '\d+']));
+
+        $sc = $this->getServiceContainer($routes);
+
+        $router = new Router($sc, 'foo');
+
+        $route = $router->getRouteCollection()->get('foo');
+
+        $this->assertSame($value, $route->getDefault('foo'));
+    }
+
+    public function testGetRouteCollectionAddsContainerParametersResource()
+    {
+        $routeCollection = new RouteCollection();
+        $routeCollection->add('foo', new Route('/%locale%'));
+
+        $sc = $this->getServiceContainer($routeCollection);
+        $sc->setParameter('locale', 'en');
+
+        $router = new Router($sc, 'foo');
+
+        $routeCollection = $router->getRouteCollection();
+
+        $this->assertEquals([new ContainerParametersResource(['locale' => 'en'])], $routeCollection->getResources());
+    }
+
+    public function getNonStringValues()
+    {
+        return [[null], [false], [true], [new \stdClass()], [['foo', 'bar']], [[[]]]];
+    }
+
+    /**
+     * @return \Symfony\Component\DependencyInjection\Container
+     */
+    private function getServiceContainer(RouteCollection $routes)
+    {
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+
+        $loader
+            ->expects($this->any())
+            ->method('load')
+            ->willReturn($routes)
+        ;
+
+        $sc = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Container')->setMethods(['get'])->getMock();
+
+        $sc
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn($loader)
+        ;
+
+        return $sc;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/DelegatingEngineTest.php b/lib/symfony/framework-bundle/Tests/Templating/DelegatingEngineTest.php
new file mode 100644
index 000000000..547339559
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/DelegatingEngineTest.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine;
+use Symfony\Component\HttpFoundation\Response;
+
+class DelegatingEngineTest extends TestCase
+{
+    public function testSupportsRetrievesEngineFromTheContainer()
+    {
+        $container = $this->getContainerMock([
+            'engine.first' => $this->getEngineMock('template.php', false),
+            'engine.second' => $this->getEngineMock('template.php', true),
+        ]);
+
+        $delegatingEngine = new DelegatingEngine($container, ['engine.first', 'engine.second']);
+
+        $this->assertTrue($delegatingEngine->supports('template.php'));
+    }
+
+    public function testGetExistingEngine()
+    {
+        $firstEngine = $this->getEngineMock('template.php', false);
+        $secondEngine = $this->getEngineMock('template.php', true);
+        $container = $this->getContainerMock([
+            'engine.first' => $firstEngine,
+            'engine.second' => $secondEngine,
+        ]);
+
+        $delegatingEngine = new DelegatingEngine($container, ['engine.first', 'engine.second']);
+
+        $this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
+    }
+
+    public function testGetInvalidEngine()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('No engine is able to work with the template "template.php"');
+        $firstEngine = $this->getEngineMock('template.php', false);
+        $secondEngine = $this->getEngineMock('template.php', false);
+        $container = $this->getContainerMock([
+            'engine.first' => $firstEngine,
+            'engine.second' => $secondEngine,
+        ]);
+
+        $delegatingEngine = new DelegatingEngine($container, ['engine.first', 'engine.second']);
+        $delegatingEngine->getEngine('template.php');
+    }
+
+    public function testRenderResponseWithFrameworkEngine()
+    {
+        $response = new Response();
+        $engine = $this->getFrameworkEngineMock('template.php', true);
+        $engine->expects($this->once())
+            ->method('renderResponse')
+            ->with('template.php', ['foo' => 'bar'])
+            ->willReturn($response);
+        $container = $this->getContainerMock(['engine' => $engine]);
+
+        $delegatingEngine = new DelegatingEngine($container, ['engine']);
+
+        $this->assertSame($response, $delegatingEngine->renderResponse('template.php', ['foo' => 'bar']));
+    }
+
+    public function testRenderResponseWithTemplatingEngine()
+    {
+        $engine = $this->getEngineMock('template.php', true);
+        $container = $this->getContainerMock(['engine' => $engine]);
+        $delegatingEngine = new DelegatingEngine($container, ['engine']);
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $delegatingEngine->renderResponse('template.php', ['foo' => 'bar']));
+    }
+
+    private function getEngineMock($template, $supports)
+    {
+        $engine = $this->getMockBuilder('Symfony\Component\Templating\EngineInterface')->getMock();
+
+        $engine->expects($this->once())
+            ->method('supports')
+            ->with($template)
+            ->willReturn($supports);
+
+        return $engine;
+    }
+
+    private function getFrameworkEngineMock($template, $supports)
+    {
+        $engine = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
+
+        $engine->expects($this->once())
+            ->method('supports')
+            ->with($template)
+            ->willReturn($supports);
+
+        return $engine;
+    }
+
+    private function getContainerMock($services)
+    {
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+
+        $i = 0;
+        foreach ($services as $id => $service) {
+            $container->expects($this->at($i++))
+                ->method('get')
+                ->with($id)
+                ->willReturn($service);
+        }
+
+        return $container;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/GlobalVariablesTest.php b/lib/symfony/framework-bundle/Tests/Templating/GlobalVariablesTest.php
new file mode 100644
index 000000000..46a581b94
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/GlobalVariablesTest.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
+
+use Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+
+class GlobalVariablesTest extends TestCase
+{
+    private $container;
+    private $globals;
+
+    protected function setUp()
+    {
+        $this->container = new Container();
+        $this->globals = new GlobalVariables($this->container);
+    }
+
+    public function testGetTokenNoTokenStorage()
+    {
+        $this->assertNull($this->globals->getToken());
+    }
+
+    public function testGetTokenNoToken()
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+        $this->container->set('security.token_storage', $tokenStorage);
+        $this->assertNull($this->globals->getToken());
+    }
+
+    public function testGetToken()
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+
+        $this->container->set('security.token_storage', $tokenStorage);
+
+        $tokenStorage
+            ->expects($this->once())
+            ->method('getToken')
+            ->willReturn('token');
+
+        $this->assertSame('token', $this->globals->getToken());
+    }
+
+    public function testGetUserNoTokenStorage()
+    {
+        $this->assertNull($this->globals->getUser());
+    }
+
+    public function testGetUserNoToken()
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+        $this->container->set('security.token_storage', $tokenStorage);
+        $this->assertNull($this->globals->getUser());
+    }
+
+    /**
+     * @dataProvider getUserProvider
+     */
+    public function testGetUser($user, $expectedUser)
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+
+        $this->container->set('security.token_storage', $tokenStorage);
+
+        $token
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+
+        $tokenStorage
+            ->expects($this->once())
+            ->method('getToken')
+            ->willReturn($token);
+
+        $this->assertSame($expectedUser, $this->globals->getUser());
+    }
+
+    public function getUserProvider()
+    {
+        $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+        $std = new \stdClass();
+        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+
+        return [
+            [$user, $user],
+            [$std, $std],
+            [$token, $token],
+            ['Anon.', null],
+            [null, null],
+            [10, null],
+            [true, null],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/AssetsHelperTest.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/AssetsHelperTest.php
new file mode 100644
index 000000000..83df0640b
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/AssetsHelperTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper;
+use Symfony\Component\Asset\Package;
+use Symfony\Component\Asset\Packages;
+use Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy;
+
+class AssetsHelperTest extends TestCase
+{
+    private $helper;
+
+    protected function setUp()
+    {
+        $fooPackage = new Package(new StaticVersionStrategy('42', '%s?v=%s'));
+        $barPackage = new Package(new StaticVersionStrategy('22', '%s?%s'));
+
+        $packages = new Packages($fooPackage, ['bar' => $barPackage]);
+
+        $this->helper = new AssetsHelper($packages);
+    }
+
+    public function testGetUrl()
+    {
+        $this->assertEquals('me.png?v=42', $this->helper->getUrl('me.png'));
+        $this->assertEquals('me.png?22', $this->helper->getUrl('me.png', 'bar'));
+    }
+
+    public function testGetVersion()
+    {
+        $this->assertEquals('42', $this->helper->getVersion('/'));
+        $this->assertEquals('22', $this->helper->getVersion('/', 'bar'));
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php
new file mode 100644
index 000000000..9835bc2a2
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures;
+
+use Symfony\Component\Templating\TemplateNameParserInterface;
+use Symfony\Component\Templating\TemplateReference;
+
+class StubTemplateNameParser implements TemplateNameParserInterface
+{
+    private $root;
+
+    private $rootTheme;
+
+    public function __construct($root, $rootTheme)
+    {
+        $this->root = $root;
+        $this->rootTheme = $rootTheme;
+    }
+
+    public function parse($name)
+    {
+        list($bundle, $controller, $template) = explode(':', $name, 3);
+
+        if ('_' == $template[0]) {
+            $path = $this->rootTheme.'/Custom/'.$template;
+        } elseif ('TestBundle' === $bundle) {
+            $path = $this->rootTheme.'/'.$controller.'/'.$template;
+        } else {
+            $path = $this->root.'/'.$controller.'/'.$template;
+        }
+
+        return new TemplateReference($path, 'php');
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/Fixtures/StubTranslator.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/Fixtures/StubTranslator.php
new file mode 100644
index 000000000..53a77f24c
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/Fixtures/StubTranslator.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures;
+
+use Symfony\Component\Translation\TranslatorInterface;
+
+class StubTranslator implements TranslatorInterface
+{
+    public function trans($id, array $parameters = [], $domain = null, $locale = null)
+    {
+        return '[trans]'.$id.'[/trans]';
+    }
+
+    public function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null)
+    {
+        return '[trans]'.$id.'[/trans]';
+    }
+
+    public function setLocale($locale)
+    {
+    }
+
+    public function getLocale()
+    {
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
new file mode 100644
index 000000000..3ac441562
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -0,0 +1,157 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
+
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper;
+use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTemplateNameParser;
+use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator;
+use Symfony\Component\Form\Extension\Templating\TemplatingExtension;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Tests\AbstractDivLayoutTest;
+use Symfony\Component\Templating\Loader\FilesystemLoader;
+use Symfony\Component\Templating\PhpEngine;
+
+class FormHelperDivLayoutTest extends AbstractDivLayoutTest
+{
+    /**
+     * @var PhpEngine
+     */
+    protected $engine;
+
+    protected static $supportedFeatureSetVersion = 304;
+
+    protected function getExtensions()
+    {
+        // should be moved to the Form component once absolute file paths are supported
+        // by the default name parser in the Templating component
+        $reflClass = new \ReflectionClass('Symfony\Bundle\FrameworkBundle\FrameworkBundle');
+        $root = realpath(\dirname($reflClass->getFileName()).'/Resources/views');
+        $rootTheme = realpath(__DIR__.'/Resources');
+        $templateNameParser = new StubTemplateNameParser($root, $rootTheme);
+        $loader = new FilesystemLoader([]);
+
+        $this->engine = new PhpEngine($templateNameParser, $loader);
+        $this->engine->addGlobal('global', '');
+        $this->engine->setHelpers([
+            new TranslatorHelper(new StubTranslator()),
+        ]);
+
+        return array_merge(parent::getExtensions(), [
+            new TemplatingExtension($this->engine, $this->csrfTokenManager, [
+                'FrameworkBundle:Form',
+            ]),
+        ]);
+    }
+
+    /**
+     * @after
+     */
+    public function doTearDown()
+    {
+        $this->engine = null;
+    }
+
+    public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get">', $html);
+    }
+
+    public function testStartTagHasActionAttributeWhenActionIsZero()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '0',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="0">', $html);
+    }
+
+    public function testMoneyWidgetInIso()
+    {
+        $this->engine->setCharset('ISO-8859-1');
+
+        $view = $this->factory
+            ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType')
+            ->createView()
+        ;
+
+        $this->assertSame('&euro; <input type="text" id="name" name="name" required="required" />', $this->renderWidget($view));
+    }
+
+    protected function renderForm(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->form($view, $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->label($view, $label, $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->engine->get('form')->errors($view);
+    }
+
+    protected function renderWidget(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->widget($view, $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->row($view, $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->rest($view, $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->start($view, $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->end($view, $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    {
+        $this->engine->get('form')->setTheme($view, $themes, $useDefaultThemes);
+    }
+
+    public static function themeBlockInheritanceProvider()
+    {
+        return [
+            [['TestBundle:Parent']],
+        ];
+    }
+
+    public static function themeInheritanceProvider()
+    {
+        return [
+            [['TestBundle:Parent'], ['TestBundle:Child']],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
new file mode 100644
index 000000000..e7555b234
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -0,0 +1,132 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
+
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper;
+use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTemplateNameParser;
+use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator;
+use Symfony\Component\Form\Extension\Templating\TemplatingExtension;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
+use Symfony\Component\Templating\Loader\FilesystemLoader;
+use Symfony\Component\Templating\PhpEngine;
+
+class FormHelperTableLayoutTest extends AbstractTableLayoutTest
+{
+    /**
+     * @var PhpEngine
+     */
+    protected $engine;
+
+    protected static $supportedFeatureSetVersion = 304;
+
+    public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get">', $html);
+    }
+
+    public function testStartTagHasActionAttributeWhenActionIsZero()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '0',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="0">', $html);
+    }
+
+    protected function getExtensions()
+    {
+        // should be moved to the Form component once absolute file paths are supported
+        // by the default name parser in the Templating component
+        $reflClass = new \ReflectionClass('Symfony\Bundle\FrameworkBundle\FrameworkBundle');
+        $root = realpath(\dirname($reflClass->getFileName()).'/Resources/views');
+        $rootTheme = realpath(__DIR__.'/Resources');
+        $templateNameParser = new StubTemplateNameParser($root, $rootTheme);
+        $loader = new FilesystemLoader([]);
+
+        $this->engine = new PhpEngine($templateNameParser, $loader);
+        $this->engine->addGlobal('global', '');
+        $this->engine->setHelpers([
+            new TranslatorHelper(new StubTranslator()),
+        ]);
+
+        return array_merge(parent::getExtensions(), [
+            new TemplatingExtension($this->engine, $this->csrfTokenManager, [
+                'FrameworkBundle:Form',
+                'FrameworkBundle:FormTable',
+            ]),
+        ]);
+    }
+
+    /**
+     * @after
+     */
+    public function doTearDown()
+    {
+        $this->engine = null;
+    }
+
+    protected function renderForm(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->form($view, $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->label($view, $label, $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->engine->get('form')->errors($view);
+    }
+
+    protected function renderWidget(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->widget($view, $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->row($view, $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->rest($view, $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->start($view, $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = [])
+    {
+        return (string) $this->engine->get('form')->end($view, $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    {
+        $this->engine->get('form')->setTheme($view, $themes, $useDefaultThemes);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/RequestHelperTest.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/RequestHelperTest.php
new file mode 100644
index 000000000..a2068ae75
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/RequestHelperTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\RequestHelper;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class RequestHelperTest extends TestCase
+{
+    protected $requestStack;
+
+    protected function setUp()
+    {
+        $this->requestStack = new RequestStack();
+        $request = new Request();
+        $request->initialize(['foobar' => 'bar']);
+        $this->requestStack->push($request);
+    }
+
+    public function testGetParameter()
+    {
+        $helper = new RequestHelper($this->requestStack);
+
+        $this->assertEquals('bar', $helper->getParameter('foobar'));
+        $this->assertEquals('foo', $helper->getParameter('bar', 'foo'));
+
+        $this->assertNull($helper->getParameter('foo'));
+    }
+
+    public function testGetLocale()
+    {
+        $helper = new RequestHelper($this->requestStack);
+
+        $this->assertEquals('en', $helper->getLocale());
+    }
+
+    public function testGetName()
+    {
+        $helper = new RequestHelper($this->requestStack);
+
+        $this->assertEquals('request', $helper->getName());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Child/form_label.html.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Child/form_label.html.php
new file mode 100644
index 000000000..aebb53d3e
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Child/form_label.html.php
@@ -0,0 +1 @@
+<label><?php echo $global; ?>child</label>
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php
new file mode 100644
index 000000000..4ad7e75dd
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php
@@ -0,0 +1,2 @@
+<?php if (!$label) { $label = $view['form']->humanize($name); } ?>
+<label>Custom name label: <?php echo $view->escape($view['translator']->trans($label, [], $translation_domain)) ?></label>
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_names_entry_label.html.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_names_entry_label.html.php
new file mode 100644
index 000000000..71de9d463
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_names_entry_label.html.php
@@ -0,0 +1,4 @@
+<?php if (!$label) {
+    $label = $view['form']->humanize($name);
+} ?>
+<label>Custom label: <?php echo $view->escape($view['translator']->trans($label, [], $translation_domain)) ?></label>
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_text_id_widget.html.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_text_id_widget.html.php
new file mode 100644
index 000000000..078fe5758
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Custom/_text_id_widget.html.php
@@ -0,0 +1,3 @@
+<div id="container">
+    <?php echo $view['form']->widget($form) ?>
+</div>
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Parent/form_label.html.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Parent/form_label.html.php
new file mode 100644
index 000000000..068c5dec3
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Parent/form_label.html.php
@@ -0,0 +1 @@
+<label>parent</label>
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php
new file mode 100644
index 000000000..1b53a7213
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php
@@ -0,0 +1,2 @@
+<?php $type = isset($type) ? $type : 'text'; ?>
+<input type="<?php echo $type; ?>" <?php $view['form']->block($form, 'widget_attributes'); ?> value="<?php echo $value; ?>" rel="theme" />
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/SessionHelperTest.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/SessionHelperTest.php
new file mode 100644
index 000000000..06984095f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/SessionHelperTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+
+class SessionHelperTest extends TestCase
+{
+    protected $requestStack;
+
+    protected function setUp()
+    {
+        $request = new Request();
+
+        $session = new Session(new MockArraySessionStorage());
+        $session->set('foobar', 'bar');
+        $session->getFlashBag()->set('notice', 'bar');
+
+        $request->setSession($session);
+
+        $this->requestStack = new RequestStack();
+        $this->requestStack->push($request);
+    }
+
+    protected function tearDown()
+    {
+        $this->requestStack = null;
+    }
+
+    public function testFlash()
+    {
+        $helper = new SessionHelper($this->requestStack);
+
+        $this->assertTrue($helper->hasFlash('notice'));
+
+        $this->assertEquals(['bar'], $helper->getFlash('notice'));
+    }
+
+    public function testGetFlashes()
+    {
+        $helper = new SessionHelper($this->requestStack);
+        $this->assertEquals(['notice' => ['bar']], $helper->getFlashes());
+    }
+
+    public function testGet()
+    {
+        $helper = new SessionHelper($this->requestStack);
+
+        $this->assertEquals('bar', $helper->get('foobar'));
+        $this->assertEquals('foo', $helper->get('bar', 'foo'));
+
+        $this->assertNull($helper->get('foo'));
+    }
+
+    public function testGetName()
+    {
+        $helper = new SessionHelper($this->requestStack);
+
+        $this->assertEquals('session', $helper->getName());
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Helper/StopwatchHelperTest.php b/lib/symfony/framework-bundle/Tests/Templating/Helper/StopwatchHelperTest.php
new file mode 100644
index 000000000..686c655aa
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Helper/StopwatchHelperTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\StopwatchHelper;
+
+class StopwatchHelperTest extends TestCase
+{
+    public function testDevEnvironment()
+    {
+        $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
+        $stopwatch->expects($this->once())
+            ->method('start')
+            ->with('foo');
+
+        $helper = new StopwatchHelper($stopwatch);
+        $helper->start('foo');
+    }
+
+    public function testProdEnvironment()
+    {
+        $helper = new StopwatchHelper(null);
+        $helper->start('foo');
+
+        // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
+        // can be executed without throwing any exceptions
+        $this->addToAssertionCount(1);
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/Loader/TemplateLocatorTest.php b/lib/symfony/framework-bundle/Tests/Templating/Loader/TemplateLocatorTest.php
new file mode 100644
index 000000000..b19ce0d27
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/Loader/TemplateLocatorTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Loader;
+
+use Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator;
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+
+class TemplateLocatorTest extends TestCase
+{
+    public function testLocateATemplate()
+    {
+        $template = new TemplateReference('bundle', 'controller', 'name', 'format', 'engine');
+
+        $fileLocator = $this->getFileLocator();
+
+        $fileLocator
+            ->expects($this->once())
+            ->method('locate')
+            ->with($template->getPath())
+            ->willReturn('/path/to/template')
+        ;
+
+        $locator = new TemplateLocator($fileLocator);
+
+        $this->assertEquals('/path/to/template', $locator->locate($template));
+
+        // Assert cache is used as $fileLocator->locate should be called only once
+        $this->assertEquals('/path/to/template', $locator->locate($template));
+    }
+
+    public function testLocateATemplateFromCacheDir()
+    {
+        $template = new TemplateReference('bundle', 'controller', 'name', 'format', 'engine');
+
+        $fileLocator = $this->getFileLocator();
+
+        $locator = new TemplateLocator($fileLocator, __DIR__.'/../../Fixtures');
+
+        $this->assertEquals(realpath(__DIR__.'/../../Fixtures/Resources/views/this.is.a.template.format.engine'), $locator->locate($template));
+    }
+
+    public function testThrowsExceptionWhenTemplateNotFound()
+    {
+        $template = new TemplateReference('bundle', 'controller', 'name', 'format', 'engine');
+
+        $fileLocator = $this->getFileLocator();
+
+        $errorMessage = 'FileLocator exception message';
+
+        $fileLocator
+            ->expects($this->once())
+            ->method('locate')
+            ->willThrowException(new \InvalidArgumentException($errorMessage))
+        ;
+
+        $locator = new TemplateLocator($fileLocator);
+
+        try {
+            $locator->locate($template);
+            $this->fail('->locate() should throw an exception when the file is not found.');
+        } catch (\InvalidArgumentException $e) {
+            $this->assertStringContainsString(
+                $errorMessage,
+                $e->getMessage(),
+                'TemplateLocator exception should propagate the FileLocator exception message'
+            );
+        }
+    }
+
+    public function testThrowsAnExceptionWhenTemplateIsNotATemplateReferenceInterface()
+    {
+        $this->expectException('InvalidArgumentException');
+        $locator = new TemplateLocator($this->getFileLocator());
+        $locator->locate('template');
+    }
+
+    protected function getFileLocator()
+    {
+        return $this
+            ->getMockBuilder('Symfony\Component\Config\FileLocator')
+            ->setMethods(['locate'])
+            ->setConstructorArgs(['/path/to/fallback'])
+            ->getMock()
+        ;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/PhpEngineTest.php b/lib/symfony/framework-bundle/Tests/Templating/PhpEngineTest.php
new file mode 100644
index 000000000..16c668117
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/PhpEngineTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
+
+use Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables;
+use Symfony\Bundle\FrameworkBundle\Templating\PhpEngine;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\Templating\TemplateNameParser;
+
+class PhpEngineTest extends TestCase
+{
+    public function testEvaluateAddsAppGlobal()
+    {
+        $container = $this->getContainer();
+        $loader = $this->getMockForAbstractClass('Symfony\Component\Templating\Loader\Loader');
+        $engine = new PhpEngine(new TemplateNameParser(), $container, $loader, $app = new GlobalVariables($container));
+        $globals = $engine->getGlobals();
+        $this->assertSame($app, $globals['app']);
+    }
+
+    public function testEvaluateWithoutAvailableRequest()
+    {
+        $container = new Container();
+        $loader = $this->getMockForAbstractClass('Symfony\Component\Templating\Loader\Loader');
+        $engine = new PhpEngine(new TemplateNameParser(), $container, $loader, new GlobalVariables($container));
+
+        $this->assertFalse($container->has('request_stack'));
+        $globals = $engine->getGlobals();
+        $this->assertEmpty($globals['app']->getRequest());
+    }
+
+    public function testGetInvalidHelper()
+    {
+        $this->expectException('InvalidArgumentException');
+        $container = $this->getContainer();
+        $loader = $this->getMockForAbstractClass('Symfony\Component\Templating\Loader\Loader');
+        $engine = new PhpEngine(new TemplateNameParser(), $container, $loader);
+
+        $engine->get('non-existing-helper');
+    }
+
+    /**
+     * Creates a Container with a Session-containing Request service.
+     *
+     * @return Container
+     */
+    protected function getContainer()
+    {
+        $container = new Container();
+        $session = new Session(new MockArraySessionStorage());
+        $request = new Request();
+        $stack = new RequestStack();
+        $stack->push($request);
+
+        $request->setSession($session);
+        $container->set('request_stack', $stack);
+
+        return $container;
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/TemplateFilenameParserTest.php b/lib/symfony/framework-bundle/Tests/Templating/TemplateFilenameParserTest.php
new file mode 100644
index 000000000..3c44612b8
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/TemplateFilenameParserTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
+
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateFilenameParser;
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+
+class TemplateFilenameParserTest extends TestCase
+{
+    protected $parser;
+
+    protected function setUp()
+    {
+        $this->parser = new TemplateFilenameParser();
+    }
+
+    protected function tearDown()
+    {
+        $this->parser = null;
+    }
+
+    /**
+     * @dataProvider getFilenameToTemplateProvider
+     */
+    public function testParseFromFilename($file, $ref)
+    {
+        $template = $this->parser->parse($file);
+
+        if (false === $ref) {
+            $this->assertFalse($template);
+        } else {
+            $this->assertEquals($template->getLogicalName(), $ref->getLogicalName());
+        }
+    }
+
+    public function getFilenameToTemplateProvider()
+    {
+        return [
+            ['/path/to/section/name.format.engine', new TemplateReference('', '/path/to/section', 'name', 'format', 'engine')],
+            ['\\path\\to\\section\\name.format.engine', new TemplateReference('', '/path/to/section', 'name', 'format', 'engine')],
+            ['name.format.engine', new TemplateReference('', '', 'name', 'format', 'engine')],
+            ['name.format', false],
+            ['name', false],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/TemplateNameParserTest.php b/lib/symfony/framework-bundle/Tests/Templating/TemplateNameParserTest.php
new file mode 100644
index 000000000..b9cb30859
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/TemplateNameParserTest.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
+
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser;
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Templating\TemplateReference as BaseTemplateReference;
+
+class TemplateNameParserTest extends TestCase
+{
+    protected $parser;
+
+    protected function setUp()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel
+            ->expects($this->any())
+            ->method('getBundle')
+            ->willReturnCallback(function ($bundle) {
+                if (\in_array($bundle, ['SensioFooBundle', 'SensioCmsFooBundle', 'FooBundle'])) {
+                    return true;
+                }
+
+                throw new \InvalidArgumentException();
+            })
+        ;
+        $this->parser = new TemplateNameParser($kernel);
+    }
+
+    protected function tearDown()
+    {
+        $this->parser = null;
+    }
+
+    /**
+     * @dataProvider parseProvider
+     */
+    public function testParse($name, $logicalName, $path, $ref)
+    {
+        $template = $this->parser->parse($name);
+
+        $this->assertSame($ref->getLogicalName(), $template->getLogicalName());
+        $this->assertSame($logicalName, $template->getLogicalName());
+        $this->assertSame($path, $template->getPath());
+    }
+
+    public function parseProvider()
+    {
+        return [
+            ['FooBundle:Post:index.html.php', 'FooBundle:Post:index.html.php', '@FooBundle/Resources/views/Post/index.html.php', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'php')],
+            ['FooBundle:Post:index.html.twig', 'FooBundle:Post:index.html.twig', '@FooBundle/Resources/views/Post/index.html.twig', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'twig')],
+            ['FooBundle:Post:index.xml.php', 'FooBundle:Post:index.xml.php', '@FooBundle/Resources/views/Post/index.xml.php', new TemplateReference('FooBundle', 'Post', 'index', 'xml', 'php')],
+            ['SensioFooBundle:Post:index.html.php', 'SensioFooBundle:Post:index.html.php', '@SensioFooBundle/Resources/views/Post/index.html.php', new TemplateReference('SensioFooBundle', 'Post', 'index', 'html', 'php')],
+            ['SensioCmsFooBundle:Post:index.html.php', 'SensioCmsFooBundle:Post:index.html.php', '@SensioCmsFooBundle/Resources/views/Post/index.html.php', new TemplateReference('SensioCmsFooBundle', 'Post', 'index', 'html', 'php')],
+            [':Post:index.html.php', ':Post:index.html.php', 'views/Post/index.html.php', new TemplateReference('', 'Post', 'index', 'html', 'php')],
+            ['::index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')],
+            ['index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')],
+            ['FooBundle:Post:foo.bar.index.html.php', 'FooBundle:Post:foo.bar.index.html.php', '@FooBundle/Resources/views/Post/foo.bar.index.html.php', new TemplateReference('FooBundle', 'Post', 'foo.bar.index', 'html', 'php')],
+            ['@FooBundle/Resources/views/layout.html.twig', '@FooBundle/Resources/views/layout.html.twig', '@FooBundle/Resources/views/layout.html.twig', new BaseTemplateReference('@FooBundle/Resources/views/layout.html.twig', 'twig')],
+            ['@FooBundle/Foo/layout.html.twig', '@FooBundle/Foo/layout.html.twig', '@FooBundle/Foo/layout.html.twig', new BaseTemplateReference('@FooBundle/Foo/layout.html.twig', 'twig')],
+            ['name.twig', 'name.twig', 'name.twig', new BaseTemplateReference('name.twig', 'twig')],
+            ['name', 'name', 'name', new BaseTemplateReference('name')],
+            ['default/index.html.php', '::default/index.html.php', 'views/default/index.html.php', new TemplateReference(null, null, 'default/index', 'html', 'php')],
+        ];
+    }
+
+    public function testParseValidNameWithNotFoundBundle()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->parser->parse('BarBundle:Post:index.html.php');
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider provideAbsolutePaths
+     * @expectedDeprecation Absolute template path support is deprecated since Symfony 3.1 and will be removed in 4.0.
+     */
+    public function testAbsolutePathsAreDeprecated($name, $logicalName, $path, $ref)
+    {
+        $template = $this->parser->parse($name);
+
+        $this->assertSame($ref->getLogicalName(), $template->getLogicalName());
+        $this->assertSame($logicalName, $template->getLogicalName());
+        $this->assertSame($path, $template->getPath());
+    }
+
+    public function provideAbsolutePaths()
+    {
+        return [
+            ['/path/to/section/index.html.php', '/path/to/section/index.html.php', '/path/to/section/index.html.php', new BaseTemplateReference('/path/to/section/index.html.php', 'php')],
+            ['C:\\path\\to\\section\\name.html.php', 'C:path/to/section/name.html.php', 'C:path/to/section/name.html.php', new BaseTemplateReference('C:path/to/section/name.html.php', 'php')],
+            ['C:\\path\\to\\section\\name:foo.html.php', 'C:path/to/section/name:foo.html.php', 'C:path/to/section/name:foo.html.php', new BaseTemplateReference('C:path/to/section/name:foo.html.php', 'php')],
+            ['\\path\\to\\section\\name.html.php', '/path/to/section/name.html.php', '/path/to/section/name.html.php', new BaseTemplateReference('/path/to/section/name.html.php', 'php')],
+            ['/path/to/section/name.php', '/path/to/section/name.php', '/path/to/section/name.php', new BaseTemplateReference('/path/to/section/name.php', 'php')],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/TemplateReferenceTest.php b/lib/symfony/framework-bundle/Tests/Templating/TemplateReferenceTest.php
new file mode 100644
index 000000000..35561bf52
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/TemplateReferenceTest.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
+
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+
+class TemplateReferenceTest extends TestCase
+{
+    public function testGetPathWorksWithNamespacedControllers()
+    {
+        $reference = new TemplateReference('AcmeBlogBundle', 'Admin\Post', 'index', 'html', 'twig');
+
+        $this->assertSame(
+            '@AcmeBlogBundle/Resources/views/Admin/Post/index.html.twig',
+            $reference->getPath()
+        );
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/TemplateTest.php b/lib/symfony/framework-bundle/Tests/Templating/TemplateTest.php
new file mode 100644
index 000000000..66872049a
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/TemplateTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
+
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+
+class TemplateTest extends TestCase
+{
+    /**
+     * @dataProvider getTemplateToPathProvider
+     */
+    public function testGetPathForTemplate($template, $path)
+    {
+        $this->assertSame($template->getPath(), $path);
+    }
+
+    public function getTemplateToPathProvider()
+    {
+        return [
+            [new TemplateReference('FooBundle', 'Post', 'index', 'html', 'php'), '@FooBundle/Resources/views/Post/index.html.php'],
+            [new TemplateReference('FooBundle', '', 'index', 'html', 'twig'), '@FooBundle/Resources/views/index.html.twig'],
+            [new TemplateReference('', 'Post', 'index', 'html', 'php'), 'views/Post/index.html.php'],
+            [new TemplateReference('', '', 'index', 'html', 'php'), 'views/index.html.php'],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Templating/TimedPhpEngineTest.php b/lib/symfony/framework-bundle/Tests/Templating/TimedPhpEngineTest.php
new file mode 100644
index 000000000..f3684529f
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Templating/TimedPhpEngineTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
+
+use Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables;
+use Symfony\Bundle\FrameworkBundle\Templating\TimedPhpEngine;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+
+class TimedPhpEngineTest extends TestCase
+{
+    public function testThatRenderLogsTime()
+    {
+        $container = $this->getContainer();
+        $templateNameParser = $this->getTemplateNameParser();
+        $globalVariables = $this->getGlobalVariables();
+        $loader = $this->getLoader($this->getStorage());
+
+        $stopwatch = $this->getStopwatch();
+        $stopwatchEvent = $this->getStopwatchEvent();
+
+        $stopwatch->expects($this->once())
+            ->method('start')
+            ->with('template.php (index.php)', 'template')
+            ->willReturn($stopwatchEvent);
+
+        $stopwatchEvent->expects($this->once())->method('stop');
+
+        $engine = new TimedPhpEngine($templateNameParser, $container, $loader, $stopwatch, $globalVariables);
+        $engine->render('index.php');
+    }
+
+    /**
+     * @return Container
+     */
+    private function getContainer()
+    {
+        return $this->getMockBuilder('Symfony\Component\DependencyInjection\Container')->getMock();
+    }
+
+    /**
+     * @return \Symfony\Component\Templating\TemplateNameParserInterface
+     */
+    private function getTemplateNameParser()
+    {
+        $templateReference = $this->getMockBuilder('Symfony\Component\Templating\TemplateReferenceInterface')->getMock();
+        $templateNameParser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+        $templateNameParser->expects($this->any())
+            ->method('parse')
+            ->willReturn($templateReference);
+
+        return $templateNameParser;
+    }
+
+    /**
+     * @return GlobalVariables
+     */
+    private function getGlobalVariables()
+    {
+        return $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @return \Symfony\Component\Templating\Storage\StringStorage
+     */
+    private function getStorage()
+    {
+        return $this->getMockBuilder('Symfony\Component\Templating\Storage\StringStorage')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+    }
+
+    /**
+     * @param \Symfony\Component\Templating\Storage\StringStorage $storage
+     *
+     * @return \Symfony\Component\Templating\Loader\Loader
+     */
+    private function getLoader($storage)
+    {
+        $loader = $this->getMockForAbstractClass('Symfony\Component\Templating\Loader\Loader');
+        $loader->expects($this->once())
+            ->method('load')
+            ->willReturn($storage);
+
+        return $loader;
+    }
+
+    /**
+     * @return \Symfony\Component\Stopwatch\StopwatchEvent
+     */
+    private function getStopwatchEvent()
+    {
+        return $this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @return \Symfony\Component\Stopwatch\Stopwatch
+     */
+    private function getStopwatch()
+    {
+        return $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/TestCase.php b/lib/symfony/framework-bundle/Tests/TestCase.php
new file mode 100644
index 000000000..115ca1ae5
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/TestCase.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests;
+
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+
+class TestCase extends PHPUnitTestCase
+{
+}
diff --git a/lib/symfony/framework-bundle/Tests/Translation/PhpExtractorTest.php b/lib/symfony/framework-bundle/Tests/Translation/PhpExtractorTest.php
new file mode 100644
index 000000000..c19c1567d
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Translation/PhpExtractorTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Translation;
+
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\FrameworkBundle\Translation\PhpExtractor;
+use Symfony\Component\Translation\MessageCatalogue;
+
+/**
+ * @group legacy
+ */
+class PhpExtractorTest extends TestCase
+{
+    /**
+     * @dataProvider resourcesProvider
+     *
+     * @param array|string $resource
+     */
+    public function testExtraction($resource)
+    {
+        // Arrange
+        $extractor = new PhpExtractor();
+        $extractor->setPrefix('prefix');
+        $catalogue = new MessageCatalogue('en');
+
+        // Act
+        $extractor->extract($resource, $catalogue);
+
+        $expectedHeredoc = <<<EOF
+heredoc key with whitespace and escaped \$\n sequences
+EOF;
+        $expectedNowdoc = <<<'EOF'
+nowdoc key with whitespace and nonescaped \$\n sequences
+EOF;
+        // Assert
+        $expectedCatalogue = [
+            'messages' => [
+                'single-quoted key' => 'prefixsingle-quoted key',
+                'double-quoted key' => 'prefixdouble-quoted key',
+                'heredoc key' => 'prefixheredoc key',
+                'nowdoc key' => 'prefixnowdoc key',
+                "double-quoted key with whitespace and escaped \$\n\" sequences" => "prefixdouble-quoted key with whitespace and escaped \$\n\" sequences",
+                'single-quoted key with whitespace and nonescaped \$\n\' sequences' => 'prefixsingle-quoted key with whitespace and nonescaped \$\n\' sequences',
+                'single-quoted key with "quote mark at the end"' => 'prefixsingle-quoted key with "quote mark at the end"',
+                $expectedHeredoc => 'prefix'.$expectedHeredoc,
+                $expectedNowdoc => 'prefix'.$expectedNowdoc,
+                '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples' => 'prefix{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
+            ],
+            'not_messages' => [
+                'other-domain-test-no-params-short-array' => 'prefixother-domain-test-no-params-short-array',
+                'other-domain-test-no-params-long-array' => 'prefixother-domain-test-no-params-long-array',
+                'other-domain-test-params-short-array' => 'prefixother-domain-test-params-short-array',
+                'other-domain-test-params-long-array' => 'prefixother-domain-test-params-long-array',
+                'other-domain-test-trans-choice-short-array-%count%' => 'prefixother-domain-test-trans-choice-short-array-%count%',
+                'other-domain-test-trans-choice-long-array-%count%' => 'prefixother-domain-test-trans-choice-long-array-%count%',
+                'typecast' => 'prefixtypecast',
+                'msg1' => 'prefixmsg1',
+                'msg2' => 'prefixmsg2',
+            ],
+        ];
+        $actualCatalogue = $catalogue->all();
+
+        $this->assertEquals($expectedCatalogue, $actualCatalogue);
+    }
+
+    public function resourcesProvider()
+    {
+        $directory = __DIR__.'/../Fixtures/Resources/views/';
+        $splFiles = [];
+        foreach (new \DirectoryIterator($directory) as $fileInfo) {
+            if ($fileInfo->isDot()) {
+                continue;
+            }
+            if ('translation.html.php' === $fileInfo->getBasename()) {
+                $phpFile = $fileInfo->getPathname();
+            }
+            $splFiles[] = $fileInfo->getFileInfo();
+        }
+
+        return [
+            [$directory],
+            [$phpFile],
+            [glob($directory.'*')],
+            [$splFiles],
+            [new \ArrayObject(glob($directory.'*'))],
+            [new \ArrayObject($splFiles)],
+        ];
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Translation/TranslatorTest.php b/lib/symfony/framework-bundle/Tests/Translation/TranslatorTest.php
new file mode 100644
index 000000000..e38e11601
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Translation/TranslatorTest.php
@@ -0,0 +1,492 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Translation;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Translation\Translator;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Translation\Formatter\MessageFormatter;
+use Symfony\Component\Translation\MessageCatalogue;
+
+class TranslatorTest extends TestCase
+{
+    protected $tmpDir;
+
+    protected function setUp()
+    {
+        $this->tmpDir = sys_get_temp_dir().'/sf2_translation';
+        $this->deleteTmpDir();
+    }
+
+    protected function tearDown()
+    {
+        $this->deleteTmpDir();
+    }
+
+    protected function deleteTmpDir()
+    {
+        if (!file_exists($dir = $this->tmpDir)) {
+            return;
+        }
+
+        $fs = new Filesystem();
+        $fs->remove($dir);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Translation\Translator::__construct()" method takes the default locale as the 3rd argument since Symfony 3.3. Not passing it is deprecated and will trigger an error in 4.0.
+     */
+    public function testTransWithoutCachingOmittingLocale()
+    {
+        $translator = $this->getTranslator($this->getLoader(), [], 'loader', '\Symfony\Bundle\FrameworkBundle\Translation\Translator', null);
+        $translator->setLocale('fr');
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
+
+        $this->assertEquals('foo (FR)', $translator->trans('foo'));
+        $this->assertEquals('bar (EN)', $translator->trans('bar'));
+        $this->assertEquals('foobar (ES)', $translator->trans('foobar'));
+        $this->assertEquals('choice 0 (EN)', $translator->transChoice('choice', 0));
+        $this->assertEquals('no translation', $translator->trans('no translation'));
+        $this->assertEquals('foobarfoo (PT-PT)', $translator->trans('foobarfoo'));
+        $this->assertEquals('other choice 1 (PT-BR)', $translator->transChoice('other choice', 1));
+        $this->assertEquals('foobarbaz (fr.UTF-8)', $translator->trans('foobarbaz'));
+        $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Translation\Translator::__construct()" method takes the default locale as the 3rd argument since Symfony 3.3. Not passing it is deprecated and will trigger an error in 4.0.
+     */
+    public function testTransWithCachingOmittingLocale()
+    {
+        // prime the cache
+        $translator = $this->getTranslator($this->getLoader(), ['cache_dir' => $this->tmpDir], 'loader', '\Symfony\Bundle\FrameworkBundle\Translation\Translator', null);
+        $translator->setLocale('fr');
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
+
+        $this->assertEquals('foo (FR)', $translator->trans('foo'));
+        $this->assertEquals('bar (EN)', $translator->trans('bar'));
+        $this->assertEquals('foobar (ES)', $translator->trans('foobar'));
+        $this->assertEquals('choice 0 (EN)', $translator->transChoice('choice', 0));
+        $this->assertEquals('no translation', $translator->trans('no translation'));
+        $this->assertEquals('foobarfoo (PT-PT)', $translator->trans('foobarfoo'));
+        $this->assertEquals('other choice 1 (PT-BR)', $translator->transChoice('other choice', 1));
+        $this->assertEquals('foobarbaz (fr.UTF-8)', $translator->trans('foobarbaz'));
+        $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
+
+        // do it another time as the cache is primed now
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+        $loader->expects($this->never())->method('load');
+
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', '\Symfony\Bundle\FrameworkBundle\Translation\Translator', null);
+        $translator->setLocale('fr');
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
+
+        $this->assertEquals('foo (FR)', $translator->trans('foo'));
+        $this->assertEquals('bar (EN)', $translator->trans('bar'));
+        $this->assertEquals('foobar (ES)', $translator->trans('foobar'));
+        $this->assertEquals('choice 0 (EN)', $translator->transChoice('choice', 0));
+        $this->assertEquals('no translation', $translator->trans('no translation'));
+        $this->assertEquals('foobarfoo (PT-PT)', $translator->trans('foobarfoo'));
+        $this->assertEquals('other choice 1 (PT-BR)', $translator->transChoice('other choice', 1));
+        $this->assertEquals('foobarbaz (fr.UTF-8)', $translator->trans('foobarbaz'));
+        $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Translation\Translator::__construct()" method takes the default locale as the 3rd argument since Symfony 3.3. Not passing it is deprecated and will trigger an error in 4.0.
+     */
+    public function testTransWithCachingWithInvalidLocaleOmittingLocale()
+    {
+        $this->expectException('InvalidArgumentException');
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale', null);
+
+        $translator->trans('foo');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Translation\Translator::__construct()" method takes the default locale as the 3rd argument since Symfony 3.3. Not passing it is deprecated and will trigger an error in 4.0.
+     */
+    public function testLoadResourcesWithoutCachingOmittingLocale()
+    {
+        $loader = new \Symfony\Component\Translation\Loader\YamlFileLoader();
+        $resourceFiles = [
+            'fr' => [
+                __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
+            ],
+        ];
+
+        $translator = $this->getTranslator($loader, ['resource_files' => $resourceFiles], 'yml', '\Symfony\Bundle\FrameworkBundle\Translation\Translator', null);
+        $translator->setLocale('fr');
+
+        $this->assertEquals('répertoire', $translator->trans('folder'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Translation\Translator::__construct()" method takes the default locale as the 3rd argument since Symfony 3.3. Not passing it is deprecated and will trigger an error in 4.0.
+     */
+    public function testGetDefaultLocaleOmittingLocale()
+    {
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container
+            ->expects($this->once())
+            ->method('getParameter')
+            ->with('kernel.default_locale')
+            ->willReturn('en')
+        ;
+        $translator = new Translator($container, new MessageFormatter());
+
+        $this->assertSame('en', $translator->getLocale());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetDefaultLocaleOmittingLocaleWithPsrContainer()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Missing third $defaultLocale argument.');
+        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+        new Translator($container, new MessageFormatter());
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Bundle\FrameworkBundle\Translation\Translator::__construct()" method takes the default locale as the 3rd argument since Symfony 3.3. Not passing it is deprecated and will trigger an error in 4.0.
+     */
+    public function testWarmupOmittingLocale()
+    {
+        $loader = new \Symfony\Component\Translation\Loader\YamlFileLoader();
+        $resourceFiles = [
+            'fr' => [
+                __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
+            ],
+        ];
+
+        // prime the cache
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles], 'yml', '\Symfony\Bundle\FrameworkBundle\Translation\Translator', null);
+        $translator->setFallbackLocales(['fr']);
+        $translator->warmup($this->tmpDir);
+
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+        $loader
+            ->expects($this->never())
+            ->method('load');
+
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles], 'yml', '\Symfony\Bundle\FrameworkBundle\Translation\Translator', null);
+        $translator->setLocale('fr');
+        $translator->setFallbackLocales(['fr']);
+        $this->assertEquals('répertoire', $translator->trans('folder'));
+    }
+
+    public function testTransWithoutCaching()
+    {
+        $translator = $this->getTranslator($this->getLoader());
+        $translator->setLocale('fr');
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
+
+        $this->assertEquals('foo (FR)', $translator->trans('foo'));
+        $this->assertEquals('bar (EN)', $translator->trans('bar'));
+        $this->assertEquals('foobar (ES)', $translator->trans('foobar'));
+        $this->assertEquals('choice 0 (EN)', $translator->transChoice('choice', 0));
+        $this->assertEquals('no translation', $translator->trans('no translation'));
+        $this->assertEquals('foobarfoo (PT-PT)', $translator->trans('foobarfoo'));
+        $this->assertEquals('other choice 1 (PT-BR)', $translator->transChoice('other choice', 1));
+        $this->assertEquals('foobarbaz (fr.UTF-8)', $translator->trans('foobarbaz'));
+        $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
+    }
+
+    public function testTransWithCaching()
+    {
+        // prime the cache
+        $translator = $this->getTranslator($this->getLoader(), ['cache_dir' => $this->tmpDir]);
+        $translator->setLocale('fr');
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
+
+        $this->assertEquals('foo (FR)', $translator->trans('foo'));
+        $this->assertEquals('bar (EN)', $translator->trans('bar'));
+        $this->assertEquals('foobar (ES)', $translator->trans('foobar'));
+        $this->assertEquals('choice 0 (EN)', $translator->transChoice('choice', 0));
+        $this->assertEquals('no translation', $translator->trans('no translation'));
+        $this->assertEquals('foobarfoo (PT-PT)', $translator->trans('foobarfoo'));
+        $this->assertEquals('other choice 1 (PT-BR)', $translator->transChoice('other choice', 1));
+        $this->assertEquals('foobarbaz (fr.UTF-8)', $translator->trans('foobarbaz'));
+        $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
+
+        // do it another time as the cache is primed now
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+        $loader->expects($this->never())->method('load');
+
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir]);
+        $translator->setLocale('fr');
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
+
+        $this->assertEquals('foo (FR)', $translator->trans('foo'));
+        $this->assertEquals('bar (EN)', $translator->trans('bar'));
+        $this->assertEquals('foobar (ES)', $translator->trans('foobar'));
+        $this->assertEquals('choice 0 (EN)', $translator->transChoice('choice', 0));
+        $this->assertEquals('no translation', $translator->trans('no translation'));
+        $this->assertEquals('foobarfoo (PT-PT)', $translator->trans('foobarfoo'));
+        $this->assertEquals('other choice 1 (PT-BR)', $translator->transChoice('other choice', 1));
+        $this->assertEquals('foobarbaz (fr.UTF-8)', $translator->trans('foobarbaz'));
+        $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
+    }
+
+    public function testTransWithCachingWithInvalidLocale()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid "invalid locale" locale.');
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');
+
+        $translator->trans('foo');
+    }
+
+    public function testLoadResourcesWithoutCaching()
+    {
+        $loader = new \Symfony\Component\Translation\Loader\YamlFileLoader();
+        $resourceFiles = [
+            'fr' => [
+                __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
+            ],
+        ];
+
+        $translator = $this->getTranslator($loader, ['resource_files' => $resourceFiles], 'yml');
+        $translator->setLocale('fr');
+
+        $this->assertEquals('répertoire', $translator->trans('folder'));
+    }
+
+    public function testGetDefaultLocale()
+    {
+        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+        $translator = new Translator($container, new MessageFormatter(), 'en');
+
+        $this->assertSame('en', $translator->getLocale());
+    }
+
+    public function testInvalidOptions()
+    {
+        $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The Translator does not support the following options: \'foo\'');
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+
+        (new Translator($container, new MessageFormatter(), 'en', [], ['foo' => 'bar']));
+    }
+
+    /** @dataProvider getDebugModeAndCacheDirCombinations */
+    public function testResourceFilesOptionLoadsBeforeOtherAddedResources($debug, $enableCache)
+    {
+        $someCatalogue = $this->getCatalogue('some_locale', []);
+
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+
+        $loader->expects($this->at(0))
+            ->method('load')
+            /* The "messages.some_locale.loader" is passed via the resource_file option and shall be loaded first */
+            ->with('messages.some_locale.loader', 'some_locale', 'messages')
+            ->willReturn($someCatalogue);
+
+        $loader->expects($this->at(1))
+            ->method('load')
+            /* This resource is added by an addResource() call and shall be loaded after the resource_files */
+            ->with('second_resource.some_locale.loader', 'some_locale', 'messages')
+            ->willReturn($someCatalogue);
+
+        $options = [
+            'resource_files' => ['some_locale' => ['messages.some_locale.loader']],
+            'debug' => $debug,
+        ];
+
+        if ($enableCache) {
+            $options['cache_dir'] = $this->tmpDir;
+        }
+
+        /** @var Translator $translator */
+        $translator = $this->createTranslator($loader, $options);
+        $translator->addResource('loader', 'second_resource.some_locale.loader', 'some_locale', 'messages');
+
+        $translator->trans('some_message', [], null, 'some_locale');
+    }
+
+    public function getDebugModeAndCacheDirCombinations()
+    {
+        return [
+            [false, false],
+            [true, false],
+            [false, true],
+            [true, true],
+        ];
+    }
+
+    protected function getCatalogue($locale, $messages, $resources = [])
+    {
+        $catalogue = new MessageCatalogue($locale);
+        foreach ($messages as $key => $translation) {
+            $catalogue->set($key, $translation);
+        }
+        foreach ($resources as $resource) {
+            $catalogue->addResource($resource);
+        }
+
+        return $catalogue;
+    }
+
+    protected function getLoader()
+    {
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+        $loader
+            ->expects($this->at(0))
+            ->method('load')
+            ->willReturn($this->getCatalogue('fr', [
+                'foo' => 'foo (FR)',
+            ]))
+        ;
+        $loader
+            ->expects($this->at(1))
+            ->method('load')
+            ->willReturn($this->getCatalogue('en', [
+                'foo' => 'foo (EN)',
+                'bar' => 'bar (EN)',
+                'choice' => '{0} choice 0 (EN)|{1} choice 1 (EN)|]1,Inf] choice inf (EN)',
+            ]))
+        ;
+        $loader
+            ->expects($this->at(2))
+            ->method('load')
+            ->willReturn($this->getCatalogue('es', [
+                'foobar' => 'foobar (ES)',
+            ]))
+        ;
+        $loader
+            ->expects($this->at(3))
+            ->method('load')
+            ->willReturn($this->getCatalogue('pt-PT', [
+                'foobarfoo' => 'foobarfoo (PT-PT)',
+            ]))
+        ;
+        $loader
+            ->expects($this->at(4))
+            ->method('load')
+            ->willReturn($this->getCatalogue('pt_BR', [
+                'other choice' => '{0} other choice 0 (PT-BR)|{1} other choice 1 (PT-BR)|]1,Inf] other choice inf (PT-BR)',
+            ]))
+        ;
+        $loader
+            ->expects($this->at(5))
+            ->method('load')
+            ->willReturn($this->getCatalogue('fr.UTF-8', [
+                'foobarbaz' => 'foobarbaz (fr.UTF-8)',
+            ]))
+        ;
+        $loader
+            ->expects($this->at(6))
+            ->method('load')
+            ->willReturn($this->getCatalogue('sr@latin', [
+                'foobarbax' => 'foobarbax (sr@latin)',
+            ]))
+        ;
+
+        return $loader;
+    }
+
+    protected function getContainer($loader)
+    {
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container
+            ->expects($this->any())
+            ->method('get')
+            ->willReturn($loader)
+        ;
+
+        return $container;
+    }
+
+    public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $defaultLocale = 'en')
+    {
+        $translator = $this->createTranslator($loader, $options, $translatorClass, $loaderFomat, $defaultLocale);
+
+        if ('loader' === $loaderFomat) {
+            $translator->addResource('loader', 'foo', 'fr');
+            $translator->addResource('loader', 'foo', 'en');
+            $translator->addResource('loader', 'foo', 'es');
+            $translator->addResource('loader', 'foo', 'pt-PT'); // European Portuguese
+            $translator->addResource('loader', 'foo', 'pt_BR'); // Brazilian Portuguese
+            $translator->addResource('loader', 'foo', 'fr.UTF-8');
+            $translator->addResource('loader', 'foo', 'sr@latin'); // Latin Serbian
+        }
+
+        return $translator;
+    }
+
+    public function testWarmup()
+    {
+        $loader = new \Symfony\Component\Translation\Loader\YamlFileLoader();
+        $resourceFiles = [
+            'fr' => [
+                __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
+            ],
+        ];
+
+        // prime the cache
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles], 'yml');
+        $translator->setFallbackLocales(['fr']);
+        $translator->warmup($this->tmpDir);
+
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+        $loader
+            ->expects($this->never())
+            ->method('load');
+
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles], 'yml');
+        $translator->setLocale('fr');
+        $translator->setFallbackLocales(['fr']);
+        $this->assertEquals('répertoire', $translator->trans('folder'));
+    }
+
+    private function createTranslator($loader, $options, $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $loaderFomat = 'loader', $defaultLocale = 'en')
+    {
+        if (null === $defaultLocale) {
+            return new $translatorClass(
+                $this->getContainer($loader),
+                new MessageFormatter(),
+                [$loaderFomat => [$loaderFomat]],
+                $options
+            );
+        }
+
+        return new $translatorClass(
+            $this->getContainer($loader),
+            new MessageFormatter(),
+            $defaultLocale,
+            [$loaderFomat => [$loaderFomat]],
+            $options
+        );
+    }
+}
+
+class TranslatorWithInvalidLocale extends Translator
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getLocale()
+    {
+        return 'invalid locale';
+    }
+}
diff --git a/lib/symfony/framework-bundle/Tests/Validator/ConstraintValidatorFactoryTest.php b/lib/symfony/framework-bundle/Tests/Validator/ConstraintValidatorFactoryTest.php
new file mode 100644
index 000000000..1b5409805
--- /dev/null
+++ b/lib/symfony/framework-bundle/Tests/Validator/ConstraintValidatorFactoryTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Validator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\Blank as BlankConstraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+/**
+ * @group legacy
+ */
+class ConstraintValidatorFactoryTest extends TestCase
+{
+    public function testGetInstanceCreatesValidator()
+    {
+        $factory = new ConstraintValidatorFactory(new Container());
+        $this->assertInstanceOf(DummyConstraintValidator::class, $factory->getInstance(new DummyConstraint()));
+    }
+
+    public function testGetInstanceReturnsExistingValidator()
+    {
+        $factory = new ConstraintValidatorFactory(new Container());
+        $v1 = $factory->getInstance(new BlankConstraint());
+        $v2 = $factory->getInstance(new BlankConstraint());
+        $this->assertSame($v1, $v2);
+    }
+
+    public function testGetInstanceReturnsService()
+    {
+        $validator = new DummyConstraintValidator();
+        $container = new Container();
+        $container->set(DummyConstraintValidator::class, $validator);
+
+        $factory = new ConstraintValidatorFactory($container);
+
+        $this->assertSame($validator, $factory->getInstance(new DummyConstraint()));
+    }
+
+    public function testGetInstanceReturnsServiceWithAlias()
+    {
+        $validator = new DummyConstraintValidator();
+
+        $container = new Container();
+        $container->set('validator_constraint_service', $validator);
+
+        $factory = new ConstraintValidatorFactory($container, ['validator_constraint_alias' => 'validator_constraint_service']);
+        $this->assertSame($validator, $factory->getInstance(new ConstraintAliasStub()));
+    }
+
+    public function testGetInstanceInvalidValidatorClass()
+    {
+        $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
+        $constraint = $this->getMockBuilder('Symfony\\Component\\Validator\\Constraint')->getMock();
+        $constraint
+            ->expects($this->exactly(2))
+            ->method('validatedBy')
+            ->willReturn('Fully\\Qualified\\ConstraintValidator\\Class\\Name');
+
+        $factory = new ConstraintValidatorFactory(new Container());
+        $factory->getInstance($constraint);
+    }
+}
+
+class ConstraintAliasStub extends Constraint
+{
+    public function validatedBy()
+    {
+        return 'validator_constraint_alias';
+    }
+}
+
+class DummyConstraint extends Constraint
+{
+    public function validatedBy()
+    {
+        return DummyConstraintValidator::class;
+    }
+}
+
+class DummyConstraintValidator extends ConstraintValidator
+{
+    public function validate($value, Constraint $constraint)
+    {
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/AcceptHeaderItemTest.php b/lib/symfony/http-foundation/Tests/AcceptHeaderItemTest.php
new file mode 100644
index 000000000..a40a7621d
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/AcceptHeaderItemTest.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\AcceptHeaderItem;
+
+class AcceptHeaderItemTest extends TestCase
+{
+    /**
+     * @dataProvider provideFromStringData
+     */
+    public function testFromString($string, $value, array $attributes)
+    {
+        $item = AcceptHeaderItem::fromString($string);
+        $this->assertEquals($value, $item->getValue());
+        $this->assertEquals($attributes, $item->getAttributes());
+    }
+
+    public function provideFromStringData()
+    {
+        return [
+            [
+                'text/html',
+                'text/html', [],
+            ],
+            [
+                '"this;should,not=matter"',
+                'this;should,not=matter', [],
+            ],
+            [
+                "text/plain; charset=utf-8;param=\"this;should,not=matter\";\tfootnotes=true",
+                'text/plain', ['charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'],
+            ],
+            [
+                '"this;should,not=matter";charset=utf-8',
+                'this;should,not=matter', ['charset' => 'utf-8'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideToStringData
+     */
+    public function testToString($value, array $attributes, $string)
+    {
+        $item = new AcceptHeaderItem($value, $attributes);
+        $this->assertEquals($string, (string) $item);
+    }
+
+    public function provideToStringData()
+    {
+        return [
+            [
+                'text/html', [],
+                'text/html',
+            ],
+            [
+                'text/plain', ['charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'],
+                'text/plain;charset=utf-8;param="this;should,not=matter";footnotes=true',
+            ],
+        ];
+    }
+
+    public function testValue()
+    {
+        $item = new AcceptHeaderItem('value', []);
+        $this->assertEquals('value', $item->getValue());
+
+        $item->setValue('new value');
+        $this->assertEquals('new value', $item->getValue());
+
+        $item->setValue(1);
+        $this->assertEquals('1', $item->getValue());
+    }
+
+    public function testQuality()
+    {
+        $item = new AcceptHeaderItem('value', []);
+        $this->assertEquals(1.0, $item->getQuality());
+
+        $item->setQuality(0.5);
+        $this->assertEquals(0.5, $item->getQuality());
+
+        $item->setAttribute('q', 0.75);
+        $this->assertEquals(0.75, $item->getQuality());
+        $this->assertFalse($item->hasAttribute('q'));
+    }
+
+    public function testAttribute()
+    {
+        $item = new AcceptHeaderItem('value', []);
+        $this->assertEquals([], $item->getAttributes());
+        $this->assertFalse($item->hasAttribute('test'));
+        $this->assertNull($item->getAttribute('test'));
+        $this->assertEquals('default', $item->getAttribute('test', 'default'));
+
+        $item->setAttribute('test', 'value');
+        $this->assertEquals(['test' => 'value'], $item->getAttributes());
+        $this->assertTrue($item->hasAttribute('test'));
+        $this->assertEquals('value', $item->getAttribute('test'));
+        $this->assertEquals('value', $item->getAttribute('test', 'default'));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/AcceptHeaderTest.php b/lib/symfony/http-foundation/Tests/AcceptHeaderTest.php
new file mode 100644
index 000000000..31998696d
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/AcceptHeaderTest.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\AcceptHeader;
+use Symfony\Component\HttpFoundation\AcceptHeaderItem;
+
+class AcceptHeaderTest extends TestCase
+{
+    public function testFirst()
+    {
+        $header = AcceptHeader::fromString('text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
+        $this->assertSame('text/html', $header->first()->getValue());
+    }
+
+    /**
+     * @dataProvider provideFromStringData
+     */
+    public function testFromString($string, array $items)
+    {
+        $header = AcceptHeader::fromString($string);
+        $parsed = array_values($header->all());
+        // reset index since the fixtures don't have them set
+        foreach ($parsed as $item) {
+            $item->setIndex(0);
+        }
+        $this->assertEquals($items, $parsed);
+    }
+
+    public function provideFromStringData()
+    {
+        return [
+            ['', []],
+            ['gzip', [new AcceptHeaderItem('gzip')]],
+            ['gzip,deflate,sdch', [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],
+            ["gzip, deflate\t,sdch", [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],
+            ['"this;should,not=matter"', [new AcceptHeaderItem('this;should,not=matter')]],
+        ];
+    }
+
+    /**
+     * @dataProvider provideToStringData
+     */
+    public function testToString(array $items, $string)
+    {
+        $header = new AcceptHeader($items);
+        $this->assertEquals($string, (string) $header);
+    }
+
+    public function provideToStringData()
+    {
+        return [
+            [[], ''],
+            [[new AcceptHeaderItem('gzip')], 'gzip'],
+            [[new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')], 'gzip,deflate,sdch'],
+            [[new AcceptHeaderItem('this;should,not=matter')], 'this;should,not=matter'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideFilterData
+     */
+    public function testFilter($string, $filter, array $values)
+    {
+        $header = AcceptHeader::fromString($string)->filter($filter);
+        $this->assertEquals($values, array_keys($header->all()));
+    }
+
+    public function provideFilterData()
+    {
+        return [
+            ['fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4', '/fr.*/', ['fr-FR', 'fr']],
+        ];
+    }
+
+    /**
+     * @dataProvider provideSortingData
+     */
+    public function testSorting($string, array $values)
+    {
+        $header = AcceptHeader::fromString($string);
+        $this->assertEquals($values, array_keys($header->all()));
+    }
+
+    public function provideSortingData()
+    {
+        return [
+            'quality has priority' => ['*;q=0.3,ISO-8859-1,utf-8;q=0.7', ['ISO-8859-1', 'utf-8', '*']],
+            'order matters when q is equal' => ['*;q=0.3,ISO-8859-1;q=0.7,utf-8;q=0.7', ['ISO-8859-1', 'utf-8', '*']],
+            'order matters when q is equal2' => ['*;q=0.3,utf-8;q=0.7,ISO-8859-1;q=0.7', ['utf-8', 'ISO-8859-1', '*']],
+        ];
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/ApacheRequestTest.php b/lib/symfony/http-foundation/Tests/ApacheRequestTest.php
new file mode 100644
index 000000000..6fa3b8891
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/ApacheRequestTest.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\ApacheRequest;
+
+class ApacheRequestTest extends TestCase
+{
+    /**
+     * @dataProvider provideServerVars
+     */
+    public function testUriMethods($server, $expectedRequestUri, $expectedBaseUrl, $expectedPathInfo)
+    {
+        $request = new ApacheRequest();
+        $request->server->replace($server);
+
+        $this->assertEquals($expectedRequestUri, $request->getRequestUri(), '->getRequestUri() is correct');
+        $this->assertEquals($expectedBaseUrl, $request->getBaseUrl(), '->getBaseUrl() is correct');
+        $this->assertEquals($expectedPathInfo, $request->getPathInfo(), '->getPathInfo() is correct');
+    }
+
+    public function provideServerVars()
+    {
+        return [
+            [
+                [
+                    'REQUEST_URI' => '/foo/app_dev.php/bar',
+                    'SCRIPT_NAME' => '/foo/app_dev.php',
+                    'PATH_INFO' => '/bar',
+                ],
+                '/foo/app_dev.php/bar',
+                '/foo/app_dev.php',
+                '/bar',
+            ],
+            [
+                [
+                    'REQUEST_URI' => '/foo/bar',
+                    'SCRIPT_NAME' => '/foo/app_dev.php',
+                ],
+                '/foo/bar',
+                '/foo',
+                '/bar',
+            ],
+            [
+                [
+                    'REQUEST_URI' => '/app_dev.php/foo/bar',
+                    'SCRIPT_NAME' => '/app_dev.php',
+                    'PATH_INFO' => '/foo/bar',
+                ],
+                '/app_dev.php/foo/bar',
+                '/app_dev.php',
+                '/foo/bar',
+            ],
+            [
+                [
+                    'REQUEST_URI' => '/foo/bar',
+                    'SCRIPT_NAME' => '/app_dev.php',
+                ],
+                '/foo/bar',
+                '',
+                '/foo/bar',
+            ],
+            [
+                [
+                    'REQUEST_URI' => '/app_dev.php',
+                    'SCRIPT_NAME' => '/app_dev.php',
+                ],
+                '/app_dev.php',
+                '/app_dev.php',
+                '/',
+            ],
+            [
+                [
+                    'REQUEST_URI' => '/',
+                    'SCRIPT_NAME' => '/app_dev.php',
+                ],
+                '/',
+                '',
+                '/',
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/BinaryFileResponseTest.php b/lib/symfony/http-foundation/Tests/BinaryFileResponseTest.php
new file mode 100644
index 000000000..fcad11def
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/BinaryFileResponseTest.php
@@ -0,0 +1,364 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\File\Stream;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpFoundation\Tests\File\FakeFile;
+
+class BinaryFileResponseTest extends ResponseTestCase
+{
+    public function testConstruction()
+    {
+        $file = __DIR__.'/../README.md';
+        $response = new BinaryFileResponse($file, 404, ['X-Header' => 'Foo'], true, null, true, true);
+        $this->assertEquals(404, $response->getStatusCode());
+        $this->assertEquals('Foo', $response->headers->get('X-Header'));
+        $this->assertTrue($response->headers->has('ETag'));
+        $this->assertTrue($response->headers->has('Last-Modified'));
+        $this->assertFalse($response->headers->has('Content-Disposition'));
+
+        $response = BinaryFileResponse::create($file, 404, [], true, ResponseHeaderBag::DISPOSITION_INLINE);
+        $this->assertEquals(404, $response->getStatusCode());
+        $this->assertFalse($response->headers->has('ETag'));
+        $this->assertEquals('inline; filename="README.md"', $response->headers->get('Content-Disposition'));
+    }
+
+    public function testConstructWithNonAsciiFilename()
+    {
+        touch(sys_get_temp_dir().'/fööö.html');
+
+        $response = new BinaryFileResponse(sys_get_temp_dir().'/fööö.html', 200, [], true, 'attachment');
+
+        @unlink(sys_get_temp_dir().'/fööö.html');
+
+        $this->assertSame('fööö.html', $response->getFile()->getFilename());
+    }
+
+    public function testSetContent()
+    {
+        $this->expectException('LogicException');
+        $response = new BinaryFileResponse(__FILE__);
+        $response->setContent('foo');
+    }
+
+    public function testGetContent()
+    {
+        $response = new BinaryFileResponse(__FILE__);
+        $this->assertFalse($response->getContent());
+    }
+
+    public function testSetContentDispositionGeneratesSafeFallbackFilename()
+    {
+        $response = new BinaryFileResponse(__FILE__);
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'föö.html');
+
+        $this->assertSame('attachment; filename="f__.html"; filename*=utf-8\'\'f%C3%B6%C3%B6.html', $response->headers->get('Content-Disposition'));
+    }
+
+    public function testSetContentDispositionGeneratesSafeFallbackFilenameForWronglyEncodedFilename()
+    {
+        $response = new BinaryFileResponse(__FILE__);
+
+        $iso88591EncodedFilename = utf8_decode('föö.html');
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $iso88591EncodedFilename);
+
+        // the parameter filename* is invalid in this case (rawurldecode('f%F6%F6') does not provide a UTF-8 string but an ISO-8859-1 encoded one)
+        $this->assertSame('attachment; filename="f__.html"; filename*=utf-8\'\'f%F6%F6.html', $response->headers->get('Content-Disposition'));
+    }
+
+    /**
+     * @dataProvider provideRanges
+     */
+    public function testRequests($requestRange, $offset, $length, $responseRange)
+    {
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
+
+        // do a request to get the ETag
+        $request = Request::create('/');
+        $response->prepare($request);
+        $etag = $response->headers->get('ETag');
+
+        // prepare a request for a range of the testing file
+        $request = Request::create('/');
+        $request->headers->set('If-Range', $etag);
+        $request->headers->set('Range', $requestRange);
+
+        $file = fopen(__DIR__.'/File/Fixtures/test.gif', 'r');
+        fseek($file, $offset);
+        $data = fread($file, $length);
+        fclose($file);
+
+        $this->expectOutputString($data);
+        $response = clone $response;
+        $response->prepare($request);
+        $response->sendContent();
+
+        $this->assertEquals(206, $response->getStatusCode());
+        $this->assertEquals($responseRange, $response->headers->get('Content-Range'));
+        $this->assertSame((string) $length, $response->headers->get('Content-Length'));
+    }
+
+    /**
+     * @dataProvider provideRanges
+     */
+    public function testRequestsWithoutEtag($requestRange, $offset, $length, $responseRange)
+    {
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
+
+        // do a request to get the LastModified
+        $request = Request::create('/');
+        $response->prepare($request);
+        $lastModified = $response->headers->get('Last-Modified');
+
+        // prepare a request for a range of the testing file
+        $request = Request::create('/');
+        $request->headers->set('If-Range', $lastModified);
+        $request->headers->set('Range', $requestRange);
+
+        $file = fopen(__DIR__.'/File/Fixtures/test.gif', 'r');
+        fseek($file, $offset);
+        $data = fread($file, $length);
+        fclose($file);
+
+        $this->expectOutputString($data);
+        $response = clone $response;
+        $response->prepare($request);
+        $response->sendContent();
+
+        $this->assertEquals(206, $response->getStatusCode());
+        $this->assertEquals($responseRange, $response->headers->get('Content-Range'));
+    }
+
+    public function provideRanges()
+    {
+        return [
+            ['bytes=1-4', 1, 4, 'bytes 1-4/35'],
+            ['bytes=-5', 30, 5, 'bytes 30-34/35'],
+            ['bytes=30-', 30, 5, 'bytes 30-34/35'],
+            ['bytes=30-30', 30, 1, 'bytes 30-30/35'],
+            ['bytes=30-34', 30, 5, 'bytes 30-34/35'],
+        ];
+    }
+
+    public function testRangeRequestsWithoutLastModifiedDate()
+    {
+        // prevent auto last modified
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'], true, null, false, false);
+
+        // prepare a request for a range of the testing file
+        $request = Request::create('/');
+        $request->headers->set('If-Range', date('D, d M Y H:i:s').' GMT');
+        $request->headers->set('Range', 'bytes=1-4');
+
+        $this->expectOutputString(file_get_contents(__DIR__.'/File/Fixtures/test.gif'));
+        $response = clone $response;
+        $response->prepare($request);
+        $response->sendContent();
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertNull($response->headers->get('Content-Range'));
+    }
+
+    /**
+     * @dataProvider provideFullFileRanges
+     */
+    public function testFullFileRequests($requestRange)
+    {
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
+
+        // prepare a request for a range of the testing file
+        $request = Request::create('/');
+        $request->headers->set('Range', $requestRange);
+
+        $file = fopen(__DIR__.'/File/Fixtures/test.gif', 'r');
+        $data = fread($file, 35);
+        fclose($file);
+
+        $this->expectOutputString($data);
+        $response = clone $response;
+        $response->prepare($request);
+        $response->sendContent();
+
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    public function provideFullFileRanges()
+    {
+        return [
+            ['bytes=0-'],
+            ['bytes=0-34'],
+            ['bytes=-35'],
+            // Syntactical invalid range-request should also return the full resource
+            ['bytes=20-10'],
+            ['bytes=50-40'],
+        ];
+    }
+
+    public function testUnpreparedResponseSendsFullFile()
+    {
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200);
+
+        $data = file_get_contents(__DIR__.'/File/Fixtures/test.gif');
+
+        $this->expectOutputString($data);
+        $response = clone $response;
+        $response->sendContent();
+
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    /**
+     * @dataProvider provideInvalidRanges
+     */
+    public function testInvalidRequests($requestRange)
+    {
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
+
+        // prepare a request for a range of the testing file
+        $request = Request::create('/');
+        $request->headers->set('Range', $requestRange);
+
+        $response = clone $response;
+        $response->prepare($request);
+        $response->sendContent();
+
+        $this->assertEquals(416, $response->getStatusCode());
+        $this->assertEquals('bytes */35', $response->headers->get('Content-Range'));
+    }
+
+    public function provideInvalidRanges()
+    {
+        return [
+            ['bytes=-40'],
+            ['bytes=30-40'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideXSendfileFiles
+     */
+    public function testXSendfile($file)
+    {
+        $request = Request::create('/');
+        $request->headers->set('X-Sendfile-Type', 'X-Sendfile');
+
+        BinaryFileResponse::trustXSendfileTypeHeader();
+        $response = BinaryFileResponse::create($file, 200, ['Content-Type' => 'application/octet-stream']);
+        $response->prepare($request);
+
+        $this->expectOutputString('');
+        $response->sendContent();
+
+        $this->assertStringContainsString('README.md', $response->headers->get('X-Sendfile'));
+    }
+
+    public function provideXSendfileFiles()
+    {
+        return [
+            [__DIR__.'/../README.md'],
+            ['file://'.__DIR__.'/../README.md'],
+        ];
+    }
+
+    /**
+     * @dataProvider getSampleXAccelMappings
+     */
+    public function testXAccelMapping($realpath, $mapping, $virtual)
+    {
+        $request = Request::create('/');
+        $request->headers->set('X-Sendfile-Type', 'X-Accel-Redirect');
+        $request->headers->set('X-Accel-Mapping', $mapping);
+
+        $file = new FakeFile($realpath, __DIR__.'/File/Fixtures/test');
+
+        BinaryFileResponse::trustXSendfileTypeHeader();
+        $response = new BinaryFileResponse($file, 200, ['Content-Type' => 'application/octet-stream']);
+        $reflection = new \ReflectionObject($response);
+        $property = $reflection->getProperty('file');
+        $property->setAccessible(true);
+        $property->setValue($response, $file);
+
+        $response->prepare($request);
+        $this->assertEquals($virtual, $response->headers->get('X-Accel-Redirect'));
+    }
+
+    public function testDeleteFileAfterSend()
+    {
+        $request = Request::create('/');
+
+        $path = __DIR__.'/File/Fixtures/to_delete';
+        touch($path);
+        $realPath = realpath($path);
+        $this->assertFileExists($realPath);
+
+        $response = new BinaryFileResponse($realPath, 200, ['Content-Type' => 'application/octet-stream']);
+        $response->deleteFileAfterSend(true);
+
+        $response->prepare($request);
+        $response->sendContent();
+
+        $this->assertFileNotExists($path);
+    }
+
+    public function testAcceptRangeOnUnsafeMethods()
+    {
+        $request = Request::create('/', 'POST');
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
+        $response->prepare($request);
+
+        $this->assertEquals('none', $response->headers->get('Accept-Ranges'));
+    }
+
+    public function testAcceptRangeNotOverriden()
+    {
+        $request = Request::create('/', 'POST');
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
+        $response->headers->set('Accept-Ranges', 'foo');
+        $response->prepare($request);
+
+        $this->assertEquals('foo', $response->headers->get('Accept-Ranges'));
+    }
+
+    public function getSampleXAccelMappings()
+    {
+        return [
+            ['/var/www/var/www/files/foo.txt', '/var/www/=/files/', '/files/var/www/files/foo.txt'],
+            ['/home/foo/bar.txt', '/var/www/=/files/,/home/foo/=/baz/', '/baz/bar.txt'],
+            ['/tmp/bar.txt', '"/var/www/"="/files/", "/home/Foo/"="/baz/"', null],
+        ];
+    }
+
+    public function testStream()
+    {
+        $request = Request::create('/');
+        $response = new BinaryFileResponse(new Stream(__DIR__.'/../README.md'), 200, ['Content-Type' => 'text/plain']);
+        $response->prepare($request);
+
+        $this->assertNull($response->headers->get('Content-Length'));
+    }
+
+    protected function provideResponse()
+    {
+        return new BinaryFileResponse(__DIR__.'/../README.md', 200, ['Content-Type' => 'application/octet-stream']);
+    }
+
+    public static function tearDownAfterClass()
+    {
+        $path = __DIR__.'/../Fixtures/to_delete';
+        if (file_exists($path)) {
+            @unlink($path);
+        }
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/CookieTest.php b/lib/symfony/http-foundation/Tests/CookieTest.php
new file mode 100644
index 000000000..169f91787
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/CookieTest.php
@@ -0,0 +1,246 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Cookie;
+
+/**
+ * CookieTest.
+ *
+ * @author John Kary <john@johnkary.net>
+ * @author Hugo Hamon <hugo.hamon@sensio.com>
+ *
+ * @group time-sensitive
+ */
+class CookieTest extends TestCase
+{
+    public function namesWithSpecialCharacters()
+    {
+        return [
+            [',MyName'],
+            [';MyName'],
+            [' MyName'],
+            ["\tMyName"],
+            ["\rMyName"],
+            ["\nMyName"],
+            ["\013MyName"],
+            ["\014MyName"],
+        ];
+    }
+
+    /**
+     * @dataProvider namesWithSpecialCharacters
+     */
+    public function testInstantiationThrowsExceptionIfRawCookieNameContainsSpecialCharacters($name)
+    {
+        $this->expectException('InvalidArgumentException');
+        new Cookie($name, null, 0, null, null, null, false, true);
+    }
+
+    /**
+     * @dataProvider namesWithSpecialCharacters
+     */
+    public function testInstantiationSucceedNonRawCookieNameContainsSpecialCharacters($name)
+    {
+        $this->assertInstanceOf(Cookie::class, new Cookie($name));
+    }
+
+    public function testInstantiationThrowsExceptionIfCookieNameIsEmpty()
+    {
+        $this->expectException('InvalidArgumentException');
+        new Cookie('');
+    }
+
+    public function testInvalidExpiration()
+    {
+        $this->expectException('InvalidArgumentException');
+        new Cookie('MyCookie', 'foo', 'bar');
+    }
+
+    public function testNegativeExpirationIsNotPossible()
+    {
+        $cookie = new Cookie('foo', 'bar', -100);
+
+        $this->assertSame(0, $cookie->getExpiresTime());
+    }
+
+    public function testGetValue()
+    {
+        $value = 'MyValue';
+        $cookie = new Cookie('MyCookie', $value);
+
+        $this->assertSame($value, $cookie->getValue(), '->getValue() returns the proper value');
+    }
+
+    public function testGetPath()
+    {
+        $cookie = new Cookie('foo', 'bar');
+
+        $this->assertSame('/', $cookie->getPath(), '->getPath() returns / as the default path');
+    }
+
+    public function testGetExpiresTime()
+    {
+        $cookie = new Cookie('foo', 'bar');
+
+        $this->assertEquals(0, $cookie->getExpiresTime(), '->getExpiresTime() returns the default expire date');
+
+        $cookie = new Cookie('foo', 'bar', $expire = time() + 3600);
+
+        $this->assertEquals($expire, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
+    }
+
+    public function testGetExpiresTimeIsCastToInt()
+    {
+        $cookie = new Cookie('foo', 'bar', 3600.9);
+
+        $this->assertSame(3600, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date as an integer');
+    }
+
+    public function testConstructorWithDateTime()
+    {
+        $expire = new \DateTime();
+        $cookie = new Cookie('foo', 'bar', $expire);
+
+        $this->assertEquals($expire->format('U'), $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
+    }
+
+    /**
+     * @requires PHP 5.5
+     */
+    public function testConstructorWithDateTimeImmutable()
+    {
+        $expire = new \DateTimeImmutable();
+        $cookie = new Cookie('foo', 'bar', $expire);
+
+        $this->assertEquals($expire->format('U'), $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
+    }
+
+    public function testGetExpiresTimeWithStringValue()
+    {
+        $value = '+1 day';
+        $cookie = new Cookie('foo', 'bar', $value);
+        $expire = strtotime($value);
+
+        $this->assertEqualsWithDelta($expire, $cookie->getExpiresTime(), 1, '->getExpiresTime() returns the expire date');
+    }
+
+    public function testGetDomain()
+    {
+        $cookie = new Cookie('foo', 'bar', 0, '/', '.myfoodomain.com');
+
+        $this->assertEquals('.myfoodomain.com', $cookie->getDomain(), '->getDomain() returns the domain name on which the cookie is valid');
+    }
+
+    public function testIsSecure()
+    {
+        $cookie = new Cookie('foo', 'bar', 0, '/', '.myfoodomain.com', true);
+
+        $this->assertTrue($cookie->isSecure(), '->isSecure() returns whether the cookie is transmitted over HTTPS');
+    }
+
+    public function testIsHttpOnly()
+    {
+        $cookie = new Cookie('foo', 'bar', 0, '/', '.myfoodomain.com', false, true);
+
+        $this->assertTrue($cookie->isHttpOnly(), '->isHttpOnly() returns whether the cookie is only transmitted over HTTP');
+    }
+
+    public function testCookieIsNotCleared()
+    {
+        $cookie = new Cookie('foo', 'bar', time() + 3600 * 24);
+
+        $this->assertFalse($cookie->isCleared(), '->isCleared() returns false if the cookie did not expire yet');
+    }
+
+    public function testCookieIsCleared()
+    {
+        $cookie = new Cookie('foo', 'bar', time() - 20);
+
+        $this->assertTrue($cookie->isCleared(), '->isCleared() returns true if the cookie has expired');
+
+        $cookie = new Cookie('foo', 'bar');
+
+        $this->assertFalse($cookie->isCleared());
+
+        $cookie = new Cookie('foo', 'bar', 0);
+
+        $this->assertFalse($cookie->isCleared());
+
+        $cookie = new Cookie('foo', 'bar', -1);
+
+        $this->assertFalse($cookie->isCleared());
+    }
+
+    public function testToString()
+    {
+        $cookie = new Cookie('foo', 'bar', $expire = strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);
+        $this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; Max-Age=0; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__toString() returns string representation of the cookie');
+
+        $cookie = new Cookie('foo', 'bar with white spaces', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);
+        $this->assertEquals('foo=bar%20with%20white%20spaces; expires=Fri, 20-May-2011 15:25:52 GMT; Max-Age=0; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__toString() encodes the value of the cookie according to RFC 3986 (white space = %20)');
+
+        $cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com');
+        $this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', $expire = time() - 31536001).'; Max-Age=0; path=/admin/; domain=.myfoodomain.com; httponly', (string) $cookie, '->__toString() returns string representation of a cleared cookie if value is NULL');
+
+        $cookie = new Cookie('foo', 'bar', 0, '/', '');
+        $this->assertEquals('foo=bar; path=/; httponly', (string) $cookie);
+    }
+
+    public function testRawCookie()
+    {
+        $cookie = new Cookie('foo', 'b a r', 0, '/', null, false, false);
+        $this->assertFalse($cookie->isRaw());
+        $this->assertEquals('foo=b%20a%20r; path=/', (string) $cookie);
+
+        $cookie = new Cookie('foo', 'b+a+r', 0, '/', null, false, false, true);
+        $this->assertTrue($cookie->isRaw());
+        $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);
+    }
+
+    public function testGetMaxAge()
+    {
+        $cookie = new Cookie('foo', 'bar');
+        $this->assertEquals(0, $cookie->getMaxAge());
+
+        $cookie = new Cookie('foo', 'bar', $expire = time() + 100);
+        $this->assertEquals($expire - time(), $cookie->getMaxAge());
+
+        $cookie = new Cookie('foo', 'bar', $expire = time() - 100);
+        $this->assertEquals(0, $cookie->getMaxAge());
+    }
+
+    public function testFromString()
+    {
+        $cookie = Cookie::fromString('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure; httponly');
+        $this->assertEquals(new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true, true, true), $cookie);
+
+        $cookie = Cookie::fromString('foo=bar', true);
+        $this->assertEquals(new Cookie('foo', 'bar', 0, '/', null, false, false), $cookie);
+    }
+
+    public function testFromStringWithHttpOnly()
+    {
+        $cookie = Cookie::fromString('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure; httponly');
+        $this->assertTrue($cookie->isHttpOnly());
+
+        $cookie = Cookie::fromString('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure');
+        $this->assertFalse($cookie->isHttpOnly());
+    }
+
+    public function testSameSiteAttributeIsCaseInsensitive()
+    {
+        $cookie = new Cookie('foo', 'bar', 0, '/', null, false, true, false, 'Lax');
+        $this->assertEquals('lax', $cookie->getSameSite());
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/ExpressionRequestMatcherTest.php b/lib/symfony/http-foundation/Tests/ExpressionRequestMatcherTest.php
new file mode 100644
index 000000000..8a389329e
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/ExpressionRequestMatcherTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\HttpFoundation\ExpressionRequestMatcher;
+use Symfony\Component\HttpFoundation\Request;
+
+class ExpressionRequestMatcherTest extends TestCase
+{
+    public function testWhenNoExpressionIsSet()
+    {
+        $this->expectException('LogicException');
+        $expressionRequestMatcher = new ExpressionRequestMatcher();
+        $expressionRequestMatcher->matches(new Request());
+    }
+
+    /**
+     * @dataProvider provideExpressions
+     */
+    public function testMatchesWhenParentMatchesIsTrue($expression, $expected)
+    {
+        $request = Request::create('/foo');
+        $expressionRequestMatcher = new ExpressionRequestMatcher();
+
+        $expressionRequestMatcher->setExpression(new ExpressionLanguage(), $expression);
+        $this->assertSame($expected, $expressionRequestMatcher->matches($request));
+    }
+
+    /**
+     * @dataProvider provideExpressions
+     */
+    public function testMatchesWhenParentMatchesIsFalse($expression)
+    {
+        $request = Request::create('/foo');
+        $request->attributes->set('foo', 'foo');
+        $expressionRequestMatcher = new ExpressionRequestMatcher();
+        $expressionRequestMatcher->matchAttribute('foo', 'bar');
+
+        $expressionRequestMatcher->setExpression(new ExpressionLanguage(), $expression);
+        $this->assertFalse($expressionRequestMatcher->matches($request));
+    }
+
+    public function provideExpressions()
+    {
+        return [
+            ['request.getMethod() == method', true],
+            ['request.getPathInfo() == path', true],
+            ['request.getHost() == host', true],
+            ['request.getClientIp() == ip', true],
+            ['request.attributes.all() == attributes', true],
+            ['request.getMethod() == method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip &&  request.attributes.all() == attributes', true],
+            ['request.getMethod() != method', false],
+            ['request.getMethod() != method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip &&  request.attributes.all() == attributes', false],
+        ];
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/File/FakeFile.php b/lib/symfony/http-foundation/Tests/File/FakeFile.php
new file mode 100644
index 000000000..c415989f2
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/File/FakeFile.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\File;
+
+use Symfony\Component\HttpFoundation\File\File as OrigFile;
+
+class FakeFile extends OrigFile
+{
+    private $realpath;
+
+    public function __construct($realpath, $path)
+    {
+        $this->realpath = $realpath;
+        parent::__construct($path, false);
+    }
+
+    public function isReadable()
+    {
+        return true;
+    }
+
+    public function getRealpath()
+    {
+        return $this->realpath;
+    }
+
+    public function getSize()
+    {
+        return 42;
+    }
+
+    public function getMTime()
+    {
+        return time();
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/File/FileTest.php b/lib/symfony/http-foundation/Tests/File/FileTest.php
new file mode 100644
index 000000000..b463aadf8
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/File/FileTest.php
@@ -0,0 +1,180 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\File;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
+
+class FileTest extends TestCase
+{
+    protected $file;
+
+    public function testGetMimeTypeUsesMimeTypeGuessers()
+    {
+        $file = new File(__DIR__.'/Fixtures/test.gif');
+        $guesser = $this->createMockGuesser($file->getPathname(), 'image/gif');
+
+        MimeTypeGuesser::getInstance()->register($guesser);
+
+        $this->assertEquals('image/gif', $file->getMimeType());
+    }
+
+    public function testGuessExtensionWithoutGuesser()
+    {
+        $file = new File(__DIR__.'/Fixtures/directory/.empty');
+
+        $this->assertNull($file->guessExtension());
+    }
+
+    public function testGuessExtensionIsBasedOnMimeType()
+    {
+        $file = new File(__DIR__.'/Fixtures/test');
+        $guesser = $this->createMockGuesser($file->getPathname(), 'image/gif');
+
+        MimeTypeGuesser::getInstance()->register($guesser);
+
+        $this->assertEquals('gif', $file->guessExtension());
+    }
+
+    /**
+     * @requires extension fileinfo
+     */
+    public function testGuessExtensionWithReset()
+    {
+        $file = new File(__DIR__.'/Fixtures/other-file.example');
+        $guesser = $this->createMockGuesser($file->getPathname(), 'image/gif');
+        MimeTypeGuesser::getInstance()->register($guesser);
+
+        $this->assertEquals('gif', $file->guessExtension());
+
+        MimeTypeGuesser::reset();
+
+        $this->assertNull($file->guessExtension());
+    }
+
+    public function testConstructWhenFileNotExists()
+    {
+        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+
+        new File(__DIR__.'/Fixtures/not_here');
+    }
+
+    public function testMove()
+    {
+        $path = __DIR__.'/Fixtures/test.copy.gif';
+        $targetDir = __DIR__.'/Fixtures/directory';
+        $targetPath = $targetDir.'/test.copy.gif';
+        @unlink($path);
+        @unlink($targetPath);
+        copy(__DIR__.'/Fixtures/test.gif', $path);
+
+        $file = new File($path);
+        $movedFile = $file->move($targetDir);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
+
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($path);
+        $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
+
+        @unlink($targetPath);
+    }
+
+    public function testMoveWithNewName()
+    {
+        $path = __DIR__.'/Fixtures/test.copy.gif';
+        $targetDir = __DIR__.'/Fixtures/directory';
+        $targetPath = $targetDir.'/test.newname.gif';
+        @unlink($path);
+        @unlink($targetPath);
+        copy(__DIR__.'/Fixtures/test.gif', $path);
+
+        $file = new File($path);
+        $movedFile = $file->move($targetDir, 'test.newname.gif');
+
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($path);
+        $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
+
+        @unlink($targetPath);
+    }
+
+    public function getFilenameFixtures()
+    {
+        return [
+            ['original.gif', 'original.gif'],
+            ['..\\..\\original.gif', 'original.gif'],
+            ['../../original.gif', 'original.gif'],
+            ['файлfile.gif', 'файлfile.gif'],
+            ['..\\..\\файлfile.gif', 'файлfile.gif'],
+            ['../../файлfile.gif', 'файлfile.gif'],
+        ];
+    }
+
+    /**
+     * @dataProvider getFilenameFixtures
+     */
+    public function testMoveWithNonLatinName($filename, $sanitizedFilename)
+    {
+        $path = __DIR__.'/Fixtures/'.$sanitizedFilename;
+        $targetDir = __DIR__.'/Fixtures/directory/';
+        $targetPath = $targetDir.$sanitizedFilename;
+        @unlink($path);
+        @unlink($targetPath);
+        copy(__DIR__.'/Fixtures/test.gif', $path);
+
+        $file = new File($path);
+        $movedFile = $file->move($targetDir, $filename);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
+
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($path);
+        $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
+
+        @unlink($targetPath);
+    }
+
+    public function testMoveToAnUnexistentDirectory()
+    {
+        $sourcePath = __DIR__.'/Fixtures/test.copy.gif';
+        $targetDir = __DIR__.'/Fixtures/directory/sub';
+        $targetPath = $targetDir.'/test.copy.gif';
+        @unlink($sourcePath);
+        @unlink($targetPath);
+        @rmdir($targetDir);
+        copy(__DIR__.'/Fixtures/test.gif', $sourcePath);
+
+        $file = new File($sourcePath);
+        $movedFile = $file->move($targetDir);
+
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($sourcePath);
+        $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
+
+        @unlink($sourcePath);
+        @unlink($targetPath);
+        @rmdir($targetDir);
+    }
+
+    protected function createMockGuesser($path, $mimeType)
+    {
+        $guesser = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface')->getMock();
+        $guesser
+            ->expects($this->once())
+            ->method('guess')
+            ->with($this->equalTo($path))
+            ->willReturn($mimeType)
+        ;
+
+        return $guesser;
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/File/Fixtures/-test b/lib/symfony/http-foundation/Tests/File/Fixtures/-test
new file mode 100644
index 0000000000000000000000000000000000000000..b636f4b8df536b0a85e7cea1a6cf3f0bd3179b96
GIT binary patch
literal 35
jcmZ?wbh9u|WMp7uXkcLY4+c66KmZb9U}AD%WUvMRyAlZ1

literal 0
HcmV?d00001

diff --git a/lib/symfony/http-foundation/Tests/File/Fixtures/.unknownextension b/lib/symfony/http-foundation/Tests/File/Fixtures/.unknownextension
new file mode 100644
index 000000000..4d1ae35ba
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/File/Fixtures/.unknownextension
@@ -0,0 +1 @@
+f
\ No newline at end of file
diff --git a/lib/symfony/http-foundation/Tests/File/Fixtures/case-sensitive-mime-type.xlsm b/lib/symfony/http-foundation/Tests/File/Fixtures/case-sensitive-mime-type.xlsm
new file mode 100644
index 0000000000000000000000000000000000000000..94d85e6132c553225a1628f056151bee22f5b352
GIT binary patch
literal 4791
zcmaJ_by$;q7bYA%x^yBTjifNTk=Ou7hct}dMu}1)H4rK35NQxZL_|6iLAsH0l%O;y
zAfX`N_Qof#*ZX=ue{9#To%1};ea^YhIX@Vb@EkoJ2?+__b=!Ddyfe6f{eIhB*xC#3
z?k#)^<>h9FLb(auMz{;%etDYEOV%breeK{RS|lKAJR(Z`=4F*yeMPpyQQ{h{u6B*n
z*{FQR29E{Tx?QOQv8jFV-bQGgOaY+KlYru-m{AD`ztgML^bI(^ig14<lEGCLdIjT5
zJLHd&e3<0wnLrP^FQe_cNVFQ}1FY50b_fg1;1t+uIiGMnz5MaHx_n4TN<oM9WO0RT
zglxe8p{t_(>+X1YeKyEMF4N~R&w0F@TI(O9KU^{Q%+*e{J|iPM;uBli)XwJwO0^Qg
zpu{Bc1O#}^*jG%)$HRmDCkf1dl7M@CZ)Z5%$6NT14^bQsu}1Ip--}QOZJXTQo1M(V
z^t9Wi4<!%4+Qeaw--=DwO~cA>a!IoX2AS-<Ope@nRX$)IARS<wVcC+*KOOR%_GV9U
zQuwvptMvLPgZ;zG<J$uq>vfD4dFW)8S5>`7kyDrYUkKt^sNq-Zm@Qb`r0E0;<SzM!
zGC1!nIYYKqoNJyxrSPB;O5s<4B#zcC>A&D^i#W<*PG1%abL(59t#%7#hGF!MY7$c5
zyJlS;sC)~4;!m<<{IbhE1V{WW5fXKs{D(7yvvfoCi$_<G!h=pK`b2{e2e#`|@5UO#
z4obqCS*9KcdbAdDxOE_y1nyeL(%0$}<_(Mq9ugjq8%nAHo-6ns6NJgzEY;-hAlYvP
zX?9Aw!4jmY7XzM5^FgW<l0k++c=*!KQg*puGU6;P1<?k@@+HwKb{`F{D3uP`Cm*3&
z^^QmF8Jjs$*JA|ioHIEKb}j3EFn+a|-60$gNgZF0s8SBxPl(StB#jV~t7SOIcYR_*
z!{bA&D)FYi{=(E;flK=d$y;B^On3sYzaAcXyA^+spTSq|%M8sN%ZOMEFr~JV@Y-Bt
zvVBatyG+z6L^Ov60X{xB$8Tk(m=AU~z7hE`iN0b54bx;-YRv*KT{*g6vb_?ny?QVr
zyzqMP_0?%LnVg4@0F0TKyj-^}Ddm(0(@)DP>GhN$1&B+@^(=-*jCt=?plX+`^<*m;
zt6gl=fy3Sl4*Sn8Blp*3C2wfmGa5pQNxQwnOp9;W=%GM9?b^5a+aQOd-9G-09_|HS
z>7kkVUQsu<+Q1=UWHY{#a{HThOl)!%)INJ++0qiJ!a2SXESu^Qu))yA!RiZFxkhmC
zEf23bf563DU4L<*Tgxos?Rg=sMo`C#WdXrQWUJqJxM<PwV5!So!j*fdw6D;|q)!B|
z%o$JIQRtg*NaXvzB)i(hnm{428hPF~pWXBPVRU$(_k{#s_SY~2;%DK9RUjX!oIL9O
zH)>TErX0XDpt{=5?v=???!HrOwGfj~uTb1MB*4QnA^KhQQ2nf)zr`cgpc{!Tn&tz6
zbF&CRt2O3SLXDaPycz0}?u<lrMz?7Ct}o;Hr?WKhBED%=szfRBxuy(1bIc>RRhHML
zc}9J0wy)%1^+Ms(9UJQgGU=j&943G?bLBoEo2kv6nGc2i3Zwqp!$EL+V|K9jT&*8K
zqE>b0ZoX!zPX7b#7rO}iyG%6%ugt&cQEQ)Ml6T02*B`M`Sf+ABz8s*E;N4K7(2Q%J
zHO_zTUe6m5zFff`FWJvyMYkE=`|zmOWZF6=?Mq;=vwlyUS$7e@wR)sva7wc4fy@Ve
zv1jun3pyfO20!i&X=WIrA3j|)d)56TuC`dUX+k}4f~+3%NgaCrs(7TE1V=Q-sfojT
z%C&n=HMbsFhx708IacTQX6<&fSgVCF2ztn5#s<vEM_ERQW<^NS>?SzHZ|2&8NmtDI
zVy>CA=XtCxkr+OE`I!AwM+50}GGTzsy_Lvh+na1b1z_+MQ;xnE!H~h(<|xE#b1AwD
zf1h^@p}WXLg5IGEg0-``^PT5aTnlA04)=|1-TLJEOqqix?hPAB8za-e;p_bGRw<kk
z*{AwR^cf+#in@?KS!S9StlK5S;u$&x%GG2VVIml9qFV)D91@Tt$wX=8Nm+Y5-932&
zt6DNY7=b63<6%hQ>S^yj@bbl_9?u=Vrvb9AcZBbK6vidaWwG4hW31$&2!EG2z&{hm
z+sDrx?v2yh&2(i{mI!_4_ILW!ZGnVh7g>Cx_xD`VO3e*iMykUIiOMg4rgTByRu5uG
zLk!=gZd4jVglkUaPG{$+ZioV(88c{HH+12?79K{&dYNB8LsU=g(DqSa(<@C7hge%t
zE)DYWTaz!5uq^cG_eA}$yKFw;Q2Vv(k4i=pjn#6xGRbZyLXBt$RgG>p7$-YS>z36?
zemTi7q2czp7!6M`R4*_Tiogdohg<AQ5PE_;x)zXdBI6dAGQ+~;ebr}#?Y2T4=&K#N
zQK~1Qk4T6$ZQdAk7pat)s!3@b?+^Bb8jeNG&<-$0n~Cx;EXF4BY%V480(*U%z>U4n
zQ(VaXo~G~0ocl(6wHe`l!n_=G!aYgqX-a4Rn3j|RHjyJK(R2>KvCVe6PEn01TKx5r
zyGR~_ZCj;`!gs-gSc()LL$6Q$1EwLxV_|@S=6rl%df&6l1&LQ~sy98}HT{Cx-T{#P
z^<viagYT4u*ZGzYe4(dZl1~os8+xo!%EOfNg{Iq<6Av2jOWkHUM^s|WM|A64RMkf$
zoFX2t7|&-XqKk{=A3VJn>A(^NDV-$G-6X%#Kxac$X<M3t@fQ{Ifww?aF9PJ`1@s4%
zH|}?-jdP=&8Vt4N2H<VqI$^~PwIOxdtS&WRvnq;WN{(iu79+l3gA$uLnVSl=<Pyn|
zDdwoK1A9j=@m+LA^WgY!-`|&lV{u939#k4g+0(z5i_xa+?*AAJUIaed-V#%+>m>ee
zwP<qWwydgn>U_e2S#7RJ4x=h;DZeTQdvG!q^I7t{-vDvSjVtFRwS5YFN^RLCbwNwh
zZ!tY(9BvQ~aNEPJC}qVHYk60&O24m?U`jp*!hhr_N_-|;eCMWUe)g&SW?UKl>}{%s
ziy;HEM2I+wCJWT=+`~gjT&g#a*k@E?HIkP0cd1T}P4z!#tUu?f#MioSL@3bP0nz*i
z5;IC9dBu&|nvLw@mtJuqK`-wWw1@5NtI^R?#8$nD^Sl%M!>(vn8+m0`gd1vg&&cc^
zK{K~~P)U354^KZ~aDV=tw=_~3`Y2U?ulVbby}kwIp27g11PIy6t`2k<f7yP+0Z(2j
z(#z85me>!6s88W$8!@z=PR99@!RMO7br5b6NG;Zj{t8z=m~bSq`*uOJ3j#}|nrMM=
zG@0KlJgB~RZabOsJcWp+4ow>Sr>!o=(b_onljPpj^mMw0`cGaSc6&tqO|;=6PCfxT
zmxDC5w{jR*u3AIxn?E}4{X~bODI!xma|=tt0G6u%9>nOd|8PLr!@N))-oo}by?sy!
zoG!c^)j@@dFcW|Nt^inNxdAhzu%Q>1-KcC&3owZm536x`0y5j5F+r~kJB+>`O*;<W
zOaf;HkEeL&L$1EIp9fNV@bYjt9aD$R_-^Wk6aYU-SDY&mb$(2=yTs>jq@oXJeix@R
zFGEx$>P3{t&Gq#8rAau_ge=e1eFMgl%S)#2%-!|87^B3RC(5aTP}}T*UR>F6<k_9*
zvPjtX@oz;G_Cxc%Z!glnwDqHCsbcG|!UI&ak{L{>&W->h7uv5GgdZ2>RJ`d}14&iQ
zY!F5+PR|Cie{5M#ij~VS<5H~FyC-=mmtBRXN%vYM)2Rzpz<VnX)owk}Q6DJ~7mLgN
zM$dvr0X4A(42#<`f})B;O{#O@j|VnTev(ov3u)t+?x$Uqc~t71@(t{D`K7V`B2x8t
zxr{fnnm1psOG5Ab(afc*OF_z5O@8uQO{V!r1W;aZ9RDf$I@hu3+Po`JhH2chS1DMN
zAswQO(ux9x)J2S~6Cf^dZ8e+(j39wwn{EC30e<`Uvj=>QRuRe|y<R?24g4=kJ2FgF
z>4|CYFgetNY)R4rZlnfP#Hx-{Mm<JtZoume#<_ZTzmzA4lbRS*DI1a&p;5VZjt=KX
zLf6erC=g}jWz45`fFWLz3Ku|^7dpl_w8blWi8sTWr}Tp5K7n)zOa(v-1ZuFKEO4y!
zSOgAT=IMjXTfM%vh9|Q>K%(LP-goS+{JR0xk=l;Ms@gU3sUQa8#G+1R+KLeNrAG{!
zl$%6L5-p9^{aTEGg;>^@6A|+WJ+ZhXwma8Xa}KiS*(+}D!=Pvock?n4P2uV!<wle=
zb47$o<7hc?FoV05n3=dQ{&~$)_>_S~=?z3Th0q2~Ibf;wJ2`MrdcgB$`AO%_Z7(}N
z>J^^hN`@JPqw?HXQ8xK#U?4$f*tN7tW<aV3FV(_Sv*R4DT*w3%*^t;^egAE_P@fH!
zt%nCLR@n*Hak1*y4vglXeyL;gSlb|zG+at2R8<*McEz(c_t@Zr?o2Ju-RjN0{=va-
zQ+EQd%HCjMhtmaWAVKQ<pZT2^4_N%Rt=AYz#URg$fR|*vLbbsk(5*$(?0F#;455Q8
z(rj-fip*GEbz|t?GdWRoYh4lBbYa#gn3sOs9irjiX$rMf|9ruRWl(8H!-DloD~x4q
zFzBd2v7?QyiJ0lB8ude~9);ZMW=}R#mmENF%<u)S=bRihj%o8>ZvhaXaXIncj`2g6
zOA02NL$f9(gsOfE<n;P)FW!*TdAsJ{y($qm3PpYZ;fVTBVNkb@r6KUQ3m#5aZm6P=
zK5(RuwV|H}+}jezRdcdDmMd!X!H?)J0SHEnEj-azNkk=5?D9kl*!YAi=f+6zpmZKv
z2(RHaZM_cxIm=dN5c&0TK3{6RfQd>i2}gj`YKreVT3&Fg*A1K%x7MM6$0)vDX^Vg?
zpuLj?O+!+s=2sj(7BJkiTFfM7m$U;Od&#wY7->8wl)`s)vic6E<rrCXeblP5sWbC7
zMR1%=LhE6jnSX0(l<7y|@;a6szX<d_>X=lH;fBEFF&@7o?t$(*L^oJIhY~TL8b3^#
zB;Z^+u}_>SaXE1<;^GyqP32%flc;<Zas4uI+HomzO>spqbx2FZXz*!y!tk8*b8#gn
zl}1+W^nIew@otnu_MaBer;Ele9e#WG^%%RI{f%P6Vv6?g^t~^ctX`}OK40_Pb#q)f
z_ogiK3JM9nzLPKWJ7rC8A;6Jed~8E4hb10-4kzmP1oU`64;jvG-nc`Cf8xK79Den4
zb_c=j=|2I$-WluXU$^#Oy__9Lar??osA8Y}FE4*@FTWa}ZSlC7^(O+cixJlN=LGw!
z>Dji2n*n~piS!>6!LNpA)f$(*KM_avuRZct2WJ%oC+a^zO>x%2UlRYT`PsU{$;?kQ
qV=4H5kN!(^eziWE82^0wPn7>!i7+StOC=s2DfUvpYM%Wc_xvA{ir)|b

literal 0
HcmV?d00001

diff --git a/lib/symfony/http-foundation/Tests/File/Fixtures/directory/.empty b/lib/symfony/http-foundation/Tests/File/Fixtures/directory/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-foundation/Tests/File/Fixtures/other-file.example b/lib/symfony/http-foundation/Tests/File/Fixtures/other-file.example
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-foundation/Tests/File/Fixtures/test b/lib/symfony/http-foundation/Tests/File/Fixtures/test
new file mode 100644
index 0000000000000000000000000000000000000000..b636f4b8df536b0a85e7cea1a6cf3f0bd3179b96
GIT binary patch
literal 35
jcmZ?wbh9u|WMp7uXkcLY4+c66KmZb9U}AD%WUvMRyAlZ1

literal 0
HcmV?d00001

diff --git a/lib/symfony/http-foundation/Tests/File/Fixtures/test.gif b/lib/symfony/http-foundation/Tests/File/Fixtures/test.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b636f4b8df536b0a85e7cea1a6cf3f0bd3179b96
GIT binary patch
literal 35
jcmZ?wbh9u|WMp7uXkcLY4+c66KmZb9U}AD%WUvMRyAlZ1

literal 0
HcmV?d00001

diff --git a/lib/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php b/lib/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
new file mode 100644
index 000000000..0418726b5
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\File\MimeType;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
+
+/**
+ * @requires extension fileinfo
+ */
+class MimeTypeTest extends TestCase
+{
+    public function testGuessWithLeadingDash()
+    {
+        $cwd = getcwd();
+        chdir(__DIR__.'/../Fixtures');
+        try {
+            $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess('-test'));
+        } finally {
+            chdir($cwd);
+        }
+    }
+
+    public function testGuessImageWithoutExtension()
+    {
+        $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test'));
+    }
+
+    public function testGuessImageWithDirectory()
+    {
+        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+
+        MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory');
+    }
+
+    public function testGuessImageWithFileBinaryMimeTypeGuesser()
+    {
+        $guesser = MimeTypeGuesser::getInstance();
+        $guesser->register(new FileBinaryMimeTypeGuesser());
+        $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test'));
+    }
+
+    public function testGuessImageWithKnownExtension()
+    {
+        $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.gif'));
+    }
+
+    public function testGuessFileWithUnknownExtension()
+    {
+        $this->assertEquals('application/octet-stream', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/.unknownextension'));
+    }
+
+    public function testGuessWithIncorrectPath()
+    {
+        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+        MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/not_here');
+    }
+
+    public function testGuessWithNonReadablePath()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Can not verify chmod operations on Windows');
+        }
+
+        if (!getenv('USER') || 'root' === getenv('USER')) {
+            $this->markTestSkipped('This test will fail if run under superuser');
+        }
+
+        $path = __DIR__.'/../Fixtures/to_delete';
+        touch($path);
+        @chmod($path, 0333);
+
+        if ('0333' == substr(sprintf('%o', fileperms($path)), -4)) {
+            $this->expectException('Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException');
+            MimeTypeGuesser::getInstance()->guess($path);
+        } else {
+            $this->markTestSkipped('Can not verify chmod operations, change of file permissions failed');
+        }
+    }
+
+    public static function tearDownAfterClass()
+    {
+        $path = __DIR__.'/../Fixtures/to_delete';
+        if (file_exists($path)) {
+            @chmod($path, 0666);
+            @unlink($path);
+        }
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/File/UploadedFileTest.php b/lib/symfony/http-foundation/Tests/File/UploadedFileTest.php
new file mode 100644
index 000000000..2ea924bac
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/File/UploadedFileTest.php
@@ -0,0 +1,298 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\File;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class UploadedFileTest extends TestCase
+{
+    protected function setUp()
+    {
+        if (!ini_get('file_uploads')) {
+            $this->markTestSkipped('file_uploads is disabled in php.ini');
+        }
+    }
+
+    public function testConstructWhenFileNotExists()
+    {
+        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+
+        new UploadedFile(
+            __DIR__.'/Fixtures/not_here',
+            'original.gif',
+            null
+        );
+    }
+
+    public function testFileUploadsWithNoMimeType()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            null,
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            UPLOAD_ERR_OK
+        );
+
+        $this->assertEquals('application/octet-stream', $file->getClientMimeType());
+
+        if (\extension_loaded('fileinfo')) {
+            $this->assertEquals('image/gif', $file->getMimeType());
+        }
+    }
+
+    public function testFileUploadsWithUnknownMimeType()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/.unknownextension',
+            'original.gif',
+            null,
+            filesize(__DIR__.'/Fixtures/.unknownextension'),
+            UPLOAD_ERR_OK
+        );
+
+        $this->assertEquals('application/octet-stream', $file->getClientMimeType());
+    }
+
+    public function testGuessClientExtension()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            null
+        );
+
+        $this->assertEquals('gif', $file->guessClientExtension());
+    }
+
+    public function testGuessClientExtensionWithIncorrectMimeType()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            'image/jpeg',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            null
+        );
+
+        $this->assertEquals('jpeg', $file->guessClientExtension());
+    }
+
+    public function testCaseSensitiveMimeType()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/case-sensitive-mime-type.xlsm',
+            'test.xlsm',
+            'application/vnd.ms-excel.sheet.macroEnabled.12',
+            filesize(__DIR__.'/Fixtures/case-sensitive-mime-type.xlsm'),
+            null
+        );
+
+        $this->assertEquals('xlsm', $file->guessClientExtension());
+    }
+
+    public function testErrorIsOkByDefault()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            null
+        );
+
+        $this->assertEquals(UPLOAD_ERR_OK, $file->getError());
+    }
+
+    public function testGetClientOriginalName()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            null
+        );
+
+        $this->assertEquals('original.gif', $file->getClientOriginalName());
+    }
+
+    public function testGetClientOriginalExtension()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            null
+        );
+
+        $this->assertEquals('gif', $file->getClientOriginalExtension());
+    }
+
+    public function testMoveLocalFileIsNotAllowed()
+    {
+        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileException');
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            UPLOAD_ERR_OK
+        );
+
+        $file->move(__DIR__.'/Fixtures/directory');
+    }
+
+    public function testMoveLocalFileIsAllowedInTestMode()
+    {
+        $path = __DIR__.'/Fixtures/test.copy.gif';
+        $targetDir = __DIR__.'/Fixtures/directory';
+        $targetPath = $targetDir.'/test.copy.gif';
+        @unlink($path);
+        @unlink($targetPath);
+        copy(__DIR__.'/Fixtures/test.gif', $path);
+
+        $file = new UploadedFile(
+            $path,
+            'original.gif',
+            'image/gif',
+            filesize($path),
+            UPLOAD_ERR_OK,
+            true
+        );
+
+        $movedFile = $file->move(__DIR__.'/Fixtures/directory');
+
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($path);
+        $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
+
+        @unlink($targetPath);
+    }
+
+    public function testGetClientOriginalNameSanitizeFilename()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            '../../original.gif',
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            null
+        );
+
+        $this->assertEquals('original.gif', $file->getClientOriginalName());
+    }
+
+    public function testGetSize()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            null
+        );
+
+        $this->assertEquals(filesize(__DIR__.'/Fixtures/test.gif'), $file->getSize());
+
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test',
+            'original.gif',
+            'image/gif'
+        );
+
+        $this->assertEquals(filesize(__DIR__.'/Fixtures/test'), $file->getSize());
+    }
+
+    public function testGetExtension()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            null
+        );
+
+        $this->assertEquals('gif', $file->getExtension());
+    }
+
+    public function testIsValid()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            null,
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            UPLOAD_ERR_OK,
+            true
+        );
+
+        $this->assertTrue($file->isValid());
+    }
+
+    /**
+     * @dataProvider uploadedFileErrorProvider
+     */
+    public function testIsInvalidOnUploadError($error)
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            null,
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            $error
+        );
+
+        $this->assertFalse($file->isValid());
+    }
+
+    public function uploadedFileErrorProvider()
+    {
+        return [
+            [UPLOAD_ERR_INI_SIZE],
+            [UPLOAD_ERR_FORM_SIZE],
+            [UPLOAD_ERR_PARTIAL],
+            [UPLOAD_ERR_NO_TMP_DIR],
+            [UPLOAD_ERR_EXTENSION],
+        ];
+    }
+
+    public function testIsInvalidIfNotHttpUpload()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            null,
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            UPLOAD_ERR_OK
+        );
+
+        $this->assertFalse($file->isValid());
+    }
+
+    public function testGetMaxFilesize()
+    {
+        $size = UploadedFile::getMaxFilesize();
+
+        $this->assertIsInt($size);
+        $this->assertGreaterThan(0, $size);
+
+        if (0 === (int) ini_get('post_max_size') && 0 === (int) ini_get('upload_max_filesize')) {
+            $this->assertSame(PHP_INT_MAX, $size);
+        } else {
+            $this->assertLessThan(PHP_INT_MAX, $size);
+        }
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/FileBagTest.php b/lib/symfony/http-foundation/Tests/FileBagTest.php
new file mode 100644
index 000000000..a3882bc86
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/FileBagTest.php
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\FileBag;
+
+/**
+ * FileBagTest.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
+ */
+class FileBagTest extends TestCase
+{
+    public function testFileMustBeAnArrayOrUploadedFile()
+    {
+        $this->expectException('InvalidArgumentException');
+        new FileBag(['file' => 'foo']);
+    }
+
+    public function testShouldConvertsUploadedFiles()
+    {
+        $tmpFile = $this->createTempFile();
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain', 100, 0);
+
+        $bag = new FileBag(['file' => [
+            'name' => basename($tmpFile),
+            'type' => 'text/plain',
+            'tmp_name' => $tmpFile,
+            'error' => 0,
+            'size' => 100,
+        ]]);
+
+        $this->assertEquals($file, $bag->get('file'));
+    }
+
+    public function testShouldSetEmptyUploadedFilesToNull()
+    {
+        $bag = new FileBag(['file' => [
+            'name' => '',
+            'type' => '',
+            'tmp_name' => '',
+            'error' => UPLOAD_ERR_NO_FILE,
+            'size' => 0,
+        ]]);
+
+        $this->assertNull($bag->get('file'));
+    }
+
+    public function testShouldRemoveEmptyUploadedFilesForMultiUpload()
+    {
+        $bag = new FileBag(['files' => [
+            'name' => [''],
+            'type' => [''],
+            'tmp_name' => [''],
+            'error' => [UPLOAD_ERR_NO_FILE],
+            'size' => [0],
+        ]]);
+
+        $this->assertSame([], $bag->get('files'));
+    }
+
+    public function testShouldNotRemoveEmptyUploadedFilesForAssociativeArray()
+    {
+        $bag = new FileBag(['files' => [
+            'name' => ['file1' => ''],
+            'type' => ['file1' => ''],
+            'tmp_name' => ['file1' => ''],
+            'error' => ['file1' => UPLOAD_ERR_NO_FILE],
+            'size' => ['file1' => 0],
+        ]]);
+
+        $this->assertSame(['file1' => null], $bag->get('files'));
+    }
+
+    public function testShouldConvertUploadedFilesWithPhpBug()
+    {
+        $tmpFile = $this->createTempFile();
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain', 100, 0);
+
+        $bag = new FileBag([
+            'child' => [
+                'name' => [
+                    'file' => basename($tmpFile),
+                ],
+                'type' => [
+                    'file' => 'text/plain',
+                ],
+                'tmp_name' => [
+                    'file' => $tmpFile,
+                ],
+                'error' => [
+                    'file' => 0,
+                ],
+                'size' => [
+                    'file' => 100,
+                ],
+            ],
+        ]);
+
+        $files = $bag->all();
+        $this->assertEquals($file, $files['child']['file']);
+    }
+
+    public function testShouldConvertNestedUploadedFilesWithPhpBug()
+    {
+        $tmpFile = $this->createTempFile();
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain', 100, 0);
+
+        $bag = new FileBag([
+            'child' => [
+                'name' => [
+                    'sub' => ['file' => basename($tmpFile)],
+                ],
+                'type' => [
+                    'sub' => ['file' => 'text/plain'],
+                ],
+                'tmp_name' => [
+                    'sub' => ['file' => $tmpFile],
+                ],
+                'error' => [
+                    'sub' => ['file' => 0],
+                ],
+                'size' => [
+                    'sub' => ['file' => 100],
+                ],
+            ],
+        ]);
+
+        $files = $bag->all();
+        $this->assertEquals($file, $files['child']['sub']['file']);
+    }
+
+    public function testShouldNotConvertNestedUploadedFiles()
+    {
+        $tmpFile = $this->createTempFile();
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain', 100, 0);
+        $bag = new FileBag(['image' => ['file' => $file]]);
+
+        $files = $bag->all();
+        $this->assertEquals($file, $files['image']['file']);
+    }
+
+    protected function createTempFile()
+    {
+        return tempnam(sys_get_temp_dir().'/form_test', 'FormTest');
+    }
+
+    protected function setUp()
+    {
+        mkdir(sys_get_temp_dir().'/form_test', 0777, true);
+    }
+
+    protected function tearDown()
+    {
+        foreach (glob(sys_get_temp_dir().'/form_test/*') as $file) {
+            unlink($file);
+        }
+
+        rmdir(sys_get_temp_dir().'/form_test');
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc
new file mode 100644
index 000000000..0bdf9e4b7
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc
@@ -0,0 +1,43 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Response;
+
+$parent = __DIR__;
+while (!@file_exists($parent.'/vendor/autoload.php')) {
+    if (!@file_exists($parent)) {
+        // open_basedir restriction in effect
+        break;
+    }
+    if ($parent === dirname($parent)) {
+        echo "vendor/autoload.php not found\n";
+        exit(1);
+    }
+
+    $parent = dirname($parent);
+}
+
+require $parent.'/vendor/autoload.php';
+
+error_reporting(-1);
+ini_set('html_errors', 0);
+ini_set('display_errors', 1);
+
+if (filter_var(ini_get('xdebug.default_enable'), FILTER_VALIDATE_BOOLEAN)) {
+    xdebug_disable();
+}
+
+header_remove('X-Powered-By');
+header('Content-Type: text/plain; charset=utf-8');
+
+register_shutdown_function(function () {
+    echo "\n";
+    session_write_close();
+    print_r(headers_list());
+    echo "shutdown\n";
+});
+ob_start();
+
+$r = new Response();
+$r->headers->set('Date', 'Sat, 12 Nov 1955 20:04:00 GMT');
+
+return $r;
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.expected b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.expected
new file mode 100644
index 000000000..bdb9d023f
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.expected
@@ -0,0 +1,11 @@
+
+Warning: Expiry date cannot have a year greater than 9999 in %scookie_max_age.php on line 10
+
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: no-cache, private
+    [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT
+    [3] => Set-Cookie: foo=bar; expires=Sat, 01-Jan-10000 02:46:40 GMT; Max-Age=%d; path=/
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.php b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.php
new file mode 100644
index 000000000..8775a5cce
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_max_age.php
@@ -0,0 +1,10 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Cookie;
+
+$r = require __DIR__.'/common.inc';
+
+$r->headers->setCookie(new Cookie('foo', 'bar', 253402310800, '', null, false, false));
+$r->sendHeaders();
+
+setcookie('foo2', 'bar', 253402310800, '/');
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.expected b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.expected
new file mode 100644
index 000000000..0c097972e
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.expected
@@ -0,0 +1,10 @@
+
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: no-cache, private
+    [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT
+    [3] => Set-Cookie: ?*():@&+$/%#[]=?*():@&+$/%#[]; path=/
+    [4] => Set-Cookie: ?*():@&+$/%#[]=?*():@&+$/%#[]; path=/
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.php b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.php
new file mode 100644
index 000000000..2ca5b59f1
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_raw_urlencode.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Cookie;
+
+$r = require __DIR__.'/common.inc';
+
+$str = '?*():@&+$/%#[]';
+
+$r->headers->setCookie(new Cookie($str, $str, 0, '/', null, false, false, true));
+$r->sendHeaders();
+
+setrawcookie($str, $str, 0, '/', null, false, false);
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.expected b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.expected
new file mode 100644
index 000000000..cbde2cbfe
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.expected
@@ -0,0 +1,9 @@
+
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: no-cache, private
+    [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT
+    [3] => Set-Cookie: CookieSamesiteLaxTest=LaxValue; path=/; httponly; samesite=lax
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.php b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.php
new file mode 100644
index 000000000..9a476f1d2
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_lax.php
@@ -0,0 +1,8 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Cookie;
+
+$r = require __DIR__.'/common.inc';
+
+$r->headers->setCookie(new Cookie('CookieSamesiteLaxTest', 'LaxValue', 0, '/', null, false, true, false, Cookie::SAMESITE_LAX));
+$r->sendHeaders();
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.expected b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.expected
new file mode 100644
index 000000000..adc491fd2
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.expected
@@ -0,0 +1,9 @@
+
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: no-cache, private
+    [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT
+    [3] => Set-Cookie: CookieSamesiteStrictTest=StrictValue; path=/; httponly; samesite=strict
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.php b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.php
new file mode 100644
index 000000000..3bcb41f8f
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_samesite_strict.php
@@ -0,0 +1,8 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Cookie;
+
+$r = require __DIR__.'/common.inc';
+
+$r->headers->setCookie(new Cookie('CookieSamesiteStrictTest', 'StrictValue', 0, '/', null, false, true, false, Cookie::SAMESITE_STRICT));
+$r->sendHeaders();
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
new file mode 100644
index 000000000..17a9efc66
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
@@ -0,0 +1,11 @@
+
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: no-cache, private
+    [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT
+    [3] => Set-Cookie: %3D%2C%3B%20%09%0D%0A%0B%0C=%3D%2C%3B%20%09%0D%0A%0B%0C; path=/
+    [4] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/
+    [5] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php
new file mode 100644
index 000000000..9ffb0dfec
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.php
@@ -0,0 +1,15 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Cookie;
+
+$r = require __DIR__.'/common.inc';
+
+$str1 = "=,; \t\r\n\v\f";
+$r->headers->setCookie(new Cookie($str1, $str1, 0, '', null, false, false, false, null));
+
+$str2 = '?*():@&+$/%#[]';
+
+$r->headers->setCookie(new Cookie($str2, $str2, 0, '', null, false, false, false, null));
+$r->sendHeaders();
+
+setcookie($str2, $str2, 0, '/');
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.expected b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.expected
new file mode 100644
index 000000000..2b560f0bd
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.expected
@@ -0,0 +1,6 @@
+The cookie name "Hello + world" contains invalid characters.
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php
new file mode 100644
index 000000000..3acf86039
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Fixtures/response-functional/invalid_cookie_name.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Cookie;
+
+$r = require __DIR__.'/common.inc';
+
+try {
+    $r->headers->setCookie(new Cookie('Hello + world', 'hodor', 0, null, null, null, false, true));
+} catch (\InvalidArgumentException $e) {
+    echo $e->getMessage();
+}
diff --git a/lib/symfony/http-foundation/Tests/HeaderBagTest.php b/lib/symfony/http-foundation/Tests/HeaderBagTest.php
new file mode 100644
index 000000000..cabe038bd
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/HeaderBagTest.php
@@ -0,0 +1,213 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\HeaderBag;
+
+class HeaderBagTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $bag = new HeaderBag(['foo' => 'bar']);
+        $this->assertTrue($bag->has('foo'));
+    }
+
+    public function testToStringNull()
+    {
+        $bag = new HeaderBag();
+        $this->assertEquals('', $bag->__toString());
+    }
+
+    public function testToStringNotNull()
+    {
+        $bag = new HeaderBag(['foo' => 'bar']);
+        $this->assertEquals("Foo: bar\r\n", $bag->__toString());
+    }
+
+    public function testKeys()
+    {
+        $bag = new HeaderBag(['foo' => 'bar']);
+        $keys = $bag->keys();
+        $this->assertEquals('foo', $keys[0]);
+    }
+
+    public function testGetDate()
+    {
+        $bag = new HeaderBag(['foo' => 'Tue, 4 Sep 2012 20:00:00 +0200']);
+        $headerDate = $bag->getDate('foo');
+        $this->assertInstanceOf('DateTime', $headerDate);
+    }
+
+    public function testGetDateNull()
+    {
+        $bag = new HeaderBag(['foo' => null]);
+        $headerDate = $bag->getDate('foo');
+        $this->assertNull($headerDate);
+    }
+
+    public function testGetDateException()
+    {
+        $this->expectException('RuntimeException');
+        $bag = new HeaderBag(['foo' => 'Tue']);
+        $bag->getDate('foo');
+    }
+
+    public function testGetCacheControlHeader()
+    {
+        $bag = new HeaderBag();
+        $bag->addCacheControlDirective('public', '#a');
+        $this->assertTrue($bag->hasCacheControlDirective('public'));
+        $this->assertEquals('#a', $bag->getCacheControlDirective('public'));
+    }
+
+    public function testAll()
+    {
+        $bag = new HeaderBag(['foo' => 'bar']);
+        $this->assertEquals(['foo' => ['bar']], $bag->all(), '->all() gets all the input');
+
+        $bag = new HeaderBag(['FOO' => 'BAR']);
+        $this->assertEquals(['foo' => ['BAR']], $bag->all(), '->all() gets all the input key are lower case');
+    }
+
+    public function testReplace()
+    {
+        $bag = new HeaderBag(['foo' => 'bar']);
+
+        $bag->replace(['NOPE' => 'BAR']);
+        $this->assertEquals(['nope' => ['BAR']], $bag->all(), '->replace() replaces the input with the argument');
+        $this->assertFalse($bag->has('foo'), '->replace() overrides previously set the input');
+    }
+
+    public function testGet()
+    {
+        $bag = new HeaderBag(['foo' => 'bar', 'fuzz' => 'bizz']);
+        $this->assertEquals('bar', $bag->get('foo'), '->get return current value');
+        $this->assertEquals('bar', $bag->get('FoO'), '->get key in case insensitive');
+        $this->assertEquals(['bar'], $bag->get('foo', 'nope', false), '->get return the value as array');
+
+        // defaults
+        $this->assertNull($bag->get('none'), '->get unknown values returns null');
+        $this->assertEquals('default', $bag->get('none', 'default'), '->get unknown values returns default');
+        $this->assertEquals(['default'], $bag->get('none', 'default', false), '->get unknown values returns default as array');
+
+        $bag->set('foo', 'bor', false);
+        $this->assertEquals('bar', $bag->get('foo'), '->get return first value');
+        $this->assertEquals(['bar', 'bor'], $bag->get('foo', 'nope', false), '->get return all values as array');
+
+        $bag->set('baz', null);
+        $this->assertNull($bag->get('baz', 'nope'), '->get return null although different default value is given');
+    }
+
+    public function testSetAssociativeArray()
+    {
+        $bag = new HeaderBag();
+        $bag->set('foo', ['bad-assoc-index' => 'value']);
+        $this->assertSame('value', $bag->get('foo'));
+        $this->assertEquals(['value'], $bag->get('foo', 'nope', false), 'assoc indices of multi-valued headers are ignored');
+    }
+
+    public function testContains()
+    {
+        $bag = new HeaderBag(['foo' => 'bar', 'fuzz' => 'bizz']);
+        $this->assertTrue($bag->contains('foo', 'bar'), '->contains first value');
+        $this->assertTrue($bag->contains('fuzz', 'bizz'), '->contains second value');
+        $this->assertFalse($bag->contains('nope', 'nope'), '->contains unknown value');
+        $this->assertFalse($bag->contains('foo', 'nope'), '->contains unknown value');
+
+        // Multiple values
+        $bag->set('foo', 'bor', false);
+        $this->assertTrue($bag->contains('foo', 'bar'), '->contains first value');
+        $this->assertTrue($bag->contains('foo', 'bor'), '->contains second value');
+        $this->assertFalse($bag->contains('foo', 'nope'), '->contains unknown value');
+    }
+
+    public function testCacheControlDirectiveAccessors()
+    {
+        $bag = new HeaderBag();
+        $bag->addCacheControlDirective('public');
+
+        $this->assertTrue($bag->hasCacheControlDirective('public'));
+        $this->assertTrue($bag->getCacheControlDirective('public'));
+        $this->assertEquals('public', $bag->get('cache-control'));
+
+        $bag->addCacheControlDirective('max-age', 10);
+        $this->assertTrue($bag->hasCacheControlDirective('max-age'));
+        $this->assertEquals(10, $bag->getCacheControlDirective('max-age'));
+        $this->assertEquals('max-age=10, public', $bag->get('cache-control'));
+
+        $bag->removeCacheControlDirective('max-age');
+        $this->assertFalse($bag->hasCacheControlDirective('max-age'));
+    }
+
+    public function testCacheControlDirectiveParsing()
+    {
+        $bag = new HeaderBag(['cache-control' => 'public, max-age=10']);
+        $this->assertTrue($bag->hasCacheControlDirective('public'));
+        $this->assertTrue($bag->getCacheControlDirective('public'));
+
+        $this->assertTrue($bag->hasCacheControlDirective('max-age'));
+        $this->assertEquals(10, $bag->getCacheControlDirective('max-age'));
+
+        $bag->addCacheControlDirective('s-maxage', 100);
+        $this->assertEquals('max-age=10, public, s-maxage=100', $bag->get('cache-control'));
+    }
+
+    public function testCacheControlDirectiveParsingQuotedZero()
+    {
+        $bag = new HeaderBag(['cache-control' => 'max-age="0"']);
+        $this->assertTrue($bag->hasCacheControlDirective('max-age'));
+        $this->assertEquals(0, $bag->getCacheControlDirective('max-age'));
+    }
+
+    public function testCacheControlDirectiveOverrideWithReplace()
+    {
+        $bag = new HeaderBag(['cache-control' => 'private, max-age=100']);
+        $bag->replace(['cache-control' => 'public, max-age=10']);
+        $this->assertTrue($bag->hasCacheControlDirective('public'));
+        $this->assertTrue($bag->getCacheControlDirective('public'));
+
+        $this->assertTrue($bag->hasCacheControlDirective('max-age'));
+        $this->assertEquals(10, $bag->getCacheControlDirective('max-age'));
+    }
+
+    public function testCacheControlClone()
+    {
+        $headers = ['foo' => 'bar'];
+        $bag1 = new HeaderBag($headers);
+        $bag2 = new HeaderBag($bag1->all());
+
+        $this->assertEquals($bag1->all(), $bag2->all());
+    }
+
+    public function testGetIterator()
+    {
+        $headers = ['foo' => 'bar', 'hello' => 'world', 'third' => 'charm'];
+        $headerBag = new HeaderBag($headers);
+
+        $i = 0;
+        foreach ($headerBag as $key => $val) {
+            ++$i;
+            $this->assertEquals([$headers[$key]], $val);
+        }
+
+        $this->assertEquals(\count($headers), $i);
+    }
+
+    public function testCount()
+    {
+        $headers = ['foo' => 'bar', 'HELLO' => 'WORLD'];
+        $headerBag = new HeaderBag($headers);
+
+        $this->assertCount(\count($headers), $headerBag);
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/IpUtilsTest.php b/lib/symfony/http-foundation/Tests/IpUtilsTest.php
new file mode 100644
index 000000000..d3b262e04
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/IpUtilsTest.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\IpUtils;
+
+class IpUtilsTest extends TestCase
+{
+    /**
+     * @dataProvider getIpv4Data
+     */
+    public function testIpv4($matches, $remoteAddr, $cidr)
+    {
+        $this->assertSame($matches, IpUtils::checkIp($remoteAddr, $cidr));
+    }
+
+    public function getIpv4Data()
+    {
+        return [
+            [true, '192.168.1.1', '192.168.1.1'],
+            [true, '192.168.1.1', '192.168.1.1/1'],
+            [true, '192.168.1.1', '192.168.1.0/24'],
+            [false, '192.168.1.1', '1.2.3.4/1'],
+            [false, '192.168.1.1', '192.168.1.1/33'], // invalid subnet
+            [true, '192.168.1.1', ['1.2.3.4/1', '192.168.1.0/24']],
+            [true, '192.168.1.1', ['192.168.1.0/24', '1.2.3.4/1']],
+            [false, '192.168.1.1', ['1.2.3.4/1', '4.3.2.1/1']],
+            [true, '1.2.3.4', '0.0.0.0/0'],
+            [true, '1.2.3.4', '192.168.1.0/0'],
+            [false, '1.2.3.4', '256.256.256/0'], // invalid CIDR notation
+            [false, 'an_invalid_ip', '192.168.1.0/24'],
+        ];
+    }
+
+    /**
+     * @dataProvider getIpv6Data
+     */
+    public function testIpv6($matches, $remoteAddr, $cidr)
+    {
+        if (!\defined('AF_INET6')) {
+            $this->markTestSkipped('Only works when PHP is compiled without the option "disable-ipv6".');
+        }
+
+        $this->assertSame($matches, IpUtils::checkIp($remoteAddr, $cidr));
+    }
+
+    public function getIpv6Data()
+    {
+        return [
+            [true, '2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'],
+            [false, '2a00:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'],
+            [false, '2a01:198:603:0:396e:4789:8e99:890f', '::1'],
+            [true, '0:0:0:0:0:0:0:1', '::1'],
+            [false, '0:0:603:0:396e:4789:8e99:0001', '::1'],
+            [true, '0:0:603:0:396e:4789:8e99:0001', '::/0'],
+            [true, '0:0:603:0:396e:4789:8e99:0001', '2a01:198:603:0::/0'],
+            [true, '2a01:198:603:0:396e:4789:8e99:890f', ['::1', '2a01:198:603:0::/65']],
+            [true, '2a01:198:603:0:396e:4789:8e99:890f', ['2a01:198:603:0::/65', '::1']],
+            [false, '2a01:198:603:0:396e:4789:8e99:890f', ['::1', '1a01:198:603:0::/65']],
+            [false, '}__test|O:21:&quot;JDatabaseDriverMysqli&quot;:3:{s:2', '::1'],
+            [false, '2a01:198:603:0:396e:4789:8e99:890f', 'unknown'],
+        ];
+    }
+
+    /**
+     * @requires extension sockets
+     */
+    public function testAnIpv6WithOptionDisabledIpv6()
+    {
+        $this->expectException('RuntimeException');
+        if (\defined('AF_INET6')) {
+            $this->markTestSkipped('Only works when PHP is compiled with the option "disable-ipv6".');
+        }
+
+        IpUtils::checkIp('2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65');
+    }
+
+    /**
+     * @dataProvider invalidIpAddressData
+     */
+    public function testInvalidIpAddressesDoNotMatch($requestIp, $proxyIp)
+    {
+        $this->assertFalse(IpUtils::checkIp4($requestIp, $proxyIp));
+    }
+
+    public function invalidIpAddressData()
+    {
+        return [
+            'invalid proxy wildcard' => ['192.168.20.13', '*'],
+            'invalid proxy missing netmask' => ['192.168.20.13', '0.0.0.0'],
+            'invalid request IP with invalid proxy wildcard' => ['0.0.0.0', '*'],
+        ];
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/JsonResponseTest.php b/lib/symfony/http-foundation/Tests/JsonResponseTest.php
new file mode 100644
index 000000000..9642dc28d
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/JsonResponseTest.php
@@ -0,0 +1,262 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class JsonResponseTest extends TestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (!\defined('HHVM_VERSION')) {
+            $this->iniSet('serialize_precision', 14);
+        }
+    }
+
+    public function testConstructorEmptyCreatesJsonObject()
+    {
+        $response = new JsonResponse();
+        $this->assertSame('{}', $response->getContent());
+    }
+
+    public function testConstructorWithArrayCreatesJsonArray()
+    {
+        $response = new JsonResponse([0, 1, 2, 3]);
+        $this->assertSame('[0,1,2,3]', $response->getContent());
+    }
+
+    public function testConstructorWithAssocArrayCreatesJsonObject()
+    {
+        $response = new JsonResponse(['foo' => 'bar']);
+        $this->assertSame('{"foo":"bar"}', $response->getContent());
+    }
+
+    public function testConstructorWithSimpleTypes()
+    {
+        $response = new JsonResponse('foo');
+        $this->assertSame('"foo"', $response->getContent());
+
+        $response = new JsonResponse(0);
+        $this->assertSame('0', $response->getContent());
+
+        $response = new JsonResponse(0.1);
+        $this->assertEquals(0.1, $response->getContent());
+        $this->assertIsString($response->getContent());
+
+        $response = new JsonResponse(true);
+        $this->assertSame('true', $response->getContent());
+    }
+
+    public function testConstructorWithCustomStatus()
+    {
+        $response = new JsonResponse([], 202);
+        $this->assertSame(202, $response->getStatusCode());
+    }
+
+    public function testConstructorAddsContentTypeHeader()
+    {
+        $response = new JsonResponse();
+        $this->assertSame('application/json', $response->headers->get('Content-Type'));
+    }
+
+    public function testConstructorWithCustomHeaders()
+    {
+        $response = new JsonResponse([], 200, ['ETag' => 'foo']);
+        $this->assertSame('application/json', $response->headers->get('Content-Type'));
+        $this->assertSame('foo', $response->headers->get('ETag'));
+    }
+
+    public function testConstructorWithCustomContentType()
+    {
+        $headers = ['Content-Type' => 'application/vnd.acme.blog-v1+json'];
+
+        $response = new JsonResponse([], 200, $headers);
+        $this->assertSame('application/vnd.acme.blog-v1+json', $response->headers->get('Content-Type'));
+    }
+
+    public function testSetJson()
+    {
+        $response = new JsonResponse('1', 200, [], true);
+        $this->assertEquals('1', $response->getContent());
+
+        $response = new JsonResponse('[1]', 200, [], true);
+        $this->assertEquals('[1]', $response->getContent());
+
+        $response = new JsonResponse(null, 200, []);
+        $response->setJson('true');
+        $this->assertEquals('true', $response->getContent());
+    }
+
+    public function testCreate()
+    {
+        $response = JsonResponse::create(['foo' => 'bar'], 204);
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
+        $this->assertEquals('{"foo":"bar"}', $response->getContent());
+        $this->assertEquals(204, $response->getStatusCode());
+    }
+
+    public function testStaticCreateEmptyJsonObject()
+    {
+        $response = JsonResponse::create();
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
+        $this->assertSame('{}', $response->getContent());
+    }
+
+    public function testStaticCreateJsonArray()
+    {
+        $response = JsonResponse::create([0, 1, 2, 3]);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
+        $this->assertSame('[0,1,2,3]', $response->getContent());
+    }
+
+    public function testStaticCreateJsonObject()
+    {
+        $response = JsonResponse::create(['foo' => 'bar']);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
+        $this->assertSame('{"foo":"bar"}', $response->getContent());
+    }
+
+    public function testStaticCreateWithSimpleTypes()
+    {
+        $response = JsonResponse::create('foo');
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
+        $this->assertSame('"foo"', $response->getContent());
+
+        $response = JsonResponse::create(0);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
+        $this->assertSame('0', $response->getContent());
+
+        $response = JsonResponse::create(0.1);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
+        $this->assertEquals(0.1, $response->getContent());
+        $this->assertIsString($response->getContent());
+
+        $response = JsonResponse::create(true);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
+        $this->assertSame('true', $response->getContent());
+    }
+
+    public function testStaticCreateWithCustomStatus()
+    {
+        $response = JsonResponse::create([], 202);
+        $this->assertSame(202, $response->getStatusCode());
+    }
+
+    public function testStaticCreateAddsContentTypeHeader()
+    {
+        $response = JsonResponse::create();
+        $this->assertSame('application/json', $response->headers->get('Content-Type'));
+    }
+
+    public function testStaticCreateWithCustomHeaders()
+    {
+        $response = JsonResponse::create([], 200, ['ETag' => 'foo']);
+        $this->assertSame('application/json', $response->headers->get('Content-Type'));
+        $this->assertSame('foo', $response->headers->get('ETag'));
+    }
+
+    public function testStaticCreateWithCustomContentType()
+    {
+        $headers = ['Content-Type' => 'application/vnd.acme.blog-v1+json'];
+
+        $response = JsonResponse::create([], 200, $headers);
+        $this->assertSame('application/vnd.acme.blog-v1+json', $response->headers->get('Content-Type'));
+    }
+
+    public function testSetCallback()
+    {
+        $response = JsonResponse::create(['foo' => 'bar'])->setCallback('callback');
+
+        $this->assertEquals('/**/callback({"foo":"bar"});', $response->getContent());
+        $this->assertEquals('text/javascript', $response->headers->get('Content-Type'));
+    }
+
+    public function testJsonEncodeFlags()
+    {
+        $response = new JsonResponse('<>\'&"');
+
+        $this->assertEquals('"\u003C\u003E\u0027\u0026\u0022"', $response->getContent());
+    }
+
+    public function testGetEncodingOptions()
+    {
+        $response = new JsonResponse();
+
+        $this->assertEquals(JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT, $response->getEncodingOptions());
+    }
+
+    public function testSetEncodingOptions()
+    {
+        $response = new JsonResponse();
+        $response->setData([[1, 2, 3]]);
+
+        $this->assertEquals('[[1,2,3]]', $response->getContent());
+
+        $response->setEncodingOptions(JSON_FORCE_OBJECT);
+
+        $this->assertEquals('{"0":{"0":1,"1":2,"2":3}}', $response->getContent());
+    }
+
+    public function testItAcceptsJsonAsString()
+    {
+        $response = JsonResponse::fromJsonString('{"foo":"bar"}');
+        $this->assertSame('{"foo":"bar"}', $response->getContent());
+    }
+
+    public function testSetCallbackInvalidIdentifier()
+    {
+        $this->expectException('InvalidArgumentException');
+        $response = new JsonResponse('foo');
+        $response->setCallback('+invalid');
+    }
+
+    public function testSetContent()
+    {
+        $this->expectException('InvalidArgumentException');
+        JsonResponse::create("\xB1\x31");
+    }
+
+    public function testSetContentJsonSerializeError()
+    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('This error is expected');
+        if (!interface_exists('JsonSerializable', false)) {
+            $this->markTestSkipped('JsonSerializable is required.');
+        }
+
+        $serializable = new JsonSerializableObject();
+
+        JsonResponse::create($serializable);
+    }
+
+    public function testSetComplexCallback()
+    {
+        $response = JsonResponse::create(['foo' => 'bar']);
+        $response->setCallback('ಠ_ಠ["foo"].bar[0]');
+
+        $this->assertEquals('/**/ಠ_ಠ["foo"].bar[0]({"foo":"bar"});', $response->getContent());
+    }
+}
+
+if (interface_exists('JsonSerializable', false)) {
+    class JsonSerializableObject implements \JsonSerializable
+    {
+        public function jsonSerialize()
+        {
+            throw new \Exception('This error is expected');
+        }
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/ParameterBagTest.php b/lib/symfony/http-foundation/Tests/ParameterBagTest.php
new file mode 100644
index 000000000..d2a5c991c
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/ParameterBagTest.php
@@ -0,0 +1,194 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\ParameterBag;
+
+class ParameterBagTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $this->testAll();
+    }
+
+    public function testAll()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $bag->all(), '->all() gets all the input');
+    }
+
+    public function testKeys()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $this->assertEquals(['foo'], $bag->keys());
+    }
+
+    public function testAdd()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $bag->add(['bar' => 'bas']);
+        $this->assertEquals(['foo' => 'bar', 'bar' => 'bas'], $bag->all());
+    }
+
+    public function testRemove()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $bag->add(['bar' => 'bas']);
+        $this->assertEquals(['foo' => 'bar', 'bar' => 'bas'], $bag->all());
+        $bag->remove('bar');
+        $this->assertEquals(['foo' => 'bar'], $bag->all());
+    }
+
+    public function testReplace()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+
+        $bag->replace(['FOO' => 'BAR']);
+        $this->assertEquals(['FOO' => 'BAR'], $bag->all(), '->replace() replaces the input with the argument');
+        $this->assertFalse($bag->has('foo'), '->replace() overrides previously set the input');
+    }
+
+    public function testGet()
+    {
+        $bag = new ParameterBag(['foo' => 'bar', 'null' => null]);
+
+        $this->assertEquals('bar', $bag->get('foo'), '->get() gets the value of a parameter');
+        $this->assertEquals('default', $bag->get('unknown', 'default'), '->get() returns second argument as default if a parameter is not defined');
+        $this->assertNull($bag->get('null', 'default'), '->get() returns null if null is set');
+    }
+
+    public function testGetDoesNotUseDeepByDefault()
+    {
+        $bag = new ParameterBag(['foo' => ['bar' => 'moo']]);
+
+        $this->assertNull($bag->get('foo[bar]'));
+    }
+
+    public function testSet()
+    {
+        $bag = new ParameterBag([]);
+
+        $bag->set('foo', 'bar');
+        $this->assertEquals('bar', $bag->get('foo'), '->set() sets the value of parameter');
+
+        $bag->set('foo', 'baz');
+        $this->assertEquals('baz', $bag->get('foo'), '->set() overrides previously set parameter');
+    }
+
+    public function testHas()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+
+        $this->assertTrue($bag->has('foo'), '->has() returns true if a parameter is defined');
+        $this->assertFalse($bag->has('unknown'), '->has() return false if a parameter is not defined');
+    }
+
+    public function testGetAlpha()
+    {
+        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
+
+        $this->assertEquals('fooBAR', $bag->getAlpha('word'), '->getAlpha() gets only alphabetic characters');
+        $this->assertEquals('', $bag->getAlpha('unknown'), '->getAlpha() returns empty string if a parameter is not defined');
+    }
+
+    public function testGetAlnum()
+    {
+        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
+
+        $this->assertEquals('fooBAR012', $bag->getAlnum('word'), '->getAlnum() gets only alphanumeric characters');
+        $this->assertEquals('', $bag->getAlnum('unknown'), '->getAlnum() returns empty string if a parameter is not defined');
+    }
+
+    public function testGetDigits()
+    {
+        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
+
+        $this->assertEquals('012', $bag->getDigits('word'), '->getDigits() gets only digits as string');
+        $this->assertEquals('', $bag->getDigits('unknown'), '->getDigits() returns empty string if a parameter is not defined');
+    }
+
+    public function testGetInt()
+    {
+        $bag = new ParameterBag(['digits' => '0123']);
+
+        $this->assertEquals(123, $bag->getInt('digits'), '->getInt() gets a value of parameter as integer');
+        $this->assertEquals(0, $bag->getInt('unknown'), '->getInt() returns zero if a parameter is not defined');
+    }
+
+    public function testFilter()
+    {
+        $bag = new ParameterBag([
+            'digits' => '0123ab',
+            'email' => 'example@example.com',
+            'url' => 'http://example.com/foo',
+            'dec' => '256',
+            'hex' => '0x100',
+            'array' => ['bang'],
+            ]);
+
+        $this->assertEmpty($bag->filter('nokey'), '->filter() should return empty by default if no key is found');
+
+        $this->assertEquals('0123', $bag->filter('digits', '', FILTER_SANITIZE_NUMBER_INT), '->filter() gets a value of parameter as integer filtering out invalid characters');
+
+        $this->assertEquals('example@example.com', $bag->filter('email', '', FILTER_VALIDATE_EMAIL), '->filter() gets a value of parameter as email');
+
+        $this->assertEquals('http://example.com/foo', $bag->filter('url', '', FILTER_VALIDATE_URL, ['flags' => FILTER_FLAG_PATH_REQUIRED]), '->filter() gets a value of parameter as URL with a path');
+
+        // This test is repeated for code-coverage
+        $this->assertEquals('http://example.com/foo', $bag->filter('url', '', FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED), '->filter() gets a value of parameter as URL with a path');
+
+        $this->assertFalse($bag->filter('dec', '', FILTER_VALIDATE_INT, [
+            'flags' => FILTER_FLAG_ALLOW_HEX,
+            'options' => ['min_range' => 1, 'max_range' => 0xff],
+        ]), '->filter() gets a value of parameter as integer between boundaries');
+
+        $this->assertFalse($bag->filter('hex', '', FILTER_VALIDATE_INT, [
+            'flags' => FILTER_FLAG_ALLOW_HEX,
+            'options' => ['min_range' => 1, 'max_range' => 0xff],
+        ]), '->filter() gets a value of parameter as integer between boundaries');
+
+        $this->assertEquals(['bang'], $bag->filter('array', ''), '->filter() gets a value of parameter as an array');
+    }
+
+    public function testGetIterator()
+    {
+        $parameters = ['foo' => 'bar', 'hello' => 'world'];
+        $bag = new ParameterBag($parameters);
+
+        $i = 0;
+        foreach ($bag as $key => $val) {
+            ++$i;
+            $this->assertEquals($parameters[$key], $val);
+        }
+
+        $this->assertEquals(\count($parameters), $i);
+    }
+
+    public function testCount()
+    {
+        $parameters = ['foo' => 'bar', 'hello' => 'world'];
+        $bag = new ParameterBag($parameters);
+
+        $this->assertCount(\count($parameters), $bag);
+    }
+
+    public function testGetBoolean()
+    {
+        $parameters = ['string_true' => 'true', 'string_false' => 'false'];
+        $bag = new ParameterBag($parameters);
+
+        $this->assertTrue($bag->getBoolean('string_true'), '->getBoolean() gets the string true as boolean true');
+        $this->assertFalse($bag->getBoolean('string_false'), '->getBoolean() gets the string false as boolean false');
+        $this->assertFalse($bag->getBoolean('unknown'), '->getBoolean() returns false if a parameter is not defined');
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/RedirectResponseTest.php b/lib/symfony/http-foundation/Tests/RedirectResponseTest.php
new file mode 100644
index 000000000..2bbf5aa1a
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/RedirectResponseTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+
+class RedirectResponseTest extends TestCase
+{
+    public function testGenerateMetaRedirect()
+    {
+        $response = new RedirectResponse('foo.bar');
+
+        $this->assertRegExp('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));
+    }
+
+    public function testRedirectResponseConstructorNullUrl()
+    {
+        $this->expectException('InvalidArgumentException');
+        new RedirectResponse(null);
+    }
+
+    public function testRedirectResponseConstructorWrongStatusCode()
+    {
+        $this->expectException('InvalidArgumentException');
+        new RedirectResponse('foo.bar', 404);
+    }
+
+    public function testGenerateLocationHeader()
+    {
+        $response = new RedirectResponse('foo.bar');
+
+        $this->assertTrue($response->headers->has('Location'));
+        $this->assertEquals('foo.bar', $response->headers->get('Location'));
+    }
+
+    public function testGetTargetUrl()
+    {
+        $response = new RedirectResponse('foo.bar');
+
+        $this->assertEquals('foo.bar', $response->getTargetUrl());
+    }
+
+    public function testSetTargetUrl()
+    {
+        $response = new RedirectResponse('foo.bar');
+        $response->setTargetUrl('baz.beep');
+
+        $this->assertEquals('baz.beep', $response->getTargetUrl());
+    }
+
+    public function testSetTargetUrlNull()
+    {
+        $this->expectException('InvalidArgumentException');
+        $response = new RedirectResponse('foo.bar');
+        $response->setTargetUrl(null);
+    }
+
+    public function testCreate()
+    {
+        $response = RedirectResponse::create('foo', 301);
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
+        $this->assertEquals(301, $response->getStatusCode());
+    }
+
+    public function testCacheHeaders()
+    {
+        $response = new RedirectResponse('foo.bar', 301);
+        $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
+
+        $response = new RedirectResponse('foo.bar', 301, ['cache-control' => 'max-age=86400']);
+        $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
+
+        $response = new RedirectResponse('foo.bar', 301, ['Cache-Control' => 'max-age=86400']);
+        $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
+
+        $response = new RedirectResponse('foo.bar', 302);
+        $this->assertTrue($response->headers->hasCacheControlDirective('no-cache'));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/RequestMatcherTest.php b/lib/symfony/http-foundation/Tests/RequestMatcherTest.php
new file mode 100644
index 000000000..7fb6925bb
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/RequestMatcherTest.php
@@ -0,0 +1,151 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcher;
+
+class RequestMatcherTest extends TestCase
+{
+    /**
+     * @dataProvider getMethodData
+     */
+    public function testMethod($requestMethod, $matcherMethod, $isMatch)
+    {
+        $matcher = new RequestMatcher();
+        $matcher->matchMethod($matcherMethod);
+        $request = Request::create('', $requestMethod);
+        $this->assertSame($isMatch, $matcher->matches($request));
+
+        $matcher = new RequestMatcher(null, null, $matcherMethod);
+        $request = Request::create('', $requestMethod);
+        $this->assertSame($isMatch, $matcher->matches($request));
+    }
+
+    public function getMethodData()
+    {
+        return [
+            ['get', 'get', true],
+            ['get', ['get', 'post'], true],
+            ['get', 'post', false],
+            ['get', 'GET', true],
+            ['get', ['GET', 'POST'], true],
+            ['get', 'POST', false],
+        ];
+    }
+
+    public function testScheme()
+    {
+        $httpRequest = $request = $request = Request::create('');
+        $httpsRequest = $request = $request = Request::create('', 'get', [], [], [], ['HTTPS' => 'on']);
+
+        $matcher = new RequestMatcher();
+        $matcher->matchScheme('https');
+        $this->assertFalse($matcher->matches($httpRequest));
+        $this->assertTrue($matcher->matches($httpsRequest));
+
+        $matcher->matchScheme('http');
+        $this->assertFalse($matcher->matches($httpsRequest));
+        $this->assertTrue($matcher->matches($httpRequest));
+
+        $matcher = new RequestMatcher();
+        $this->assertTrue($matcher->matches($httpsRequest));
+        $this->assertTrue($matcher->matches($httpRequest));
+    }
+
+    /**
+     * @dataProvider getHostData
+     */
+    public function testHost($pattern, $isMatch)
+    {
+        $matcher = new RequestMatcher();
+        $request = Request::create('', 'get', [], [], [], ['HTTP_HOST' => 'foo.example.com']);
+
+        $matcher->matchHost($pattern);
+        $this->assertSame($isMatch, $matcher->matches($request));
+
+        $matcher = new RequestMatcher(null, $pattern);
+        $this->assertSame($isMatch, $matcher->matches($request));
+    }
+
+    public function getHostData()
+    {
+        return [
+            ['.*\.example\.com', true],
+            ['\.example\.com$', true],
+            ['^.*\.example\.com$', true],
+            ['.*\.sensio\.com', false],
+            ['.*\.example\.COM', true],
+            ['\.example\.COM$', true],
+            ['^.*\.example\.COM$', true],
+            ['.*\.sensio\.COM', false],
+        ];
+    }
+
+    public function testPath()
+    {
+        $matcher = new RequestMatcher();
+
+        $request = Request::create('/admin/foo');
+
+        $matcher->matchPath('/admin/.*');
+        $this->assertTrue($matcher->matches($request));
+
+        $matcher->matchPath('/admin');
+        $this->assertTrue($matcher->matches($request));
+
+        $matcher->matchPath('^/admin/.*$');
+        $this->assertTrue($matcher->matches($request));
+
+        $matcher->matchMethod('/blog/.*');
+        $this->assertFalse($matcher->matches($request));
+    }
+
+    public function testPathWithLocaleIsNotSupported()
+    {
+        $matcher = new RequestMatcher();
+        $request = Request::create('/en/login');
+        $request->setLocale('en');
+
+        $matcher->matchPath('^/{_locale}/login$');
+        $this->assertFalse($matcher->matches($request));
+    }
+
+    public function testPathWithEncodedCharacters()
+    {
+        $matcher = new RequestMatcher();
+        $request = Request::create('/admin/fo%20o');
+        $matcher->matchPath('^/admin/fo o*$');
+        $this->assertTrue($matcher->matches($request));
+    }
+
+    public function testAttributes()
+    {
+        $matcher = new RequestMatcher();
+
+        $request = Request::create('/admin/foo');
+        $request->attributes->set('foo', 'foo_bar');
+
+        $matcher->matchAttribute('foo', 'foo_.*');
+        $this->assertTrue($matcher->matches($request));
+
+        $matcher->matchAttribute('foo', 'foo');
+        $this->assertTrue($matcher->matches($request));
+
+        $matcher->matchAttribute('foo', '^foo_bar$');
+        $this->assertTrue($matcher->matches($request));
+
+        $matcher->matchAttribute('foo', 'babar');
+        $this->assertFalse($matcher->matches($request));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/RequestStackTest.php b/lib/symfony/http-foundation/Tests/RequestStackTest.php
new file mode 100644
index 000000000..a84fb26f0
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/RequestStackTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class RequestStackTest extends TestCase
+{
+    public function testGetCurrentRequest()
+    {
+        $requestStack = new RequestStack();
+        $this->assertNull($requestStack->getCurrentRequest());
+
+        $request = Request::create('/foo');
+
+        $requestStack->push($request);
+        $this->assertSame($request, $requestStack->getCurrentRequest());
+
+        $this->assertSame($request, $requestStack->pop());
+        $this->assertNull($requestStack->getCurrentRequest());
+
+        $this->assertNull($requestStack->pop());
+    }
+
+    public function testGetMasterRequest()
+    {
+        $requestStack = new RequestStack();
+        $this->assertNull($requestStack->getMasterRequest());
+
+        $masterRequest = Request::create('/foo');
+        $subRequest = Request::create('/bar');
+
+        $requestStack->push($masterRequest);
+        $requestStack->push($subRequest);
+
+        $this->assertSame($masterRequest, $requestStack->getMasterRequest());
+    }
+
+    public function testGetParentRequest()
+    {
+        $requestStack = new RequestStack();
+        $this->assertNull($requestStack->getParentRequest());
+
+        $masterRequest = Request::create('/foo');
+
+        $requestStack->push($masterRequest);
+        $this->assertNull($requestStack->getParentRequest());
+
+        $firstSubRequest = Request::create('/bar');
+
+        $requestStack->push($firstSubRequest);
+        $this->assertSame($masterRequest, $requestStack->getParentRequest());
+
+        $secondSubRequest = Request::create('/baz');
+
+        $requestStack->push($secondSubRequest);
+        $this->assertSame($firstSubRequest, $requestStack->getParentRequest());
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/RequestTest.php b/lib/symfony/http-foundation/Tests/RequestTest.php
new file mode 100644
index 000000000..bf70a5f83
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/RequestTest.php
@@ -0,0 +1,2451 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+
+class RequestTest extends TestCase
+{
+    protected function tearDown()
+    {
+        Request::setTrustedProxies([], -1);
+        Request::setTrustedHosts([]);
+    }
+
+    public function testInitialize()
+    {
+        $request = new Request();
+
+        $request->initialize(['foo' => 'bar']);
+        $this->assertEquals('bar', $request->query->get('foo'), '->initialize() takes an array of query parameters as its first argument');
+
+        $request->initialize([], ['foo' => 'bar']);
+        $this->assertEquals('bar', $request->request->get('foo'), '->initialize() takes an array of request parameters as its second argument');
+
+        $request->initialize([], [], ['foo' => 'bar']);
+        $this->assertEquals('bar', $request->attributes->get('foo'), '->initialize() takes an array of attributes as its third argument');
+
+        $request->initialize([], [], [], [], [], ['HTTP_FOO' => 'bar']);
+        $this->assertEquals('bar', $request->headers->get('FOO'), '->initialize() takes an array of HTTP headers as its sixth argument');
+    }
+
+    public function testGetLocale()
+    {
+        $request = new Request();
+        $request->setLocale('pl');
+        $locale = $request->getLocale();
+        $this->assertEquals('pl', $locale);
+    }
+
+    public function testGetUser()
+    {
+        $request = Request::create('http://user:password@test.com');
+        $user = $request->getUser();
+
+        $this->assertEquals('user', $user);
+    }
+
+    public function testGetPassword()
+    {
+        $request = Request::create('http://user:password@test.com');
+        $password = $request->getPassword();
+
+        $this->assertEquals('password', $password);
+    }
+
+    public function testIsNoCache()
+    {
+        $request = new Request();
+        $isNoCache = $request->isNoCache();
+
+        $this->assertFalse($isNoCache);
+    }
+
+    public function testGetContentType()
+    {
+        $request = new Request();
+        $contentType = $request->getContentType();
+
+        $this->assertNull($contentType);
+    }
+
+    public function testSetDefaultLocale()
+    {
+        $request = new Request();
+        $request->setDefaultLocale('pl');
+        $locale = $request->getLocale();
+
+        $this->assertEquals('pl', $locale);
+    }
+
+    public function testCreate()
+    {
+        $request = Request::create('http://test.com/foo?bar=baz');
+        $this->assertEquals('http://test.com/foo?bar=baz', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('bar=baz', $request->getQueryString());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://test.com/foo', 'GET', ['bar' => 'baz']);
+        $this->assertEquals('http://test.com/foo?bar=baz', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('bar=baz', $request->getQueryString());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://test.com/foo?bar=foo', 'GET', ['bar' => 'baz']);
+        $this->assertEquals('http://test.com/foo?bar=baz', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('bar=baz', $request->getQueryString());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('https://test.com/foo?bar=baz');
+        $this->assertEquals('https://test.com/foo?bar=baz', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('bar=baz', $request->getQueryString());
+        $this->assertEquals(443, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertTrue($request->isSecure());
+
+        $request = Request::create('test.com:90/foo');
+        $this->assertEquals('http://test.com:90/foo', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('test.com', $request->getHost());
+        $this->assertEquals('test.com:90', $request->getHttpHost());
+        $this->assertEquals(90, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('https://test.com:90/foo');
+        $this->assertEquals('https://test.com:90/foo', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('test.com', $request->getHost());
+        $this->assertEquals('test.com:90', $request->getHttpHost());
+        $this->assertEquals(90, $request->getPort());
+        $this->assertTrue($request->isSecure());
+
+        $request = Request::create('https://127.0.0.1:90/foo');
+        $this->assertEquals('https://127.0.0.1:90/foo', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('127.0.0.1', $request->getHost());
+        $this->assertEquals('127.0.0.1:90', $request->getHttpHost());
+        $this->assertEquals(90, $request->getPort());
+        $this->assertTrue($request->isSecure());
+
+        $request = Request::create('https://[::1]:90/foo');
+        $this->assertEquals('https://[::1]:90/foo', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('[::1]', $request->getHost());
+        $this->assertEquals('[::1]:90', $request->getHttpHost());
+        $this->assertEquals(90, $request->getPort());
+        $this->assertTrue($request->isSecure());
+
+        $request = Request::create('https://[::1]/foo');
+        $this->assertEquals('https://[::1]/foo', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('[::1]', $request->getHost());
+        $this->assertEquals('[::1]', $request->getHttpHost());
+        $this->assertEquals(443, $request->getPort());
+        $this->assertTrue($request->isSecure());
+
+        $json = '{"jsonrpc":"2.0","method":"echo","id":7,"params":["Hello World"]}';
+        $request = Request::create('http://example.com/jsonrpc', 'POST', [], [], [], [], $json);
+        $this->assertEquals($json, $request->getContent());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://test.com');
+        $this->assertEquals('http://test.com/', $request->getUri());
+        $this->assertEquals('/', $request->getPathInfo());
+        $this->assertEquals('', $request->getQueryString());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://test.com?test=1');
+        $this->assertEquals('http://test.com/?test=1', $request->getUri());
+        $this->assertEquals('/', $request->getPathInfo());
+        $this->assertEquals('test=1', $request->getQueryString());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://test.com:90/?test=1');
+        $this->assertEquals('http://test.com:90/?test=1', $request->getUri());
+        $this->assertEquals('/', $request->getPathInfo());
+        $this->assertEquals('test=1', $request->getQueryString());
+        $this->assertEquals(90, $request->getPort());
+        $this->assertEquals('test.com:90', $request->getHttpHost());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://username:password@test.com');
+        $this->assertEquals('http://test.com/', $request->getUri());
+        $this->assertEquals('/', $request->getPathInfo());
+        $this->assertEquals('', $request->getQueryString());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertEquals('username', $request->getUser());
+        $this->assertEquals('password', $request->getPassword());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://username@test.com');
+        $this->assertEquals('http://test.com/', $request->getUri());
+        $this->assertEquals('/', $request->getPathInfo());
+        $this->assertEquals('', $request->getQueryString());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertEquals('username', $request->getUser());
+        $this->assertSame('', $request->getPassword());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://test.com/?foo');
+        $this->assertEquals('/?foo', $request->getRequestUri());
+        $this->assertEquals(['foo' => ''], $request->query->all());
+
+        // assume rewrite rule: (.*) --> app/app.php; app/ is a symlink to a symfony web/ directory
+        $request = Request::create('http://test.com/apparthotel-1234', 'GET', [], [], [],
+            [
+                'DOCUMENT_ROOT' => '/var/www/www.test.com',
+                'SCRIPT_FILENAME' => '/var/www/www.test.com/app/app.php',
+                'SCRIPT_NAME' => '/app/app.php',
+                'PHP_SELF' => '/app/app.php/apparthotel-1234',
+            ]);
+        $this->assertEquals('http://test.com/apparthotel-1234', $request->getUri());
+        $this->assertEquals('/apparthotel-1234', $request->getPathInfo());
+        $this->assertEquals('', $request->getQueryString());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertFalse($request->isSecure());
+
+        // Fragment should not be included in the URI
+        $request = Request::create('http://test.com/foo#bar');
+        $this->assertEquals('http://test.com/foo', $request->getUri());
+    }
+
+    public function testCreateWithRequestUri()
+    {
+        $request = Request::create('http://test.com:80/foo');
+        $request->server->set('REQUEST_URI', 'http://test.com:80/foo');
+        $this->assertEquals('http://test.com/foo', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('test.com', $request->getHost());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://test.com:8080/foo');
+        $request->server->set('REQUEST_URI', 'http://test.com:8080/foo');
+        $this->assertEquals('http://test.com:8080/foo', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('test.com', $request->getHost());
+        $this->assertEquals('test.com:8080', $request->getHttpHost());
+        $this->assertEquals(8080, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('http://test.com/foo?bar=foo', 'GET', ['bar' => 'baz']);
+        $request->server->set('REQUEST_URI', 'http://test.com/foo?bar=foo');
+        $this->assertEquals('http://test.com/foo?bar=baz', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('bar=baz', $request->getQueryString());
+        $this->assertEquals('test.com', $request->getHost());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        $request = Request::create('https://test.com:443/foo');
+        $request->server->set('REQUEST_URI', 'https://test.com:443/foo');
+        $this->assertEquals('https://test.com/foo', $request->getUri());
+        $this->assertEquals('/foo', $request->getPathInfo());
+        $this->assertEquals('test.com', $request->getHost());
+        $this->assertEquals('test.com', $request->getHttpHost());
+        $this->assertEquals(443, $request->getPort());
+        $this->assertTrue($request->isSecure());
+
+        // Fragment should not be included in the URI
+        $request = Request::create('http://test.com/foo#bar');
+        $request->server->set('REQUEST_URI', 'http://test.com/foo#bar');
+        $this->assertEquals('http://test.com/foo', $request->getUri());
+    }
+
+    /**
+     * @dataProvider getRequestUriData
+     */
+    public function testGetRequestUri($serverRequestUri, $expected, $message)
+    {
+        $request = new Request();
+        $request->server->add([
+            'REQUEST_URI' => $serverRequestUri,
+
+            // For having http://test.com
+            'SERVER_NAME' => 'test.com',
+            'SERVER_PORT' => 80,
+        ]);
+
+        $this->assertSame($expected, $request->getRequestUri(), $message);
+        $this->assertSame($expected, $request->server->get('REQUEST_URI'), 'Normalize the request URI.');
+    }
+
+    public function getRequestUriData()
+    {
+        $message = 'Do not modify the path.';
+        yield ['/foo', '/foo', $message];
+        yield ['//bar/foo', '//bar/foo', $message];
+        yield ['///bar/foo', '///bar/foo', $message];
+
+        $message = 'Handle when the scheme, host are on REQUEST_URI.';
+        yield ['http://test.com/foo?bar=baz', '/foo?bar=baz', $message];
+
+        $message = 'Handle when the scheme, host and port are on REQUEST_URI.';
+        yield ['http://test.com:80/foo', '/foo', $message];
+        yield ['https://test.com:8080/foo', '/foo', $message];
+        yield ['https://test.com:443/foo', '/foo', $message];
+
+        $message = 'Fragment should not be included in the URI';
+        yield ['http://test.com/foo#bar', '/foo', $message];
+        yield ['/foo#bar', '/foo', $message];
+    }
+
+    public function testGetRequestUriWithoutRequiredHeader()
+    {
+        $expected = '';
+
+        $request = new Request();
+
+        $message = 'Fallback to empty URI when headers are missing.';
+        $this->assertSame($expected, $request->getRequestUri(), $message);
+        $this->assertSame($expected, $request->server->get('REQUEST_URI'), 'Normalize the request URI.');
+    }
+
+    public function testCreateCheckPrecedence()
+    {
+        // server is used by default
+        $request = Request::create('/', 'DELETE', [], [], [], [
+            'HTTP_HOST' => 'example.com',
+            'HTTPS' => 'on',
+            'SERVER_PORT' => 443,
+            'PHP_AUTH_USER' => 'fabien',
+            'PHP_AUTH_PW' => 'pa$$',
+            'QUERY_STRING' => 'foo=bar',
+            'CONTENT_TYPE' => 'application/json',
+        ]);
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(443, $request->getPort());
+        $this->assertTrue($request->isSecure());
+        $this->assertEquals('fabien', $request->getUser());
+        $this->assertEquals('pa$$', $request->getPassword());
+        $this->assertEquals('', $request->getQueryString());
+        $this->assertEquals('application/json', $request->headers->get('CONTENT_TYPE'));
+
+        // URI has precedence over server
+        $request = Request::create('http://thomas:pokemon@example.net:8080/?foo=bar', 'GET', [], [], [], [
+            'HTTP_HOST' => 'example.com',
+            'HTTPS' => 'on',
+            'SERVER_PORT' => 443,
+        ]);
+        $this->assertEquals('example.net', $request->getHost());
+        $this->assertEquals(8080, $request->getPort());
+        $this->assertFalse($request->isSecure());
+        $this->assertEquals('thomas', $request->getUser());
+        $this->assertEquals('pokemon', $request->getPassword());
+        $this->assertEquals('foo=bar', $request->getQueryString());
+    }
+
+    public function testDuplicate()
+    {
+        $request = new Request(['foo' => 'bar'], ['foo' => 'bar'], ['foo' => 'bar'], [], [], ['HTTP_FOO' => 'bar']);
+        $dup = $request->duplicate();
+
+        $this->assertEquals($request->query->all(), $dup->query->all(), '->duplicate() duplicates a request an copy the current query parameters');
+        $this->assertEquals($request->request->all(), $dup->request->all(), '->duplicate() duplicates a request an copy the current request parameters');
+        $this->assertEquals($request->attributes->all(), $dup->attributes->all(), '->duplicate() duplicates a request an copy the current attributes');
+        $this->assertEquals($request->headers->all(), $dup->headers->all(), '->duplicate() duplicates a request an copy the current HTTP headers');
+
+        $dup = $request->duplicate(['foo' => 'foobar'], ['foo' => 'foobar'], ['foo' => 'foobar'], [], [], ['HTTP_FOO' => 'foobar']);
+
+        $this->assertEquals(['foo' => 'foobar'], $dup->query->all(), '->duplicate() overrides the query parameters if provided');
+        $this->assertEquals(['foo' => 'foobar'], $dup->request->all(), '->duplicate() overrides the request parameters if provided');
+        $this->assertEquals(['foo' => 'foobar'], $dup->attributes->all(), '->duplicate() overrides the attributes if provided');
+        $this->assertEquals(['foo' => ['foobar']], $dup->headers->all(), '->duplicate() overrides the HTTP header if provided');
+    }
+
+    public function testDuplicateWithFormat()
+    {
+        $request = new Request([], [], ['_format' => 'json']);
+        $dup = $request->duplicate();
+
+        $this->assertEquals('json', $dup->getRequestFormat());
+        $this->assertEquals('json', $dup->attributes->get('_format'));
+
+        $request = new Request();
+        $request->setRequestFormat('xml');
+        $dup = $request->duplicate();
+
+        $this->assertEquals('xml', $dup->getRequestFormat());
+    }
+
+    /**
+     * @dataProvider getFormatToMimeTypeMapProviderWithAdditionalNullFormat
+     */
+    public function testGetFormatFromMimeType($format, $mimeTypes)
+    {
+        $request = new Request();
+        foreach ($mimeTypes as $mime) {
+            $this->assertEquals($format, $request->getFormat($mime));
+        }
+        $request->setFormat($format, $mimeTypes);
+        foreach ($mimeTypes as $mime) {
+            $this->assertEquals($format, $request->getFormat($mime));
+
+            if (null !== $format) {
+                $this->assertEquals($mimeTypes[0], $request->getMimeType($format));
+            }
+        }
+    }
+
+    public function getFormatToMimeTypeMapProviderWithAdditionalNullFormat()
+    {
+        return array_merge(
+            [[null, [null, 'unexistent-mime-type']]],
+            $this->getFormatToMimeTypeMapProvider()
+        );
+    }
+
+    public function testGetFormatFromMimeTypeWithParameters()
+    {
+        $request = new Request();
+        $this->assertEquals('json', $request->getFormat('application/json; charset=utf-8'));
+        $this->assertEquals('json', $request->getFormat('application/json;charset=utf-8'));
+        $this->assertEquals('json', $request->getFormat('application/json ; charset=utf-8'));
+        $this->assertEquals('json', $request->getFormat('application/json ;charset=utf-8'));
+    }
+
+    /**
+     * @dataProvider getFormatToMimeTypeMapProvider
+     */
+    public function testGetMimeTypeFromFormat($format, $mimeTypes)
+    {
+        $request = new Request();
+        $this->assertEquals($mimeTypes[0], $request->getMimeType($format));
+    }
+
+    /**
+     * @dataProvider getFormatToMimeTypeMapProvider
+     */
+    public function testGetMimeTypesFromFormat($format, $mimeTypes)
+    {
+        $this->assertEquals($mimeTypes, Request::getMimeTypes($format));
+    }
+
+    public function testGetMimeTypesFromInexistentFormat()
+    {
+        $request = new Request();
+        $this->assertNull($request->getMimeType('foo'));
+        $this->assertEquals([], Request::getMimeTypes('foo'));
+    }
+
+    public function testGetFormatWithCustomMimeType()
+    {
+        $request = new Request();
+        $request->setFormat('custom', 'application/vnd.foo.api;myversion=2.3');
+        $this->assertEquals('custom', $request->getFormat('application/vnd.foo.api;myversion=2.3'));
+    }
+
+    public function getFormatToMimeTypeMapProvider()
+    {
+        return [
+            ['txt', ['text/plain']],
+            ['js', ['application/javascript', 'application/x-javascript', 'text/javascript']],
+            ['css', ['text/css']],
+            ['json', ['application/json', 'application/x-json']],
+            ['jsonld', ['application/ld+json']],
+            ['xml', ['text/xml', 'application/xml', 'application/x-xml']],
+            ['rdf', ['application/rdf+xml']],
+            ['atom', ['application/atom+xml']],
+        ];
+    }
+
+    public function testGetUri()
+    {
+        $server = [];
+
+        // Standard Request on non default PORT
+        // http://host:8080/index.php/path/info?query=string
+
+        $server['HTTP_HOST'] = 'host:8080';
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '8080';
+
+        $server['QUERY_STRING'] = 'query=string';
+        $server['REQUEST_URI'] = '/index.php/path/info?query=string';
+        $server['SCRIPT_NAME'] = '/index.php';
+        $server['PATH_INFO'] = '/path/info';
+        $server['PATH_TRANSLATED'] = 'redirect:/index.php/path/info';
+        $server['PHP_SELF'] = '/index_dev.php/path/info';
+        $server['SCRIPT_FILENAME'] = '/some/where/index.php';
+
+        $request = new Request();
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://host:8080/index.php/path/info?query=string', $request->getUri(), '->getUri() with non default port');
+
+        // Use std port number
+        $server['HTTP_HOST'] = 'host';
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '80';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://host/index.php/path/info?query=string', $request->getUri(), '->getUri() with default port');
+
+        // Without HOST HEADER
+        unset($server['HTTP_HOST']);
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '80';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://servername/index.php/path/info?query=string', $request->getUri(), '->getUri() with default port without HOST_HEADER');
+
+        // Request with URL REWRITING (hide index.php)
+        //   RewriteCond %{REQUEST_FILENAME} !-f
+        //   RewriteRule ^(.*)$ index.php [QSA,L]
+        // http://host:8080/path/info?query=string
+        $server = [];
+        $server['HTTP_HOST'] = 'host:8080';
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '8080';
+
+        $server['REDIRECT_QUERY_STRING'] = 'query=string';
+        $server['REDIRECT_URL'] = '/path/info';
+        $server['SCRIPT_NAME'] = '/index.php';
+        $server['QUERY_STRING'] = 'query=string';
+        $server['REQUEST_URI'] = '/path/info?toto=test&1=1';
+        $server['SCRIPT_NAME'] = '/index.php';
+        $server['PHP_SELF'] = '/index.php';
+        $server['SCRIPT_FILENAME'] = '/some/where/index.php';
+
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://host:8080/path/info?query=string', $request->getUri(), '->getUri() with rewrite');
+
+        // Use std port number
+        //  http://host/path/info?query=string
+        $server['HTTP_HOST'] = 'host';
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '80';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://host/path/info?query=string', $request->getUri(), '->getUri() with rewrite and default port');
+
+        // Without HOST HEADER
+        unset($server['HTTP_HOST']);
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '80';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://servername/path/info?query=string', $request->getUri(), '->getUri() with rewrite, default port without HOST_HEADER');
+
+        // With encoded characters
+
+        $server = [
+            'HTTP_HOST' => 'host:8080',
+            'SERVER_NAME' => 'servername',
+            'SERVER_PORT' => '8080',
+            'QUERY_STRING' => 'query=string',
+            'REQUEST_URI' => '/ba%20se/index_dev.php/foo%20bar/in+fo?query=string',
+            'SCRIPT_NAME' => '/ba se/index_dev.php',
+            'PATH_TRANSLATED' => 'redirect:/index.php/foo bar/in+fo',
+            'PHP_SELF' => '/ba se/index_dev.php/path/info',
+            'SCRIPT_FILENAME' => '/some/where/ba se/index_dev.php',
+        ];
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals(
+            'http://host:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string',
+            $request->getUri()
+        );
+
+        // with user info
+
+        $server['PHP_AUTH_USER'] = 'fabien';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://host:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri());
+
+        $server['PHP_AUTH_PW'] = 'symfony';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://host:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri());
+    }
+
+    public function testGetUriForPath()
+    {
+        $request = Request::create('http://test.com/foo?bar=baz');
+        $this->assertEquals('http://test.com/some/path', $request->getUriForPath('/some/path'));
+
+        $request = Request::create('http://test.com:90/foo?bar=baz');
+        $this->assertEquals('http://test.com:90/some/path', $request->getUriForPath('/some/path'));
+
+        $request = Request::create('https://test.com/foo?bar=baz');
+        $this->assertEquals('https://test.com/some/path', $request->getUriForPath('/some/path'));
+
+        $request = Request::create('https://test.com:90/foo?bar=baz');
+        $this->assertEquals('https://test.com:90/some/path', $request->getUriForPath('/some/path'));
+
+        $server = [];
+
+        // Standard Request on non default PORT
+        // http://host:8080/index.php/path/info?query=string
+
+        $server['HTTP_HOST'] = 'host:8080';
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '8080';
+
+        $server['QUERY_STRING'] = 'query=string';
+        $server['REQUEST_URI'] = '/index.php/path/info?query=string';
+        $server['SCRIPT_NAME'] = '/index.php';
+        $server['PATH_INFO'] = '/path/info';
+        $server['PATH_TRANSLATED'] = 'redirect:/index.php/path/info';
+        $server['PHP_SELF'] = '/index_dev.php/path/info';
+        $server['SCRIPT_FILENAME'] = '/some/where/index.php';
+
+        $request = new Request();
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://host:8080/index.php/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with non default port');
+
+        // Use std port number
+        $server['HTTP_HOST'] = 'host';
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '80';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://host/index.php/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with default port');
+
+        // Without HOST HEADER
+        unset($server['HTTP_HOST']);
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '80';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://servername/index.php/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with default port without HOST_HEADER');
+
+        // Request with URL REWRITING (hide index.php)
+        //   RewriteCond %{REQUEST_FILENAME} !-f
+        //   RewriteRule ^(.*)$ index.php [QSA,L]
+        // http://host:8080/path/info?query=string
+        $server = [];
+        $server['HTTP_HOST'] = 'host:8080';
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '8080';
+
+        $server['REDIRECT_QUERY_STRING'] = 'query=string';
+        $server['REDIRECT_URL'] = '/path/info';
+        $server['SCRIPT_NAME'] = '/index.php';
+        $server['QUERY_STRING'] = 'query=string';
+        $server['REQUEST_URI'] = '/path/info?toto=test&1=1';
+        $server['SCRIPT_NAME'] = '/index.php';
+        $server['PHP_SELF'] = '/index.php';
+        $server['SCRIPT_FILENAME'] = '/some/where/index.php';
+
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://host:8080/some/path', $request->getUriForPath('/some/path'), '->getUri() with rewrite');
+
+        // Use std port number
+        //  http://host/path/info?query=string
+        $server['HTTP_HOST'] = 'host';
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '80';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://host/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with rewrite and default port');
+
+        // Without HOST HEADER
+        unset($server['HTTP_HOST']);
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '80';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with rewrite, default port without HOST_HEADER');
+        $this->assertEquals('servername', $request->getHttpHost());
+
+        // with user info
+
+        $server['PHP_AUTH_USER'] = 'fabien';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'));
+
+        $server['PHP_AUTH_PW'] = 'symfony';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'));
+    }
+
+    /**
+     * @dataProvider getRelativeUriForPathData()
+     */
+    public function testGetRelativeUriForPath($expected, $pathinfo, $path)
+    {
+        $this->assertEquals($expected, Request::create($pathinfo)->getRelativeUriForPath($path));
+    }
+
+    public function getRelativeUriForPathData()
+    {
+        return [
+            ['me.png', '/foo', '/me.png'],
+            ['../me.png', '/foo/bar', '/me.png'],
+            ['me.png', '/foo/bar', '/foo/me.png'],
+            ['../baz/me.png', '/foo/bar/b', '/foo/baz/me.png'],
+            ['../../fooz/baz/me.png', '/foo/bar/b', '/fooz/baz/me.png'],
+            ['baz/me.png', '/foo/bar/b', 'baz/me.png'],
+        ];
+    }
+
+    public function testGetUserInfo()
+    {
+        $request = new Request();
+
+        $server = ['PHP_AUTH_USER' => 'fabien'];
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('fabien', $request->getUserInfo());
+
+        $server['PHP_AUTH_USER'] = '0';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('0', $request->getUserInfo());
+
+        $server['PHP_AUTH_PW'] = '0';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('0:0', $request->getUserInfo());
+    }
+
+    public function testGetSchemeAndHttpHost()
+    {
+        $request = new Request();
+
+        $server = [];
+        $server['SERVER_NAME'] = 'servername';
+        $server['SERVER_PORT'] = '90';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
+
+        $server['PHP_AUTH_USER'] = 'fabien';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
+
+        $server['PHP_AUTH_USER'] = '0';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
+
+        $server['PHP_AUTH_PW'] = '0';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
+    }
+
+    /**
+     * @dataProvider getQueryStringNormalizationData
+     */
+    public function testGetQueryString($query, $expectedQuery, $msg)
+    {
+        $request = new Request();
+
+        $request->server->set('QUERY_STRING', $query);
+        $this->assertSame($expectedQuery, $request->getQueryString(), $msg);
+    }
+
+    public function getQueryStringNormalizationData()
+    {
+        return [
+            ['foo', 'foo', 'works with valueless parameters'],
+            ['foo=', 'foo=', 'includes a dangling equal sign'],
+            ['bar=&foo=bar', 'bar=&foo=bar', '->works with empty parameters'],
+            ['foo=bar&bar=', 'bar=&foo=bar', 'sorts keys alphabetically'],
+
+            // 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.
+            ['baz=Foo%20Baz&bar=Foo+Bar', 'bar=Foo%20Bar&baz=Foo%20Baz', 'normalizes spaces in both encodings "%20" and "+"'],
+
+            ['foo[]=1&foo[]=2', 'foo%5B%5D=1&foo%5B%5D=2', 'allows array notation'],
+            ['foo=1&foo=2', 'foo=1&foo=2', 'allows repeated parameters'],
+            ['pa%3Dram=foo%26bar%3Dbaz&test=test', 'pa%3Dram=foo%26bar%3Dbaz&test=test', 'works with encoded delimiters'],
+            ['0', '0', 'allows "0"'],
+            ['Foo Bar&Foo%20Baz', 'Foo%20Bar&Foo%20Baz', 'normalizes encoding in keys'],
+            ['bar=Foo Bar&baz=Foo%20Baz', 'bar=Foo%20Bar&baz=Foo%20Baz', 'normalizes encoding in values'],
+            ['foo=bar&&&test&&', 'foo=bar&test', 'removes unneeded delimiters'],
+            ['formula=e=m*c^2', 'formula=e%3Dm%2Ac%5E2', 'correctly treats only the first "=" as delimiter and the next as value'],
+
+            // 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.
+            ['foo=bar&=a=b&=x=y', 'foo=bar', 'removes params with empty key'],
+        ];
+    }
+
+    public function testGetQueryStringReturnsNull()
+    {
+        $request = new Request();
+
+        $this->assertNull($request->getQueryString(), '->getQueryString() returns null for non-existent query string');
+
+        $request->server->set('QUERY_STRING', '');
+        $this->assertNull($request->getQueryString(), '->getQueryString() returns null for empty query string');
+    }
+
+    public function testGetHost()
+    {
+        $request = new Request();
+
+        $request->initialize(['foo' => 'bar']);
+        $this->assertEquals('', $request->getHost(), '->getHost() return empty string if not initialized');
+
+        $request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.example.com']);
+        $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from Host Header');
+
+        // Host header with port number
+        $request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.example.com:8080']);
+        $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from Host Header with port number');
+
+        // Server values
+        $request->initialize([], [], [], [], [], ['SERVER_NAME' => 'www.example.com']);
+        $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from server name');
+
+        $request->initialize([], [], [], [], [], ['SERVER_NAME' => 'www.example.com', 'HTTP_HOST' => 'www.host.com']);
+        $this->assertEquals('www.host.com', $request->getHost(), '->getHost() value from Host header has priority over SERVER_NAME ');
+    }
+
+    public function testGetPort()
+    {
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
+            'HTTP_X_FORWARDED_PROTO' => 'https',
+            'HTTP_X_FORWARDED_PORT' => '443',
+        ]);
+        $port = $request->getPort();
+
+        $this->assertEquals(80, $port, 'Without trusted proxies FORWARDED_PROTO and FORWARDED_PORT are ignored.');
+
+        Request::setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_ALL);
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
+            'HTTP_X_FORWARDED_PROTO' => 'https',
+            'HTTP_X_FORWARDED_PORT' => '8443',
+        ]);
+        $this->assertEquals(80, $request->getPort(), 'With PROTO and PORT on untrusted connection server value takes precedence.');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $this->assertEquals(8443, $request->getPort(), 'With PROTO and PORT set PORT takes precedence.');
+
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
+            'HTTP_X_FORWARDED_PROTO' => 'https',
+        ]);
+        $this->assertEquals(80, $request->getPort(), 'With only PROTO set getPort() ignores trusted headers on untrusted connection.');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $this->assertEquals(443, $request->getPort(), 'With only PROTO set getPort() defaults to 443.');
+
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
+            'HTTP_X_FORWARDED_PROTO' => 'http',
+        ]);
+        $this->assertEquals(80, $request->getPort(), 'If X_FORWARDED_PROTO is set to HTTP getPort() ignores trusted headers on untrusted connection.');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $this->assertEquals(80, $request->getPort(), 'If X_FORWARDED_PROTO is set to HTTP getPort() returns port of the original request.');
+
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
+            'HTTP_X_FORWARDED_PROTO' => 'On',
+        ]);
+        $this->assertEquals(80, $request->getPort(), 'With only PROTO set and value is On, getPort() ignores trusted headers on untrusted connection.');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $this->assertEquals(443, $request->getPort(), 'With only PROTO set and value is On, getPort() defaults to 443.');
+
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
+            'HTTP_X_FORWARDED_PROTO' => '1',
+        ]);
+        $this->assertEquals(80, $request->getPort(), 'With only PROTO set and value is 1, getPort() ignores trusted headers on untrusted connection.');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $this->assertEquals(443, $request->getPort(), 'With only PROTO set and value is 1, getPort() defaults to 443.');
+
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
+            'HTTP_X_FORWARDED_PROTO' => 'something-else',
+        ]);
+        $port = $request->getPort();
+        $this->assertEquals(80, $port, 'With only PROTO set and value is not recognized, getPort() defaults to 80.');
+    }
+
+    public function testGetHostWithFakeHttpHostValue()
+    {
+        $this->expectException('RuntimeException');
+        $request = new Request();
+        $request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.host.com?query=string']);
+        $request->getHost();
+    }
+
+    public function testGetSetMethod()
+    {
+        $request = new Request();
+
+        $this->assertEquals('GET', $request->getMethod(), '->getMethod() returns GET if no method is defined');
+
+        $request->setMethod('get');
+        $this->assertEquals('GET', $request->getMethod(), '->getMethod() returns an uppercased string');
+
+        $request->setMethod('PURGE');
+        $this->assertEquals('PURGE', $request->getMethod(), '->getMethod() returns the method even if it is not a standard one');
+
+        $request->setMethod('POST');
+        $this->assertEquals('POST', $request->getMethod(), '->getMethod() returns the method POST if no _method is defined');
+
+        $request->setMethod('POST');
+        $request->request->set('_method', 'purge');
+        $this->assertEquals('POST', $request->getMethod(), '->getMethod() does not return the method from _method if defined and POST but support not enabled');
+
+        $request = new Request();
+        $request->setMethod('POST');
+        $request->request->set('_method', 'purge');
+
+        $this->assertFalse(Request::getHttpMethodParameterOverride(), 'httpMethodParameterOverride should be disabled by default');
+
+        Request::enableHttpMethodParameterOverride();
+
+        $this->assertTrue(Request::getHttpMethodParameterOverride(), 'httpMethodParameterOverride should be enabled now but it is not');
+
+        $this->assertEquals('PURGE', $request->getMethod(), '->getMethod() returns the method from _method if defined and POST');
+        $this->disableHttpMethodParameterOverride();
+
+        $request = new Request();
+        $request->setMethod('POST');
+        $request->query->set('_method', 'purge');
+        $this->assertEquals('POST', $request->getMethod(), '->getMethod() does not return the method from _method if defined and POST but support not enabled');
+
+        $request = new Request();
+        $request->setMethod('POST');
+        $request->query->set('_method', 'purge');
+        Request::enableHttpMethodParameterOverride();
+        $this->assertEquals('PURGE', $request->getMethod(), '->getMethod() returns the method from _method if defined and POST');
+        $this->disableHttpMethodParameterOverride();
+
+        $request = new Request();
+        $request->setMethod('POST');
+        $request->headers->set('X-HTTP-METHOD-OVERRIDE', 'delete');
+        $this->assertEquals('DELETE', $request->getMethod(), '->getMethod() returns the method from X-HTTP-Method-Override even though _method is set if defined and POST');
+
+        $request = new Request();
+        $request->setMethod('POST');
+        $request->headers->set('X-HTTP-METHOD-OVERRIDE', 'delete');
+        $this->assertEquals('DELETE', $request->getMethod(), '->getMethod() returns the method from X-HTTP-Method-Override if defined and POST');
+
+        $request = new Request();
+        $request->setMethod('POST');
+        $request->query->set('_method', ['delete', 'patch']);
+        $this->assertSame('POST', $request->getMethod(), '->getMethod() returns the request method if invalid type is defined in query');
+    }
+
+    /**
+     * @dataProvider getClientIpsProvider
+     */
+    public function testGetClientIp($expected, $remoteAddr, $httpForwardedFor, $trustedProxies)
+    {
+        $request = $this->getRequestInstanceForClientIpTests($remoteAddr, $httpForwardedFor, $trustedProxies);
+
+        $this->assertEquals($expected[0], $request->getClientIp());
+    }
+
+    /**
+     * @dataProvider getClientIpsProvider
+     */
+    public function testGetClientIps($expected, $remoteAddr, $httpForwardedFor, $trustedProxies)
+    {
+        $request = $this->getRequestInstanceForClientIpTests($remoteAddr, $httpForwardedFor, $trustedProxies);
+
+        $this->assertEquals($expected, $request->getClientIps());
+    }
+
+    /**
+     * @dataProvider getClientIpsForwardedProvider
+     */
+    public function testGetClientIpsForwarded($expected, $remoteAddr, $httpForwarded, $trustedProxies)
+    {
+        $request = $this->getRequestInstanceForClientIpsForwardedTests($remoteAddr, $httpForwarded, $trustedProxies);
+
+        $this->assertEquals($expected, $request->getClientIps());
+    }
+
+    public function getClientIpsForwardedProvider()
+    {
+        //              $expected                                  $remoteAddr  $httpForwarded                                       $trustedProxies
+        return [
+            [['127.0.0.1'],                              '127.0.0.1', 'for="_gazonk"',                                      null],
+            [['127.0.0.1'],                              '127.0.0.1', 'for="_gazonk"',                                      ['127.0.0.1']],
+            [['88.88.88.88'],                            '127.0.0.1', 'for="88.88.88.88:80"',                               ['127.0.0.1']],
+            [['192.0.2.60'],                             '::1',       'for=192.0.2.60;proto=http;by=203.0.113.43',          ['::1']],
+            [['2620:0:1cfe:face:b00c::3', '192.0.2.43'], '::1',       'for=192.0.2.43, for=2620:0:1cfe:face:b00c::3',       ['::1']],
+            [['2001:db8:cafe::17'],                      '::1',       'for="[2001:db8:cafe::17]:4711',                      ['::1']],
+        ];
+    }
+
+    public function getClientIpsProvider()
+    {
+        //        $expected                          $remoteAddr                 $httpForwardedFor            $trustedProxies
+        return [
+            // simple IPv4
+            [['88.88.88.88'],              '88.88.88.88',              null,                        null],
+            // trust the IPv4 remote addr
+            [['88.88.88.88'],              '88.88.88.88',              null,                        ['88.88.88.88']],
+
+            // simple IPv6
+            [['::1'],                      '::1',                      null,                        null],
+            // trust the IPv6 remote addr
+            [['::1'],                      '::1',                      null,                        ['::1']],
+
+            // forwarded for with remote IPv4 addr not trusted
+            [['127.0.0.1'],                '127.0.0.1',                '88.88.88.88',               null],
+            // forwarded for with remote IPv4 addr trusted + comma
+            [['88.88.88.88'],              '127.0.0.1',                '88.88.88.88,',              ['127.0.0.1']],
+            // forwarded for with remote IPv4 and all FF addrs trusted
+            [['88.88.88.88'],              '127.0.0.1',                '88.88.88.88',               ['127.0.0.1', '88.88.88.88']],
+            // forwarded for with remote IPv4 range trusted
+            [['88.88.88.88'],              '123.45.67.89',             '88.88.88.88',               ['123.45.67.0/24']],
+
+            // forwarded for with remote IPv6 addr not trusted
+            [['1620:0:1cfe:face:b00c::3'], '1620:0:1cfe:face:b00c::3', '2620:0:1cfe:face:b00c::3',  null],
+            // forwarded for with remote IPv6 addr trusted
+            [['2620:0:1cfe:face:b00c::3'], '1620:0:1cfe:face:b00c::3', '2620:0:1cfe:face:b00c::3', ['1620:0:1cfe:face:b00c::3']],
+            // forwarded for with remote IPv6 range trusted
+            [['88.88.88.88'],              '2a01:198:603:0:396e:4789:8e99:890f', '88.88.88.88',     ['2a01:198:603:0::/65']],
+
+            // multiple forwarded for with remote IPv4 addr trusted
+            [['88.88.88.88', '87.65.43.21', '127.0.0.1'], '123.45.67.89', '127.0.0.1, 87.65.43.21, 88.88.88.88', ['123.45.67.89']],
+            // multiple forwarded for with remote IPv4 addr and some reverse proxies trusted
+            [['87.65.43.21', '127.0.0.1'], '123.45.67.89',             '127.0.0.1, 87.65.43.21, 88.88.88.88', ['123.45.67.89', '88.88.88.88']],
+            // multiple forwarded for with remote IPv4 addr and some reverse proxies trusted but in the middle
+            [['88.88.88.88', '127.0.0.1'], '123.45.67.89',             '127.0.0.1, 87.65.43.21, 88.88.88.88', ['123.45.67.89', '87.65.43.21']],
+            // multiple forwarded for with remote IPv4 addr and all reverse proxies trusted
+            [['127.0.0.1'],                '123.45.67.89',             '127.0.0.1, 87.65.43.21, 88.88.88.88', ['123.45.67.89', '87.65.43.21', '88.88.88.88', '127.0.0.1']],
+
+            // multiple forwarded for with remote IPv6 addr trusted
+            [['2620:0:1cfe:face:b00c::3', '3620:0:1cfe:face:b00c::3'], '1620:0:1cfe:face:b00c::3', '3620:0:1cfe:face:b00c::3,2620:0:1cfe:face:b00c::3', ['1620:0:1cfe:face:b00c::3']],
+            // multiple forwarded for with remote IPv6 addr and some reverse proxies trusted
+            [['3620:0:1cfe:face:b00c::3'], '1620:0:1cfe:face:b00c::3', '3620:0:1cfe:face:b00c::3,2620:0:1cfe:face:b00c::3', ['1620:0:1cfe:face:b00c::3', '2620:0:1cfe:face:b00c::3']],
+            // multiple forwarded for with remote IPv4 addr and some reverse proxies trusted but in the middle
+            [['2620:0:1cfe:face:b00c::3', '4620:0:1cfe:face:b00c::3'], '1620:0:1cfe:face:b00c::3', '4620:0:1cfe:face:b00c::3,3620:0:1cfe:face:b00c::3,2620:0:1cfe:face:b00c::3', ['1620:0:1cfe:face:b00c::3', '3620:0:1cfe:face:b00c::3']],
+
+            // client IP with port
+            [['88.88.88.88'], '127.0.0.1', '88.88.88.88:12345, 127.0.0.1', ['127.0.0.1']],
+
+            // invalid forwarded IP is ignored
+            [['88.88.88.88'], '127.0.0.1', 'unknown,88.88.88.88', ['127.0.0.1']],
+            [['88.88.88.88'], '127.0.0.1', '}__test|O:21:&quot;JDatabaseDriverMysqli&quot;:3:{s:2,88.88.88.88', ['127.0.0.1']],
+        ];
+    }
+
+    /**
+     * @dataProvider getClientIpsWithConflictingHeadersProvider
+     */
+    public function testGetClientIpsWithConflictingHeaders($httpForwarded, $httpXForwardedFor)
+    {
+        $this->expectException('Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException');
+        $request = new Request();
+
+        $server = [
+            'REMOTE_ADDR' => '88.88.88.88',
+            'HTTP_FORWARDED' => $httpForwarded,
+            'HTTP_X_FORWARDED_FOR' => $httpXForwardedFor,
+        ];
+
+        Request::setTrustedProxies(['88.88.88.88'], Request::HEADER_X_FORWARDED_ALL | Request::HEADER_FORWARDED);
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $request->getClientIps();
+    }
+
+    /**
+     * @dataProvider getClientIpsWithConflictingHeadersProvider
+     */
+    public function testGetClientIpsOnlyXHttpForwardedForTrusted($httpForwarded, $httpXForwardedFor)
+    {
+        $request = new Request();
+
+        $server = [
+            'REMOTE_ADDR' => '88.88.88.88',
+            'HTTP_FORWARDED' => $httpForwarded,
+            'HTTP_X_FORWARDED_FOR' => $httpXForwardedFor,
+        ];
+
+        Request::setTrustedProxies(['88.88.88.88'], Request::HEADER_X_FORWARDED_FOR);
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertSame(array_reverse(explode(',', $httpXForwardedFor)), $request->getClientIps());
+    }
+
+    public function getClientIpsWithConflictingHeadersProvider()
+    {
+        //        $httpForwarded                   $httpXForwardedFor
+        return [
+            ['for=87.65.43.21',                 '192.0.2.60'],
+            ['for=87.65.43.21, for=192.0.2.60', '192.0.2.60'],
+            ['for=192.0.2.60',                  '192.0.2.60,87.65.43.21'],
+            ['for="::face", for=192.0.2.60',    '192.0.2.60,192.0.2.43'],
+            ['for=87.65.43.21, for=192.0.2.60', '192.0.2.60,87.65.43.21'],
+        ];
+    }
+
+    /**
+     * @dataProvider getClientIpsWithAgreeingHeadersProvider
+     */
+    public function testGetClientIpsWithAgreeingHeaders($httpForwarded, $httpXForwardedFor, $expectedIps)
+    {
+        $request = new Request();
+
+        $server = [
+            'REMOTE_ADDR' => '88.88.88.88',
+            'HTTP_FORWARDED' => $httpForwarded,
+            'HTTP_X_FORWARDED_FOR' => $httpXForwardedFor,
+        ];
+
+        Request::setTrustedProxies(['88.88.88.88'], -1);
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $clientIps = $request->getClientIps();
+
+        $this->assertSame($expectedIps, $clientIps);
+    }
+
+    public function getClientIpsWithAgreeingHeadersProvider()
+    {
+        //        $httpForwarded                               $httpXForwardedFor
+        return [
+            ['for="192.0.2.60"',                          '192.0.2.60',             ['192.0.2.60']],
+            ['for=192.0.2.60, for=87.65.43.21',           '192.0.2.60,87.65.43.21', ['87.65.43.21', '192.0.2.60']],
+            ['for="[::face]", for=192.0.2.60',            '::face,192.0.2.60',      ['192.0.2.60', '::face']],
+            ['for="192.0.2.60:80"',                       '192.0.2.60',             ['192.0.2.60']],
+            ['for=192.0.2.60;proto=http;by=203.0.113.43', '192.0.2.60',             ['192.0.2.60']],
+            ['for="[2001:db8:cafe::17]:4711"',            '2001:db8:cafe::17',      ['2001:db8:cafe::17']],
+        ];
+    }
+
+    public function testGetContentWorksTwiceInDefaultMode()
+    {
+        $req = new Request();
+        $this->assertEquals('', $req->getContent());
+        $this->assertEquals('', $req->getContent());
+    }
+
+    public function testGetContentReturnsResource()
+    {
+        $req = new Request();
+        $retval = $req->getContent(true);
+        $this->assertIsResource($retval);
+        $this->assertEquals('', fread($retval, 1));
+        $this->assertTrue(feof($retval));
+    }
+
+    public function testGetContentReturnsResourceWhenContentSetInConstructor()
+    {
+        $req = new Request([], [], [], [], [], [], 'MyContent');
+        $resource = $req->getContent(true);
+
+        $this->assertIsResource($resource);
+        $this->assertEquals('MyContent', stream_get_contents($resource));
+    }
+
+    public function testContentAsResource()
+    {
+        $resource = fopen('php://memory', 'r+');
+        fwrite($resource, 'My other content');
+        rewind($resource);
+
+        $req = new Request([], [], [], [], [], [], $resource);
+        $this->assertEquals('My other content', stream_get_contents($req->getContent(true)));
+        $this->assertEquals('My other content', $req->getContent());
+    }
+
+    /**
+     * @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
+     */
+    public function testGetContentCantBeCalledTwiceWithResources($first, $second)
+    {
+        $this->expectException('LogicException');
+        if (\PHP_VERSION_ID >= 50600) {
+            $this->markTestSkipped('PHP >= 5.6 allows to open php://input several times.');
+        }
+
+        $req = new Request();
+        $req->getContent($first);
+        $req->getContent($second);
+    }
+
+    public function getContentCantBeCalledTwiceWithResourcesProvider()
+    {
+        return [
+            'Resource then fetch' => [true, false],
+            'Resource then resource' => [true, true],
+        ];
+    }
+
+    /**
+     * @dataProvider getContentCanBeCalledTwiceWithResourcesProvider
+     * @requires PHP 5.6
+     */
+    public function testGetContentCanBeCalledTwiceWithResources($first, $second)
+    {
+        $req = new Request();
+        $a = $req->getContent($first);
+        $b = $req->getContent($second);
+
+        if ($first) {
+            $a = stream_get_contents($a);
+        }
+
+        if ($second) {
+            $b = stream_get_contents($b);
+        }
+
+        $this->assertSame($a, $b);
+    }
+
+    public function getContentCanBeCalledTwiceWithResourcesProvider()
+    {
+        return [
+            'Fetch then fetch' => [false, false],
+            'Fetch then resource' => [false, true],
+            'Resource then fetch' => [true, false],
+            'Resource then resource' => [true, true],
+        ];
+    }
+
+    public function provideOverloadedMethods()
+    {
+        return [
+            ['PUT'],
+            ['DELETE'],
+            ['PATCH'],
+            ['put'],
+            ['delete'],
+            ['patch'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideOverloadedMethods
+     */
+    public function testCreateFromGlobals($method)
+    {
+        $normalizedMethod = strtoupper($method);
+
+        $_GET['foo1'] = 'bar1';
+        $_POST['foo2'] = 'bar2';
+        $_COOKIE['foo3'] = 'bar3';
+        $_FILES['foo4'] = ['bar4'];
+        $_SERVER['foo5'] = 'bar5';
+
+        $request = Request::createFromGlobals();
+        $this->assertEquals('bar1', $request->query->get('foo1'), '::fromGlobals() uses values from $_GET');
+        $this->assertEquals('bar2', $request->request->get('foo2'), '::fromGlobals() uses values from $_POST');
+        $this->assertEquals('bar3', $request->cookies->get('foo3'), '::fromGlobals() uses values from $_COOKIE');
+        $this->assertEquals(['bar4'], $request->files->get('foo4'), '::fromGlobals() uses values from $_FILES');
+        $this->assertEquals('bar5', $request->server->get('foo5'), '::fromGlobals() uses values from $_SERVER');
+
+        unset($_GET['foo1'], $_POST['foo2'], $_COOKIE['foo3'], $_FILES['foo4'], $_SERVER['foo5']);
+
+        $_SERVER['REQUEST_METHOD'] = $method;
+        $_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
+        $request = RequestContentProxy::createFromGlobals();
+        $this->assertEquals($normalizedMethod, $request->getMethod());
+        $this->assertEquals('mycontent', $request->request->get('content'));
+
+        unset($_SERVER['REQUEST_METHOD'], $_SERVER['CONTENT_TYPE']);
+
+        Request::createFromGlobals();
+        Request::enableHttpMethodParameterOverride();
+        $_POST['_method'] = $method;
+        $_POST['foo6'] = 'bar6';
+        $_SERVER['REQUEST_METHOD'] = 'PoSt';
+        $request = Request::createFromGlobals();
+        $this->assertEquals($normalizedMethod, $request->getMethod());
+        $this->assertEquals('POST', $request->getRealMethod());
+        $this->assertEquals('bar6', $request->request->get('foo6'));
+
+        unset($_POST['_method'], $_POST['foo6'], $_SERVER['REQUEST_METHOD']);
+        $this->disableHttpMethodParameterOverride();
+    }
+
+    public function testOverrideGlobals()
+    {
+        $request = new Request();
+        $request->initialize(['foo' => 'bar']);
+
+        // as the Request::overrideGlobals really work, it erase $_SERVER, so we must backup it
+        $server = $_SERVER;
+
+        $request->overrideGlobals();
+
+        $this->assertEquals(['foo' => 'bar'], $_GET);
+
+        $request->initialize([], ['foo' => 'bar']);
+        $request->overrideGlobals();
+
+        $this->assertEquals(['foo' => 'bar'], $_POST);
+
+        $this->assertArrayNotHasKey('HTTP_X_FORWARDED_PROTO', $_SERVER);
+
+        $request->headers->set('X_FORWARDED_PROTO', 'https');
+
+        Request::setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_ALL);
+        $this->assertFalse($request->isSecure());
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $this->assertTrue($request->isSecure());
+
+        $request->overrideGlobals();
+
+        $this->assertArrayHasKey('HTTP_X_FORWARDED_PROTO', $_SERVER);
+
+        $request->headers->set('CONTENT_TYPE', 'multipart/form-data');
+        $request->headers->set('CONTENT_LENGTH', 12345);
+
+        $request->overrideGlobals();
+
+        $this->assertArrayHasKey('CONTENT_TYPE', $_SERVER);
+        $this->assertArrayHasKey('CONTENT_LENGTH', $_SERVER);
+
+        $request->initialize(['foo' => 'bar', 'baz' => 'foo']);
+        $request->query->remove('baz');
+
+        $request->overrideGlobals();
+
+        $this->assertEquals(['foo' => 'bar'], $_GET);
+        $this->assertEquals('foo=bar', $_SERVER['QUERY_STRING']);
+        $this->assertEquals('foo=bar', $request->server->get('QUERY_STRING'));
+
+        // restore initial $_SERVER array
+        $_SERVER = $server;
+    }
+
+    public function testGetScriptName()
+    {
+        $request = new Request();
+        $this->assertEquals('', $request->getScriptName());
+
+        $server = [];
+        $server['SCRIPT_NAME'] = '/index.php';
+
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('/index.php', $request->getScriptName());
+
+        $server = [];
+        $server['ORIG_SCRIPT_NAME'] = '/frontend.php';
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('/frontend.php', $request->getScriptName());
+
+        $server = [];
+        $server['SCRIPT_NAME'] = '/index.php';
+        $server['ORIG_SCRIPT_NAME'] = '/frontend.php';
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('/index.php', $request->getScriptName());
+    }
+
+    public function testGetBasePath()
+    {
+        $request = new Request();
+        $this->assertEquals('', $request->getBasePath());
+
+        $server = [];
+        $server['SCRIPT_FILENAME'] = '/some/where/index.php';
+        $request->initialize([], [], [], [], [], $server);
+        $this->assertEquals('', $request->getBasePath());
+
+        $server = [];
+        $server['SCRIPT_FILENAME'] = '/some/where/index.php';
+        $server['SCRIPT_NAME'] = '/index.php';
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('', $request->getBasePath());
+
+        $server = [];
+        $server['SCRIPT_FILENAME'] = '/some/where/index.php';
+        $server['PHP_SELF'] = '/index.php';
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('', $request->getBasePath());
+
+        $server = [];
+        $server['SCRIPT_FILENAME'] = '/some/where/index.php';
+        $server['ORIG_SCRIPT_NAME'] = '/index.php';
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('', $request->getBasePath());
+    }
+
+    public function testGetPathInfo()
+    {
+        $request = new Request();
+        $this->assertEquals('/', $request->getPathInfo());
+
+        $server = [];
+        $server['REQUEST_URI'] = '/path/info';
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('/path/info', $request->getPathInfo());
+
+        $server = [];
+        $server['REQUEST_URI'] = '/path%20test/info';
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('/path%20test/info', $request->getPathInfo());
+
+        $server = [];
+        $server['REQUEST_URI'] = '?a=b';
+        $request->initialize([], [], [], [], [], $server);
+
+        $this->assertEquals('/', $request->getPathInfo());
+    }
+
+    public function testGetParameterPrecedence()
+    {
+        $request = new Request();
+        $request->attributes->set('foo', 'attr');
+        $request->query->set('foo', 'query');
+        $request->request->set('foo', 'body');
+
+        $this->assertSame('attr', $request->get('foo'));
+
+        $request->attributes->remove('foo');
+        $this->assertSame('query', $request->get('foo'));
+
+        $request->query->remove('foo');
+        $this->assertSame('body', $request->get('foo'));
+
+        $request->request->remove('foo');
+        $this->assertNull($request->get('foo'));
+    }
+
+    public function testGetPreferredLanguage()
+    {
+        $request = new Request();
+        $this->assertNull($request->getPreferredLanguage());
+        $this->assertNull($request->getPreferredLanguage([]));
+        $this->assertEquals('fr', $request->getPreferredLanguage(['fr']));
+        $this->assertEquals('fr', $request->getPreferredLanguage(['fr', 'en']));
+        $this->assertEquals('en', $request->getPreferredLanguage(['en', 'fr']));
+        $this->assertEquals('fr-ch', $request->getPreferredLanguage(['fr-ch', 'fr-fr']));
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
+        $this->assertEquals('en', $request->getPreferredLanguage(['en', 'en-us']));
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
+        $this->assertEquals('en', $request->getPreferredLanguage(['fr', 'en']));
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.8');
+        $this->assertEquals('en', $request->getPreferredLanguage(['fr', 'en']));
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.8, fr-fr; q=0.6, fr; q=0.5');
+        $this->assertEquals('en', $request->getPreferredLanguage(['fr', 'en']));
+    }
+
+    public function testIsXmlHttpRequest()
+    {
+        $request = new Request();
+        $this->assertFalse($request->isXmlHttpRequest());
+
+        $request->headers->set('X-Requested-With', 'XMLHttpRequest');
+        $this->assertTrue($request->isXmlHttpRequest());
+
+        $request->headers->remove('X-Requested-With');
+        $this->assertFalse($request->isXmlHttpRequest());
+    }
+
+    /**
+     * @requires extension intl
+     */
+    public function testIntlLocale()
+    {
+        $request = new Request();
+
+        $request->setDefaultLocale('fr');
+        $this->assertEquals('fr', $request->getLocale());
+        $this->assertEquals('fr', \Locale::getDefault());
+
+        $request->setLocale('en');
+        $this->assertEquals('en', $request->getLocale());
+        $this->assertEquals('en', \Locale::getDefault());
+
+        $request->setDefaultLocale('de');
+        $this->assertEquals('en', $request->getLocale());
+        $this->assertEquals('en', \Locale::getDefault());
+    }
+
+    public function testGetCharsets()
+    {
+        $request = new Request();
+        $this->assertEquals([], $request->getCharsets());
+        $request->headers->set('Accept-Charset', 'ISO-8859-1, US-ASCII, UTF-8; q=0.8, ISO-10646-UCS-2; q=0.6');
+        $this->assertEquals([], $request->getCharsets()); // testing caching
+
+        $request = new Request();
+        $request->headers->set('Accept-Charset', 'ISO-8859-1, US-ASCII, UTF-8; q=0.8, ISO-10646-UCS-2; q=0.6');
+        $this->assertEquals(['ISO-8859-1', 'US-ASCII', 'UTF-8', 'ISO-10646-UCS-2'], $request->getCharsets());
+
+        $request = new Request();
+        $request->headers->set('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7');
+        $this->assertEquals(['ISO-8859-1', 'utf-8', '*'], $request->getCharsets());
+    }
+
+    public function testGetEncodings()
+    {
+        $request = new Request();
+        $this->assertEquals([], $request->getEncodings());
+        $request->headers->set('Accept-Encoding', 'gzip,deflate,sdch');
+        $this->assertEquals([], $request->getEncodings()); // testing caching
+
+        $request = new Request();
+        $request->headers->set('Accept-Encoding', 'gzip,deflate,sdch');
+        $this->assertEquals(['gzip', 'deflate', 'sdch'], $request->getEncodings());
+
+        $request = new Request();
+        $request->headers->set('Accept-Encoding', 'gzip;q=0.4,deflate;q=0.9,compress;q=0.7');
+        $this->assertEquals(['deflate', 'compress', 'gzip'], $request->getEncodings());
+    }
+
+    public function testGetAcceptableContentTypes()
+    {
+        $request = new Request();
+        $this->assertEquals([], $request->getAcceptableContentTypes());
+        $request->headers->set('Accept', 'application/vnd.wap.wmlscriptc, text/vnd.wap.wml, application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html, multipart/mixed, */*');
+        $this->assertEquals([], $request->getAcceptableContentTypes()); // testing caching
+
+        $request = new Request();
+        $request->headers->set('Accept', 'application/vnd.wap.wmlscriptc, text/vnd.wap.wml, application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html, multipart/mixed, */*');
+        $this->assertEquals(['application/vnd.wap.wmlscriptc', 'text/vnd.wap.wml', 'application/vnd.wap.xhtml+xml', 'application/xhtml+xml', 'text/html', 'multipart/mixed', '*/*'], $request->getAcceptableContentTypes());
+    }
+
+    public function testGetLanguages()
+    {
+        $request = new Request();
+        $this->assertEquals([], $request->getLanguages());
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
+        $this->assertEquals(['zh', 'en_US', 'en'], $request->getLanguages());
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.6, en; q=0.8');
+        $this->assertEquals(['zh', 'en', 'en_US'], $request->getLanguages()); // Test out of order qvalues
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en, en-us');
+        $this->assertEquals(['zh', 'en', 'en_US'], $request->getLanguages()); // Test equal weighting without qvalues
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh; q=0.6, en, en-us; q=0.6');
+        $this->assertEquals(['en', 'zh', 'en_US'], $request->getLanguages()); // Test equal weighting with qvalues
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, i-cherokee; q=0.6');
+        $this->assertEquals(['zh', 'cherokee'], $request->getLanguages());
+    }
+
+    public function testGetRequestFormat()
+    {
+        $request = new Request();
+        $this->assertEquals('html', $request->getRequestFormat());
+
+        // Ensure that setting different default values over time is possible,
+        // aka. setRequestFormat determines the state.
+        $this->assertEquals('json', $request->getRequestFormat('json'));
+        $this->assertEquals('html', $request->getRequestFormat('html'));
+
+        $request = new Request();
+        $this->assertNull($request->getRequestFormat(null));
+
+        $request = new Request();
+        $this->assertNull($request->setRequestFormat('foo'));
+        $this->assertEquals('foo', $request->getRequestFormat(null));
+
+        $request = new Request(['_format' => 'foo']);
+        $this->assertEquals('html', $request->getRequestFormat());
+    }
+
+    public function testHasSession()
+    {
+        $request = new Request();
+
+        $this->assertFalse($request->hasSession());
+        $request->setSession(new Session(new MockArraySessionStorage()));
+        $this->assertTrue($request->hasSession());
+    }
+
+    public function testGetSession()
+    {
+        $request = new Request();
+
+        $request->setSession(new Session(new MockArraySessionStorage()));
+        $this->assertTrue($request->hasSession());
+
+        $session = $request->getSession();
+        $this->assertObjectHasAttribute('storage', $session);
+        $this->assertObjectHasAttribute('flashName', $session);
+        $this->assertObjectHasAttribute('attributeName', $session);
+    }
+
+    public function testHasPreviousSession()
+    {
+        $request = new Request();
+
+        $this->assertFalse($request->hasPreviousSession());
+        $request->cookies->set('MOCKSESSID', 'foo');
+        $this->assertFalse($request->hasPreviousSession());
+        $request->setSession(new Session(new MockArraySessionStorage()));
+        $this->assertTrue($request->hasPreviousSession());
+    }
+
+    public function testToString()
+    {
+        $request = new Request();
+
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
+        $request->cookies->set('Foo', 'Bar');
+
+        $asString = (string) $request;
+
+        $this->assertStringContainsString('Accept-Language: zh, en-us; q=0.8, en; q=0.6', $asString);
+        $this->assertStringContainsString('Cookie: Foo=Bar', $asString);
+
+        $request->cookies->set('Another', 'Cookie');
+
+        $asString = (string) $request;
+
+        $this->assertStringContainsString('Cookie: Foo=Bar; Another=Cookie', $asString);
+    }
+
+    public function testIsMethod()
+    {
+        $request = new Request();
+        $request->setMethod('POST');
+        $this->assertTrue($request->isMethod('POST'));
+        $this->assertTrue($request->isMethod('post'));
+        $this->assertFalse($request->isMethod('GET'));
+        $this->assertFalse($request->isMethod('get'));
+
+        $request->setMethod('GET');
+        $this->assertTrue($request->isMethod('GET'));
+        $this->assertTrue($request->isMethod('get'));
+        $this->assertFalse($request->isMethod('POST'));
+        $this->assertFalse($request->isMethod('post'));
+    }
+
+    /**
+     * @dataProvider getBaseUrlData
+     */
+    public function testGetBaseUrl($uri, $server, $expectedBaseUrl, $expectedPathInfo)
+    {
+        $request = Request::create($uri, 'GET', [], [], [], $server);
+
+        $this->assertSame($expectedBaseUrl, $request->getBaseUrl(), 'baseUrl');
+        $this->assertSame($expectedPathInfo, $request->getPathInfo(), 'pathInfo');
+    }
+
+    public function getBaseUrlData()
+    {
+        return [
+            [
+                '/fruit/strawberry/1234index.php/blah',
+                [
+                    'SCRIPT_FILENAME' => 'E:/Sites/cc-new/public_html/fruit/index.php',
+                    'SCRIPT_NAME' => '/fruit/index.php',
+                    'PHP_SELF' => '/fruit/index.php',
+                ],
+                '/fruit',
+                '/strawberry/1234index.php/blah',
+            ],
+            [
+                '/fruit/strawberry/1234index.php/blah',
+                [
+                    'SCRIPT_FILENAME' => 'E:/Sites/cc-new/public_html/index.php',
+                    'SCRIPT_NAME' => '/index.php',
+                    'PHP_SELF' => '/index.php',
+                ],
+                '',
+                '/fruit/strawberry/1234index.php/blah',
+            ],
+            [
+                '/foo%20bar/',
+                [
+                    'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
+                    'SCRIPT_NAME' => '/foo bar/app.php',
+                    'PHP_SELF' => '/foo bar/app.php',
+                ],
+                '/foo%20bar',
+                '/',
+            ],
+            [
+                '/foo%20bar/home',
+                [
+                    'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
+                    'SCRIPT_NAME' => '/foo bar/app.php',
+                    'PHP_SELF' => '/foo bar/app.php',
+                ],
+                '/foo%20bar',
+                '/home',
+            ],
+            [
+                '/foo%20bar/app.php/home',
+                [
+                    'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
+                    'SCRIPT_NAME' => '/foo bar/app.php',
+                    'PHP_SELF' => '/foo bar/app.php',
+                ],
+                '/foo%20bar/app.php',
+                '/home',
+            ],
+            [
+                '/foo%20bar/app.php/home%3Dbaz',
+                [
+                    'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
+                    'SCRIPT_NAME' => '/foo bar/app.php',
+                    'PHP_SELF' => '/foo bar/app.php',
+                ],
+                '/foo%20bar/app.php',
+                '/home%3Dbaz',
+            ],
+            [
+                '/foo/bar+baz',
+                [
+                    'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo/app.php',
+                    'SCRIPT_NAME' => '/foo/app.php',
+                    'PHP_SELF' => '/foo/app.php',
+                ],
+                '/foo',
+                '/bar+baz',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider urlencodedStringPrefixData
+     */
+    public function testUrlencodedStringPrefix($string, $prefix, $expect)
+    {
+        $request = new Request();
+
+        $me = new \ReflectionMethod($request, 'getUrlencodedPrefix');
+        $me->setAccessible(true);
+
+        $this->assertSame($expect, $me->invoke($request, $string, $prefix));
+    }
+
+    public function urlencodedStringPrefixData()
+    {
+        return [
+            ['foo', 'foo', 'foo'],
+            ['fo%6f', 'foo', 'fo%6f'],
+            ['foo/bar', 'foo', 'foo'],
+            ['fo%6f/bar', 'foo', 'fo%6f'],
+            ['f%6f%6f/bar', 'foo', 'f%6f%6f'],
+            ['%66%6F%6F/bar', 'foo', '%66%6F%6F'],
+            ['fo+o/bar', 'fo+o', 'fo+o'],
+            ['fo%2Bo/bar', 'fo+o', 'fo%2Bo'],
+        ];
+    }
+
+    private function disableHttpMethodParameterOverride()
+    {
+        $class = new \ReflectionClass('Symfony\\Component\\HttpFoundation\\Request');
+        $property = $class->getProperty('httpMethodParameterOverride');
+        $property->setAccessible(true);
+        $property->setValue(false);
+    }
+
+    private function getRequestInstanceForClientIpTests($remoteAddr, $httpForwardedFor, $trustedProxies)
+    {
+        $request = new Request();
+
+        $server = ['REMOTE_ADDR' => $remoteAddr];
+        if (null !== $httpForwardedFor) {
+            $server['HTTP_X_FORWARDED_FOR'] = $httpForwardedFor;
+        }
+
+        if ($trustedProxies) {
+            Request::setTrustedProxies($trustedProxies, Request::HEADER_X_FORWARDED_ALL);
+        }
+
+        $request->initialize([], [], [], [], [], $server);
+
+        return $request;
+    }
+
+    private function getRequestInstanceForClientIpsForwardedTests($remoteAddr, $httpForwarded, $trustedProxies)
+    {
+        $request = new Request();
+
+        $server = ['REMOTE_ADDR' => $remoteAddr];
+
+        if (null !== $httpForwarded) {
+            $server['HTTP_FORWARDED'] = $httpForwarded;
+        }
+
+        if ($trustedProxies) {
+            Request::setTrustedProxies($trustedProxies, Request::HEADER_FORWARDED);
+        }
+
+        $request->initialize([], [], [], [], [], $server);
+
+        return $request;
+    }
+
+    public function testTrustedProxiesXForwardedFor()
+    {
+        $request = Request::create('http://example.com/');
+        $request->server->set('REMOTE_ADDR', '3.3.3.3');
+        $request->headers->set('X_FORWARDED_FOR', '1.1.1.1, 2.2.2.2');
+        $request->headers->set('X_FORWARDED_HOST', 'foo.example.com:1234, real.example.com:8080');
+        $request->headers->set('X_FORWARDED_PROTO', 'https');
+        $request->headers->set('X_FORWARDED_PORT', 443);
+
+        // no trusted proxies
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // disabling proxy trusting
+        Request::setTrustedProxies([], Request::HEADER_X_FORWARDED_ALL);
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // request is forwarded by a non-trusted proxy
+        Request::setTrustedProxies(['2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // trusted proxy via setTrustedProxies()
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
+        $this->assertEquals('1.1.1.1', $request->getClientIp());
+        $this->assertEquals('foo.example.com', $request->getHost());
+        $this->assertEquals(443, $request->getPort());
+        $this->assertTrue($request->isSecure());
+
+        // trusted proxy via setTrustedProxies()
+        Request::setTrustedProxies(['3.3.3.4', '2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // check various X_FORWARDED_PROTO header values
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
+        $request->headers->set('X_FORWARDED_PROTO', 'ssl');
+        $this->assertTrue($request->isSecure());
+
+        $request->headers->set('X_FORWARDED_PROTO', 'https, http');
+        $this->assertTrue($request->isSecure());
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Component\HttpFoundation\Request::setTrustedHeaderName()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the $trustedHeaderSet argument of the Request::setTrustedProxies() method instead.
+     */
+    public function testLegacyTrustedProxies()
+    {
+        $request = Request::create('http://example.com/');
+        $request->server->set('REMOTE_ADDR', '3.3.3.3');
+        $request->headers->set('X_FORWARDED_FOR', '1.1.1.1, 2.2.2.2');
+        $request->headers->set('X_FORWARDED_HOST', 'foo.example.com, real.example.com:8080');
+        $request->headers->set('X_FORWARDED_PROTO', 'https');
+        $request->headers->set('X_FORWARDED_PORT', 443);
+        $request->headers->set('X_MY_FOR', '3.3.3.3, 4.4.4.4');
+        $request->headers->set('X_MY_HOST', 'my.example.com');
+        $request->headers->set('X_MY_PROTO', 'http');
+        $request->headers->set('X_MY_PORT', 81);
+
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
+
+        // custom header names
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'X_MY_FOR');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'X_MY_HOST');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'X_MY_PORT');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'X_MY_PROTO');
+        $this->assertEquals('4.4.4.4', $request->getClientIp());
+        $this->assertEquals('my.example.com', $request->getHost());
+        $this->assertEquals(81, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // disabling via empty header names
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, null);
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, null);
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, null);
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, null);
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        //reset
+        Request::setTrustedHeaderName(Request::HEADER_FORWARDED, 'FORWARDED');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'X_FORWARDED_FOR');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'X_FORWARDED_HOST');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'X_FORWARDED_PORT');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'X_FORWARDED_PROTO');
+    }
+
+    public function testTrustedProxiesForwarded()
+    {
+        $request = Request::create('http://example.com/');
+        $request->server->set('REMOTE_ADDR', '3.3.3.3');
+        $request->headers->set('FORWARDED', 'for=1.1.1.1, host=foo.example.com:8080, proto=https, for=2.2.2.2, host=real.example.com:8080');
+
+        // no trusted proxies
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // disabling proxy trusting
+        Request::setTrustedProxies([], Request::HEADER_FORWARDED);
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // request is forwarded by a non-trusted proxy
+        Request::setTrustedProxies(['2.2.2.2'], Request::HEADER_FORWARDED);
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // trusted proxy via setTrustedProxies()
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_FORWARDED);
+        $this->assertEquals('1.1.1.1', $request->getClientIp());
+        $this->assertEquals('foo.example.com', $request->getHost());
+        $this->assertEquals(8080, $request->getPort());
+        $this->assertTrue($request->isSecure());
+
+        // trusted proxy via setTrustedProxies()
+        Request::setTrustedProxies(['3.3.3.4', '2.2.2.2'], Request::HEADER_FORWARDED);
+        $this->assertEquals('3.3.3.3', $request->getClientIp());
+        $this->assertEquals('example.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+        $this->assertFalse($request->isSecure());
+
+        // check various X_FORWARDED_PROTO header values
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_FORWARDED);
+        $request->headers->set('FORWARDED', 'proto=ssl');
+        $this->assertTrue($request->isSecure());
+
+        $request->headers->set('FORWARDED', 'proto=https, proto=http');
+        $this->assertTrue($request->isSecure());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testSetTrustedProxiesInvalidHeaderName()
+    {
+        $this->expectException('InvalidArgumentException');
+        Request::create('http://example.com/');
+        Request::setTrustedHeaderName('bogus name', 'X_MY_FOR');
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetTrustedProxiesInvalidHeaderName()
+    {
+        $this->expectException('InvalidArgumentException');
+        Request::create('http://example.com/');
+        Request::getTrustedHeaderName('bogus name');
+    }
+
+    /**
+     * @dataProvider iisRequestUriProvider
+     */
+    public function testIISRequestUri($headers, $server, $expectedRequestUri)
+    {
+        $request = new Request();
+        $request->headers->replace($headers);
+        $request->server->replace($server);
+
+        $this->assertEquals($expectedRequestUri, $request->getRequestUri(), '->getRequestUri() is correct');
+
+        $subRequestUri = '/bar/foo';
+        $subRequest = Request::create($subRequestUri, 'get', [], [], [], $request->server->all());
+        $this->assertEquals($subRequestUri, $subRequest->getRequestUri(), '->getRequestUri() is correct in sub request');
+    }
+
+    public function iisRequestUriProvider()
+    {
+        return [
+            [
+                [],
+                [
+                    'IIS_WasUrlRewritten' => '1',
+                    'UNENCODED_URL' => '/foo/bar',
+                ],
+                '/foo/bar',
+            ],
+            [
+                [],
+                [
+                    'ORIG_PATH_INFO' => '/foo/bar',
+                ],
+                '/foo/bar',
+            ],
+            [
+                [],
+                [
+                    'ORIG_PATH_INFO' => '/foo/bar',
+                    'QUERY_STRING' => 'foo=bar',
+                ],
+                '/foo/bar?foo=bar',
+            ],
+        ];
+    }
+
+    public function testTrustedHosts()
+    {
+        // create a request
+        $request = Request::create('/');
+
+        // no trusted host set -> no host check
+        $request->headers->set('host', 'evil.com');
+        $this->assertEquals('evil.com', $request->getHost());
+
+        // add a trusted domain and all its subdomains
+        Request::setTrustedHosts(['^([a-z]{9}\.)?trusted\.com$']);
+
+        // untrusted host
+        $request->headers->set('host', 'evil.com');
+        try {
+            $request->getHost();
+            $this->fail('Request::getHost() should throw an exception when host is not trusted.');
+        } catch (SuspiciousOperationException $e) {
+            $this->assertEquals('Untrusted Host "evil.com".', $e->getMessage());
+        }
+
+        // trusted hosts
+        $request->headers->set('host', 'trusted.com');
+        $this->assertEquals('trusted.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+
+        $request->server->set('HTTPS', true);
+        $request->headers->set('host', 'trusted.com');
+        $this->assertEquals('trusted.com', $request->getHost());
+        $this->assertEquals(443, $request->getPort());
+        $request->server->set('HTTPS', false);
+
+        $request->headers->set('host', 'trusted.com:8000');
+        $this->assertEquals('trusted.com', $request->getHost());
+        $this->assertEquals(8000, $request->getPort());
+
+        $request->headers->set('host', 'subdomain.trusted.com');
+        $this->assertEquals('subdomain.trusted.com', $request->getHost());
+    }
+
+    public function testSetTrustedHostsDoesNotBreakOnSpecialCharacters()
+    {
+        Request::setTrustedHosts(['localhost(\.local){0,1}#,example.com', 'localhost']);
+
+        $request = Request::create('/');
+        $request->headers->set('host', 'localhost');
+        $this->assertSame('localhost', $request->getHost());
+    }
+
+    public function testFactory()
+    {
+        Request::setFactory(function (array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null) {
+            return new NewRequest();
+        });
+
+        $this->assertEquals('foo', Request::create('/')->getFoo());
+
+        Request::setFactory(null);
+    }
+
+    /**
+     * @dataProvider getLongHostNames
+     */
+    public function testVeryLongHosts($host)
+    {
+        $start = microtime(true);
+
+        $request = Request::create('/');
+        $request->headers->set('host', $host);
+        $this->assertEquals($host, $request->getHost());
+        $this->assertLessThan(5, microtime(true) - $start);
+    }
+
+    /**
+     * @dataProvider getHostValidities
+     */
+    public function testHostValidity($host, $isValid, $expectedHost = null, $expectedPort = null)
+    {
+        $request = Request::create('/');
+        $request->headers->set('host', $host);
+
+        if ($isValid) {
+            $this->assertSame($expectedHost ?: $host, $request->getHost());
+            if ($expectedPort) {
+                $this->assertSame($expectedPort, $request->getPort());
+            }
+        } else {
+            $this->expectException(SuspiciousOperationException::class);
+            $this->expectExceptionMessage('Invalid Host');
+
+            $request->getHost();
+        }
+    }
+
+    public function getHostValidities()
+    {
+        return [
+            ['.a', false],
+            ['a..', false],
+            ['a.', true],
+            ["\xE9", false],
+            ['[::1]', true],
+            ['[::1]:80', true, '[::1]', 80],
+            [str_repeat('.', 101), false],
+        ];
+    }
+
+    public function getLongHostNames()
+    {
+        return [
+            ['a'.str_repeat('.a', 40000)],
+            [str_repeat(':', 101)],
+        ];
+    }
+
+    /**
+     * @dataProvider methodIdempotentProvider
+     */
+    public function testMethodIdempotent($method, $idempotent)
+    {
+        $request = new Request();
+        $request->setMethod($method);
+        $this->assertEquals($idempotent, $request->isMethodIdempotent());
+    }
+
+    public function methodIdempotentProvider()
+    {
+        return [
+            ['HEAD', true],
+            ['GET', true],
+            ['POST', false],
+            ['PUT', true],
+            ['PATCH', false],
+            ['DELETE', true],
+            ['PURGE', true],
+            ['OPTIONS', true],
+            ['TRACE', true],
+            ['CONNECT', false],
+        ];
+    }
+
+    /**
+     * @dataProvider methodSafeProvider
+     */
+    public function testMethodSafe($method, $safe)
+    {
+        $request = new Request();
+        $request->setMethod($method);
+        $this->assertEquals($safe, $request->isMethodSafe(false));
+    }
+
+    public function methodSafeProvider()
+    {
+        return [
+            ['HEAD', true],
+            ['GET', true],
+            ['POST', false],
+            ['PUT', false],
+            ['PATCH', false],
+            ['DELETE', false],
+            ['PURGE', false],
+            ['OPTIONS', true],
+            ['TRACE', true],
+            ['CONNECT', false],
+        ];
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Checking only for cacheable HTTP methods with Symfony\Component\HttpFoundation\Request::isMethodSafe() is deprecated since Symfony 3.2 and will throw an exception in 4.0. Disable checking only for cacheable methods by calling the method with `false` as first argument or use the Request::isMethodCacheable() instead.
+     */
+    public function testMethodSafeChecksCacheable()
+    {
+        $request = new Request();
+        $request->setMethod('OPTIONS');
+        $this->assertFalse($request->isMethodSafe());
+    }
+
+    /**
+     * @dataProvider methodCacheableProvider
+     */
+    public function testMethodCacheable($method, $cacheable)
+    {
+        $request = new Request();
+        $request->setMethod($method);
+        $this->assertEquals($cacheable, $request->isMethodCacheable());
+    }
+
+    public function methodCacheableProvider()
+    {
+        return [
+            ['HEAD', true],
+            ['GET', true],
+            ['POST', false],
+            ['PUT', false],
+            ['PATCH', false],
+            ['DELETE', false],
+            ['PURGE', false],
+            ['OPTIONS', false],
+            ['TRACE', false],
+            ['CONNECT', false],
+        ];
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetTrustedHeaderName()
+    {
+        Request::setTrustedProxies(['8.8.8.8'], Request::HEADER_X_FORWARDED_ALL);
+
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
+        $this->assertSame('X_FORWARDED_FOR', Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP));
+        $this->assertSame('X_FORWARDED_HOST', Request::getTrustedHeaderName(Request::HEADER_CLIENT_HOST));
+        $this->assertSame('X_FORWARDED_PORT', Request::getTrustedHeaderName(Request::HEADER_CLIENT_PORT));
+        $this->assertSame('X_FORWARDED_PROTO', Request::getTrustedHeaderName(Request::HEADER_CLIENT_PROTO));
+
+        Request::setTrustedProxies(['8.8.8.8'], Request::HEADER_FORWARDED);
+
+        $this->assertSame('FORWARDED', Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP));
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_HOST));
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_PORT));
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_PROTO));
+
+        Request::setTrustedHeaderName(Request::HEADER_FORWARDED, 'A');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'B');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'C');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'D');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'E');
+
+        Request::setTrustedProxies(['8.8.8.8'], Request::HEADER_FORWARDED);
+
+        $this->assertSame('A', Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP));
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_HOST));
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_PORT));
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_PROTO));
+
+        Request::setTrustedProxies(['8.8.8.8'], Request::HEADER_X_FORWARDED_ALL);
+
+        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
+        $this->assertSame('B', Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP));
+        $this->assertSame('C', Request::getTrustedHeaderName(Request::HEADER_CLIENT_HOST));
+        $this->assertSame('D', Request::getTrustedHeaderName(Request::HEADER_CLIENT_PORT));
+        $this->assertSame('E', Request::getTrustedHeaderName(Request::HEADER_CLIENT_PROTO));
+
+        Request::setTrustedProxies(['8.8.8.8'], Request::HEADER_FORWARDED);
+
+        $this->assertSame('A', Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
+
+        //reset
+        Request::setTrustedHeaderName(Request::HEADER_FORWARDED, 'FORWARDED');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'X_FORWARDED_FOR');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'X_FORWARDED_HOST');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'X_FORWARDED_PORT');
+        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'X_FORWARDED_PROTO');
+    }
+
+    /**
+     * @dataProvider protocolVersionProvider
+     */
+    public function testProtocolVersion($serverProtocol, $trustedProxy, $via, $expected)
+    {
+        if ($trustedProxy) {
+            Request::setTrustedProxies(['1.1.1.1'], -1);
+        }
+
+        $request = new Request();
+        $request->server->set('SERVER_PROTOCOL', $serverProtocol);
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Via', $via);
+
+        $this->assertSame($expected, $request->getProtocolVersion());
+    }
+
+    public function protocolVersionProvider()
+    {
+        return [
+            'untrusted without via' => ['HTTP/2.0', false, '', 'HTTP/2.0'],
+            'untrusted with via' => ['HTTP/2.0', false, '1.0 fred, 1.1 nowhere.com (Apache/1.1)', 'HTTP/2.0'],
+            'trusted without via' => ['HTTP/2.0', true, '', 'HTTP/2.0'],
+            'trusted with via' => ['HTTP/2.0', true, '1.0 fred, 1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'],
+            'trusted with via and protocol name' => ['HTTP/2.0', true, 'HTTP/1.0 fred, HTTP/1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'],
+            'trusted with broken via' => ['HTTP/2.0', true, 'HTTP/1^0 foo', 'HTTP/2.0'],
+            'trusted with partially-broken via' => ['HTTP/2.0', true, '1.0 fred, foo', 'HTTP/1.0'],
+        ];
+    }
+
+    public function nonstandardRequestsData()
+    {
+        return [
+            ['',  '', '/', 'http://host:8080/', ''],
+            ['/', '', '/', 'http://host:8080/', ''],
+
+            ['hello/app.php/x',  '', '/x', 'http://host:8080/hello/app.php/x', '/hello', '/hello/app.php'],
+            ['/hello/app.php/x', '', '/x', 'http://host:8080/hello/app.php/x', '/hello', '/hello/app.php'],
+
+            ['',      'a=b', '/', 'http://host:8080/?a=b'],
+            ['?a=b',  'a=b', '/', 'http://host:8080/?a=b'],
+            ['/?a=b', 'a=b', '/', 'http://host:8080/?a=b'],
+
+            ['x',      'a=b', '/x', 'http://host:8080/x?a=b'],
+            ['x?a=b',  'a=b', '/x', 'http://host:8080/x?a=b'],
+            ['/x?a=b', 'a=b', '/x', 'http://host:8080/x?a=b'],
+
+            ['hello/x',  '', '/x', 'http://host:8080/hello/x', '/hello'],
+            ['/hello/x', '', '/x', 'http://host:8080/hello/x', '/hello'],
+
+            ['hello/app.php/x',      'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'],
+            ['hello/app.php/x?a=b',  'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'],
+            ['/hello/app.php/x?a=b', 'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'],
+        ];
+    }
+
+    /**
+     * @dataProvider nonstandardRequestsData
+     */
+    public function testNonstandardRequests($requestUri, $queryString, $expectedPathInfo, $expectedUri, $expectedBasePath = '', $expectedBaseUrl = null)
+    {
+        if (null === $expectedBaseUrl) {
+            $expectedBaseUrl = $expectedBasePath;
+        }
+
+        $server = [
+            'HTTP_HOST' => 'host:8080',
+            'SERVER_PORT' => '8080',
+            'QUERY_STRING' => $queryString,
+            'PHP_SELF' => '/hello/app.php',
+            'SCRIPT_FILENAME' => '/some/path/app.php',
+            'REQUEST_URI' => $requestUri,
+        ];
+
+        $request = new Request([], [], [], [], [], $server);
+
+        $this->assertEquals($expectedPathInfo, $request->getPathInfo());
+        $this->assertEquals($expectedUri, $request->getUri());
+        $this->assertEquals($queryString, $request->getQueryString());
+        $this->assertEquals(8080, $request->getPort());
+        $this->assertEquals('host:8080', $request->getHttpHost());
+        $this->assertEquals($expectedBaseUrl, $request->getBaseUrl());
+        $this->assertEquals($expectedBasePath, $request->getBasePath());
+    }
+
+    public function testTrustedHost()
+    {
+        Request::setTrustedProxies(['1.1.1.1'], -1);
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host=localhost:8080');
+        $request->headers->set('X-Forwarded-Host', 'localhost:8080');
+
+        $this->assertSame('localhost:8080', $request->getHttpHost());
+        $this->assertSame(8080, $request->getPort());
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host="[::1]:443"');
+        $request->headers->set('X-Forwarded-Host', '[::1]:443');
+        $request->headers->set('X-Forwarded-Port', 443);
+
+        $this->assertSame('[::1]:443', $request->getHttpHost());
+        $this->assertSame(443, $request->getPort());
+    }
+
+    public function testTrustedPort()
+    {
+        Request::setTrustedProxies(['1.1.1.1'], -1);
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host=localhost:8080');
+        $request->headers->set('X-Forwarded-Port', 8080);
+
+        $this->assertSame(8080, $request->getPort());
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host=localhost');
+        $request->headers->set('X-Forwarded-Port', 80);
+
+        $this->assertSame(80, $request->getPort());
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host="[::1]"');
+        $request->headers->set('X-Forwarded-Proto', 'https');
+        $request->headers->set('X-Forwarded-Port', 443);
+
+        $this->assertSame(443, $request->getPort());
+    }
+
+    public function testTrustedPortDoesNotDefaultToZero()
+    {
+        Request::setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_ALL);
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('X-Forwarded-Host', 'test.example.com');
+        $request->headers->set('X-Forwarded-Port', '');
+
+        $this->assertSame(80, $request->getPort());
+    }
+}
+
+class RequestContentProxy extends Request
+{
+    public function getContent($asResource = false)
+    {
+        return http_build_query(['_method' => 'PUT', 'content' => 'mycontent'], '', '&');
+    }
+}
+
+class NewRequest extends Request
+{
+    public function getFoo()
+    {
+        return 'foo';
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/ResponseFunctionalTest.php b/lib/symfony/http-foundation/Tests/ResponseFunctionalTest.php
new file mode 100644
index 000000000..3d3e696c7
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/ResponseFunctionalTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @requires PHP 7.0
+ */
+class ResponseFunctionalTest extends TestCase
+{
+    private static $server;
+
+    public static function setUpBeforeClass()
+    {
+        $spec = [
+            1 => ['file', '/dev/null', 'w'],
+            2 => ['file', '/dev/null', 'w'],
+        ];
+        if (!self::$server = @proc_open('exec php -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/response-functional')) {
+            self::markTestSkipped('PHP server unable to start.');
+        }
+        sleep(1);
+    }
+
+    public static function tearDownAfterClass()
+    {
+        if (self::$server) {
+            proc_terminate(self::$server);
+            proc_close(self::$server);
+        }
+    }
+
+    /**
+     * @dataProvider provideCookie
+     */
+    public function testCookie($fixture)
+    {
+        $result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture));
+        $this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result);
+    }
+
+    public function provideCookie()
+    {
+        foreach (glob(__DIR__.'/Fixtures/response-functional/*.php') as $file) {
+            yield [pathinfo($file, PATHINFO_FILENAME)];
+        }
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/ResponseHeaderBagTest.php b/lib/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
new file mode 100644
index 000000000..d85f6e112
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
@@ -0,0 +1,359 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+
+/**
+ * @group time-sensitive
+ */
+class ResponseHeaderBagTest extends TestCase
+{
+    public function testAllPreserveCase()
+    {
+        $headers = [
+            'fOo' => 'BAR',
+            'ETag' => 'xyzzy',
+            'Content-MD5' => 'Q2hlY2sgSW50ZWdyaXR5IQ==',
+            'P3P' => 'CP="CAO PSA OUR"',
+            'WWW-Authenticate' => 'Basic realm="WallyWorld"',
+            'X-UA-Compatible' => 'IE=edge,chrome=1',
+            'X-XSS-Protection' => '1; mode=block',
+        ];
+
+        $bag = new ResponseHeaderBag($headers);
+        $allPreservedCase = $bag->allPreserveCase();
+
+        foreach (array_keys($headers) as $headerName) {
+            $this->assertArrayHasKey($headerName, $allPreservedCase, '->allPreserveCase() gets all input keys in original case');
+        }
+    }
+
+    public function testCacheControlHeader()
+    {
+        $bag = new ResponseHeaderBag([]);
+        $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
+        $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
+
+        $bag = new ResponseHeaderBag(['Cache-Control' => 'public']);
+        $this->assertEquals('public', $bag->get('Cache-Control'));
+        $this->assertTrue($bag->hasCacheControlDirective('public'));
+
+        $bag = new ResponseHeaderBag(['ETag' => 'abcde']);
+        $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
+        $this->assertTrue($bag->hasCacheControlDirective('private'));
+        $this->assertTrue($bag->hasCacheControlDirective('must-revalidate'));
+        $this->assertFalse($bag->hasCacheControlDirective('max-age'));
+
+        $bag = new ResponseHeaderBag(['Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT']);
+        $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag([
+            'Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT',
+            'Cache-Control' => 'max-age=3600',
+        ]);
+        $this->assertEquals('max-age=3600, private', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag(['Last-Modified' => 'abcde']);
+        $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag(['Etag' => 'abcde', 'Last-Modified' => 'abcde']);
+        $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag(['cache-control' => 'max-age=100']);
+        $this->assertEquals('max-age=100, private', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag(['cache-control' => 's-maxage=100']);
+        $this->assertEquals('s-maxage=100', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag(['cache-control' => 'private, max-age=100']);
+        $this->assertEquals('max-age=100, private', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag(['cache-control' => 'public, max-age=100']);
+        $this->assertEquals('max-age=100, public', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag();
+        $bag->set('Last-Modified', 'abcde');
+        $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag();
+        $bag->set('Cache-Control', ['public', 'must-revalidate']);
+        $this->assertCount(1, $bag->get('Cache-Control', null, false));
+        $this->assertEquals('must-revalidate, public', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag();
+        $bag->set('Cache-Control', 'public');
+        $bag->set('Cache-Control', 'must-revalidate', false);
+        $this->assertCount(1, $bag->get('Cache-Control', null, false));
+        $this->assertEquals('must-revalidate, public', $bag->get('Cache-Control'));
+    }
+
+    public function testCacheControlClone()
+    {
+        $headers = ['foo' => 'bar'];
+        $bag1 = new ResponseHeaderBag($headers);
+        $bag2 = new ResponseHeaderBag($bag1->allPreserveCase());
+        $this->assertEquals($bag1->allPreserveCase(), $bag2->allPreserveCase());
+    }
+
+    public function testToStringIncludesCookieHeaders()
+    {
+        $bag = new ResponseHeaderBag([]);
+        $bag->setCookie(new Cookie('foo', 'bar'));
+
+        $this->assertSetCookieHeader('foo=bar; path=/; httponly', $bag);
+
+        $bag->clearCookie('foo');
+
+        $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0; path=/; httponly', $bag);
+    }
+
+    public function testClearCookieSecureNotHttpOnly()
+    {
+        $bag = new ResponseHeaderBag([]);
+
+        $bag->clearCookie('foo', '/', null, true, false);
+
+        $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0; path=/; secure', $bag);
+    }
+
+    public function testReplace()
+    {
+        $bag = new ResponseHeaderBag([]);
+        $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
+        $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
+
+        $bag->replace(['Cache-Control' => 'public']);
+        $this->assertEquals('public', $bag->get('Cache-Control'));
+        $this->assertTrue($bag->hasCacheControlDirective('public'));
+    }
+
+    public function testReplaceWithRemove()
+    {
+        $bag = new ResponseHeaderBag([]);
+        $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
+        $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
+
+        $bag->remove('Cache-Control');
+        $bag->replace([]);
+        $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
+        $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
+    }
+
+    public function testCookiesWithSameNames()
+    {
+        $bag = new ResponseHeaderBag();
+        $bag->setCookie(new Cookie('foo', 'bar', 0, '/path/foo', 'foo.bar'));
+        $bag->setCookie(new Cookie('foo', 'bar', 0, '/path/bar', 'foo.bar'));
+        $bag->setCookie(new Cookie('foo', 'bar', 0, '/path/bar', 'bar.foo'));
+        $bag->setCookie(new Cookie('foo', 'bar'));
+
+        $this->assertCount(4, $bag->getCookies());
+        $this->assertEquals('foo=bar; path=/path/foo; domain=foo.bar; httponly', $bag->get('set-cookie'));
+        $this->assertEquals([
+            'foo=bar; path=/path/foo; domain=foo.bar; httponly',
+            'foo=bar; path=/path/bar; domain=foo.bar; httponly',
+            'foo=bar; path=/path/bar; domain=bar.foo; httponly',
+            'foo=bar; path=/; httponly',
+        ], $bag->get('set-cookie', null, false));
+
+        $this->assertSetCookieHeader('foo=bar; path=/path/foo; domain=foo.bar; httponly', $bag);
+        $this->assertSetCookieHeader('foo=bar; path=/path/bar; domain=foo.bar; httponly', $bag);
+        $this->assertSetCookieHeader('foo=bar; path=/path/bar; domain=bar.foo; httponly', $bag);
+        $this->assertSetCookieHeader('foo=bar; path=/; httponly', $bag);
+
+        $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY);
+
+        $this->assertArrayHasKey('foo', $cookies['foo.bar']['/path/foo']);
+        $this->assertArrayHasKey('foo', $cookies['foo.bar']['/path/bar']);
+        $this->assertArrayHasKey('foo', $cookies['bar.foo']['/path/bar']);
+        $this->assertArrayHasKey('foo', $cookies['']['/']);
+    }
+
+    public function testRemoveCookie()
+    {
+        $bag = new ResponseHeaderBag();
+        $this->assertFalse($bag->has('set-cookie'));
+
+        $bag->setCookie(new Cookie('foo', 'bar', 0, '/path/foo', 'foo.bar'));
+        $bag->setCookie(new Cookie('bar', 'foo', 0, '/path/bar', 'foo.bar'));
+        $this->assertTrue($bag->has('set-cookie'));
+
+        $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY);
+        $this->assertArrayHasKey('/path/foo', $cookies['foo.bar']);
+
+        $bag->removeCookie('foo', '/path/foo', 'foo.bar');
+        $this->assertTrue($bag->has('set-cookie'));
+
+        $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY);
+        $this->assertArrayNotHasKey('/path/foo', $cookies['foo.bar']);
+
+        $bag->removeCookie('bar', '/path/bar', 'foo.bar');
+        $this->assertFalse($bag->has('set-cookie'));
+
+        $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY);
+        $this->assertArrayNotHasKey('foo.bar', $cookies);
+    }
+
+    public function testRemoveCookieWithNullRemove()
+    {
+        $bag = new ResponseHeaderBag();
+        $bag->setCookie(new Cookie('foo', 'bar', 0));
+        $bag->setCookie(new Cookie('bar', 'foo', 0));
+
+        $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY);
+        $this->assertArrayHasKey('/', $cookies['']);
+
+        $bag->removeCookie('foo', null);
+        $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY);
+        $this->assertArrayNotHasKey('foo', $cookies['']['/']);
+
+        $bag->removeCookie('bar', null);
+        $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY);
+        $this->assertFalse(isset($cookies['']['/']['bar']));
+    }
+
+    public function testSetCookieHeader()
+    {
+        $bag = new ResponseHeaderBag();
+        $bag->set('set-cookie', 'foo=bar');
+        $this->assertEquals([new Cookie('foo', 'bar', 0, '/', null, false, false, true)], $bag->getCookies());
+
+        $bag->set('set-cookie', 'foo2=bar2', false);
+        $this->assertEquals([
+            new Cookie('foo', 'bar', 0, '/', null, false, false, true),
+            new Cookie('foo2', 'bar2', 0, '/', null, false, false, true),
+        ], $bag->getCookies());
+
+        $bag->remove('set-cookie');
+        $this->assertEquals([], $bag->getCookies());
+    }
+
+    public function testGetCookiesWithInvalidArgument()
+    {
+        $this->expectException('InvalidArgumentException');
+        $bag = new ResponseHeaderBag();
+
+        $bag->getCookies('invalid_argument');
+    }
+
+    public function testMakeDispositionInvalidDisposition()
+    {
+        $this->expectException('InvalidArgumentException');
+        $headers = new ResponseHeaderBag();
+
+        $headers->makeDisposition('invalid', 'foo.html');
+    }
+
+    /**
+     * @dataProvider provideMakeDisposition
+     */
+    public function testMakeDisposition($disposition, $filename, $filenameFallback, $expected)
+    {
+        $headers = new ResponseHeaderBag();
+
+        $this->assertEquals($expected, $headers->makeDisposition($disposition, $filename, $filenameFallback));
+    }
+
+    public function testToStringDoesntMessUpHeaders()
+    {
+        $headers = new ResponseHeaderBag();
+
+        $headers->set('Location', 'http://www.symfony.com');
+        $headers->set('Content-type', 'text/html');
+
+        (string) $headers;
+
+        $allHeaders = $headers->allPreserveCase();
+        $this->assertEquals(['http://www.symfony.com'], $allHeaders['Location']);
+        $this->assertEquals(['text/html'], $allHeaders['Content-type']);
+    }
+
+    public function provideMakeDisposition()
+    {
+        return [
+            ['attachment', 'foo.html', 'foo.html', 'attachment; filename="foo.html"'],
+            ['attachment', 'foo.html', '', 'attachment; filename="foo.html"'],
+            ['attachment', 'foo bar.html', '', 'attachment; filename="foo bar.html"'],
+            ['attachment', 'foo "bar".html', '', 'attachment; filename="foo \\"bar\\".html"'],
+            ['attachment', 'foo%20bar.html', 'foo bar.html', 'attachment; filename="foo bar.html"; filename*=utf-8\'\'foo%2520bar.html'],
+            ['attachment', 'föö.html', 'foo.html', 'attachment; filename="foo.html"; filename*=utf-8\'\'f%C3%B6%C3%B6.html'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideMakeDispositionFail
+     */
+    public function testMakeDispositionFail($disposition, $filename)
+    {
+        $this->expectException('InvalidArgumentException');
+        $headers = new ResponseHeaderBag();
+
+        $headers->makeDisposition($disposition, $filename);
+    }
+
+    public function provideMakeDispositionFail()
+    {
+        return [
+            ['attachment', 'foo%20bar.html'],
+            ['attachment', 'foo/bar.html'],
+            ['attachment', '/foo.html'],
+            ['attachment', 'foo\bar.html'],
+            ['attachment', '\foo.html'],
+            ['attachment', 'föö.html'],
+        ];
+    }
+
+    public function testDateHeaderAddedOnCreation()
+    {
+        $now = time();
+
+        $bag = new ResponseHeaderBag();
+        $this->assertTrue($bag->has('Date'));
+
+        $this->assertEquals($now, $bag->getDate('Date')->getTimestamp());
+    }
+
+    public function testDateHeaderCanBeSetOnCreation()
+    {
+        $someDate = 'Thu, 23 Mar 2017 09:15:12 GMT';
+        $bag = new ResponseHeaderBag(['Date' => $someDate]);
+
+        $this->assertEquals($someDate, $bag->get('Date'));
+    }
+
+    public function testDateHeaderWillBeRecreatedWhenRemoved()
+    {
+        $someDate = 'Thu, 23 Mar 2017 09:15:12 GMT';
+        $bag = new ResponseHeaderBag(['Date' => $someDate]);
+        $bag->remove('Date');
+
+        // a (new) Date header is still present
+        $this->assertTrue($bag->has('Date'));
+        $this->assertNotEquals($someDate, $bag->get('Date'));
+    }
+
+    public function testDateHeaderWillBeRecreatedWhenHeadersAreReplaced()
+    {
+        $bag = new ResponseHeaderBag();
+        $bag->replace([]);
+
+        $this->assertTrue($bag->has('Date'));
+    }
+
+    private function assertSetCookieHeader($expected, ResponseHeaderBag $actual)
+    {
+        $this->assertRegExp('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/ResponseTest.php b/lib/symfony/http-foundation/Tests/ResponseTest.php
new file mode 100644
index 000000000..b846cdad3
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/ResponseTest.php
@@ -0,0 +1,1008 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * @group time-sensitive
+ */
+class ResponseTest extends ResponseTestCase
+{
+    public function testCreate()
+    {
+        $response = Response::create('foo', 301, ['Foo' => 'bar']);
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
+        $this->assertEquals(301, $response->getStatusCode());
+        $this->assertEquals('bar', $response->headers->get('foo'));
+    }
+
+    public function testToString()
+    {
+        $response = new Response();
+        $response = explode("\r\n", $response);
+        $this->assertEquals('HTTP/1.0 200 OK', $response[0]);
+        $this->assertEquals('Cache-Control: no-cache, private', $response[1]);
+    }
+
+    public function testClone()
+    {
+        $response = new Response();
+        $responseClone = clone $response;
+        $this->assertEquals($response, $responseClone);
+    }
+
+    public function testSendHeaders()
+    {
+        $response = new Response();
+        $headers = $response->sendHeaders();
+        $this->assertObjectHasAttribute('headers', $headers);
+        $this->assertObjectHasAttribute('content', $headers);
+        $this->assertObjectHasAttribute('version', $headers);
+        $this->assertObjectHasAttribute('statusCode', $headers);
+        $this->assertObjectHasAttribute('statusText', $headers);
+        $this->assertObjectHasAttribute('charset', $headers);
+    }
+
+    public function testSend()
+    {
+        $response = new Response();
+        $responseSend = $response->send();
+        $this->assertObjectHasAttribute('headers', $responseSend);
+        $this->assertObjectHasAttribute('content', $responseSend);
+        $this->assertObjectHasAttribute('version', $responseSend);
+        $this->assertObjectHasAttribute('statusCode', $responseSend);
+        $this->assertObjectHasAttribute('statusText', $responseSend);
+        $this->assertObjectHasAttribute('charset', $responseSend);
+    }
+
+    public function testGetCharset()
+    {
+        $response = new Response();
+        $charsetOrigin = 'UTF-8';
+        $response->setCharset($charsetOrigin);
+        $charset = $response->getCharset();
+        $this->assertEquals($charsetOrigin, $charset);
+    }
+
+    public function testIsCacheable()
+    {
+        $response = new Response();
+        $this->assertFalse($response->isCacheable());
+    }
+
+    public function testIsCacheableWithErrorCode()
+    {
+        $response = new Response('', 500);
+        $this->assertFalse($response->isCacheable());
+    }
+
+    public function testIsCacheableWithNoStoreDirective()
+    {
+        $response = new Response();
+        $response->headers->set('cache-control', 'private');
+        $this->assertFalse($response->isCacheable());
+    }
+
+    public function testIsCacheableWithSetTtl()
+    {
+        $response = new Response();
+        $response->setTtl(10);
+        $this->assertTrue($response->isCacheable());
+    }
+
+    public function testMustRevalidate()
+    {
+        $response = new Response();
+        $this->assertFalse($response->mustRevalidate());
+    }
+
+    public function testMustRevalidateWithMustRevalidateCacheControlHeader()
+    {
+        $response = new Response();
+        $response->headers->set('cache-control', 'must-revalidate');
+
+        $this->assertTrue($response->mustRevalidate());
+    }
+
+    public function testMustRevalidateWithProxyRevalidateCacheControlHeader()
+    {
+        $response = new Response();
+        $response->headers->set('cache-control', 'proxy-revalidate');
+
+        $this->assertTrue($response->mustRevalidate());
+    }
+
+    public function testSetNotModified()
+    {
+        $response = new Response('foo');
+        $modified = $response->setNotModified();
+        $this->assertObjectHasAttribute('headers', $modified);
+        $this->assertObjectHasAttribute('content', $modified);
+        $this->assertObjectHasAttribute('version', $modified);
+        $this->assertObjectHasAttribute('statusCode', $modified);
+        $this->assertObjectHasAttribute('statusText', $modified);
+        $this->assertObjectHasAttribute('charset', $modified);
+        $this->assertEquals(304, $modified->getStatusCode());
+
+        ob_start();
+        $modified->sendContent();
+        $string = ob_get_clean();
+        $this->assertEmpty($string);
+    }
+
+    public function testIsSuccessful()
+    {
+        $response = new Response();
+        $this->assertTrue($response->isSuccessful());
+    }
+
+    public function testIsNotModified()
+    {
+        $response = new Response();
+        $modified = $response->isNotModified(new Request());
+        $this->assertFalse($modified);
+    }
+
+    public function testIsNotModifiedNotSafe()
+    {
+        $request = Request::create('/homepage', 'POST');
+
+        $response = new Response();
+        $this->assertFalse($response->isNotModified($request));
+    }
+
+    public function testIsNotModifiedLastModified()
+    {
+        $before = 'Sun, 25 Aug 2013 18:32:31 GMT';
+        $modified = 'Sun, 25 Aug 2013 18:33:31 GMT';
+        $after = 'Sun, 25 Aug 2013 19:33:31 GMT';
+
+        $request = new Request();
+        $request->headers->set('If-Modified-Since', $modified);
+
+        $response = new Response();
+
+        $response->headers->set('Last-Modified', $modified);
+        $this->assertTrue($response->isNotModified($request));
+
+        $response->headers->set('Last-Modified', $before);
+        $this->assertTrue($response->isNotModified($request));
+
+        $response->headers->set('Last-Modified', $after);
+        $this->assertFalse($response->isNotModified($request));
+
+        $response->headers->set('Last-Modified', '');
+        $this->assertFalse($response->isNotModified($request));
+    }
+
+    public function testIsNotModifiedEtag()
+    {
+        $etagOne = 'randomly_generated_etag';
+        $etagTwo = 'randomly_generated_etag_2';
+
+        $request = new Request();
+        $request->headers->set('if_none_match', sprintf('%s, %s, %s', $etagOne, $etagTwo, 'etagThree'));
+
+        $response = new Response();
+
+        $response->headers->set('ETag', $etagOne);
+        $this->assertTrue($response->isNotModified($request));
+
+        $response->headers->set('ETag', $etagTwo);
+        $this->assertTrue($response->isNotModified($request));
+
+        $response->headers->set('ETag', '');
+        $this->assertFalse($response->isNotModified($request));
+    }
+
+    public function testIsNotModifiedLastModifiedAndEtag()
+    {
+        $before = 'Sun, 25 Aug 2013 18:32:31 GMT';
+        $modified = 'Sun, 25 Aug 2013 18:33:31 GMT';
+        $after = 'Sun, 25 Aug 2013 19:33:31 GMT';
+        $etag = 'randomly_generated_etag';
+
+        $request = new Request();
+        $request->headers->set('if_none_match', sprintf('%s, %s', $etag, 'etagThree'));
+        $request->headers->set('If-Modified-Since', $modified);
+
+        $response = new Response();
+
+        $response->headers->set('ETag', $etag);
+        $response->headers->set('Last-Modified', $after);
+        $this->assertFalse($response->isNotModified($request));
+
+        $response->headers->set('ETag', 'non-existent-etag');
+        $response->headers->set('Last-Modified', $before);
+        $this->assertFalse($response->isNotModified($request));
+
+        $response->headers->set('ETag', $etag);
+        $response->headers->set('Last-Modified', $modified);
+        $this->assertTrue($response->isNotModified($request));
+    }
+
+    public function testIsNotModifiedIfModifiedSinceAndEtagWithoutLastModified()
+    {
+        $modified = 'Sun, 25 Aug 2013 18:33:31 GMT';
+        $etag = 'randomly_generated_etag';
+
+        $request = new Request();
+        $request->headers->set('if_none_match', sprintf('%s, %s', $etag, 'etagThree'));
+        $request->headers->set('If-Modified-Since', $modified);
+
+        $response = new Response();
+
+        $response->headers->set('ETag', $etag);
+        $this->assertTrue($response->isNotModified($request));
+
+        $response->headers->set('ETag', 'non-existent-etag');
+        $this->assertFalse($response->isNotModified($request));
+    }
+
+    public function testIsValidateable()
+    {
+        $response = new Response('', 200, ['Last-Modified' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)]);
+        $this->assertTrue($response->isValidateable(), '->isValidateable() returns true if Last-Modified is present');
+
+        $response = new Response('', 200, ['ETag' => '"12345"']);
+        $this->assertTrue($response->isValidateable(), '->isValidateable() returns true if ETag is present');
+
+        $response = new Response();
+        $this->assertFalse($response->isValidateable(), '->isValidateable() returns false when no validator is present');
+    }
+
+    public function testGetDate()
+    {
+        $oneHourAgo = $this->createDateTimeOneHourAgo();
+        $response = new Response('', 200, ['Date' => $oneHourAgo->format(DATE_RFC2822)]);
+        $date = $response->getDate();
+        $this->assertEquals($oneHourAgo->getTimestamp(), $date->getTimestamp(), '->getDate() returns the Date header if present');
+
+        $response = new Response();
+        $date = $response->getDate();
+        $this->assertEquals(time(), $date->getTimestamp(), '->getDate() returns the current Date if no Date header present');
+
+        $response = new Response('', 200, ['Date' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)]);
+        $now = $this->createDateTimeNow();
+        $response->headers->set('Date', $now->format(DATE_RFC2822));
+        $date = $response->getDate();
+        $this->assertEquals($now->getTimestamp(), $date->getTimestamp(), '->getDate() returns the date when the header has been modified');
+
+        $response = new Response('', 200);
+        $now = $this->createDateTimeNow();
+        $response->headers->remove('Date');
+        $date = $response->getDate();
+        $this->assertEquals($now->getTimestamp(), $date->getTimestamp(), '->getDate() returns the current Date when the header has previously been removed');
+    }
+
+    public function testGetMaxAge()
+    {
+        $response = new Response();
+        $response->headers->set('Cache-Control', 's-maxage=600, max-age=0');
+        $this->assertEquals(600, $response->getMaxAge(), '->getMaxAge() uses s-maxage cache control directive when present');
+
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'max-age=600');
+        $this->assertEquals(600, $response->getMaxAge(), '->getMaxAge() falls back to max-age when no s-maxage directive present');
+
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'must-revalidate');
+        $response->headers->set('Expires', $this->createDateTimeOneHourLater()->format(DATE_RFC2822));
+        $this->assertEquals(3600, $response->getMaxAge(), '->getMaxAge() falls back to Expires when no max-age or s-maxage directive present');
+
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'must-revalidate');
+        $response->headers->set('Expires', -1);
+        $this->assertEquals('Sat, 01 Jan 00 00:00:00 +0000', $response->getExpires()->format(DATE_RFC822));
+
+        $response = new Response();
+        $this->assertNull($response->getMaxAge(), '->getMaxAge() returns null if no freshness information available');
+    }
+
+    public function testSetSharedMaxAge()
+    {
+        $response = new Response();
+        $response->setSharedMaxAge(20);
+
+        $cacheControl = $response->headers->get('Cache-Control');
+        $this->assertEquals('public, s-maxage=20', $cacheControl);
+    }
+
+    public function testIsPrivate()
+    {
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'max-age=100');
+        $response->setPrivate();
+        $this->assertEquals(100, $response->headers->getCacheControlDirective('max-age'), '->isPrivate() adds the private Cache-Control directive when set to true');
+        $this->assertTrue($response->headers->getCacheControlDirective('private'), '->isPrivate() adds the private Cache-Control directive when set to true');
+
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'public, max-age=100');
+        $response->setPrivate();
+        $this->assertEquals(100, $response->headers->getCacheControlDirective('max-age'), '->isPrivate() adds the private Cache-Control directive when set to true');
+        $this->assertTrue($response->headers->getCacheControlDirective('private'), '->isPrivate() adds the private Cache-Control directive when set to true');
+        $this->assertFalse($response->headers->hasCacheControlDirective('public'), '->isPrivate() removes the public Cache-Control directive');
+    }
+
+    public function testExpire()
+    {
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'max-age=100');
+        $response->expire();
+        $this->assertEquals(100, $response->headers->get('Age'), '->expire() sets the Age to max-age when present');
+
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'max-age=100, s-maxage=500');
+        $response->expire();
+        $this->assertEquals(500, $response->headers->get('Age'), '->expire() sets the Age to s-maxage when both max-age and s-maxage are present');
+
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'max-age=5, s-maxage=500');
+        $response->headers->set('Age', '1000');
+        $response->expire();
+        $this->assertEquals(1000, $response->headers->get('Age'), '->expire() does nothing when the response is already stale/expired');
+
+        $response = new Response();
+        $response->expire();
+        $this->assertFalse($response->headers->has('Age'), '->expire() does nothing when the response does not include freshness information');
+
+        $response = new Response();
+        $response->headers->set('Expires', -1);
+        $response->expire();
+        $this->assertNull($response->headers->get('Age'), '->expire() does not set the Age when the response is expired');
+
+        $response = new Response();
+        $response->headers->set('Expires', date(DATE_RFC2822, time() + 600));
+        $response->expire();
+        $this->assertNull($response->headers->get('Expires'), '->expire() removes the Expires header when the response is fresh');
+    }
+
+    public function testNullExpireHeader()
+    {
+        $response = new Response(null, 200, ['Expires' => null]);
+        $this->assertNull($response->getExpires());
+    }
+
+    public function testGetTtl()
+    {
+        $response = new Response();
+        $this->assertNull($response->getTtl(), '->getTtl() returns null when no Expires or Cache-Control headers are present');
+
+        $response = new Response();
+        $response->headers->set('Expires', $this->createDateTimeOneHourLater()->format(DATE_RFC2822));
+        $this->assertEquals(3600, $response->getTtl(), '->getTtl() uses the Expires header when no max-age is present');
+
+        $response = new Response();
+        $response->headers->set('Expires', $this->createDateTimeOneHourAgo()->format(DATE_RFC2822));
+        $this->assertLessThan(0, $response->getTtl(), '->getTtl() returns negative values when Expires is in past');
+
+        $response = new Response();
+        $response->headers->set('Expires', $response->getDate()->format(DATE_RFC2822));
+        $response->headers->set('Age', 0);
+        $this->assertSame(0, $response->getTtl(), '->getTtl() correctly handles zero');
+
+        $response = new Response();
+        $response->headers->set('Cache-Control', 'max-age=60');
+        $this->assertEquals(60, $response->getTtl(), '->getTtl() uses Cache-Control max-age when present');
+    }
+
+    public function testSetClientTtl()
+    {
+        $response = new Response();
+        $response->setClientTtl(10);
+
+        $this->assertEquals($response->getMaxAge(), $response->getAge() + 10);
+    }
+
+    public function testGetSetProtocolVersion()
+    {
+        $response = new Response();
+
+        $this->assertEquals('1.0', $response->getProtocolVersion());
+
+        $response->setProtocolVersion('1.1');
+
+        $this->assertEquals('1.1', $response->getProtocolVersion());
+    }
+
+    public function testGetVary()
+    {
+        $response = new Response();
+        $this->assertEquals([], $response->getVary(), '->getVary() returns an empty array if no Vary header is present');
+
+        $response = new Response();
+        $response->headers->set('Vary', 'Accept-Language');
+        $this->assertEquals(['Accept-Language'], $response->getVary(), '->getVary() parses a single header name value');
+
+        $response = new Response();
+        $response->headers->set('Vary', 'Accept-Language User-Agent    X-Foo');
+        $this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->getVary() parses multiple header name values separated by spaces');
+
+        $response = new Response();
+        $response->headers->set('Vary', 'Accept-Language,User-Agent,    X-Foo');
+        $this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->getVary() parses multiple header name values separated by commas');
+
+        $vary = ['Accept-Language', 'User-Agent', 'X-foo'];
+
+        $response = new Response();
+        $response->headers->set('Vary', $vary);
+        $this->assertEquals($vary, $response->getVary(), '->getVary() parses multiple header name values in arrays');
+
+        $response = new Response();
+        $response->headers->set('Vary', 'Accept-Language, User-Agent, X-foo');
+        $this->assertEquals($vary, $response->getVary(), '->getVary() parses multiple header name values in arrays');
+    }
+
+    public function testSetVary()
+    {
+        $response = new Response();
+        $response->setVary('Accept-Language');
+        $this->assertEquals(['Accept-Language'], $response->getVary());
+
+        $response->setVary('Accept-Language, User-Agent');
+        $this->assertEquals(['Accept-Language', 'User-Agent'], $response->getVary(), '->setVary() replace the vary header by default');
+
+        $response->setVary('X-Foo', false);
+        $this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
+    }
+
+    public function testDefaultContentType()
+    {
+        $headerMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->setMethods(['set'])->getMock();
+        $headerMock->expects($this->at(0))
+            ->method('set')
+            ->with('Content-Type', 'text/html');
+        $headerMock->expects($this->at(1))
+            ->method('set')
+            ->with('Content-Type', 'text/html; charset=UTF-8');
+
+        $response = new Response('foo');
+        $response->headers = $headerMock;
+
+        $response->prepare(new Request());
+    }
+
+    public function testContentTypeCharset()
+    {
+        $response = new Response();
+        $response->headers->set('Content-Type', 'text/css');
+
+        // force fixContentType() to be called
+        $response->prepare(new Request());
+
+        $this->assertEquals('text/css; charset=UTF-8', $response->headers->get('Content-Type'));
+    }
+
+    public function testPrepareDoesNothingIfContentTypeIsSet()
+    {
+        $response = new Response('foo');
+        $response->headers->set('Content-Type', 'text/plain');
+
+        $response->prepare(new Request());
+
+        $this->assertEquals('text/plain; charset=UTF-8', $response->headers->get('content-type'));
+    }
+
+    public function testPrepareDoesNothingIfRequestFormatIsNotDefined()
+    {
+        $response = new Response('foo');
+
+        $response->prepare(new Request());
+
+        $this->assertEquals('text/html; charset=UTF-8', $response->headers->get('content-type'));
+    }
+
+    public function testPrepareSetContentType()
+    {
+        $response = new Response('foo');
+        $request = Request::create('/');
+        $request->setRequestFormat('json');
+
+        $response->prepare($request);
+
+        $this->assertEquals('application/json', $response->headers->get('content-type'));
+    }
+
+    public function testPrepareRemovesContentForHeadRequests()
+    {
+        $response = new Response('foo');
+        $request = Request::create('/', 'HEAD');
+
+        $length = 12345;
+        $response->headers->set('Content-Length', $length);
+        $response->prepare($request);
+
+        $this->assertEquals('', $response->getContent());
+        $this->assertEquals($length, $response->headers->get('Content-Length'), 'Content-Length should be as if it was GET; see RFC2616 14.13');
+    }
+
+    public function testPrepareRemovesContentForInformationalResponse()
+    {
+        $response = new Response('foo');
+        $request = Request::create('/');
+
+        $response->setContent('content');
+        $response->setStatusCode(101);
+        $response->prepare($request);
+        $this->assertEquals('', $response->getContent());
+        $this->assertFalse($response->headers->has('Content-Type'));
+
+        $response->setContent('content');
+        $response->setStatusCode(304);
+        $response->prepare($request);
+        $this->assertEquals('', $response->getContent());
+        $this->assertFalse($response->headers->has('Content-Type'));
+        $this->assertFalse($response->headers->has('Content-Length'));
+    }
+
+    public function testPrepareRemovesContentLength()
+    {
+        $response = new Response('foo');
+        $request = Request::create('/');
+
+        $response->headers->set('Content-Length', 12345);
+        $response->prepare($request);
+        $this->assertEquals(12345, $response->headers->get('Content-Length'));
+
+        $response->headers->set('Transfer-Encoding', 'chunked');
+        $response->prepare($request);
+        $this->assertFalse($response->headers->has('Content-Length'));
+    }
+
+    public function testPrepareSetsPragmaOnHttp10Only()
+    {
+        $request = Request::create('/', 'GET');
+        $request->server->set('SERVER_PROTOCOL', 'HTTP/1.0');
+
+        $response = new Response('foo');
+        $response->prepare($request);
+        $this->assertEquals('no-cache', $response->headers->get('pragma'));
+        $this->assertEquals('-1', $response->headers->get('expires'));
+
+        $request->server->set('SERVER_PROTOCOL', 'HTTP/1.1');
+        $response = new Response('foo');
+        $response->prepare($request);
+        $this->assertFalse($response->headers->has('pragma'));
+        $this->assertFalse($response->headers->has('expires'));
+    }
+
+    public function testSetCache()
+    {
+        $response = new Response();
+        // ['etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public']
+        try {
+            $response->setCache(['wrong option' => 'value']);
+            $this->fail('->setCache() throws an InvalidArgumentException if an option is not supported');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('InvalidArgumentException', $e, '->setCache() throws an InvalidArgumentException if an option is not supported');
+            $this->assertStringContainsString('"wrong option"', $e->getMessage());
+        }
+
+        $options = ['etag' => '"whatever"'];
+        $response->setCache($options);
+        $this->assertEquals($response->getEtag(), '"whatever"');
+
+        $now = $this->createDateTimeNow();
+        $options = ['last_modified' => $now];
+        $response->setCache($options);
+        $this->assertEquals($response->getLastModified()->getTimestamp(), $now->getTimestamp());
+
+        $options = ['max_age' => 100];
+        $response->setCache($options);
+        $this->assertEquals($response->getMaxAge(), 100);
+
+        $options = ['s_maxage' => 200];
+        $response->setCache($options);
+        $this->assertEquals($response->getMaxAge(), 200);
+
+        $this->assertTrue($response->headers->hasCacheControlDirective('public'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+
+        $response->setCache(['public' => true]);
+        $this->assertTrue($response->headers->hasCacheControlDirective('public'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+
+        $response->setCache(['public' => false]);
+        $this->assertFalse($response->headers->hasCacheControlDirective('public'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('private'));
+
+        $response->setCache(['private' => true]);
+        $this->assertFalse($response->headers->hasCacheControlDirective('public'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('private'));
+
+        $response->setCache(['private' => false]);
+        $this->assertTrue($response->headers->hasCacheControlDirective('public'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+
+        $response->setCache(['immutable' => true]);
+        $this->assertTrue($response->headers->hasCacheControlDirective('immutable'));
+
+        $response->setCache(['immutable' => false]);
+        $this->assertFalse($response->headers->hasCacheControlDirective('immutable'));
+    }
+
+    public function testSendContent()
+    {
+        $response = new Response('test response rendering', 200);
+
+        ob_start();
+        $response->sendContent();
+        $string = ob_get_clean();
+        $this->assertStringContainsString('test response rendering', $string);
+    }
+
+    public function testSetPublic()
+    {
+        $response = new Response();
+        $response->setPublic();
+
+        $this->assertTrue($response->headers->hasCacheControlDirective('public'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+    }
+
+    public function testSetImmutable()
+    {
+        $response = new Response();
+        $response->setImmutable();
+
+        $this->assertTrue($response->headers->hasCacheControlDirective('immutable'));
+    }
+
+    public function testIsImmutable()
+    {
+        $response = new Response();
+        $response->setImmutable();
+
+        $this->assertTrue($response->isImmutable());
+    }
+
+    public function testSetExpires()
+    {
+        $response = new Response();
+        $response->setExpires(null);
+
+        $this->assertNull($response->getExpires(), '->setExpires() remove the header when passed null');
+
+        $now = $this->createDateTimeNow();
+        $response->setExpires($now);
+
+        $this->assertEquals($response->getExpires()->getTimestamp(), $now->getTimestamp());
+    }
+
+    public function testSetLastModified()
+    {
+        $response = new Response();
+        $response->setLastModified($this->createDateTimeNow());
+        $this->assertNotNull($response->getLastModified());
+
+        $response->setLastModified(null);
+        $this->assertNull($response->getLastModified());
+    }
+
+    public function testIsInvalid()
+    {
+        $response = new Response();
+
+        try {
+            $response->setStatusCode(99);
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertTrue($response->isInvalid());
+        }
+
+        try {
+            $response->setStatusCode(650);
+            $this->fail();
+        } catch (\InvalidArgumentException $e) {
+            $this->assertTrue($response->isInvalid());
+        }
+
+        $response = new Response('', 200);
+        $this->assertFalse($response->isInvalid());
+    }
+
+    /**
+     * @dataProvider getStatusCodeFixtures
+     */
+    public function testSetStatusCode($code, $text, $expectedText)
+    {
+        $response = new Response();
+
+        $response->setStatusCode($code, $text);
+
+        $statusText = new \ReflectionProperty($response, 'statusText');
+        $statusText->setAccessible(true);
+
+        $this->assertEquals($expectedText, $statusText->getValue($response));
+    }
+
+    public function getStatusCodeFixtures()
+    {
+        return [
+            ['200', null, 'OK'],
+            ['200', false, ''],
+            ['200', 'foo', 'foo'],
+            ['199', null, 'unknown status'],
+            ['199', false, ''],
+            ['199', 'foo', 'foo'],
+        ];
+    }
+
+    public function testIsInformational()
+    {
+        $response = new Response('', 100);
+        $this->assertTrue($response->isInformational());
+
+        $response = new Response('', 200);
+        $this->assertFalse($response->isInformational());
+    }
+
+    public function testIsRedirectRedirection()
+    {
+        foreach ([301, 302, 303, 307] as $code) {
+            $response = new Response('', $code);
+            $this->assertTrue($response->isRedirection());
+            $this->assertTrue($response->isRedirect());
+        }
+
+        $response = new Response('', 304);
+        $this->assertTrue($response->isRedirection());
+        $this->assertFalse($response->isRedirect());
+
+        $response = new Response('', 200);
+        $this->assertFalse($response->isRedirection());
+        $this->assertFalse($response->isRedirect());
+
+        $response = new Response('', 404);
+        $this->assertFalse($response->isRedirection());
+        $this->assertFalse($response->isRedirect());
+
+        $response = new Response('', 301, ['Location' => '/good-uri']);
+        $this->assertFalse($response->isRedirect('/bad-uri'));
+        $this->assertTrue($response->isRedirect('/good-uri'));
+    }
+
+    public function testIsNotFound()
+    {
+        $response = new Response('', 404);
+        $this->assertTrue($response->isNotFound());
+
+        $response = new Response('', 200);
+        $this->assertFalse($response->isNotFound());
+    }
+
+    public function testIsEmpty()
+    {
+        foreach ([204, 304] as $code) {
+            $response = new Response('', $code);
+            $this->assertTrue($response->isEmpty());
+        }
+
+        $response = new Response('', 200);
+        $this->assertFalse($response->isEmpty());
+    }
+
+    public function testIsForbidden()
+    {
+        $response = new Response('', 403);
+        $this->assertTrue($response->isForbidden());
+
+        $response = new Response('', 200);
+        $this->assertFalse($response->isForbidden());
+    }
+
+    public function testIsOk()
+    {
+        $response = new Response('', 200);
+        $this->assertTrue($response->isOk());
+
+        $response = new Response('', 404);
+        $this->assertFalse($response->isOk());
+    }
+
+    public function testIsServerOrClientError()
+    {
+        $response = new Response('', 404);
+        $this->assertTrue($response->isClientError());
+        $this->assertFalse($response->isServerError());
+
+        $response = new Response('', 500);
+        $this->assertFalse($response->isClientError());
+        $this->assertTrue($response->isServerError());
+    }
+
+    public function testHasVary()
+    {
+        $response = new Response();
+        $this->assertFalse($response->hasVary());
+
+        $response->setVary('User-Agent');
+        $this->assertTrue($response->hasVary());
+    }
+
+    public function testSetEtag()
+    {
+        $response = new Response('', 200, ['ETag' => '"12345"']);
+        $response->setEtag();
+
+        $this->assertNull($response->headers->get('Etag'), '->setEtag() removes Etags when call with null');
+    }
+
+    /**
+     * @dataProvider validContentProvider
+     */
+    public function testSetContent($content)
+    {
+        $response = new Response();
+        $response->setContent($content);
+        $this->assertEquals((string) $content, $response->getContent());
+    }
+
+    /**
+     * @dataProvider invalidContentProvider
+     */
+    public function testSetContentInvalid($content)
+    {
+        $this->expectException('UnexpectedValueException');
+        $response = new Response();
+        $response->setContent($content);
+    }
+
+    public function testSettersAreChainable()
+    {
+        $response = new Response();
+
+        $setters = [
+            'setProtocolVersion' => '1.0',
+            'setCharset' => 'UTF-8',
+            'setPublic' => null,
+            'setPrivate' => null,
+            'setDate' => $this->createDateTimeNow(),
+            'expire' => null,
+            'setMaxAge' => 1,
+            'setSharedMaxAge' => 1,
+            'setTtl' => 1,
+            'setClientTtl' => 1,
+        ];
+
+        foreach ($setters as $setter => $arg) {
+            $this->assertEquals($response, $response->{$setter}($arg));
+        }
+    }
+
+    public function testNoDeprecationsAreTriggered()
+    {
+        new DefaultResponse();
+        $this->getMockBuilder(Response::class)->getMock();
+
+        // we just need to ensure that subclasses of Response can be created without any deprecations
+        // being triggered if the subclass does not override any final methods
+        $this->addToAssertionCount(1);
+    }
+
+    public function validContentProvider()
+    {
+        return [
+            'obj' => [new StringableObject()],
+            'string' => ['Foo'],
+            'int' => [2],
+        ];
+    }
+
+    public function invalidContentProvider()
+    {
+        return [
+            'obj' => [new \stdClass()],
+            'array' => [[]],
+            'bool' => [true, '1'],
+        ];
+    }
+
+    protected function createDateTimeOneHourAgo()
+    {
+        return $this->createDateTimeNow()->sub(new \DateInterval('PT1H'));
+    }
+
+    protected function createDateTimeOneHourLater()
+    {
+        return $this->createDateTimeNow()->add(new \DateInterval('PT1H'));
+    }
+
+    protected function createDateTimeNow()
+    {
+        $date = new \DateTime();
+
+        return $date->setTimestamp(time());
+    }
+
+    protected function provideResponse()
+    {
+        return new Response();
+    }
+
+    /**
+     * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
+     *
+     * @author Fábio Pacheco
+     * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+     * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+     */
+    public function ianaCodesReasonPhrasesProvider()
+    {
+        if (!\in_array('https', stream_get_wrappers(), true)) {
+            $this->markTestSkipped('The "https" wrapper is not available');
+        }
+
+        $ianaHttpStatusCodes = new \DOMDocument();
+
+        $context = stream_context_create([
+            'http' => [
+                'method' => 'GET',
+                'timeout' => 30,
+                'user_agent' => __METHOD__,
+            ],
+        ]);
+
+        $ianaHttpStatusCodes->loadXML(file_get_contents('https://www.iana.org/assignments/http-status-codes/http-status-codes.xml', false, $context));
+        if (!$ianaHttpStatusCodes->relaxNGValidate(__DIR__.'/schema/http-status-codes.rng')) {
+            self::fail('Invalid IANA\'s HTTP status code list.');
+        }
+
+        $ianaCodesReasonPhrases = [];
+
+        $xpath = new \DOMXPath($ianaHttpStatusCodes);
+        $xpath->registerNamespace('ns', 'http://www.iana.org/assignments');
+
+        $records = $xpath->query('//ns:record');
+        foreach ($records as $record) {
+            $value = $xpath->query('.//ns:value', $record)->item(0)->nodeValue;
+            $description = $xpath->query('.//ns:description', $record)->item(0)->nodeValue;
+
+            if (\in_array($description, ['Unassigned', '(Unused)'], true)) {
+                continue;
+            }
+
+            if (preg_match('/^([0-9]+)\s*\-\s*([0-9]+)$/', $value, $matches)) {
+                for ($value = $matches[1]; $value <= $matches[2]; ++$value) {
+                    $ianaCodesReasonPhrases[] = [$value, $description];
+                }
+            } else {
+                $ianaCodesReasonPhrases[] = [$value, $description];
+            }
+        }
+
+        return $ianaCodesReasonPhrases;
+    }
+
+    /**
+     * @dataProvider ianaCodesReasonPhrasesProvider
+     */
+    public function testReasonPhraseDefaultsAgainstIana($code, $reasonPhrase)
+    {
+        $this->assertEquals($reasonPhrase, Response::$statusTexts[$code]);
+    }
+}
+
+class StringableObject
+{
+    public function __toString()
+    {
+        return 'Foo';
+    }
+}
+
+class DefaultResponse extends Response
+{
+}
diff --git a/lib/symfony/http-foundation/Tests/ResponseTestCase.php b/lib/symfony/http-foundation/Tests/ResponseTestCase.php
new file mode 100644
index 000000000..4ead34c10
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/ResponseTestCase.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+abstract class ResponseTestCase extends TestCase
+{
+    public function testNoCacheControlHeaderOnAttachmentUsingHTTPSAndMSIE()
+    {
+        // Check for HTTPS and IE 8
+        $request = new Request();
+        $request->server->set('HTTPS', true);
+        $request->server->set('HTTP_USER_AGENT', 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)');
+
+        $response = $this->provideResponse();
+        $response->headers->set('Content-Disposition', 'attachment; filename="fname.ext"');
+        $response->prepare($request);
+
+        $this->assertFalse($response->headers->has('Cache-Control'));
+
+        // Check for IE 10 and HTTPS
+        $request->server->set('HTTP_USER_AGENT', 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)');
+
+        $response = $this->provideResponse();
+        $response->headers->set('Content-Disposition', 'attachment; filename="fname.ext"');
+        $response->prepare($request);
+
+        $this->assertTrue($response->headers->has('Cache-Control'));
+
+        // Check for IE 9 and HTTPS
+        $request->server->set('HTTP_USER_AGENT', 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)');
+
+        $response = $this->provideResponse();
+        $response->headers->set('Content-Disposition', 'attachment; filename="fname.ext"');
+        $response->prepare($request);
+
+        $this->assertTrue($response->headers->has('Cache-Control'));
+
+        // Check for IE 9 and HTTP
+        $request->server->set('HTTPS', false);
+
+        $response = $this->provideResponse();
+        $response->headers->set('Content-Disposition', 'attachment; filename="fname.ext"');
+        $response->prepare($request);
+
+        $this->assertTrue($response->headers->has('Cache-Control'));
+
+        // Check for IE 8 and HTTP
+        $request->server->set('HTTP_USER_AGENT', 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)');
+
+        $response = $this->provideResponse();
+        $response->headers->set('Content-Disposition', 'attachment; filename="fname.ext"');
+        $response->prepare($request);
+
+        $this->assertTrue($response->headers->has('Cache-Control'));
+
+        // Check for non-IE and HTTPS
+        $request->server->set('HTTPS', true);
+        $request->server->set('HTTP_USER_AGENT', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.60 Safari/537.17');
+
+        $response = $this->provideResponse();
+        $response->headers->set('Content-Disposition', 'attachment; filename="fname.ext"');
+        $response->prepare($request);
+
+        $this->assertTrue($response->headers->has('Cache-Control'));
+
+        // Check for non-IE and HTTP
+        $request->server->set('HTTPS', false);
+
+        $response = $this->provideResponse();
+        $response->headers->set('Content-Disposition', 'attachment; filename="fname.ext"');
+        $response->prepare($request);
+
+        $this->assertTrue($response->headers->has('Cache-Control'));
+    }
+
+    abstract protected function provideResponse();
+}
diff --git a/lib/symfony/http-foundation/Tests/ServerBagTest.php b/lib/symfony/http-foundation/Tests/ServerBagTest.php
new file mode 100644
index 000000000..0663b118e
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/ServerBagTest.php
@@ -0,0 +1,170 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\ServerBag;
+
+/**
+ * ServerBagTest.
+ *
+ * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
+ */
+class ServerBagTest extends TestCase
+{
+    public function testShouldExtractHeadersFromServerArray()
+    {
+        $server = [
+            'SOME_SERVER_VARIABLE' => 'value',
+            'SOME_SERVER_VARIABLE2' => 'value',
+            'ROOT' => 'value',
+            'HTTP_CONTENT_TYPE' => 'text/html',
+            'HTTP_CONTENT_LENGTH' => '0',
+            'HTTP_ETAG' => 'asdf',
+            'PHP_AUTH_USER' => 'foo',
+            'PHP_AUTH_PW' => 'bar',
+        ];
+
+        $bag = new ServerBag($server);
+
+        $this->assertEquals([
+            'CONTENT_TYPE' => 'text/html',
+            'CONTENT_LENGTH' => '0',
+            'ETAG' => 'asdf',
+            'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
+            'PHP_AUTH_USER' => 'foo',
+            'PHP_AUTH_PW' => 'bar',
+        ], $bag->getHeaders());
+    }
+
+    public function testHttpPasswordIsOptional()
+    {
+        $bag = new ServerBag(['PHP_AUTH_USER' => 'foo']);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
+            'PHP_AUTH_USER' => 'foo',
+            'PHP_AUTH_PW' => '',
+        ], $bag->getHeaders());
+    }
+
+    public function testHttpBasicAuthWithPhpCgi()
+    {
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')]);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
+            'PHP_AUTH_USER' => 'foo',
+            'PHP_AUTH_PW' => 'bar',
+        ], $bag->getHeaders());
+    }
+
+    public function testHttpBasicAuthWithPhpCgiBogus()
+    {
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic_'.base64_encode('foo:bar')]);
+
+        // Username and passwords should not be set as the header is bogus
+        $headers = $bag->getHeaders();
+        $this->assertArrayNotHasKey('PHP_AUTH_USER', $headers);
+        $this->assertArrayNotHasKey('PHP_AUTH_PW', $headers);
+    }
+
+    public function testHttpBasicAuthWithPhpCgiRedirect()
+    {
+        $bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => 'Basic '.base64_encode('username:pass:word')]);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => 'Basic '.base64_encode('username:pass:word'),
+            'PHP_AUTH_USER' => 'username',
+            'PHP_AUTH_PW' => 'pass:word',
+        ], $bag->getHeaders());
+    }
+
+    public function testHttpBasicAuthWithPhpCgiEmptyPassword()
+    {
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:')]);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
+            'PHP_AUTH_USER' => 'foo',
+            'PHP_AUTH_PW' => '',
+        ], $bag->getHeaders());
+    }
+
+    public function testHttpDigestAuthWithPhpCgi()
+    {
+        $digest = 'Digest username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => $digest]);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => $digest,
+            'PHP_AUTH_DIGEST' => $digest,
+        ], $bag->getHeaders());
+    }
+
+    public function testHttpDigestAuthWithPhpCgiBogus()
+    {
+        $digest = 'Digest_username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => $digest]);
+
+        // Username and passwords should not be set as the header is bogus
+        $headers = $bag->getHeaders();
+        $this->assertArrayNotHasKey('PHP_AUTH_USER', $headers);
+        $this->assertArrayNotHasKey('PHP_AUTH_PW', $headers);
+    }
+
+    public function testHttpDigestAuthWithPhpCgiRedirect()
+    {
+        $digest = 'Digest username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
+        $bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => $digest]);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => $digest,
+            'PHP_AUTH_DIGEST' => $digest,
+        ], $bag->getHeaders());
+    }
+
+    public function testOAuthBearerAuth()
+    {
+        $headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => $headerContent]);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => $headerContent,
+        ], $bag->getHeaders());
+    }
+
+    public function testOAuthBearerAuthWithRedirect()
+    {
+        $headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
+        $bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => $headerContent]);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => $headerContent,
+        ], $bag->getHeaders());
+    }
+
+    /**
+     * @see https://github.com/symfony/symfony/issues/17345
+     */
+    public function testItDoesNotOverwriteTheAuthorizationHeaderIfItIsAlreadySet()
+    {
+        $headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
+        $bag = new ServerBag(['PHP_AUTH_USER' => 'foo', 'HTTP_AUTHORIZATION' => $headerContent]);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => $headerContent,
+            'PHP_AUTH_USER' => 'foo',
+            'PHP_AUTH_PW' => '',
+        ], $bag->getHeaders());
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Attribute/AttributeBagTest.php b/lib/symfony/http-foundation/Tests/Session/Attribute/AttributeBagTest.php
new file mode 100644
index 000000000..3f2f7b3c8
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Attribute/AttributeBagTest.php
@@ -0,0 +1,186 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Attribute;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+
+/**
+ * Tests AttributeBag.
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class AttributeBagTest extends TestCase
+{
+    private $array = [];
+
+    /**
+     * @var AttributeBag
+     */
+    private $bag;
+
+    protected function setUp()
+    {
+        $this->array = [
+            'hello' => 'world',
+            'always' => 'be happy',
+            'user.login' => 'drak',
+            'csrf.token' => [
+                'a' => '1234',
+                'b' => '4321',
+            ],
+            'category' => [
+                'fishing' => [
+                    'first' => 'cod',
+                    'second' => 'sole',
+                ],
+            ],
+        ];
+        $this->bag = new AttributeBag('_sf2');
+        $this->bag->initialize($this->array);
+    }
+
+    protected function tearDown()
+    {
+        $this->bag = null;
+        $this->array = [];
+    }
+
+    public function testInitialize()
+    {
+        $bag = new AttributeBag();
+        $bag->initialize($this->array);
+        $this->assertEquals($this->array, $bag->all());
+        $array = ['should' => 'change'];
+        $bag->initialize($array);
+        $this->assertEquals($array, $bag->all());
+    }
+
+    public function testGetStorageKey()
+    {
+        $this->assertEquals('_sf2', $this->bag->getStorageKey());
+        $attributeBag = new AttributeBag('test');
+        $this->assertEquals('test', $attributeBag->getStorageKey());
+    }
+
+    public function testGetSetName()
+    {
+        $this->assertEquals('attributes', $this->bag->getName());
+        $this->bag->setName('foo');
+        $this->assertEquals('foo', $this->bag->getName());
+    }
+
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testHas($key, $value, $exists)
+    {
+        $this->assertEquals($exists, $this->bag->has($key));
+    }
+
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testGet($key, $value, $expected)
+    {
+        $this->assertEquals($value, $this->bag->get($key));
+    }
+
+    public function testGetDefaults()
+    {
+        $this->assertNull($this->bag->get('user2.login'));
+        $this->assertEquals('default', $this->bag->get('user2.login', 'default'));
+    }
+
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testSet($key, $value, $expected)
+    {
+        $this->bag->set($key, $value);
+        $this->assertEquals($value, $this->bag->get($key));
+    }
+
+    public function testAll()
+    {
+        $this->assertEquals($this->array, $this->bag->all());
+
+        $this->bag->set('hello', 'fabien');
+        $array = $this->array;
+        $array['hello'] = 'fabien';
+        $this->assertEquals($array, $this->bag->all());
+    }
+
+    public function testReplace()
+    {
+        $array = [];
+        $array['name'] = 'jack';
+        $array['foo.bar'] = 'beep';
+        $this->bag->replace($array);
+        $this->assertEquals($array, $this->bag->all());
+        $this->assertNull($this->bag->get('hello'));
+        $this->assertNull($this->bag->get('always'));
+        $this->assertNull($this->bag->get('user.login'));
+    }
+
+    public function testRemove()
+    {
+        $this->assertEquals('world', $this->bag->get('hello'));
+        $this->bag->remove('hello');
+        $this->assertNull($this->bag->get('hello'));
+
+        $this->assertEquals('be happy', $this->bag->get('always'));
+        $this->bag->remove('always');
+        $this->assertNull($this->bag->get('always'));
+
+        $this->assertEquals('drak', $this->bag->get('user.login'));
+        $this->bag->remove('user.login');
+        $this->assertNull($this->bag->get('user.login'));
+    }
+
+    public function testClear()
+    {
+        $this->bag->clear();
+        $this->assertEquals([], $this->bag->all());
+    }
+
+    public function attributesProvider()
+    {
+        return [
+            ['hello', 'world', true],
+            ['always', 'be happy', true],
+            ['user.login', 'drak', true],
+            ['csrf.token', ['a' => '1234', 'b' => '4321'], true],
+            ['category', ['fishing' => ['first' => 'cod', 'second' => 'sole']], true],
+            ['user2.login', null, false],
+            ['never', null, false],
+            ['bye', null, false],
+            ['bye/for/now', null, false],
+        ];
+    }
+
+    public function testGetIterator()
+    {
+        $i = 0;
+        foreach ($this->bag as $key => $val) {
+            $this->assertEquals($this->array[$key], $val);
+            ++$i;
+        }
+
+        $this->assertEquals(\count($this->array), $i);
+    }
+
+    public function testCount()
+    {
+        $this->assertCount(\count($this->array), $this->bag);
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php b/lib/symfony/http-foundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
new file mode 100644
index 000000000..6b4bb17d6
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
@@ -0,0 +1,204 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Attribute;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Attribute\NamespacedAttributeBag;
+
+/**
+ * Tests NamespacedAttributeBag.
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class NamespacedAttributeBagTest extends TestCase
+{
+    private $array = [];
+
+    /**
+     * @var NamespacedAttributeBag
+     */
+    private $bag;
+
+    protected function setUp()
+    {
+        $this->array = [
+            'hello' => 'world',
+            'always' => 'be happy',
+            'user.login' => 'drak',
+            'csrf.token' => [
+                'a' => '1234',
+                'b' => '4321',
+            ],
+            'category' => [
+                'fishing' => [
+                    'first' => 'cod',
+                    'second' => 'sole',
+                ],
+            ],
+        ];
+        $this->bag = new NamespacedAttributeBag('_sf2', '/');
+        $this->bag->initialize($this->array);
+    }
+
+    protected function tearDown()
+    {
+        $this->bag = null;
+        $this->array = [];
+    }
+
+    public function testInitialize()
+    {
+        $bag = new NamespacedAttributeBag();
+        $bag->initialize($this->array);
+        $this->assertEquals($this->array, $this->bag->all());
+        $array = ['should' => 'not stick'];
+        $bag->initialize($array);
+
+        // should have remained the same
+        $this->assertEquals($this->array, $this->bag->all());
+    }
+
+    public function testGetStorageKey()
+    {
+        $this->assertEquals('_sf2', $this->bag->getStorageKey());
+        $attributeBag = new NamespacedAttributeBag('test');
+        $this->assertEquals('test', $attributeBag->getStorageKey());
+    }
+
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testHas($key, $value, $exists)
+    {
+        $this->assertEquals($exists, $this->bag->has($key));
+    }
+
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testHasNoSideEffect($key, $value, $expected)
+    {
+        $expected = json_encode($this->bag->all());
+        $this->bag->has($key);
+
+        $this->assertEquals($expected, json_encode($this->bag->all()));
+    }
+
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testGet($key, $value, $expected)
+    {
+        $this->assertEquals($value, $this->bag->get($key));
+    }
+
+    public function testGetDefaults()
+    {
+        $this->assertNull($this->bag->get('user2.login'));
+        $this->assertEquals('default', $this->bag->get('user2.login', 'default'));
+    }
+
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testGetNoSideEffect($key, $value, $expected)
+    {
+        $expected = json_encode($this->bag->all());
+        $this->bag->get($key);
+
+        $this->assertEquals($expected, json_encode($this->bag->all()));
+    }
+
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testSet($key, $value, $expected)
+    {
+        $this->bag->set($key, $value);
+        $this->assertEquals($value, $this->bag->get($key));
+    }
+
+    public function testAll()
+    {
+        $this->assertEquals($this->array, $this->bag->all());
+
+        $this->bag->set('hello', 'fabien');
+        $array = $this->array;
+        $array['hello'] = 'fabien';
+        $this->assertEquals($array, $this->bag->all());
+    }
+
+    public function testReplace()
+    {
+        $array = [];
+        $array['name'] = 'jack';
+        $array['foo.bar'] = 'beep';
+        $this->bag->replace($array);
+        $this->assertEquals($array, $this->bag->all());
+        $this->assertNull($this->bag->get('hello'));
+        $this->assertNull($this->bag->get('always'));
+        $this->assertNull($this->bag->get('user.login'));
+    }
+
+    public function testRemove()
+    {
+        $this->assertEquals('world', $this->bag->get('hello'));
+        $this->bag->remove('hello');
+        $this->assertNull($this->bag->get('hello'));
+
+        $this->assertEquals('be happy', $this->bag->get('always'));
+        $this->bag->remove('always');
+        $this->assertNull($this->bag->get('always'));
+
+        $this->assertEquals('drak', $this->bag->get('user.login'));
+        $this->bag->remove('user.login');
+        $this->assertNull($this->bag->get('user.login'));
+    }
+
+    public function testRemoveExistingNamespacedAttribute()
+    {
+        $this->assertSame('cod', $this->bag->remove('category/fishing/first'));
+    }
+
+    public function testRemoveNonexistingNamespacedAttribute()
+    {
+        $this->assertNull($this->bag->remove('foo/bar/baz'));
+    }
+
+    public function testClear()
+    {
+        $this->bag->clear();
+        $this->assertEquals([], $this->bag->all());
+    }
+
+    public function attributesProvider()
+    {
+        return [
+            ['hello', 'world', true],
+            ['always', 'be happy', true],
+            ['user.login', 'drak', true],
+            ['csrf.token', ['a' => '1234', 'b' => '4321'], true],
+            ['csrf.token/a', '1234', true],
+            ['csrf.token/b', '4321', true],
+            ['category', ['fishing' => ['first' => 'cod', 'second' => 'sole']], true],
+            ['category/fishing', ['first' => 'cod', 'second' => 'sole'], true],
+            ['category/fishing/missing/first', null, false],
+            ['category/fishing/first', 'cod', true],
+            ['category/fishing/second', 'sole', true],
+            ['category/fishing/missing/second', null, false],
+            ['user2.login', null, false],
+            ['never', null, false],
+            ['bye', null, false],
+            ['bye/for/now', null, false],
+        ];
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Flash/AutoExpireFlashBagTest.php b/lib/symfony/http-foundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
new file mode 100644
index 000000000..b4e2c3a5a
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
@@ -0,0 +1,161 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Flash;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag as FlashBag;
+
+/**
+ * AutoExpireFlashBagTest.
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class AutoExpireFlashBagTest extends TestCase
+{
+    /**
+     * @var \Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag
+     */
+    private $bag;
+
+    protected $array = [];
+
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->bag = new FlashBag();
+        $this->array = ['new' => ['notice' => ['A previous flash message']]];
+        $this->bag->initialize($this->array);
+    }
+
+    protected function tearDown()
+    {
+        $this->bag = null;
+        parent::tearDown();
+    }
+
+    public function testInitialize()
+    {
+        $bag = new FlashBag();
+        $array = ['new' => ['notice' => ['A previous flash message']]];
+        $bag->initialize($array);
+        $this->assertEquals(['A previous flash message'], $bag->peek('notice'));
+        $array = ['new' => [
+                'notice' => ['Something else'],
+                'error' => ['a'],
+            ]];
+        $bag->initialize($array);
+        $this->assertEquals(['Something else'], $bag->peek('notice'));
+        $this->assertEquals(['a'], $bag->peek('error'));
+    }
+
+    public function testGetStorageKey()
+    {
+        $this->assertEquals('_symfony_flashes', $this->bag->getStorageKey());
+        $attributeBag = new FlashBag('test');
+        $this->assertEquals('test', $attributeBag->getStorageKey());
+    }
+
+    public function testGetSetName()
+    {
+        $this->assertEquals('flashes', $this->bag->getName());
+        $this->bag->setName('foo');
+        $this->assertEquals('foo', $this->bag->getName());
+    }
+
+    public function testPeek()
+    {
+        $this->assertEquals([], $this->bag->peek('non_existing'));
+        $this->assertEquals(['default'], $this->bag->peek('non_existing', ['default']));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
+    }
+
+    public function testSet()
+    {
+        $this->bag->set('notice', 'Foo');
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
+    }
+
+    public function testHas()
+    {
+        $this->assertFalse($this->bag->has('nothing'));
+        $this->assertTrue($this->bag->has('notice'));
+    }
+
+    public function testKeys()
+    {
+        $this->assertEquals(['notice'], $this->bag->keys());
+    }
+
+    public function testPeekAll()
+    {
+        $array = [
+            'new' => [
+                'notice' => 'Foo',
+                'error' => 'Bar',
+            ],
+        ];
+
+        $this->bag->initialize($array);
+        $this->assertEquals([
+            'notice' => 'Foo',
+            'error' => 'Bar',
+            ], $this->bag->peekAll()
+        );
+
+        $this->assertEquals([
+            'notice' => 'Foo',
+            'error' => 'Bar',
+            ], $this->bag->peekAll()
+        );
+    }
+
+    public function testGet()
+    {
+        $this->assertEquals([], $this->bag->get('non_existing'));
+        $this->assertEquals(['default'], $this->bag->get('non_existing', ['default']));
+        $this->assertEquals(['A previous flash message'], $this->bag->get('notice'));
+        $this->assertEquals([], $this->bag->get('notice'));
+    }
+
+    public function testSetAll()
+    {
+        $this->bag->setAll(['a' => 'first', 'b' => 'second']);
+        $this->assertFalse($this->bag->has('a'));
+        $this->assertFalse($this->bag->has('b'));
+    }
+
+    public function testAll()
+    {
+        $this->bag->set('notice', 'Foo');
+        $this->bag->set('error', 'Bar');
+        $this->assertEquals([
+            'notice' => ['A previous flash message'],
+            ], $this->bag->all()
+        );
+
+        $this->assertEquals([], $this->bag->all());
+    }
+
+    public function testClear()
+    {
+        $this->assertEquals(['notice' => ['A previous flash message']], $this->bag->clear());
+    }
+
+    public function testDoNotRemoveTheNewFlashesWhenDisplayingTheExistingOnes()
+    {
+        $this->bag->add('success', 'Something');
+        $this->bag->all();
+
+        $this->assertEquals(['new' => ['success' => ['Something']], 'display' => []], $this->array);
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php b/lib/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
new file mode 100644
index 000000000..6d8619e07
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
@@ -0,0 +1,157 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Flash;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+
+/**
+ * FlashBagTest.
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class FlashBagTest extends TestCase
+{
+    /**
+     * @var \Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface
+     */
+    private $bag;
+
+    protected $array = [];
+
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->bag = new FlashBag();
+        $this->array = ['notice' => ['A previous flash message']];
+        $this->bag->initialize($this->array);
+    }
+
+    protected function tearDown()
+    {
+        $this->bag = null;
+        parent::tearDown();
+    }
+
+    public function testInitialize()
+    {
+        $bag = new FlashBag();
+        $bag->initialize($this->array);
+        $this->assertEquals($this->array, $bag->peekAll());
+        $array = ['should' => ['change']];
+        $bag->initialize($array);
+        $this->assertEquals($array, $bag->peekAll());
+    }
+
+    public function testGetStorageKey()
+    {
+        $this->assertEquals('_symfony_flashes', $this->bag->getStorageKey());
+        $attributeBag = new FlashBag('test');
+        $this->assertEquals('test', $attributeBag->getStorageKey());
+    }
+
+    public function testGetSetName()
+    {
+        $this->assertEquals('flashes', $this->bag->getName());
+        $this->bag->setName('foo');
+        $this->assertEquals('foo', $this->bag->getName());
+    }
+
+    public function testPeek()
+    {
+        $this->assertEquals([], $this->bag->peek('non_existing'));
+        $this->assertEquals(['default'], $this->bag->peek('not_existing', ['default']));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
+    }
+
+    public function testAdd()
+    {
+        $tab = ['bar' => 'baz'];
+        $this->bag->add('string_message', 'lorem');
+        $this->bag->add('object_message', new \stdClass());
+        $this->bag->add('array_message', $tab);
+
+        $this->assertEquals(['lorem'], $this->bag->get('string_message'));
+        $this->assertEquals([new \stdClass()], $this->bag->get('object_message'));
+        $this->assertEquals([$tab], $this->bag->get('array_message'));
+    }
+
+    public function testGet()
+    {
+        $this->assertEquals([], $this->bag->get('non_existing'));
+        $this->assertEquals(['default'], $this->bag->get('not_existing', ['default']));
+        $this->assertEquals(['A previous flash message'], $this->bag->get('notice'));
+        $this->assertEquals([], $this->bag->get('notice'));
+    }
+
+    public function testAll()
+    {
+        $this->bag->set('notice', 'Foo');
+        $this->bag->set('error', 'Bar');
+        $this->assertEquals([
+            'notice' => ['Foo'],
+            'error' => ['Bar'], ], $this->bag->all()
+        );
+
+        $this->assertEquals([], $this->bag->all());
+    }
+
+    public function testSet()
+    {
+        $this->bag->set('notice', 'Foo');
+        $this->bag->set('notice', 'Bar');
+        $this->assertEquals(['Bar'], $this->bag->peek('notice'));
+    }
+
+    public function testHas()
+    {
+        $this->assertFalse($this->bag->has('nothing'));
+        $this->assertTrue($this->bag->has('notice'));
+    }
+
+    public function testKeys()
+    {
+        $this->assertEquals(['notice'], $this->bag->keys());
+    }
+
+    public function testSetAll()
+    {
+        $this->bag->add('one_flash', 'Foo');
+        $this->bag->add('another_flash', 'Bar');
+        $this->assertTrue($this->bag->has('one_flash'));
+        $this->assertTrue($this->bag->has('another_flash'));
+        $this->bag->setAll(['unique_flash' => 'FooBar']);
+        $this->assertFalse($this->bag->has('one_flash'));
+        $this->assertFalse($this->bag->has('another_flash'));
+        $this->assertSame(['unique_flash' => 'FooBar'], $this->bag->all());
+        $this->assertSame([], $this->bag->all());
+    }
+
+    public function testPeekAll()
+    {
+        $this->bag->set('notice', 'Foo');
+        $this->bag->set('error', 'Bar');
+        $this->assertEquals([
+            'notice' => ['Foo'],
+            'error' => ['Bar'],
+            ], $this->bag->peekAll()
+        );
+        $this->assertTrue($this->bag->has('notice'));
+        $this->assertTrue($this->bag->has('error'));
+        $this->assertEquals([
+            'notice' => ['Foo'],
+            'error' => ['Bar'],
+            ], $this->bag->peekAll()
+        );
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/SessionTest.php b/lib/symfony/http-foundation/Tests/Session/SessionTest.php
new file mode 100644
index 000000000..acb129984
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/SessionTest.php
@@ -0,0 +1,288 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionBagProxy;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+
+/**
+ * SessionTest.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Robert Schönthal <seroscho@googlemail.com>
+ * @author Drak <drak@zikula.org>
+ */
+class SessionTest extends TestCase
+{
+    /**
+     * @var \Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface
+     */
+    protected $storage;
+
+    /**
+     * @var \Symfony\Component\HttpFoundation\Session\SessionInterface
+     */
+    protected $session;
+
+    protected function setUp()
+    {
+        $this->storage = new MockArraySessionStorage();
+        $this->session = new Session($this->storage, new AttributeBag(), new FlashBag());
+    }
+
+    protected function tearDown()
+    {
+        $this->storage = null;
+        $this->session = null;
+    }
+
+    public function testStart()
+    {
+        $this->assertEquals('', $this->session->getId());
+        $this->assertTrue($this->session->start());
+        $this->assertNotEquals('', $this->session->getId());
+    }
+
+    public function testIsStarted()
+    {
+        $this->assertFalse($this->session->isStarted());
+        $this->session->start();
+        $this->assertTrue($this->session->isStarted());
+    }
+
+    public function testSetId()
+    {
+        $this->assertEquals('', $this->session->getId());
+        $this->session->setId('0123456789abcdef');
+        $this->session->start();
+        $this->assertEquals('0123456789abcdef', $this->session->getId());
+    }
+
+    public function testSetIdAfterStart()
+    {
+        $this->session->start();
+        $id = $this->session->getId();
+
+        $e = null;
+        try {
+            $this->session->setId($id);
+        } catch (\Exception $e) {
+        }
+
+        $this->assertNull($e);
+
+        try {
+            $this->session->setId('different');
+        } catch (\Exception $e) {
+        }
+
+        $this->assertInstanceOf('\LogicException', $e);
+    }
+
+    public function testSetName()
+    {
+        $this->assertEquals('MOCKSESSID', $this->session->getName());
+        $this->session->setName('session.test.com');
+        $this->session->start();
+        $this->assertEquals('session.test.com', $this->session->getName());
+    }
+
+    public function testGet()
+    {
+        // tests defaults
+        $this->assertNull($this->session->get('foo'));
+        $this->assertEquals(1, $this->session->get('foo', 1));
+    }
+
+    /**
+     * @dataProvider setProvider
+     */
+    public function testSet($key, $value)
+    {
+        $this->session->set($key, $value);
+        $this->assertEquals($value, $this->session->get($key));
+    }
+
+    /**
+     * @dataProvider setProvider
+     */
+    public function testHas($key, $value)
+    {
+        $this->session->set($key, $value);
+        $this->assertTrue($this->session->has($key));
+        $this->assertFalse($this->session->has($key.'non_value'));
+    }
+
+    public function testReplace()
+    {
+        $this->session->replace(['happiness' => 'be good', 'symfony' => 'awesome']);
+        $this->assertEquals(['happiness' => 'be good', 'symfony' => 'awesome'], $this->session->all());
+        $this->session->replace([]);
+        $this->assertEquals([], $this->session->all());
+    }
+
+    /**
+     * @dataProvider setProvider
+     */
+    public function testAll($key, $value, $result)
+    {
+        $this->session->set($key, $value);
+        $this->assertEquals($result, $this->session->all());
+    }
+
+    /**
+     * @dataProvider setProvider
+     */
+    public function testClear($key, $value)
+    {
+        $this->session->set('hi', 'fabien');
+        $this->session->set($key, $value);
+        $this->session->clear();
+        $this->assertEquals([], $this->session->all());
+    }
+
+    public function setProvider()
+    {
+        return [
+            ['foo', 'bar', ['foo' => 'bar']],
+            ['foo.bar', 'too much beer', ['foo.bar' => 'too much beer']],
+            ['great', 'symfony is great', ['great' => 'symfony is great']],
+        ];
+    }
+
+    /**
+     * @dataProvider setProvider
+     */
+    public function testRemove($key, $value)
+    {
+        $this->session->set('hi.world', 'have a nice day');
+        $this->session->set($key, $value);
+        $this->session->remove($key);
+        $this->assertEquals(['hi.world' => 'have a nice day'], $this->session->all());
+    }
+
+    public function testInvalidate()
+    {
+        $this->session->set('invalidate', 123);
+        $this->session->invalidate();
+        $this->assertEquals([], $this->session->all());
+    }
+
+    public function testMigrate()
+    {
+        $this->session->set('migrate', 321);
+        $this->session->migrate();
+        $this->assertEquals(321, $this->session->get('migrate'));
+    }
+
+    public function testMigrateDestroy()
+    {
+        $this->session->set('migrate', 333);
+        $this->session->migrate(true);
+        $this->assertEquals(333, $this->session->get('migrate'));
+    }
+
+    public function testSave()
+    {
+        $this->session->start();
+        $this->session->save();
+
+        $this->assertFalse($this->session->isStarted());
+    }
+
+    public function testGetId()
+    {
+        $this->assertEquals('', $this->session->getId());
+        $this->session->start();
+        $this->assertNotEquals('', $this->session->getId());
+    }
+
+    public function testGetFlashBag()
+    {
+        $this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface', $this->session->getFlashBag());
+    }
+
+    public function testGetIterator()
+    {
+        $attributes = ['hello' => 'world', 'symfony' => 'rocks'];
+        foreach ($attributes as $key => $val) {
+            $this->session->set($key, $val);
+        }
+
+        $i = 0;
+        foreach ($this->session as $key => $val) {
+            $this->assertEquals($attributes[$key], $val);
+            ++$i;
+        }
+
+        $this->assertEquals(\count($attributes), $i);
+    }
+
+    public function testGetCount()
+    {
+        $this->session->set('hello', 'world');
+        $this->session->set('symfony', 'rocks');
+
+        $this->assertCount(2, $this->session);
+    }
+
+    public function testGetMeta()
+    {
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\MetadataBag', $this->session->getMetadataBag());
+    }
+
+    public function testIsEmpty()
+    {
+        $this->assertTrue($this->session->isEmpty());
+
+        $this->session->set('hello', 'world');
+        $this->assertFalse($this->session->isEmpty());
+
+        $this->session->remove('hello');
+        $this->assertTrue($this->session->isEmpty());
+
+        $flash = $this->session->getFlashBag();
+        $flash->set('hello', 'world');
+        $this->assertFalse($this->session->isEmpty());
+
+        $flash->get('hello');
+        $this->assertTrue($this->session->isEmpty());
+    }
+
+    public function testGetBagWithBagImplementingGetBag()
+    {
+        $bag = new AttributeBag();
+        $bag->setName('foo');
+
+        $storage = new MockArraySessionStorage();
+        $storage->registerBag($bag);
+
+        $this->assertSame($bag, (new Session($storage))->getBag('foo'));
+    }
+
+    public function testGetBagWithBagNotImplementingGetBag()
+    {
+        $data = [];
+
+        $bag = new AttributeBag();
+        $bag->setName('foo');
+
+        $storage = new MockArraySessionStorage();
+        $storage->registerBag(new SessionBagProxy($bag, $data, $usageIndex));
+
+        $this->assertSame($bag, (new Session($storage))->getBag('foo'));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
new file mode 100644
index 000000000..98bc67bca
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @requires PHP 7.0
+ */
+class AbstractSessionHandlerTest extends TestCase
+{
+    private static $server;
+
+    public static function setUpBeforeClass()
+    {
+        $spec = [
+            1 => ['file', '/dev/null', 'w'],
+            2 => ['file', '/dev/null', 'w'],
+        ];
+        if (!self::$server = @proc_open('exec php -S localhost:8053', $spec, $pipes, __DIR__.'/Fixtures')) {
+            self::markTestSkipped('PHP server unable to start.');
+        }
+        sleep(1);
+    }
+
+    public static function tearDownAfterClass()
+    {
+        if (self::$server) {
+            proc_terminate(self::$server);
+            proc_close(self::$server);
+        }
+    }
+
+    /**
+     * @dataProvider provideSession
+     */
+    public function testSession($fixture)
+    {
+        $context = ['http' => ['header' => "Cookie: sid=123abc\r\n"]];
+        $context = stream_context_create($context);
+        $result = file_get_contents(sprintf('http://localhost:8053/%s.php', $fixture), false, $context);
+
+        $this->assertStringEqualsFile(__DIR__.sprintf('/Fixtures/%s.expected', $fixture), $result);
+    }
+
+    public function provideSession()
+    {
+        foreach (glob(__DIR__.'/Fixtures/*.php') as $file) {
+            yield [pathinfo($file, PATHINFO_FILENAME)];
+        }
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/common.inc b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/common.inc
new file mode 100644
index 000000000..7a064c7f3
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/common.inc
@@ -0,0 +1,151 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\AbstractSessionHandler;
+
+$parent = __DIR__;
+while (!@file_exists($parent.'/vendor/autoload.php')) {
+    if (!@file_exists($parent)) {
+        // open_basedir restriction in effect
+        break;
+    }
+    if ($parent === dirname($parent)) {
+        echo "vendor/autoload.php not found\n";
+        exit(1);
+    }
+
+    $parent = dirname($parent);
+}
+
+require $parent.'/vendor/autoload.php';
+
+error_reporting(-1);
+ini_set('html_errors', 0);
+ini_set('display_errors', 1);
+ini_set('session.gc_probability', 0);
+ini_set('session.serialize_handler', 'php');
+ini_set('session.cookie_lifetime', 0);
+ini_set('session.cookie_domain', '');
+ini_set('session.cookie_secure', '');
+ini_set('session.cookie_httponly', '');
+ini_set('session.use_cookies', 1);
+ini_set('session.use_only_cookies', 1);
+ini_set('session.cache_expire', 180);
+ini_set('session.cookie_path', '/');
+ini_set('session.cookie_domain', '');
+ini_set('session.cookie_secure', 1);
+ini_set('session.cookie_httponly', 1);
+ini_set('session.use_strict_mode', 1);
+ini_set('session.lazy_write', 1);
+ini_set('session.name', 'sid');
+ini_set('session.save_path', __DIR__);
+ini_set('session.cache_limiter', '');
+
+header_remove('X-Powered-By');
+header('Content-Type: text/plain; charset=utf-8');
+
+register_shutdown_function(function () {
+    echo "\n";
+    session_write_close();
+    print_r(headers_list());
+    echo "shutdown\n";
+});
+ob_start();
+
+class TestSessionHandler extends AbstractSessionHandler
+{
+    private $data;
+
+    public function __construct($data = '')
+    {
+        $this->data = $data;
+    }
+
+    public function open($path, $name)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::open($path, $name);
+    }
+
+    public function validateId($sessionId)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::validateId($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($sessionId)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::read($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTimestamp($sessionId, $data)
+    {
+        echo __FUNCTION__, "\n";
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($sessionId, $data)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::write($sessionId, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy($sessionId)
+    {
+        echo __FUNCTION__, "\n";
+
+        return parent::destroy($sessionId);
+    }
+
+    public function close()
+    {
+        echo __FUNCTION__, "\n";
+
+        return true;
+    }
+
+    public function gc($maxLifetime)
+    {
+        echo __FUNCTION__, "\n";
+
+        return true;
+    }
+
+    protected function doRead($sessionId)
+    {
+        echo __FUNCTION__.': ', $this->data, "\n";
+
+        return $this->data;
+    }
+
+    protected function doWrite($sessionId, $data)
+    {
+        echo __FUNCTION__.': ', $data, "\n";
+
+        return true;
+    }
+
+    protected function doDestroy($sessionId)
+    {
+        echo __FUNCTION__, "\n";
+
+        return true;
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.expected b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.expected
new file mode 100644
index 000000000..820371474
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.expected
@@ -0,0 +1,17 @@
+open
+validateId
+read
+doRead: abc|i:123;
+read
+
+write
+destroy
+doDestroy
+close
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: max-age=10800, private, must-revalidate
+    [2] => Set-Cookie: sid=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; secure; HttpOnly
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.php
new file mode 100644
index 000000000..3cfc1250a
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/empty_destroys.php
@@ -0,0 +1,8 @@
+<?php
+
+require __DIR__.'/common.inc';
+
+session_set_save_handler(new TestSessionHandler('abc|i:123;'), false);
+session_start();
+
+unset($_SESSION['abc']);
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/read_only.expected b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/read_only.expected
new file mode 100644
index 000000000..587adaf15
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/read_only.expected
@@ -0,0 +1,14 @@
+open
+validateId
+read
+doRead: abc|i:123;
+read
+123
+updateTimestamp
+close
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: max-age=10800, private, must-revalidate
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/read_only.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/read_only.php
new file mode 100644
index 000000000..3e62fb9ec
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/read_only.php
@@ -0,0 +1,8 @@
+<?php
+
+require __DIR__.'/common.inc';
+
+session_set_save_handler(new TestSessionHandler('abc|i:123;'), false);
+session_start();
+
+echo $_SESSION['abc'];
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected
new file mode 100644
index 000000000..baa5f2f6f
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected
@@ -0,0 +1,24 @@
+open
+validateId
+read
+doRead: abc|i:123;
+read
+destroy
+doDestroy
+close
+open
+validateId
+read
+doRead: abc|i:123;
+read
+
+write
+doWrite: abc|i:123;
+close
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: max-age=10800, private, must-revalidate
+    [2] => Set-Cookie: sid=random_session_id; path=/; secure; HttpOnly
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
new file mode 100644
index 000000000..a0f635c87
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
@@ -0,0 +1,10 @@
+<?php
+
+require __DIR__.'/common.inc';
+
+session_set_save_handler(new TestSessionHandler('abc|i:123;'), false);
+session_start();
+
+session_regenerate_id(true);
+
+ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.expected b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.expected
new file mode 100644
index 000000000..4533a10a1
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.expected
@@ -0,0 +1,20 @@
+open
+validateId
+read
+doRead: 
+read
+Array
+(
+    [0] => bar
+)
+$_SESSION is not empty
+write
+destroy
+close
+$_SESSION is not empty
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: max-age=0, private, must-revalidate
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.php
new file mode 100644
index 000000000..96dca3c2c
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.php
@@ -0,0 +1,24 @@
+<?php
+
+require __DIR__.'/common.inc';
+
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+
+$storage = new NativeSessionStorage();
+$storage->setSaveHandler(new TestSessionHandler());
+$flash = new FlashBag();
+$storage->registerBag($flash);
+$storage->start();
+
+$flash->add('foo', 'bar');
+
+print_r($flash->get('foo'));
+echo empty($_SESSION) ? '$_SESSION is empty' : '$_SESSION is not empty';
+echo "\n";
+
+$storage->save();
+
+echo empty($_SESSION) ? '$_SESSION is empty' : '$_SESSION is not empty';
+
+ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.expected b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.expected
new file mode 100644
index 000000000..33da0a5be
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.expected
@@ -0,0 +1,15 @@
+open
+validateId
+read
+doRead: abc|i:123;
+read
+
+updateTimestamp
+close
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: max-age=10800, private, must-revalidate
+    [2] => Set-Cookie: abc=def
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.php
new file mode 100644
index 000000000..ffb5b20a3
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie.php
@@ -0,0 +1,8 @@
+<?php
+
+require __DIR__.'/common.inc';
+
+session_set_save_handler(new TestSessionHandler('abc|i:123;'), false);
+session_start();
+
+setcookie('abc', 'def');
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.expected b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.expected
new file mode 100644
index 000000000..5de2d9e39
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.expected
@@ -0,0 +1,24 @@
+open
+validateId
+read
+doRead: abc|i:123;
+read
+updateTimestamp
+close
+open
+validateId
+read
+doRead: abc|i:123;
+read
+
+write
+destroy
+doDestroy
+close
+Array
+(
+    [0] => Content-Type: text/plain; charset=utf-8
+    [1] => Cache-Control: max-age=10800, private, must-revalidate
+    [2] => Set-Cookie: abc=def
+)
+shutdown
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.php
new file mode 100644
index 000000000..ec5119323
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.php
@@ -0,0 +1,13 @@
+<?php
+
+require __DIR__.'/common.inc';
+
+setcookie('abc', 'def');
+
+session_set_save_handler(new TestSessionHandler('abc|i:123;'), false);
+session_start();
+session_write_close();
+session_start();
+
+$_SESSION['abc'] = 234;
+unset($_SESSION['abc']);
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
new file mode 100644
index 000000000..d7a324fc2
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcacheSessionHandler;
+
+/**
+ * @requires extension memcache
+ * @group time-sensitive
+ * @group legacy
+ */
+class MemcacheSessionHandlerTest extends TestCase
+{
+    const PREFIX = 'prefix_';
+    const TTL = 1000;
+
+    /**
+     * @var MemcacheSessionHandler
+     */
+    protected $storage;
+
+    protected $memcache;
+
+    protected function setUp()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('PHPUnit_MockObject cannot mock the Memcache class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
+        }
+
+        parent::setUp();
+        $this->memcache = $this->getMockBuilder('Memcache')->getMock();
+        $this->storage = new MemcacheSessionHandler(
+            $this->memcache,
+            ['prefix' => self::PREFIX, 'expiretime' => self::TTL]
+        );
+    }
+
+    protected function tearDown()
+    {
+        $this->memcache = null;
+        $this->storage = null;
+        parent::tearDown();
+    }
+
+    public function testOpenSession()
+    {
+        $this->assertTrue($this->storage->open('', ''));
+    }
+
+    public function testCloseSession()
+    {
+        $this->assertTrue($this->storage->close());
+    }
+
+    public function testReadSession()
+    {
+        $this->memcache
+            ->expects($this->once())
+            ->method('get')
+            ->with(self::PREFIX.'id')
+        ;
+
+        $this->assertEquals('', $this->storage->read('id'));
+    }
+
+    public function testWriteSession()
+    {
+        $this->memcache
+            ->expects($this->once())
+            ->method('set')
+            ->with(self::PREFIX.'id', 'data', 0, $this->equalTo(time() + self::TTL, 2))
+            ->willReturn(true)
+        ;
+
+        $this->assertTrue($this->storage->write('id', 'data'));
+    }
+
+    public function testDestroySession()
+    {
+        $this->memcache
+            ->expects($this->once())
+            ->method('delete')
+            ->with(self::PREFIX.'id')
+            ->willReturn(true)
+        ;
+
+        $this->assertTrue($this->storage->destroy('id'));
+    }
+
+    public function testGcSession()
+    {
+        $this->assertTrue($this->storage->gc(123));
+    }
+
+    /**
+     * @dataProvider getOptionFixtures
+     */
+    public function testSupportedOptions($options, $supported)
+    {
+        try {
+            new MemcacheSessionHandler($this->memcache, $options);
+            $this->assertTrue($supported);
+        } catch (\InvalidArgumentException $e) {
+            $this->assertFalse($supported);
+        }
+    }
+
+    public function getOptionFixtures()
+    {
+        return [
+            [['prefix' => 'session'], true],
+            [['expiretime' => 100], true],
+            [['prefix' => 'session', 'expiretime' => 200], true],
+            [['expiretime' => 100, 'foo' => 'bar'], false],
+        ];
+    }
+
+    public function testGetConnection()
+    {
+        $method = new \ReflectionMethod($this->storage, 'getMemcache');
+        $method->setAccessible(true);
+
+        $this->assertInstanceOf('\Memcache', $method->invoke($this->storage));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
new file mode 100644
index 000000000..c3deb7aed
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler;
+
+/**
+ * @requires extension memcached
+ * @group time-sensitive
+ */
+class MemcachedSessionHandlerTest extends TestCase
+{
+    const PREFIX = 'prefix_';
+    const TTL = 1000;
+
+    /**
+     * @var MemcachedSessionHandler
+     */
+    protected $storage;
+
+    protected $memcached;
+
+    protected function setUp()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('PHPUnit_MockObject cannot mock the Memcached class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
+        }
+
+        parent::setUp();
+
+        if (version_compare(phpversion('memcached'), '2.2.0', '>=') && version_compare(phpversion('memcached'), '3.0.0b1', '<')) {
+            $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower, or 3.0.0b1 or higher');
+        }
+
+        $this->memcached = $this->getMockBuilder('Memcached')->getMock();
+        $this->storage = new MemcachedSessionHandler(
+            $this->memcached,
+            ['prefix' => self::PREFIX, 'expiretime' => self::TTL]
+        );
+    }
+
+    protected function tearDown()
+    {
+        $this->memcached = null;
+        $this->storage = null;
+        parent::tearDown();
+    }
+
+    public function testOpenSession()
+    {
+        $this->assertTrue($this->storage->open('', ''));
+    }
+
+    public function testCloseSession()
+    {
+        $this->memcached
+            ->expects($this->once())
+            ->method('quit')
+            ->willReturn(true)
+        ;
+
+        $this->assertTrue($this->storage->close());
+    }
+
+    public function testReadSession()
+    {
+        $this->memcached
+            ->expects($this->once())
+            ->method('get')
+            ->with(self::PREFIX.'id')
+        ;
+
+        $this->assertEquals('', $this->storage->read('id'));
+    }
+
+    public function testWriteSession()
+    {
+        $this->memcached
+            ->expects($this->once())
+            ->method('set')
+            ->with(self::PREFIX.'id', 'data', $this->equalTo(time() + self::TTL, 2))
+            ->willReturn(true)
+        ;
+
+        $this->assertTrue($this->storage->write('id', 'data'));
+    }
+
+    public function testDestroySession()
+    {
+        $this->memcached
+            ->expects($this->once())
+            ->method('delete')
+            ->with(self::PREFIX.'id')
+            ->willReturn(true)
+        ;
+
+        $this->assertTrue($this->storage->destroy('id'));
+    }
+
+    public function testGcSession()
+    {
+        $this->assertTrue($this->storage->gc(123));
+    }
+
+    /**
+     * @dataProvider getOptionFixtures
+     */
+    public function testSupportedOptions($options, $supported)
+    {
+        try {
+            new MemcachedSessionHandler($this->memcached, $options);
+            $this->assertTrue($supported);
+        } catch (\InvalidArgumentException $e) {
+            $this->assertFalse($supported);
+        }
+    }
+
+    public function getOptionFixtures()
+    {
+        return [
+            [['prefix' => 'session'], true],
+            [['expiretime' => 100], true],
+            [['prefix' => 'session', 'expiretime' => 200], true],
+            [['expiretime' => 100, 'foo' => 'bar'], false],
+        ];
+    }
+
+    public function testGetConnection()
+    {
+        $method = new \ReflectionMethod($this->storage, 'getMemcached');
+        $method->setAccessible(true);
+
+        $this->assertInstanceOf('\Memcached', $method->invoke($this->storage));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
new file mode 100644
index 000000000..f0f43d05b
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -0,0 +1,330 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler;
+
+/**
+ * @author Markus Bachmann <markus.bachmann@bachi.biz>
+ * @group time-sensitive
+ * @group legacy
+ */
+class MongoDbSessionHandlerTest extends TestCase
+{
+    /**
+     * @var MockObject
+     */
+    private $mongo;
+    private $storage;
+    public $options;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (\extension_loaded('mongodb')) {
+            if (!class_exists('MongoDB\Client')) {
+                $this->markTestSkipped('The mongodb/mongodb package is required.');
+            }
+        } elseif (!\extension_loaded('mongo')) {
+            $this->markTestSkipped('The Mongo or MongoDB extension is required.');
+        }
+
+        if (phpversion('mongodb')) {
+            $mongoClass = 'MongoDB\Client';
+        } else {
+            $mongoClass = version_compare(phpversion('mongo'), '1.3.0', '<') ? 'Mongo' : 'MongoClient';
+        }
+
+        $this->mongo = $this->getMockBuilder($mongoClass)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->options = [
+            'id_field' => '_id',
+            'data_field' => 'data',
+            'time_field' => 'time',
+            'expiry_field' => 'expires_at',
+            'database' => 'sf2-test',
+            'collection' => 'session-test',
+        ];
+
+        $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
+    }
+
+    public function testConstructorShouldThrowExceptionForInvalidMongo()
+    {
+        $this->expectException('InvalidArgumentException');
+        new MongoDbSessionHandler(new \stdClass(), $this->options);
+    }
+
+    public function testConstructorShouldThrowExceptionForMissingOptions()
+    {
+        $this->expectException('InvalidArgumentException');
+        new MongoDbSessionHandler($this->mongo, []);
+    }
+
+    public function testOpenMethodAlwaysReturnTrue()
+    {
+        $this->assertTrue($this->storage->open('test', 'test'), 'The "open" method should always return true');
+    }
+
+    public function testCloseMethodAlwaysReturnTrue()
+    {
+        $this->assertTrue($this->storage->close(), 'The "close" method should always return true');
+    }
+
+    public function testRead()
+    {
+        $collection = $this->createMongoCollectionMock();
+
+        $this->mongo->expects($this->once())
+            ->method('selectCollection')
+            ->with($this->options['database'], $this->options['collection'])
+            ->willReturn($collection);
+
+        // defining the timeout before the actual method call
+        // allows to test for "greater than" values in the $criteria
+        $testTimeout = time() + 1;
+
+        $collection->expects($this->once())
+            ->method('findOne')
+            ->willReturnCallback(function ($criteria) use ($testTimeout) {
+                $this->assertArrayHasKey($this->options['id_field'], $criteria);
+                $this->assertEquals($criteria[$this->options['id_field']], 'foo');
+
+                $this->assertArrayHasKey($this->options['expiry_field'], $criteria);
+                $this->assertArrayHasKey('$gte', $criteria[$this->options['expiry_field']]);
+
+                if (phpversion('mongodb')) {
+                    $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$gte']);
+                    $this->assertGreaterThanOrEqual(round((string) $criteria[$this->options['expiry_field']]['$gte'] / 1000), $testTimeout);
+                } else {
+                    $this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$gte']);
+                    $this->assertGreaterThanOrEqual($criteria[$this->options['expiry_field']]['$gte']->sec, $testTimeout);
+                }
+
+                $fields = [
+                    $this->options['id_field'] => 'foo',
+                ];
+
+                if (phpversion('mongodb')) {
+                    $fields[$this->options['data_field']] = new \MongoDB\BSON\Binary('bar', \MongoDB\BSON\Binary::TYPE_OLD_BINARY);
+                    $fields[$this->options['id_field']] = new \MongoDB\BSON\UTCDateTime(time() * 1000);
+                } else {
+                    $fields[$this->options['data_field']] = new \MongoBinData('bar', \MongoBinData::BYTE_ARRAY);
+                    $fields[$this->options['id_field']] = new \MongoDate();
+                }
+
+                return $fields;
+            });
+
+        $this->assertEquals('bar', $this->storage->read('foo'));
+    }
+
+    public function testWrite()
+    {
+        $collection = $this->createMongoCollectionMock();
+
+        $this->mongo->expects($this->once())
+            ->method('selectCollection')
+            ->with($this->options['database'], $this->options['collection'])
+            ->willReturn($collection);
+
+        $data = [];
+
+        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
+
+        $collection->expects($this->once())
+            ->method($methodName)
+            ->willReturnCallback(function ($criteria, $updateData, $options) use (&$data) {
+                $this->assertEquals([$this->options['id_field'] => 'foo'], $criteria);
+
+                if (phpversion('mongodb')) {
+                    $this->assertEquals(['upsert' => true], $options);
+                } else {
+                    $this->assertEquals(['upsert' => true, 'multiple' => false], $options);
+                }
+
+                $data = $updateData['$set'];
+            });
+
+        $expectedExpiry = time() + (int) ini_get('session.gc_maxlifetime');
+        $this->assertTrue($this->storage->write('foo', 'bar'));
+
+        if (phpversion('mongodb')) {
+            $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
+            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['time_field']]);
+            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['expiry_field']]);
+            $this->assertGreaterThanOrEqual($expectedExpiry, round((string) $data[$this->options['expiry_field']] / 1000));
+        } else {
+            $this->assertEquals('bar', $data[$this->options['data_field']]->bin);
+            $this->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
+            $this->assertInstanceOf('MongoDate', $data[$this->options['expiry_field']]);
+            $this->assertGreaterThanOrEqual($expectedExpiry, $data[$this->options['expiry_field']]->sec);
+        }
+    }
+
+    public function testWriteWhenUsingExpiresField()
+    {
+        $this->options = [
+            'id_field' => '_id',
+            'data_field' => 'data',
+            'time_field' => 'time',
+            'database' => 'sf2-test',
+            'collection' => 'session-test',
+            'expiry_field' => 'expiresAt',
+        ];
+
+        $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
+
+        $collection = $this->createMongoCollectionMock();
+
+        $this->mongo->expects($this->once())
+            ->method('selectCollection')
+            ->with($this->options['database'], $this->options['collection'])
+            ->willReturn($collection);
+
+        $data = [];
+
+        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
+
+        $collection->expects($this->once())
+            ->method($methodName)
+            ->willReturnCallback(function ($criteria, $updateData, $options) use (&$data) {
+                $this->assertEquals([$this->options['id_field'] => 'foo'], $criteria);
+
+                if (phpversion('mongodb')) {
+                    $this->assertEquals(['upsert' => true], $options);
+                } else {
+                    $this->assertEquals(['upsert' => true, 'multiple' => false], $options);
+                }
+
+                $data = $updateData['$set'];
+            });
+
+        $this->assertTrue($this->storage->write('foo', 'bar'));
+
+        if (phpversion('mongodb')) {
+            $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
+            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['time_field']]);
+            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['expiry_field']]);
+        } else {
+            $this->assertEquals('bar', $data[$this->options['data_field']]->bin);
+            $this->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
+            $this->assertInstanceOf('MongoDate', $data[$this->options['expiry_field']]);
+        }
+    }
+
+    public function testReplaceSessionData()
+    {
+        $collection = $this->createMongoCollectionMock();
+
+        $this->mongo->expects($this->once())
+            ->method('selectCollection')
+            ->with($this->options['database'], $this->options['collection'])
+            ->willReturn($collection);
+
+        $data = [];
+
+        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
+
+        $collection->expects($this->exactly(2))
+            ->method($methodName)
+            ->willReturnCallback(function ($criteria, $updateData, $options) use (&$data) {
+                $data = $updateData;
+            });
+
+        $this->storage->write('foo', 'bar');
+        $this->storage->write('foo', 'foobar');
+
+        if (phpversion('mongodb')) {
+            $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->getData());
+        } else {
+            $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->bin);
+        }
+    }
+
+    public function testDestroy()
+    {
+        $collection = $this->createMongoCollectionMock();
+
+        $this->mongo->expects($this->once())
+            ->method('selectCollection')
+            ->with($this->options['database'], $this->options['collection'])
+            ->willReturn($collection);
+
+        $methodName = phpversion('mongodb') ? 'deleteOne' : 'remove';
+
+        $collection->expects($this->once())
+            ->method($methodName)
+            ->with([$this->options['id_field'] => 'foo']);
+
+        $this->assertTrue($this->storage->destroy('foo'));
+    }
+
+    public function testGc()
+    {
+        $collection = $this->createMongoCollectionMock();
+
+        $this->mongo->expects($this->once())
+            ->method('selectCollection')
+            ->with($this->options['database'], $this->options['collection'])
+            ->willReturn($collection);
+
+        $methodName = phpversion('mongodb') ? 'deleteMany' : 'remove';
+
+        $collection->expects($this->once())
+            ->method($methodName)
+            ->willReturnCallback(function ($criteria) {
+                if (phpversion('mongodb')) {
+                    $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$lt']);
+                    $this->assertGreaterThanOrEqual(time() - 1, round((string) $criteria[$this->options['expiry_field']]['$lt'] / 1000));
+                } else {
+                    $this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$lt']);
+                    $this->assertGreaterThanOrEqual(time() - 1, $criteria[$this->options['expiry_field']]['$lt']->sec);
+                }
+            });
+
+        $this->assertTrue($this->storage->gc(1));
+    }
+
+    public function testGetConnection()
+    {
+        $method = new \ReflectionMethod($this->storage, 'getMongo');
+        $method->setAccessible(true);
+
+        if (phpversion('mongodb')) {
+            $mongoClass = 'MongoDB\Client';
+        } else {
+            $mongoClass = version_compare(phpversion('mongo'), '1.3.0', '<') ? 'Mongo' : 'MongoClient';
+        }
+
+        $this->assertInstanceOf($mongoClass, $method->invoke($this->storage));
+    }
+
+    private function createMongoCollectionMock()
+    {
+        $collectionClass = 'MongoCollection';
+        if (phpversion('mongodb')) {
+            $collectionClass = 'MongoDB\Collection';
+        }
+
+        $collection = $this->getMockBuilder($collectionClass)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        return $collection;
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
new file mode 100644
index 000000000..7de55798a
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+
+/**
+ * Test class for NativeFileSessionHandler.
+ *
+ * @author Drak <drak@zikula.org>
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class NativeFileSessionHandlerTest extends TestCase
+{
+    public function testConstruct()
+    {
+        $storage = new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler(sys_get_temp_dir()));
+
+        $this->assertEquals('files', $storage->getSaveHandler()->getSaveHandlerName());
+        $this->assertEquals('user', ini_get('session.save_handler'));
+
+        $this->assertEquals(sys_get_temp_dir(), ini_get('session.save_path'));
+        $this->assertEquals('TESTING', ini_get('session.name'));
+    }
+
+    /**
+     * @dataProvider savePathDataProvider
+     */
+    public function testConstructSavePath($savePath, $expectedSavePath, $path)
+    {
+        new NativeFileSessionHandler($savePath);
+        $this->assertEquals($expectedSavePath, ini_get('session.save_path'));
+        $this->assertDirectoryExists(realpath($path));
+
+        rmdir($path);
+    }
+
+    public function savePathDataProvider()
+    {
+        $base = sys_get_temp_dir();
+
+        return [
+            ["$base/foo", "$base/foo", "$base/foo"],
+            ["5;$base/foo", "5;$base/foo", "$base/foo"],
+            ["5;0600;$base/foo", "5;0600;$base/foo", "$base/foo"],
+        ];
+    }
+
+    public function testConstructException()
+    {
+        $this->expectException('InvalidArgumentException');
+        new NativeFileSessionHandler('something;invalid;with;too-many-args');
+    }
+
+    public function testConstructDefault()
+    {
+        $path = ini_get('session.save_path');
+        new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler());
+
+        $this->assertEquals($path, ini_get('session.save_path'));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
new file mode 100644
index 000000000..4a9fb600d
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
+
+/**
+ * Test class for NativeSessionHandler.
+ *
+ * @author Drak <drak@zikula.org>
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @group legacy
+ */
+class NativeSessionHandlerTest extends TestCase
+{
+    /**
+     * @expectedDeprecation The Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler class is deprecated since Symfony 3.4 and will be removed in 4.0. Use the \SessionHandler class instead.
+     */
+    public function testConstruct()
+    {
+        $handler = new NativeSessionHandler();
+
+        $this->assertInstanceOf('SessionHandler', $handler);
+        $this->assertTrue($handler instanceof NativeSessionHandler);
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
new file mode 100644
index 000000000..f793db144
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+
+/**
+ * Test class for NullSessionHandler.
+ *
+ * @author Drak <drak@zikula.org>
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class NullSessionHandlerTest extends TestCase
+{
+    public function testSaveHandlers()
+    {
+        $this->getStorage();
+        $this->assertEquals('user', ini_get('session.save_handler'));
+    }
+
+    public function testSession()
+    {
+        session_id('nullsessionstorage');
+        $storage = $this->getStorage();
+        $session = new Session($storage);
+        $this->assertNull($session->get('something'));
+        $session->set('something', 'unique');
+        $this->assertEquals('unique', $session->get('something'));
+    }
+
+    public function testNothingIsPersisted()
+    {
+        session_id('nullsessionstorage');
+        $storage = $this->getStorage();
+        $session = new Session($storage);
+        $session->start();
+        $this->assertEquals('nullsessionstorage', $session->getId());
+        $this->assertNull($session->get('something'));
+    }
+
+    public function getStorage()
+    {
+        return new NativeSessionStorage([], new NullSessionHandler());
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
new file mode 100644
index 000000000..e710dca92
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -0,0 +1,405 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
+
+/**
+ * @requires extension pdo_sqlite
+ * @group time-sensitive
+ */
+class PdoSessionHandlerTest extends TestCase
+{
+    private $dbFile;
+
+    protected function tearDown()
+    {
+        // make sure the temporary database file is deleted when it has been created (even when a test fails)
+        if ($this->dbFile) {
+            @unlink($this->dbFile);
+        }
+        parent::tearDown();
+    }
+
+    protected function getPersistentSqliteDsn()
+    {
+        $this->dbFile = tempnam(sys_get_temp_dir(), 'sf2_sqlite_sessions');
+
+        return 'sqlite:'.$this->dbFile;
+    }
+
+    protected function getMemorySqlitePdo()
+    {
+        $pdo = new \PDO('sqlite::memory:');
+        $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+        $storage = new PdoSessionHandler($pdo);
+        $storage->createTable();
+
+        return $pdo;
+    }
+
+    public function testWrongPdoErrMode()
+    {
+        $this->expectException('InvalidArgumentException');
+        $pdo = $this->getMemorySqlitePdo();
+        $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
+
+        new PdoSessionHandler($pdo);
+    }
+
+    public function testInexistentTable()
+    {
+        $this->expectException('RuntimeException');
+        $storage = new PdoSessionHandler($this->getMemorySqlitePdo(), ['db_table' => 'inexistent_table']);
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
+    }
+
+    public function testCreateTableTwice()
+    {
+        $this->expectException('RuntimeException');
+        $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $storage->createTable();
+    }
+
+    public function testWithLazyDsnConnection()
+    {
+        $dsn = $this->getPersistentSqliteDsn();
+
+        $storage = new PdoSessionHandler($dsn);
+        $storage->createTable();
+        $storage->open('', 'sid');
+        $data = $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
+        $this->assertSame('', $data, 'New session returns empty string data');
+
+        $storage->open('', 'sid');
+        $data = $storage->read('id');
+        $storage->close();
+        $this->assertSame('data', $data, 'Written value can be read back correctly');
+    }
+
+    public function testWithLazySavePathConnection()
+    {
+        $dsn = $this->getPersistentSqliteDsn();
+
+        // Open is called with what ini_set('session.save_path', $dsn) would mean
+        $storage = new PdoSessionHandler(null);
+        $storage->open($dsn, 'sid');
+        $storage->createTable();
+        $data = $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
+        $this->assertSame('', $data, 'New session returns empty string data');
+
+        $storage->open($dsn, 'sid');
+        $data = $storage->read('id');
+        $storage->close();
+        $this->assertSame('data', $data, 'Written value can be read back correctly');
+    }
+
+    public function testReadWriteReadWithNullByte()
+    {
+        $sessionData = 'da'."\0".'ta';
+
+        $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $storage->open('', 'sid');
+        $readData = $storage->read('id');
+        $storage->write('id', $sessionData);
+        $storage->close();
+        $this->assertSame('', $readData, 'New session returns empty string data');
+
+        $storage->open('', 'sid');
+        $readData = $storage->read('id');
+        $storage->close();
+        $this->assertSame($sessionData, $readData, 'Written value can be read back correctly');
+    }
+
+    public function testReadConvertsStreamToString()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('PHPUnit_MockObject cannot mock the PDOStatement class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
+        }
+
+        $pdo = new MockPdo('pgsql');
+        $pdo->prepareResult = $this->getMockBuilder('PDOStatement')->getMock();
+
+        $content = 'foobar';
+        $stream = $this->createStream($content);
+
+        $pdo->prepareResult->expects($this->once())->method('fetchAll')
+            ->willReturn([[$stream, 42, time()]]);
+
+        $storage = new PdoSessionHandler($pdo);
+        $result = $storage->read('foo');
+
+        $this->assertSame($content, $result);
+    }
+
+    public function testReadLockedConvertsStreamToString()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('PHPUnit_MockObject cannot mock the PDOStatement class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
+        }
+        if (filter_var(ini_get('session.use_strict_mode'), FILTER_VALIDATE_BOOLEAN)) {
+            $this->markTestSkipped('Strict mode needs no locking for new sessions.');
+        }
+
+        $pdo = new MockPdo('pgsql');
+        $selectStmt = $this->getMockBuilder('PDOStatement')->getMock();
+        $insertStmt = $this->getMockBuilder('PDOStatement')->getMock();
+
+        $pdo->prepareResult = function ($statement) use ($selectStmt, $insertStmt) {
+            return 0 === strpos($statement, 'INSERT') ? $insertStmt : $selectStmt;
+        };
+
+        $content = 'foobar';
+        $stream = $this->createStream($content);
+        $exception = null;
+
+        $selectStmt->expects($this->atLeast(2))->method('fetchAll')
+            ->willReturnCallback(function () use (&$exception, $stream) {
+                return $exception ? [[$stream, 42, time()]] : [];
+            });
+
+        $insertStmt->expects($this->once())->method('execute')
+            ->willReturnCallback(function () use (&$exception) {
+                throw $exception = new \PDOException('', '23');
+            });
+
+        $storage = new PdoSessionHandler($pdo);
+        $result = $storage->read('foo');
+
+        $this->assertSame($content, $result);
+    }
+
+    public function testReadingRequiresExactlySameId()
+    {
+        $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $storage->open('', 'sid');
+        $storage->write('id', 'data');
+        $storage->write('test', 'data');
+        $storage->write('space ', 'data');
+        $storage->close();
+
+        $storage->open('', 'sid');
+        $readDataCaseSensitive = $storage->read('ID');
+        $readDataNoCharFolding = $storage->read('tést');
+        $readDataKeepSpace = $storage->read('space ');
+        $readDataExtraSpace = $storage->read('space  ');
+        $storage->close();
+
+        $this->assertSame('', $readDataCaseSensitive, 'Retrieval by ID should be case-sensitive (collation setting)');
+        $this->assertSame('', $readDataNoCharFolding, 'Retrieval by ID should not do character folding (collation setting)');
+        $this->assertSame('data', $readDataKeepSpace, 'Retrieval by ID requires spaces as-is');
+        $this->assertSame('', $readDataExtraSpace, 'Retrieval by ID requires spaces as-is');
+    }
+
+    /**
+     * Simulates session_regenerate_id(true) which will require an INSERT or UPDATE (replace).
+     */
+    public function testWriteDifferentSessionIdThanRead()
+    {
+        $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->destroy('id');
+        $storage->write('new_id', 'data_of_new_session_id');
+        $storage->close();
+
+        $storage->open('', 'sid');
+        $data = $storage->read('new_id');
+        $storage->close();
+
+        $this->assertSame('data_of_new_session_id', $data, 'Data of regenerated session id is available');
+    }
+
+    public function testWrongUsageStillWorks()
+    {
+        // wrong method sequence that should no happen, but still works
+        $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $storage->write('id', 'data');
+        $storage->write('other_id', 'other_data');
+        $storage->destroy('inexistent');
+        $storage->open('', 'sid');
+        $data = $storage->read('id');
+        $otherData = $storage->read('other_id');
+        $storage->close();
+
+        $this->assertSame('data', $data);
+        $this->assertSame('other_data', $otherData);
+    }
+
+    public function testSessionDestroy()
+    {
+        $pdo = $this->getMemorySqlitePdo();
+        $storage = new PdoSessionHandler($pdo);
+
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
+        $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn());
+
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->destroy('id');
+        $storage->close();
+        $this->assertEquals(0, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn());
+
+        $storage->open('', 'sid');
+        $data = $storage->read('id');
+        $storage->close();
+        $this->assertSame('', $data, 'Destroyed session returns empty string');
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testSessionGC()
+    {
+        $previousLifeTime = ini_set('session.gc_maxlifetime', 1000);
+        $pdo = $this->getMemorySqlitePdo();
+        $storage = new PdoSessionHandler($pdo);
+
+        $storage->open('', 'sid');
+        $storage->read('id');
+        $storage->write('id', 'data');
+        $storage->close();
+
+        $storage->open('', 'sid');
+        $storage->read('gc_id');
+        ini_set('session.gc_maxlifetime', -1); // test that you can set lifetime of a session after it has been read
+        $storage->write('gc_id', 'data');
+        $storage->close();
+        $this->assertEquals(2, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'No session pruned because gc not called');
+
+        $storage->open('', 'sid');
+        $data = $storage->read('gc_id');
+        $storage->gc(-1);
+        $storage->close();
+
+        ini_set('session.gc_maxlifetime', $previousLifeTime);
+
+        $this->assertSame('', $data, 'Session already considered garbage, so not returning data even if it is not pruned yet');
+        $this->assertEquals(1, $pdo->query('SELECT COUNT(*) FROM sessions')->fetchColumn(), 'Expired session is pruned');
+    }
+
+    public function testGetConnection()
+    {
+        $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
+
+        $method = new \ReflectionMethod($storage, 'getConnection');
+        $method->setAccessible(true);
+
+        $this->assertInstanceOf('\PDO', $method->invoke($storage));
+    }
+
+    public function testGetConnectionConnectsIfNeeded()
+    {
+        $storage = new PdoSessionHandler('sqlite::memory:');
+
+        $method = new \ReflectionMethod($storage, 'getConnection');
+        $method->setAccessible(true);
+
+        $this->assertInstanceOf('\PDO', $method->invoke($storage));
+    }
+
+    /**
+     * @dataProvider provideUrlDsnPairs
+     */
+    public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPassword = null)
+    {
+        $storage = new PdoSessionHandler($url);
+        $reflection = new \ReflectionClass(PdoSessionHandler::class);
+
+        foreach (['dsn' => $expectedDsn, 'username' => $expectedUser, 'password' => $expectedPassword] as $property => $expectedValue) {
+            if (!isset($expectedValue)) {
+                continue;
+            }
+            $property = $reflection->getProperty($property);
+            $property->setAccessible(true);
+            $this->assertSame($expectedValue, $property->getValue($storage));
+        }
+    }
+
+    public function provideUrlDsnPairs()
+    {
+        yield ['mysql://localhost/test', 'mysql:host=localhost;dbname=test;'];
+        yield ['mysql://localhost:56/test', 'mysql:host=localhost;port=56;dbname=test;'];
+        yield ['mysql2://root:pwd@localhost/test', 'mysql:host=localhost;dbname=test;', 'root', 'pwd'];
+        yield ['postgres://localhost/test', 'pgsql:host=localhost;dbname=test;'];
+        yield ['postgresql://localhost:5634/test', 'pgsql:host=localhost;port=5634;dbname=test;'];
+        yield ['postgres://root:pwd@localhost/test', 'pgsql:host=localhost;dbname=test;', 'root', 'pwd'];
+        yield 'sqlite relative path' => ['sqlite://localhost/tmp/test', 'sqlite:tmp/test'];
+        yield 'sqlite absolute path' => ['sqlite://localhost//tmp/test', 'sqlite:/tmp/test'];
+        yield 'sqlite relative path without host' => ['sqlite:///tmp/test', 'sqlite:tmp/test'];
+        yield 'sqlite absolute path without host' => ['sqlite3:////tmp/test', 'sqlite:/tmp/test'];
+        yield ['sqlite://localhost/:memory:', 'sqlite::memory:'];
+        yield ['mssql://localhost/test', 'sqlsrv:server=localhost;Database=test'];
+        yield ['mssql://localhost:56/test', 'sqlsrv:server=localhost,56;Database=test'];
+    }
+
+    private function createStream($content)
+    {
+        $stream = tmpfile();
+        fwrite($stream, $content);
+        fseek($stream, 0);
+
+        return $stream;
+    }
+}
+
+class MockPdo extends \PDO
+{
+    public $prepareResult;
+    private $driverName;
+    private $errorMode;
+
+    public function __construct($driverName = null, $errorMode = null)
+    {
+        $this->driverName = $driverName;
+        $this->errorMode = null !== $errorMode ?: \PDO::ERRMODE_EXCEPTION;
+    }
+
+    public function getAttribute($attribute)
+    {
+        if (\PDO::ATTR_ERRMODE === $attribute) {
+            return $this->errorMode;
+        }
+
+        if (\PDO::ATTR_DRIVER_NAME === $attribute) {
+            return $this->driverName;
+        }
+
+        return parent::getAttribute($attribute);
+    }
+
+    public function prepare($statement, $driverOptions = [])
+    {
+        return \is_callable($this->prepareResult)
+            ? \call_user_func($this->prepareResult, $statement, $driverOptions)
+            : $this->prepareResult;
+    }
+
+    public function beginTransaction()
+    {
+    }
+
+    public function rollBack()
+    {
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
new file mode 100644
index 000000000..6a0d16876
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
@@ -0,0 +1,189 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\AbstractSessionHandler;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler;
+
+class StrictSessionHandlerTest extends TestCase
+{
+    public function testOpen()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('open')
+            ->with('path', 'name')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertInstanceOf('SessionUpdateTimestampHandlerInterface', $proxy);
+        $this->assertInstanceOf(AbstractSessionHandler::class, $proxy);
+        $this->assertTrue($proxy->open('path', 'name'));
+    }
+
+    public function testCloseSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('close')
+            ->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->close());
+    }
+
+    public function testValidateIdOK()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('data');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->validateId('id'));
+    }
+
+    public function testValidateIdKO()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertFalse($proxy->validateId('id'));
+    }
+
+    public function testRead()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('data');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertSame('data', $proxy->read('id'));
+    }
+
+    public function testReadWithValidateIdOK()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('data');
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->validateId('id'));
+        $this->assertSame('data', $proxy->read('id'));
+    }
+
+    public function testReadWithValidateIdMismatch()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->exactly(2))->method('read')
+            ->withConsecutive(['id1'], ['id2'])
+            ->will($this->onConsecutiveCalls('data1', 'data2'));
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->validateId('id1'));
+        $this->assertSame('data2', $proxy->read('id2'));
+    }
+
+    public function testUpdateTimestamp()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('write')
+            ->with('id', 'data')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->updateTimestamp('id', 'data'));
+    }
+
+    public function testWrite()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('write')
+            ->with('id', 'data')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->write('id', 'data'));
+    }
+
+    public function testWriteEmptyNewSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('');
+        $handler->expects($this->never())->method('write');
+        $handler->expects($this->once())->method('destroy')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertFalse($proxy->validateId('id'));
+        $this->assertSame('', $proxy->read('id'));
+        $this->assertTrue($proxy->write('id', ''));
+    }
+
+    public function testWriteEmptyExistingSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('data');
+        $handler->expects($this->never())->method('write');
+        $handler->expects($this->once())->method('destroy')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertSame('data', $proxy->read('id'));
+        $this->assertTrue($proxy->write('id', ''));
+    }
+
+    public function testDestroy()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('destroy')
+            ->with('id')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->destroy('id'));
+    }
+
+    public function testDestroyNewSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('');
+        $handler->expects($this->once())->method('destroy')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertSame('', $proxy->read('id'));
+        $this->assertTrue($proxy->destroy('id'));
+    }
+
+    public function testDestroyNonEmptyNewSession()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('read')
+            ->with('id')->willReturn('');
+        $handler->expects($this->once())->method('write')
+            ->with('id', 'data')->willReturn(true);
+        $handler->expects($this->once())->method('destroy')
+            ->with('id')->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertSame('', $proxy->read('id'));
+        $this->assertTrue($proxy->write('id', 'data'));
+        $this->assertTrue($proxy->destroy('id'));
+    }
+
+    public function testGc()
+    {
+        $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $handler->expects($this->once())->method('gc')
+            ->with(123)->willReturn(true);
+        $proxy = new StrictSessionHandler($handler);
+
+        $this->assertTrue($proxy->gc(123));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
new file mode 100644
index 000000000..b89454f87
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler;
+
+/**
+ * @author Adrien Brault <adrien.brault@gmail.com>
+ *
+ * @group legacy
+ */
+class WriteCheckSessionHandlerTest extends TestCase
+{
+    public function test()
+    {
+        $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
+
+        $wrappedSessionHandlerMock
+            ->expects($this->once())
+            ->method('close')
+            ->with()
+            ->willReturn(true)
+        ;
+
+        $this->assertTrue($writeCheckSessionHandler->close());
+    }
+
+    public function testWrite()
+    {
+        $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
+
+        $wrappedSessionHandlerMock
+            ->expects($this->once())
+            ->method('write')
+            ->with('foo', 'bar')
+            ->willReturn(true)
+        ;
+
+        $this->assertTrue($writeCheckSessionHandler->write('foo', 'bar'));
+    }
+
+    public function testSkippedWrite()
+    {
+        $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
+
+        $wrappedSessionHandlerMock
+            ->expects($this->once())
+            ->method('read')
+            ->with('foo')
+            ->willReturn('bar')
+        ;
+
+        $wrappedSessionHandlerMock
+            ->expects($this->never())
+            ->method('write')
+        ;
+
+        $this->assertEquals('bar', $writeCheckSessionHandler->read('foo'));
+        $this->assertTrue($writeCheckSessionHandler->write('foo', 'bar'));
+    }
+
+    public function testNonSkippedWrite()
+    {
+        $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
+
+        $wrappedSessionHandlerMock
+            ->expects($this->once())
+            ->method('read')
+            ->with('foo')
+            ->willReturn('bar')
+        ;
+
+        $wrappedSessionHandlerMock
+            ->expects($this->once())
+            ->method('write')
+            ->with('foo', 'baZZZ')
+            ->willReturn(true)
+        ;
+
+        $this->assertEquals('bar', $writeCheckSessionHandler->read('foo'));
+        $this->assertTrue($writeCheckSessionHandler->write('foo', 'baZZZ'));
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/MetadataBagTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/MetadataBagTest.php
new file mode 100644
index 000000000..2c4758b91
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/MetadataBagTest.php
@@ -0,0 +1,139 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag;
+
+/**
+ * Test class for MetadataBag.
+ *
+ * @group time-sensitive
+ */
+class MetadataBagTest extends TestCase
+{
+    /**
+     * @var MetadataBag
+     */
+    protected $bag;
+
+    protected $array = [];
+
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->bag = new MetadataBag();
+        $this->array = [MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 0];
+        $this->bag->initialize($this->array);
+    }
+
+    protected function tearDown()
+    {
+        $this->array = [];
+        $this->bag = null;
+        parent::tearDown();
+    }
+
+    public function testInitialize()
+    {
+        $sessionMetadata = [];
+
+        $bag1 = new MetadataBag();
+        $bag1->initialize($sessionMetadata);
+        $this->assertGreaterThanOrEqual(time(), $bag1->getCreated());
+        $this->assertEquals($bag1->getCreated(), $bag1->getLastUsed());
+
+        sleep(1);
+        $bag2 = new MetadataBag();
+        $bag2->initialize($sessionMetadata);
+        $this->assertEquals($bag1->getCreated(), $bag2->getCreated());
+        $this->assertEquals($bag1->getLastUsed(), $bag2->getLastUsed());
+        $this->assertEquals($bag2->getCreated(), $bag2->getLastUsed());
+
+        sleep(1);
+        $bag3 = new MetadataBag();
+        $bag3->initialize($sessionMetadata);
+        $this->assertEquals($bag1->getCreated(), $bag3->getCreated());
+        $this->assertGreaterThan($bag2->getLastUsed(), $bag3->getLastUsed());
+        $this->assertNotEquals($bag3->getCreated(), $bag3->getLastUsed());
+    }
+
+    public function testGetSetName()
+    {
+        $this->assertEquals('__metadata', $this->bag->getName());
+        $this->bag->setName('foo');
+        $this->assertEquals('foo', $this->bag->getName());
+    }
+
+    public function testGetStorageKey()
+    {
+        $this->assertEquals('_sf2_meta', $this->bag->getStorageKey());
+    }
+
+    public function testGetLifetime()
+    {
+        $bag = new MetadataBag();
+        $array = [MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 1000];
+        $bag->initialize($array);
+        $this->assertEquals(1000, $bag->getLifetime());
+    }
+
+    public function testGetCreated()
+    {
+        $this->assertEquals(1234567, $this->bag->getCreated());
+    }
+
+    public function testGetLastUsed()
+    {
+        $this->assertLessThanOrEqual(time(), $this->bag->getLastUsed());
+    }
+
+    public function testClear()
+    {
+        $this->bag->clear();
+
+        // the clear method has no side effects, we just want to ensure it doesn't trigger any exceptions
+        $this->addToAssertionCount(1);
+    }
+
+    public function testSkipLastUsedUpdate()
+    {
+        $bag = new MetadataBag('', 30);
+        $timeStamp = time();
+
+        $created = $timeStamp - 15;
+        $sessionMetadata = [
+            MetadataBag::CREATED => $created,
+            MetadataBag::UPDATED => $created,
+            MetadataBag::LIFETIME => 1000,
+        ];
+        $bag->initialize($sessionMetadata);
+
+        $this->assertEquals($created, $sessionMetadata[MetadataBag::UPDATED]);
+    }
+
+    public function testDoesNotSkipLastUsedUpdate()
+    {
+        $bag = new MetadataBag('', 30);
+        $timeStamp = time();
+
+        $created = $timeStamp - 45;
+        $sessionMetadata = [
+            MetadataBag::CREATED => $created,
+            MetadataBag::UPDATED => $created,
+            MetadataBag::LIFETIME => 1000,
+        ];
+        $bag->initialize($sessionMetadata);
+
+        $this->assertEquals($timeStamp, $sessionMetadata[MetadataBag::UPDATED]);
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
new file mode 100644
index 000000000..7e0d303b9
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+
+/**
+ * Test class for MockArraySessionStorage.
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class MockArraySessionStorageTest extends TestCase
+{
+    /**
+     * @var MockArraySessionStorage
+     */
+    private $storage;
+
+    /**
+     * @var AttributeBag
+     */
+    private $attributes;
+
+    /**
+     * @var FlashBag
+     */
+    private $flashes;
+
+    private $data;
+
+    protected function setUp()
+    {
+        $this->attributes = new AttributeBag();
+        $this->flashes = new FlashBag();
+
+        $this->data = [
+            $this->attributes->getStorageKey() => ['foo' => 'bar'],
+            $this->flashes->getStorageKey() => ['notice' => 'hello'],
+        ];
+
+        $this->storage = new MockArraySessionStorage();
+        $this->storage->registerBag($this->flashes);
+        $this->storage->registerBag($this->attributes);
+        $this->storage->setSessionData($this->data);
+    }
+
+    protected function tearDown()
+    {
+        $this->data = null;
+        $this->flashes = null;
+        $this->attributes = null;
+        $this->storage = null;
+    }
+
+    public function testStart()
+    {
+        $this->assertEquals('', $this->storage->getId());
+        $this->storage->start();
+        $id = $this->storage->getId();
+        $this->assertNotEquals('', $id);
+        $this->storage->start();
+        $this->assertEquals($id, $this->storage->getId());
+    }
+
+    public function testRegenerate()
+    {
+        $this->storage->start();
+        $id = $this->storage->getId();
+        $this->storage->regenerate();
+        $this->assertNotEquals($id, $this->storage->getId());
+        $this->assertEquals(['foo' => 'bar'], $this->storage->getBag('attributes')->all());
+        $this->assertEquals(['notice' => 'hello'], $this->storage->getBag('flashes')->peekAll());
+
+        $id = $this->storage->getId();
+        $this->storage->regenerate(true);
+        $this->assertNotEquals($id, $this->storage->getId());
+        $this->assertEquals(['foo' => 'bar'], $this->storage->getBag('attributes')->all());
+        $this->assertEquals(['notice' => 'hello'], $this->storage->getBag('flashes')->peekAll());
+    }
+
+    public function testGetId()
+    {
+        $this->assertEquals('', $this->storage->getId());
+        $this->storage->start();
+        $this->assertNotEquals('', $this->storage->getId());
+    }
+
+    public function testClearClearsBags()
+    {
+        $this->storage->clear();
+
+        $this->assertSame([], $this->storage->getBag('attributes')->all());
+        $this->assertSame([], $this->storage->getBag('flashes')->peekAll());
+    }
+
+    public function testClearStartsSession()
+    {
+        $this->storage->clear();
+
+        $this->assertTrue($this->storage->isStarted());
+    }
+
+    public function testClearWithNoBagsStartsSession()
+    {
+        $storage = new MockArraySessionStorage();
+
+        $storage->clear();
+
+        $this->assertTrue($storage->isStarted());
+    }
+
+    public function testUnstartedSave()
+    {
+        $this->expectException('RuntimeException');
+        $this->storage->save();
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
new file mode 100644
index 000000000..d6bd1823f
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage;
+
+/**
+ * Test class for MockFileSessionStorage.
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class MockFileSessionStorageTest extends TestCase
+{
+    /**
+     * @var string
+     */
+    private $sessionDir;
+
+    /**
+     * @var MockFileSessionStorage
+     */
+    protected $storage;
+
+    protected function setUp()
+    {
+        $this->sessionDir = sys_get_temp_dir().'/sf2test';
+        $this->storage = $this->getStorage();
+    }
+
+    protected function tearDown()
+    {
+        array_map('unlink', glob($this->sessionDir.'/*'));
+        if (is_dir($this->sessionDir)) {
+            rmdir($this->sessionDir);
+        }
+        $this->sessionDir = null;
+        $this->storage = null;
+    }
+
+    public function testStart()
+    {
+        $this->assertEquals('', $this->storage->getId());
+        $this->assertTrue($this->storage->start());
+        $id = $this->storage->getId();
+        $this->assertNotEquals('', $this->storage->getId());
+        $this->assertTrue($this->storage->start());
+        $this->assertEquals($id, $this->storage->getId());
+    }
+
+    public function testRegenerate()
+    {
+        $this->storage->start();
+        $this->storage->getBag('attributes')->set('regenerate', 1234);
+        $this->storage->regenerate();
+        $this->assertEquals(1234, $this->storage->getBag('attributes')->get('regenerate'));
+        $this->storage->regenerate(true);
+        $this->assertEquals(1234, $this->storage->getBag('attributes')->get('regenerate'));
+    }
+
+    public function testGetId()
+    {
+        $this->assertEquals('', $this->storage->getId());
+        $this->storage->start();
+        $this->assertNotEquals('', $this->storage->getId());
+    }
+
+    public function testSave()
+    {
+        $this->storage->start();
+        $id = $this->storage->getId();
+        $this->assertNotEquals('108', $this->storage->getBag('attributes')->get('new'));
+        $this->assertFalse($this->storage->getBag('flashes')->has('newkey'));
+        $this->storage->getBag('attributes')->set('new', '108');
+        $this->storage->getBag('flashes')->set('newkey', 'test');
+        $this->storage->save();
+
+        $storage = $this->getStorage();
+        $storage->setId($id);
+        $storage->start();
+        $this->assertEquals('108', $storage->getBag('attributes')->get('new'));
+        $this->assertTrue($storage->getBag('flashes')->has('newkey'));
+        $this->assertEquals(['test'], $storage->getBag('flashes')->peek('newkey'));
+    }
+
+    public function testMultipleInstances()
+    {
+        $storage1 = $this->getStorage();
+        $storage1->start();
+        $storage1->getBag('attributes')->set('foo', 'bar');
+        $storage1->save();
+
+        $storage2 = $this->getStorage();
+        $storage2->setId($storage1->getId());
+        $storage2->start();
+        $this->assertEquals('bar', $storage2->getBag('attributes')->get('foo'), 'values persist between instances');
+    }
+
+    public function testSaveWithoutStart()
+    {
+        $this->expectException('RuntimeException');
+        $storage1 = $this->getStorage();
+        $storage1->save();
+    }
+
+    private function getStorage()
+    {
+        $storage = new MockFileSessionStorage($this->sessionDir);
+        $storage->registerBag(new FlashBag());
+        $storage->registerBag(new AttributeBag());
+
+        return $storage;
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
new file mode 100644
index 000000000..9ce8108da
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -0,0 +1,288 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
+
+/**
+ * Test class for NativeSessionStorage.
+ *
+ * @author Drak <drak@zikula.org>
+ *
+ * These tests require separate processes.
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class NativeSessionStorageTest extends TestCase
+{
+    private $savePath;
+
+    protected function setUp()
+    {
+        $this->iniSet('session.save_handler', 'files');
+        $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sf2test');
+        if (!is_dir($this->savePath)) {
+            mkdir($this->savePath);
+        }
+    }
+
+    protected function tearDown()
+    {
+        session_write_close();
+        array_map('unlink', glob($this->savePath.'/*'));
+        if (is_dir($this->savePath)) {
+            rmdir($this->savePath);
+        }
+
+        $this->savePath = null;
+    }
+
+    /**
+     * @return NativeSessionStorage
+     */
+    protected function getStorage(array $options = [])
+    {
+        $storage = new NativeSessionStorage($options);
+        $storage->registerBag(new AttributeBag());
+
+        return $storage;
+    }
+
+    public function testBag()
+    {
+        $storage = $this->getStorage();
+        $bag = new FlashBag();
+        $storage->registerBag($bag);
+        $this->assertSame($bag, $storage->getBag($bag->getName()));
+    }
+
+    public function testRegisterBagException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $storage = $this->getStorage();
+        $storage->getBag('non_existing');
+    }
+
+    public function testRegisterBagForAStartedSessionThrowsException()
+    {
+        $this->expectException('LogicException');
+        $storage = $this->getStorage();
+        $storage->start();
+        $storage->registerBag(new AttributeBag());
+    }
+
+    public function testGetId()
+    {
+        $storage = $this->getStorage();
+        $this->assertSame('', $storage->getId(), 'Empty ID before starting session');
+
+        $storage->start();
+        $id = $storage->getId();
+        $this->assertIsString($id);
+        $this->assertNotSame('', $id);
+
+        $storage->save();
+        $this->assertSame($id, $storage->getId(), 'ID stays after saving session');
+    }
+
+    public function testRegenerate()
+    {
+        $storage = $this->getStorage();
+        $storage->start();
+        $id = $storage->getId();
+        $storage->getBag('attributes')->set('lucky', 7);
+        $storage->regenerate();
+        $this->assertNotEquals($id, $storage->getId());
+        $this->assertEquals(7, $storage->getBag('attributes')->get('lucky'));
+    }
+
+    public function testRegenerateDestroy()
+    {
+        $storage = $this->getStorage();
+        $storage->start();
+        $id = $storage->getId();
+        $storage->getBag('attributes')->set('legs', 11);
+        $storage->regenerate(true);
+        $this->assertNotEquals($id, $storage->getId());
+        $this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
+    }
+
+    public function testSessionGlobalIsUpToDateAfterIdRegeneration()
+    {
+        $storage = $this->getStorage();
+        $storage->start();
+        $storage->getBag('attributes')->set('lucky', 7);
+        $storage->regenerate();
+        $storage->getBag('attributes')->set('lucky', 42);
+
+        $this->assertEquals(42, $_SESSION['_sf2_attributes']['lucky']);
+    }
+
+    public function testRegenerationFailureDoesNotFlagStorageAsStarted()
+    {
+        $storage = $this->getStorage();
+        $this->assertFalse($storage->regenerate());
+        $this->assertFalse($storage->isStarted());
+    }
+
+    public function testDefaultSessionCacheLimiter()
+    {
+        $this->iniSet('session.cache_limiter', 'nocache');
+
+        new NativeSessionStorage();
+        $this->assertEquals('', ini_get('session.cache_limiter'));
+    }
+
+    public function testExplicitSessionCacheLimiter()
+    {
+        $this->iniSet('session.cache_limiter', 'nocache');
+
+        new NativeSessionStorage(['cache_limiter' => 'public']);
+        $this->assertEquals('public', ini_get('session.cache_limiter'));
+    }
+
+    public function testCookieOptions()
+    {
+        $options = [
+            'cookie_lifetime' => 123456,
+            'cookie_path' => '/my/cookie/path',
+            'cookie_domain' => 'symfony.example.com',
+            'cookie_secure' => true,
+            'cookie_httponly' => false,
+        ];
+
+        $this->getStorage($options);
+        $temp = session_get_cookie_params();
+        $gco = [];
+
+        foreach ($temp as $key => $value) {
+            $gco['cookie_'.$key] = $value;
+        }
+
+        unset($gco['cookie_samesite']);
+
+        $this->assertEquals($options, $gco);
+    }
+
+    public function testSessionOptions()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM is not handled in this test case.');
+        }
+
+        $options = [
+            'url_rewriter.tags' => 'a=href',
+            'cache_expire' => '200',
+        ];
+
+        $this->getStorage($options);
+
+        $this->assertSame('a=href', ini_get('url_rewriter.tags'));
+        $this->assertSame('200', ini_get('session.cache_expire'));
+    }
+
+    public function testSetSaveHandlerException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $storage = $this->getStorage();
+        $storage->setSaveHandler(new \stdClass());
+    }
+
+    public function testSetSaveHandler()
+    {
+        $this->iniSet('session.save_handler', 'files');
+        $storage = $this->getStorage();
+        $storage->setSaveHandler();
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+        $storage->setSaveHandler(null);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+        $storage->setSaveHandler(new SessionHandlerProxy(new NativeFileSessionHandler()));
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+        $storage->setSaveHandler(new NativeFileSessionHandler());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+        $storage->setSaveHandler(new SessionHandlerProxy(new NullSessionHandler()));
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+        $storage->setSaveHandler(new NullSessionHandler());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
+    }
+
+    public function testStarted()
+    {
+        $this->expectException('RuntimeException');
+        $storage = $this->getStorage();
+
+        $this->assertFalse($storage->getSaveHandler()->isActive());
+        $this->assertFalse($storage->isStarted());
+
+        session_start();
+        $this->assertTrue(isset($_SESSION));
+        $this->assertTrue($storage->getSaveHandler()->isActive());
+
+        // PHP session might have started, but the storage driver has not, so false is correct here
+        $this->assertFalse($storage->isStarted());
+
+        $key = $storage->getMetadataBag()->getStorageKey();
+        $this->assertArrayNotHasKey($key, $_SESSION);
+        $storage->start();
+    }
+
+    public function testRestart()
+    {
+        $storage = $this->getStorage();
+        $storage->start();
+        $id = $storage->getId();
+        $storage->getBag('attributes')->set('lucky', 7);
+        $storage->save();
+        $storage->start();
+        $this->assertSame($id, $storage->getId(), 'Same session ID after restarting');
+        $this->assertSame(7, $storage->getBag('attributes')->get('lucky'), 'Data still available');
+    }
+
+    public function testCanCreateNativeSessionStorageWhenSessionAlreadyStarted()
+    {
+        session_start();
+        $this->getStorage();
+
+        // Assert no exception has been thrown by `getStorage()`
+        $this->addToAssertionCount(1);
+    }
+
+    public function testSetSessionOptionsOnceSessionStartedIsIgnored()
+    {
+        session_start();
+        $this->getStorage([
+            'name' => 'something-else',
+        ]);
+
+        // Assert no exception has been thrown by `getStorage()`
+        $this->addToAssertionCount(1);
+    }
+
+    public function testGetBagsOnceSessionStartedIsIgnored()
+    {
+        session_start();
+        $bag = new AttributeBag();
+        $bag->setName('flashes');
+
+        $storage = $this->getStorage();
+        $storage->registerBag($bag);
+
+        $this->assertEquals($storage->getBag('flashes'), $bag);
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
new file mode 100644
index 000000000..752be618b
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\Storage\PhpBridgeSessionStorage;
+
+/**
+ * Test class for PhpSessionStorage.
+ *
+ * @author Drak <drak@zikula.org>
+ *
+ * These tests require separate processes.
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class PhpBridgeSessionStorageTest extends TestCase
+{
+    private $savePath;
+
+    protected function setUp()
+    {
+        $this->iniSet('session.save_handler', 'files');
+        $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sf2test');
+        if (!is_dir($this->savePath)) {
+            mkdir($this->savePath);
+        }
+    }
+
+    protected function tearDown()
+    {
+        session_write_close();
+        array_map('unlink', glob($this->savePath.'/*'));
+        if (is_dir($this->savePath)) {
+            rmdir($this->savePath);
+        }
+
+        $this->savePath = null;
+    }
+
+    /**
+     * @return PhpBridgeSessionStorage
+     */
+    protected function getStorage()
+    {
+        $storage = new PhpBridgeSessionStorage();
+        $storage->registerBag(new AttributeBag());
+
+        return $storage;
+    }
+
+    public function testPhpSession()
+    {
+        $storage = $this->getStorage();
+
+        $this->assertFalse($storage->getSaveHandler()->isActive());
+        $this->assertFalse($storage->isStarted());
+
+        session_start();
+        $this->assertTrue(isset($_SESSION));
+        // in PHP 5.4 we can reliably detect a session started
+        $this->assertTrue($storage->getSaveHandler()->isActive());
+        // PHP session might have started, but the storage driver has not, so false is correct here
+        $this->assertFalse($storage->isStarted());
+
+        $key = $storage->getMetadataBag()->getStorageKey();
+        $this->assertArrayNotHasKey($key, $_SESSION);
+        $storage->start();
+        $this->assertArrayHasKey($key, $_SESSION);
+    }
+
+    public function testClear()
+    {
+        $storage = $this->getStorage();
+        session_start();
+        $_SESSION['drak'] = 'loves symfony';
+        $storage->getBag('attributes')->set('symfony', 'greatness');
+        $key = $storage->getBag('attributes')->getStorageKey();
+        $this->assertEquals($_SESSION[$key], ['symfony' => 'greatness']);
+        $this->assertEquals($_SESSION['drak'], 'loves symfony');
+        $storage->clear();
+        $this->assertEquals($_SESSION[$key], []);
+        $this->assertEquals($_SESSION['drak'], 'loves symfony');
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
new file mode 100644
index 000000000..ae40f2c29
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Proxy;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
+use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
+
+/**
+ * Test class for AbstractProxy.
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class AbstractProxyTest extends TestCase
+{
+    /**
+     * @var AbstractProxy
+     */
+    protected $proxy;
+
+    protected function setUp()
+    {
+        $this->proxy = $this->getMockForAbstractClass(AbstractProxy::class);
+    }
+
+    protected function tearDown()
+    {
+        $this->proxy = null;
+    }
+
+    public function testGetSaveHandlerName()
+    {
+        $this->assertNull($this->proxy->getSaveHandlerName());
+    }
+
+    public function testIsSessionHandlerInterface()
+    {
+        $this->assertFalse($this->proxy->isSessionHandlerInterface());
+        $sh = new SessionHandlerProxy(new \SessionHandler());
+        $this->assertTrue($sh->isSessionHandlerInterface());
+    }
+
+    public function testIsWrapper()
+    {
+        $this->assertFalse($this->proxy->isWrapper());
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testIsActive()
+    {
+        $this->assertFalse($this->proxy->isActive());
+        session_start();
+        $this->assertTrue($this->proxy->isActive());
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testName()
+    {
+        $this->assertEquals(session_name(), $this->proxy->getName());
+        $this->proxy->setName('foo');
+        $this->assertEquals('foo', $this->proxy->getName());
+        $this->assertEquals(session_name(), $this->proxy->getName());
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testNameException()
+    {
+        $this->expectException('LogicException');
+        session_start();
+        $this->proxy->setName('foo');
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testId()
+    {
+        $this->assertEquals(session_id(), $this->proxy->getId());
+        $this->proxy->setId('foo');
+        $this->assertEquals('foo', $this->proxy->getId());
+        $this->assertEquals(session_id(), $this->proxy->getId());
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testIdException()
+    {
+        $this->expectException('LogicException');
+        session_start();
+        $this->proxy->setId('foo');
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/NativeProxyTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
new file mode 100644
index 000000000..ed4fee6bf
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Proxy;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy;
+
+/**
+ * Test class for NativeProxy.
+ *
+ * @group legacy
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class NativeProxyTest extends TestCase
+{
+    public function testIsWrapper()
+    {
+        $proxy = new NativeProxy();
+        $this->assertFalse($proxy->isWrapper());
+    }
+
+    public function testGetSaveHandlerName()
+    {
+        $name = ini_get('session.save_handler');
+        $proxy = new NativeProxy();
+        $this->assertEquals($name, $proxy->getSaveHandlerName());
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
new file mode 100644
index 000000000..1457ebd70
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -0,0 +1,158 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Session\Storage\Proxy;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
+
+/**
+ * Tests for SessionHandlerProxy class.
+ *
+ * @author Drak <drak@zikula.org>
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class SessionHandlerProxyTest extends TestCase
+{
+    /**
+     * @var \PHPUnit\Framework\MockObject\Matcher
+     */
+    private $mock;
+
+    /**
+     * @var SessionHandlerProxy
+     */
+    private $proxy;
+
+    protected function setUp()
+    {
+        $this->mock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
+        $this->proxy = new SessionHandlerProxy($this->mock);
+    }
+
+    protected function tearDown()
+    {
+        $this->mock = null;
+        $this->proxy = null;
+    }
+
+    public function testOpenTrue()
+    {
+        $this->mock->expects($this->once())
+            ->method('open')
+            ->willReturn(true);
+
+        $this->assertFalse($this->proxy->isActive());
+        $this->proxy->open('name', 'id');
+        $this->assertFalse($this->proxy->isActive());
+    }
+
+    public function testOpenFalse()
+    {
+        $this->mock->expects($this->once())
+            ->method('open')
+            ->willReturn(false);
+
+        $this->assertFalse($this->proxy->isActive());
+        $this->proxy->open('name', 'id');
+        $this->assertFalse($this->proxy->isActive());
+    }
+
+    public function testClose()
+    {
+        $this->mock->expects($this->once())
+            ->method('close')
+            ->willReturn(true);
+
+        $this->assertFalse($this->proxy->isActive());
+        $this->proxy->close();
+        $this->assertFalse($this->proxy->isActive());
+    }
+
+    public function testCloseFalse()
+    {
+        $this->mock->expects($this->once())
+            ->method('close')
+            ->willReturn(false);
+
+        $this->assertFalse($this->proxy->isActive());
+        $this->proxy->close();
+        $this->assertFalse($this->proxy->isActive());
+    }
+
+    public function testRead()
+    {
+        $this->mock->expects($this->once())
+            ->method('read');
+
+        $this->proxy->read('id');
+    }
+
+    public function testWrite()
+    {
+        $this->mock->expects($this->once())
+            ->method('write');
+
+        $this->proxy->write('id', 'data');
+    }
+
+    public function testDestroy()
+    {
+        $this->mock->expects($this->once())
+            ->method('destroy');
+
+        $this->proxy->destroy('id');
+    }
+
+    public function testGc()
+    {
+        $this->mock->expects($this->once())
+            ->method('gc');
+
+        $this->proxy->gc(86400);
+    }
+
+    /**
+     * @requires PHPUnit 5.1
+     */
+    public function testValidateId()
+    {
+        $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
+        $mock->expects($this->once())
+            ->method('validateId');
+
+        $proxy = new SessionHandlerProxy($mock);
+        $proxy->validateId('id');
+
+        $this->assertTrue($this->proxy->validateId('id'));
+    }
+
+    /**
+     * @requires PHPUnit 5.1
+     */
+    public function testUpdateTimestamp()
+    {
+        $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
+        $mock->expects($this->once())
+            ->method('updateTimestamp')
+            ->willReturn(false);
+
+        $proxy = new SessionHandlerProxy($mock);
+        $proxy->updateTimestamp('id', 'data');
+
+        $this->mock->expects($this->once())
+            ->method('write');
+
+        $this->proxy->updateTimestamp('id', 'data');
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/StreamedResponseTest.php b/lib/symfony/http-foundation/Tests/StreamedResponseTest.php
new file mode 100644
index 000000000..a084e917d
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/StreamedResponseTest.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class StreamedResponseTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $response = new StreamedResponse(function () { echo 'foo'; }, 404, ['Content-Type' => 'text/plain']);
+
+        $this->assertEquals(404, $response->getStatusCode());
+        $this->assertEquals('text/plain', $response->headers->get('Content-Type'));
+    }
+
+    public function testPrepareWith11Protocol()
+    {
+        $response = new StreamedResponse(function () { echo 'foo'; });
+        $request = Request::create('/');
+        $request->server->set('SERVER_PROTOCOL', 'HTTP/1.1');
+
+        $response->prepare($request);
+
+        $this->assertEquals('1.1', $response->getProtocolVersion());
+        $this->assertNotEquals('chunked', $response->headers->get('Transfer-Encoding'), 'Apache assumes responses with a Transfer-Encoding header set to chunked to already be encoded.');
+    }
+
+    public function testPrepareWith10Protocol()
+    {
+        $response = new StreamedResponse(function () { echo 'foo'; });
+        $request = Request::create('/');
+        $request->server->set('SERVER_PROTOCOL', 'HTTP/1.0');
+
+        $response->prepare($request);
+
+        $this->assertEquals('1.0', $response->getProtocolVersion());
+        $this->assertNull($response->headers->get('Transfer-Encoding'));
+    }
+
+    public function testPrepareWithHeadRequest()
+    {
+        $response = new StreamedResponse(function () { echo 'foo'; }, 200, ['Content-Length' => '123']);
+        $request = Request::create('/', 'HEAD');
+
+        $response->prepare($request);
+
+        $this->assertSame('123', $response->headers->get('Content-Length'));
+    }
+
+    public function testPrepareWithCacheHeaders()
+    {
+        $response = new StreamedResponse(function () { echo 'foo'; }, 200, ['Cache-Control' => 'max-age=600, public']);
+        $request = Request::create('/', 'GET');
+
+        $response->prepare($request);
+        $this->assertEquals('max-age=600, public', $response->headers->get('Cache-Control'));
+    }
+
+    public function testSendContent()
+    {
+        $called = 0;
+
+        $response = new StreamedResponse(function () use (&$called) { ++$called; });
+
+        $response->sendContent();
+        $this->assertEquals(1, $called);
+
+        $response->sendContent();
+        $this->assertEquals(1, $called);
+    }
+
+    public function testSendContentWithNonCallable()
+    {
+        $this->expectException('LogicException');
+        $response = new StreamedResponse(null);
+        $response->sendContent();
+    }
+
+    public function testSetContent()
+    {
+        $this->expectException('LogicException');
+        $response = new StreamedResponse(function () { echo 'foo'; });
+        $response->setContent('foo');
+    }
+
+    public function testGetContent()
+    {
+        $response = new StreamedResponse(function () { echo 'foo'; });
+        $this->assertFalse($response->getContent());
+    }
+
+    public function testCreate()
+    {
+        $response = StreamedResponse::create(function () {}, 204);
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response);
+        $this->assertEquals(204, $response->getStatusCode());
+    }
+
+    public function testReturnThis()
+    {
+        $response = new StreamedResponse(function () {});
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendContent());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendContent());
+
+        $response = new StreamedResponse(function () {});
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
+    }
+
+    public function testSetNotModified()
+    {
+        $response = new StreamedResponse(function () { echo 'foo'; });
+        $modified = $response->setNotModified();
+        $this->assertObjectHasAttribute('headers', $modified);
+        $this->assertObjectHasAttribute('content', $modified);
+        $this->assertObjectHasAttribute('version', $modified);
+        $this->assertObjectHasAttribute('statusCode', $modified);
+        $this->assertObjectHasAttribute('statusText', $modified);
+        $this->assertObjectHasAttribute('charset', $modified);
+        $this->assertEquals(304, $modified->getStatusCode());
+
+        ob_start();
+        $modified->sendContent();
+        $string = ob_get_clean();
+        $this->assertEmpty($string);
+    }
+}
diff --git a/lib/symfony/http-foundation/Tests/schema/http-status-codes.rng b/lib/symfony/http-foundation/Tests/schema/http-status-codes.rng
new file mode 100644
index 000000000..73708ca68
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/schema/http-status-codes.rng
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+  ns="http://www.iana.org/assignments">
+
+  <include href="iana-registry.rng"/>
+
+  <start>
+    <element name="registry">
+      <ref name="registryMeta"/>
+      <element name="registry">
+        <ref name="registryMeta"/>
+        <zeroOrMore>
+          <element name="record">
+            <optional>
+              <attribute name="date"><ref name="genericDate"/></attribute>
+            </optional>
+            <optional>
+              <attribute name="updated"><ref name="genericDate"/></attribute>
+            </optional>
+            <element name="value"><ref name="genericRange"/></element>
+            <element name="description"><text/></element>
+            <ref name="references"/>
+          </element>
+        </zeroOrMore>
+      </element>
+      <ref name="people"/>
+    </element>
+  </start>
+
+</grammar>
diff --git a/lib/symfony/http-foundation/Tests/schema/iana-registry.rng b/lib/symfony/http-foundation/Tests/schema/iana-registry.rng
new file mode 100644
index 000000000..b9c3ca9d9
--- /dev/null
+++ b/lib/symfony/http-foundation/Tests/schema/iana-registry.rng
@@ -0,0 +1,198 @@
+<?xml version='1.0'?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+  ns="http://www.iana.org/assignments">
+
+  <define name="registryMeta">
+    <interleave>
+      <attribute name="id"><data type="ID"/></attribute>
+      <optional><element name="title"><ref name="text_with_references"/></element></optional>
+      <optional><element name="created"><ref name="genericDate"/></element></optional>
+      <optional><element name="updated"><data type="date"/></element></optional>
+      <optional><element name="registration_rule"><ref
+            name="text_with_references"/></element></optional>
+      <optional><element name="expert"><text/></element></optional>
+      <optional><element name="description"><ref name="text_with_references"/></element></optional>
+      <zeroOrMore><element name="note"><ref name="text_with_references"/></element></zeroOrMore>
+      <ref name="references"/>
+      <optional><element name="hide"><empty/></element></optional>
+      <zeroOrMore><element name="category"><text/></element></zeroOrMore>
+      <zeroOrMore><ref name="range"/></zeroOrMore>
+      <optional><ref name="file"/></optional>
+    </interleave>
+  </define>
+
+  <define name="range">
+    <element name="range">
+       <interleave>
+	  <element name="value"><text/></element>
+	  <optional><element name="hex"><text/></element></optional>
+	  <element name="registration_rule"><ref name="text_with_references"/></element>
+	  <optional><element name="note"><ref name="text_with_references"/></element></optional>
+	  <optional><ref name="xref"/></optional>
+       </interleave>
+    </element>
+  </define>
+
+  <define name="people">
+    <element name="people">
+      <zeroOrMore>
+        <element name="person">
+          <attribute name="id"><data type="ID"/></attribute>
+          <optional><element name="name"><text/></element></optional>
+          <optional><element name="org"><text/></element></optional>
+          <zeroOrMore><element name="uri"><data type="anyURI"/></element></zeroOrMore>
+          <optional><element name="updated"><ref name="genericDate"/></element></optional>
+        </element>
+      </zeroOrMore>
+    </element>
+  </define>
+
+  <define name="xref">
+    <element name="xref">
+      <optional>
+        <attribute name="lastupdated"><ref name="genericDate"/></attribute>
+      </optional>
+      <choice>
+        <group>
+          <attribute name="type"><value>uri</value></attribute>
+          <attribute name="data"><data type="anyURI"/></attribute>
+        </group>
+        <group>
+          <attribute name="type"><value>rfc</value></attribute>
+          <attribute name="data">
+            <data type="string">
+              <param name="pattern">(rfc|bcp|std)\d+</param>
+            </data>
+          </attribute>
+        </group>
+        <group>
+          <attribute name="type"><value>rfc-errata</value></attribute>
+          <attribute name="data"><data type="positiveInteger"/></attribute>
+        </group>
+        <group>
+          <attribute name="type"><value>draft</value></attribute>
+          <attribute name="data">
+            <data type="string">
+              <param name="pattern">(draft|RFC)(-[a-zA-Z0-9]+)+</param>
+            </data>
+          </attribute>
+        </group>
+        <group>
+          <attribute name="type"><value>registry</value></attribute>
+          <attribute name="data"><data type="NCName"/></attribute>
+        </group>
+        <group>
+          <attribute name="type"><value>person</value></attribute>
+          <attribute name="data"><data type="NCName"/></attribute>
+        </group>
+        <group>
+          <attribute name="type"><value>text</value></attribute>
+        </group>
+        <group>
+          <attribute name="type"><value>note</value></attribute>
+          <attribute name="data"><data type="positiveInteger"/></attribute>
+        </group>
+        <group>
+          <attribute name="type"><value>unicode</value></attribute>
+          <attribute name="data">
+            <data type="string">
+              <param name="pattern">ucd\d+\.\d+\.\d+</param>
+            </data>
+          </attribute>
+        </group>
+      </choice>
+      <text/>
+    </element>
+  </define>
+
+  <define name="references">
+    <zeroOrMore>
+      <ref name="xref"/>
+    </zeroOrMore>
+  </define>
+
+  <define name="text_with_references">
+    <interleave>
+      <zeroOrMore>
+        <text/>
+        <optional><ref name="xref"/></optional>
+      </zeroOrMore>
+    </interleave>
+  </define>
+
+  <define name="richText">
+    <zeroOrMore>
+      <choice>
+        <interleave>
+          <ref name="text_with_references"/>
+          <optional><element name="br"><empty/></element></optional>
+        </interleave>
+        <element name="paragraph">
+          <interleave>
+            <ref name="text_with_references"/>
+            <optional><element name="br"><empty/></element></optional>
+          </interleave>
+        </element>
+        <element name="artwork"><text/></element>
+      </choice>
+    </zeroOrMore>
+  </define>
+
+  <define name="genericRange">
+    <data type="string">
+      <param name="pattern">(\d+|0x[\da-fA-F]+)(\s*-\s*(\d+|0x[\da-fA-F]+))?</param>
+    </data>
+  </define>
+
+  <define name="genericDate">
+    <choice>
+      <data type="date"/>
+      <data type="gYearMonth"/>
+    </choice>
+  </define>
+
+  <define name="hex32">
+    <data type="string">
+      <param name="pattern">0x[0-9]{8}</param>
+    </data>
+  </define>
+
+  <define name="binary">
+    <data type="string">
+      <param name="pattern">[0-1]+</param>
+    </data>
+  </define>
+
+  <define name="footnotes">
+    <zeroOrMore>
+      <element name="footnote">
+        <attribute name="anchor"><data type="positiveInteger"/></attribute>
+        <interleave>
+          <zeroOrMore>
+            <text/>
+            <optional><ref name="xref"/></optional>
+          </zeroOrMore>
+        </interleave>
+      </element>
+    </zeroOrMore>
+  </define>
+
+  <define name="file">
+    <element name="file">
+      <attribute name="type">
+        <choice>
+          <value>legacy</value>
+          <value>mib</value>
+          <value>template</value>
+          <value>json</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <data type="anyURI"/>
+    </element>
+  </define>
+
+</grammar>
diff --git a/lib/symfony/http-kernel/Tests/Bundle/BundleTest.php b/lib/symfony/http-kernel/Tests/Bundle/BundleTest.php
new file mode 100644
index 000000000..6803579c6
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Bundle/BundleTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Bundle;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionNotValidBundle\ExtensionNotValidBundle;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;
+
+class BundleTest extends TestCase
+{
+    public function testGetContainerExtension()
+    {
+        $bundle = new ExtensionPresentBundle();
+
+        $this->assertInstanceOf(
+            'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\DependencyInjection\ExtensionPresentExtension',
+            $bundle->getContainerExtension()
+        );
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Auto-registration of the command "Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand" is deprecated since Symfony 3.4 and won't be supported in 4.0. Use PSR-4 based service discovery instead.
+     */
+    public function testRegisterCommands()
+    {
+        $cmd = new FooCommand();
+        $app = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
+        $app->expects($this->once())->method('add')->with($this->equalTo($cmd));
+
+        $bundle = new ExtensionPresentBundle();
+        $bundle->registerCommands($app);
+
+        $bundle2 = new ExtensionAbsentBundle();
+
+        $this->assertNull($bundle2->registerCommands($app));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetContainerExtensionWithInvalidClass()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface');
+        $bundle = new ExtensionNotValidBundle();
+        $bundle->getContainerExtension();
+    }
+
+    public function testHttpKernelRegisterCommandsIgnoresCommandsThatAreRegisteredAsServices()
+    {
+        $container = new ContainerBuilder();
+        $container->register('console.command.symfony_component_httpkernel_tests_fixtures_extensionpresentbundle_command_foocommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
+
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
+        // add() is never called when the found command classes are already registered as services
+        $application->expects($this->never())->method('add');
+
+        $bundle = new ExtensionPresentBundle();
+        $bundle->setContainer($container);
+        $bundle->registerCommands($application);
+    }
+
+    public function testBundleNameIsGuessedFromClass()
+    {
+        $bundle = new GuessedNameBundle();
+
+        $this->assertSame('Symfony\Component\HttpKernel\Tests\Bundle', $bundle->getNamespace());
+        $this->assertSame('GuessedNameBundle', $bundle->getName());
+    }
+
+    public function testBundleNameCanBeExplicitlyProvided()
+    {
+        $bundle = new NamedBundle();
+
+        $this->assertSame('ExplicitlyNamedBundle', $bundle->getName());
+        $this->assertSame('Symfony\Component\HttpKernel\Tests\Bundle', $bundle->getNamespace());
+        $this->assertSame('ExplicitlyNamedBundle', $bundle->getName());
+    }
+}
+
+class NamedBundle extends Bundle
+{
+    public function __construct()
+    {
+        $this->name = 'ExplicitlyNamedBundle';
+    }
+}
+
+class GuessedNameBundle extends Bundle
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/CacheClearer/ChainCacheClearerTest.php b/lib/symfony/http-kernel/Tests/CacheClearer/ChainCacheClearerTest.php
new file mode 100644
index 000000000..a7093dfc9
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/CacheClearer/ChainCacheClearerTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\CacheClearer;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer;
+
+class ChainCacheClearerTest extends TestCase
+{
+    protected static $cacheDir;
+
+    public static function setUpBeforeClass()
+    {
+        self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf2_cache_clearer_dir');
+    }
+
+    public static function tearDownAfterClass()
+    {
+        @unlink(self::$cacheDir);
+    }
+
+    public function testInjectClearersInConstructor()
+    {
+        $clearer = $this->getMockClearer();
+        $clearer
+            ->expects($this->once())
+            ->method('clear');
+
+        $chainClearer = new ChainCacheClearer([$clearer]);
+        $chainClearer->clear(self::$cacheDir);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInjectClearerUsingAdd()
+    {
+        $clearer = $this->getMockClearer();
+        $clearer
+            ->expects($this->once())
+            ->method('clear');
+
+        $chainClearer = new ChainCacheClearer();
+        $chainClearer->add($clearer);
+        $chainClearer->clear(self::$cacheDir);
+    }
+
+    protected function getMockClearer()
+    {
+        return $this->getMockBuilder('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface')->getMock();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php b/lib/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
new file mode 100644
index 000000000..2fbce41d1
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\CacheClearer;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
+
+class Psr6CacheClearerTest extends TestCase
+{
+    public function testClearPoolsInjectedInConstructor()
+    {
+        $pool = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
+        $pool
+            ->expects($this->once())
+            ->method('clear');
+
+        (new Psr6CacheClearer(['pool' => $pool]))->clear('');
+    }
+
+    public function testClearPool()
+    {
+        $pool = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
+        $pool
+            ->expects($this->once())
+            ->method('clear');
+
+        (new Psr6CacheClearer(['pool' => $pool]))->clearPool('pool');
+    }
+
+    public function testClearPoolThrowsExceptionOnUnreferencedPool()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Cache pool not found: unknown');
+        (new Psr6CacheClearer())->clearPool('unknown');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer::addPool() method is deprecated since Symfony 3.3 and will be removed in 4.0. Pass an array of pools indexed by name to the constructor instead.
+     */
+    public function testClearPoolsInjectedByAdder()
+    {
+        $pool1 = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
+        $pool1
+            ->expects($this->once())
+            ->method('clear');
+
+        $pool2 = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
+        $pool2
+            ->expects($this->once())
+            ->method('clear');
+
+        $clearer = new Psr6CacheClearer(['pool1' => $pool1]);
+        $clearer->addPool($pool2);
+        $clearer->clear('');
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php b/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
new file mode 100644
index 000000000..41fe28507
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\CacheWarmer;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate;
+
+class CacheWarmerAggregateTest extends TestCase
+{
+    protected static $cacheDir;
+
+    public static function setUpBeforeClass()
+    {
+        self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf2_cache_warmer_dir');
+    }
+
+    public static function tearDownAfterClass()
+    {
+        @unlink(self::$cacheDir);
+    }
+
+    public function testInjectWarmersUsingConstructor()
+    {
+        $warmer = $this->getCacheWarmerMock();
+        $warmer
+            ->expects($this->once())
+            ->method('warmUp');
+        $aggregate = new CacheWarmerAggregate([$warmer]);
+        $aggregate->warmUp(self::$cacheDir);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInjectWarmersUsingAdd()
+    {
+        $warmer = $this->getCacheWarmerMock();
+        $warmer
+            ->expects($this->once())
+            ->method('warmUp');
+        $aggregate = new CacheWarmerAggregate();
+        $aggregate->add($warmer);
+        $aggregate->warmUp(self::$cacheDir);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInjectWarmersUsingSetWarmers()
+    {
+        $warmer = $this->getCacheWarmerMock();
+        $warmer
+            ->expects($this->once())
+            ->method('warmUp');
+        $aggregate = new CacheWarmerAggregate();
+        $aggregate->setWarmers([$warmer]);
+        $aggregate->warmUp(self::$cacheDir);
+    }
+
+    public function testWarmupDoesCallWarmupOnOptionalWarmersWhenEnableOptionalWarmersIsEnabled()
+    {
+        $warmer = $this->getCacheWarmerMock();
+        $warmer
+            ->expects($this->never())
+            ->method('isOptional');
+        $warmer
+            ->expects($this->once())
+            ->method('warmUp');
+
+        $aggregate = new CacheWarmerAggregate([$warmer]);
+        $aggregate->enableOptionalWarmers();
+        $aggregate->warmUp(self::$cacheDir);
+    }
+
+    public function testWarmupDoesNotCallWarmupOnOptionalWarmersWhenEnableOptionalWarmersIsNotEnabled()
+    {
+        $warmer = $this->getCacheWarmerMock();
+        $warmer
+            ->expects($this->once())
+            ->method('isOptional')
+            ->willReturn(true);
+        $warmer
+            ->expects($this->never())
+            ->method('warmUp');
+
+        $aggregate = new CacheWarmerAggregate([$warmer]);
+        $aggregate->warmUp(self::$cacheDir);
+    }
+
+    protected function getCacheWarmerMock()
+    {
+        $warmer = $this->getMockBuilder('Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        return $warmer;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php b/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
new file mode 100644
index 000000000..400e48457
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\CacheWarmer;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer;
+
+class CacheWarmerTest extends TestCase
+{
+    protected static $cacheFile;
+
+    public static function setUpBeforeClass()
+    {
+        self::$cacheFile = tempnam(sys_get_temp_dir(), 'sf2_cache_warmer_dir');
+    }
+
+    public static function tearDownAfterClass()
+    {
+        @unlink(self::$cacheFile);
+    }
+
+    public function testWriteCacheFileCreatesTheFile()
+    {
+        $warmer = new TestCacheWarmer(self::$cacheFile);
+        $warmer->warmUp(\dirname(self::$cacheFile));
+
+        $this->assertFileExists(self::$cacheFile);
+    }
+
+    public function testWriteNonWritableCacheFileThrowsARuntimeException()
+    {
+        $this->expectException('RuntimeException');
+        $nonWritableFile = '/this/file/is/very/probably/not/writable';
+        $warmer = new TestCacheWarmer($nonWritableFile);
+        $warmer->warmUp(\dirname($nonWritableFile));
+    }
+}
+
+class TestCacheWarmer extends CacheWarmer
+{
+    protected $file;
+
+    public function __construct($file)
+    {
+        $this->file = $file;
+    }
+
+    public function warmUp($cacheDir)
+    {
+        $this->writeCacheFile($this->file, 'content');
+    }
+
+    public function isOptional()
+    {
+        return false;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/ClientTest.php b/lib/symfony/http-kernel/Tests/ClientTest.php
new file mode 100644
index 000000000..b141c16d6
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/ClientTest.php
@@ -0,0 +1,179 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Client;
+use Symfony\Component\HttpKernel\Tests\Fixtures\TestClient;
+
+/**
+ * @group time-sensitive
+ */
+class ClientTest extends TestCase
+{
+    public function testDoRequest()
+    {
+        $client = new Client(new TestHttpKernel());
+
+        $client->request('GET', '/');
+        $this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request');
+        $this->assertInstanceOf('Symfony\Component\BrowserKit\Request', $client->getInternalRequest());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Request', $client->getRequest());
+        $this->assertInstanceOf('Symfony\Component\BrowserKit\Response', $client->getInternalResponse());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $client->getResponse());
+
+        $client->request('GET', 'http://www.example.com/');
+        $this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request');
+        $this->assertEquals('www.example.com', $client->getRequest()->getHost(), '->doRequest() uses the request handler to make the request');
+
+        $client->request('GET', 'http://www.example.com/?parameter=http://example.com');
+        $this->assertEquals('http://www.example.com/?parameter='.urlencode('http://example.com'), $client->getRequest()->getUri(), '->doRequest() uses the request handler to make the request');
+    }
+
+    public function testGetScript()
+    {
+        $client = new TestClient(new TestHttpKernel());
+        $client->insulate();
+        $client->request('GET', '/');
+
+        $this->assertEquals('Request: /', $client->getResponse()->getContent(), '->getScript() returns a script that uses the request handler to make the request');
+    }
+
+    public function testFilterResponseConvertsCookies()
+    {
+        $client = new Client(new TestHttpKernel());
+
+        $r = new \ReflectionObject($client);
+        $m = $r->getMethod('filterResponse');
+        $m->setAccessible(true);
+
+        $response = new Response();
+        $response->headers->setCookie($cookie1 = new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
+        $domResponse = $m->invoke($client, $response);
+        $this->assertSame((string) $cookie1, $domResponse->getHeader('Set-Cookie'));
+
+        $response = new Response();
+        $response->headers->setCookie($cookie1 = new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
+        $response->headers->setCookie($cookie2 = new Cookie('foo1', 'bar1', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
+        $domResponse = $m->invoke($client, $response);
+        $this->assertSame((string) $cookie1, $domResponse->getHeader('Set-Cookie'));
+        $this->assertSame([(string) $cookie1, (string) $cookie2], $domResponse->getHeader('Set-Cookie', false));
+    }
+
+    public function testFilterResponseSupportsStreamedResponses()
+    {
+        $client = new Client(new TestHttpKernel());
+
+        $r = new \ReflectionObject($client);
+        $m = $r->getMethod('filterResponse');
+        $m->setAccessible(true);
+
+        $response = new StreamedResponse(function () {
+            echo 'foo';
+        });
+
+        $domResponse = $m->invoke($client, $response);
+        $this->assertEquals('foo', $domResponse->getContent());
+    }
+
+    public function testUploadedFile()
+    {
+        $source = tempnam(sys_get_temp_dir(), 'source');
+        file_put_contents($source, '1');
+        $target = sys_get_temp_dir().'/sf.moved.file';
+        @unlink($target);
+
+        $kernel = new TestHttpKernel();
+        $client = new Client($kernel);
+
+        $files = [
+            ['tmp_name' => $source, 'name' => 'original', 'type' => 'mime/original', 'size' => 1, 'error' => UPLOAD_ERR_OK],
+            new UploadedFile($source, 'original', 'mime/original', 1, UPLOAD_ERR_OK, true),
+        ];
+
+        $file = null;
+        foreach ($files as $file) {
+            $client->request('POST', '/', [], ['foo' => $file]);
+
+            $files = $client->getRequest()->files->all();
+
+            $this->assertCount(1, $files);
+
+            $file = $files['foo'];
+
+            $this->assertEquals('original', $file->getClientOriginalName());
+            $this->assertEquals('mime/original', $file->getClientMimeType());
+            $this->assertSame(1, $file->getClientSize());
+            $this->assertTrue($file->isValid());
+        }
+
+        $file->move(\dirname($target), basename($target));
+
+        $this->assertFileExists($target);
+        unlink($target);
+    }
+
+    public function testUploadedFileWhenNoFileSelected()
+    {
+        $kernel = new TestHttpKernel();
+        $client = new Client($kernel);
+
+        $file = ['tmp_name' => '', 'name' => '', 'type' => '', 'size' => 0, 'error' => UPLOAD_ERR_NO_FILE];
+
+        $client->request('POST', '/', [], ['foo' => $file]);
+
+        $files = $client->getRequest()->files->all();
+
+        $this->assertCount(1, $files);
+        $this->assertNull($files['foo']);
+    }
+
+    public function testUploadedFileWhenSizeExceedsUploadMaxFileSize()
+    {
+        $source = tempnam(sys_get_temp_dir(), 'source');
+
+        $kernel = new TestHttpKernel();
+        $client = new Client($kernel);
+
+        $file = $this
+            ->getMockBuilder('Symfony\Component\HttpFoundation\File\UploadedFile')
+            ->setConstructorArgs([$source, 'original', 'mime/original', 123, UPLOAD_ERR_OK, true])
+            ->setMethods(['getSize'])
+            ->getMock()
+        ;
+
+        $file->expects($this->once())
+            ->method('getSize')
+            ->willReturn(INF)
+        ;
+
+        $client->request('POST', '/', [], [$file]);
+
+        $files = $client->getRequest()->files->all();
+
+        $this->assertCount(1, $files);
+
+        $file = $files[0];
+
+        $this->assertFalse($file->isValid());
+        $this->assertEquals(UPLOAD_ERR_INI_SIZE, $file->getError());
+        $this->assertEquals('mime/original', $file->getClientMimeType());
+        $this->assertEquals('original', $file->getClientOriginalName());
+        $this->assertEquals(0, $file->getClientSize());
+
+        unlink($source);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Config/EnvParametersResourceTest.php b/lib/symfony/http-kernel/Tests/Config/EnvParametersResourceTest.php
new file mode 100644
index 000000000..a1bf52957
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Config/EnvParametersResourceTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Config;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Config\EnvParametersResource;
+
+/**
+ * @group legacy
+ */
+class EnvParametersResourceTest extends TestCase
+{
+    protected $prefix = '__DUMMY_';
+    protected $initialEnv;
+    protected $resource;
+
+    protected function setUp()
+    {
+        $this->initialEnv = [
+            $this->prefix.'1' => 'foo',
+            $this->prefix.'2' => 'bar',
+        ];
+
+        foreach ($this->initialEnv as $key => $value) {
+            $_SERVER[$key] = $value;
+        }
+
+        $this->resource = new EnvParametersResource($this->prefix);
+    }
+
+    protected function tearDown()
+    {
+        foreach ($_SERVER as $key => $value) {
+            if (0 === strpos($key, $this->prefix)) {
+                unset($_SERVER[$key]);
+            }
+        }
+    }
+
+    public function testGetResource()
+    {
+        $this->assertSame(
+            ['prefix' => $this->prefix, 'variables' => $this->initialEnv],
+            $this->resource->getResource(),
+            '->getResource() returns the resource'
+        );
+    }
+
+    public function testToString()
+    {
+        $this->assertSame(
+            serialize(['prefix' => $this->prefix, 'variables' => $this->initialEnv]),
+            (string) $this->resource
+        );
+    }
+
+    public function testIsFreshNotChanged()
+    {
+        $this->assertTrue(
+            $this->resource->isFresh(time()),
+            '->isFresh() returns true if the variables have not changed'
+        );
+    }
+
+    public function testIsFreshValueChanged()
+    {
+        reset($this->initialEnv);
+        $_SERVER[key($this->initialEnv)] = 'baz';
+
+        $this->assertFalse(
+            $this->resource->isFresh(time()),
+            '->isFresh() returns false if a variable has been changed'
+        );
+    }
+
+    public function testIsFreshValueRemoved()
+    {
+        reset($this->initialEnv);
+        unset($_SERVER[key($this->initialEnv)]);
+
+        $this->assertFalse(
+            $this->resource->isFresh(time()),
+            '->isFresh() returns false if a variable has been removed'
+        );
+    }
+
+    public function testIsFreshValueAdded()
+    {
+        $_SERVER[$this->prefix.'3'] = 'foo';
+
+        $this->assertFalse(
+            $this->resource->isFresh(time()),
+            '->isFresh() returns false if a variable has been added'
+        );
+    }
+
+    public function testSerializeUnserialize()
+    {
+        $this->assertEquals($this->resource, unserialize(serialize($this->resource)));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Config/FileLocatorTest.php b/lib/symfony/http-kernel/Tests/Config/FileLocatorTest.php
new file mode 100644
index 000000000..72b38c672
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Config/FileLocatorTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Config;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Config\FileLocator;
+
+class FileLocatorTest extends TestCase
+{
+    public function testLocate()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel
+            ->expects($this->atLeastOnce())
+            ->method('locateResource')
+            ->with('@BundleName/some/path', null, true)
+            ->willReturn('/bundle-name/some/path');
+        $locator = new FileLocator($kernel);
+        $this->assertEquals('/bundle-name/some/path', $locator->locate('@BundleName/some/path'));
+
+        $kernel
+            ->expects($this->never())
+            ->method('locateResource');
+        $this->expectException('LogicException');
+        $locator->locate('/some/path');
+    }
+
+    public function testLocateWithGlobalResourcePath()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel
+            ->expects($this->atLeastOnce())
+            ->method('locateResource')
+            ->with('@BundleName/some/path', '/global/resource/path', false);
+
+        $locator = new FileLocator($kernel, '/global/resource/path');
+        $locator->locate('@BundleName/some/path', null, false);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php b/lib/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
new file mode 100644
index 000000000..2c43e5b1b
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
@@ -0,0 +1,130 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Controller\ArgumentResolver;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+
+class ServiceValueResolverTest extends TestCase
+{
+    public function testDoNotSupportWhenControllerDoNotExists()
+    {
+        $resolver = new ServiceValueResolver(new ServiceLocator([]));
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+        $request = $this->requestWithAttributes(['_controller' => 'my_controller']);
+
+        $this->assertFalse($resolver->supports($request, $argument));
+    }
+
+    public function testExistingController()
+    {
+        $resolver = new ServiceValueResolver(new ServiceLocator([
+            'App\\Controller\\Mine::method' => function () {
+                return new ServiceLocator([
+                    'dummy' => function () {
+                        return new DummyService();
+                    },
+                ]);
+            },
+        ]));
+
+        $request = $this->requestWithAttributes(['_controller' => 'App\\Controller\\Mine::method']);
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+
+        $this->assertTrue($resolver->supports($request, $argument));
+        $this->assertYieldEquals([new DummyService()], $resolver->resolve($request, $argument));
+    }
+
+    public function testExistingControllerWithATrailingBackSlash()
+    {
+        $resolver = new ServiceValueResolver(new ServiceLocator([
+            'App\\Controller\\Mine::method' => function () {
+                return new ServiceLocator([
+                    'dummy' => function () {
+                        return new DummyService();
+                    },
+                ]);
+            },
+        ]));
+
+        $request = $this->requestWithAttributes(['_controller' => '\\App\\Controller\\Mine::method']);
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+
+        $this->assertTrue($resolver->supports($request, $argument));
+        $this->assertYieldEquals([new DummyService()], $resolver->resolve($request, $argument));
+    }
+
+    public function testExistingControllerWithMethodNameStartUppercase()
+    {
+        $resolver = new ServiceValueResolver(new ServiceLocator([
+            'App\\Controller\\Mine::method' => function () {
+                return new ServiceLocator([
+                    'dummy' => function () {
+                        return new DummyService();
+                    },
+                ]);
+            },
+        ]));
+        $request = $this->requestWithAttributes(['_controller' => 'App\\Controller\\Mine::Method']);
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+
+        $this->assertTrue($resolver->supports($request, $argument));
+        $this->assertYieldEquals([new DummyService()], $resolver->resolve($request, $argument));
+    }
+
+    public function testControllerNameIsAnArray()
+    {
+        $resolver = new ServiceValueResolver(new ServiceLocator([
+            'App\\Controller\\Mine::method' => function () {
+                return new ServiceLocator([
+                    'dummy' => function () {
+                        return new DummyService();
+                    },
+                ]);
+            },
+        ]));
+
+        $request = $this->requestWithAttributes(['_controller' => ['App\\Controller\\Mine', 'method']]);
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+
+        $this->assertTrue($resolver->supports($request, $argument));
+        $this->assertYieldEquals([new DummyService()], $resolver->resolve($request, $argument));
+    }
+
+    private function requestWithAttributes(array $attributes)
+    {
+        $request = Request::create('/');
+
+        foreach ($attributes as $name => $value) {
+            $request->attributes->set($name, $value);
+        }
+
+        return $request;
+    }
+
+    private function assertYieldEquals(array $expected, \Generator $generator)
+    {
+        $args = [];
+        foreach ($generator as $arg) {
+            $args[] = $arg;
+        }
+
+        $this->assertEquals($expected, $args);
+    }
+}
+
+class DummyService
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php b/lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
new file mode 100644
index 000000000..a964aaeb5
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
@@ -0,0 +1,341 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Controller;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingRequest;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingSession;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
+
+class ArgumentResolverTest extends TestCase
+{
+    /** @var ArgumentResolver */
+    private static $resolver;
+
+    public static function setUpBeforeClass()
+    {
+        $factory = new ArgumentMetadataFactory();
+
+        self::$resolver = new ArgumentResolver($factory);
+    }
+
+    public function testDefaultState()
+    {
+        $this->assertEquals(self::$resolver, new ArgumentResolver());
+        $this->assertNotEquals(self::$resolver, new ArgumentResolver(null, [new RequestAttributeValueResolver()]));
+    }
+
+    public function testGetArguments()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = [new self(), 'controllerWithFoo'];
+
+        $this->assertEquals(['foo'], self::$resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
+    }
+
+    public function testGetArgumentsReturnsEmptyArrayWhenNoArguments()
+    {
+        $request = Request::create('/');
+        $controller = [new self(), 'controllerWithoutArguments'];
+
+        $this->assertEquals([], self::$resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
+    }
+
+    public function testGetArgumentsUsesDefaultValue()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = [new self(), 'controllerWithFooAndDefaultBar'];
+
+        $this->assertEquals(['foo', null], self::$resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
+    }
+
+    public function testGetArgumentsOverrideDefaultValueByRequestAttribute()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('bar', 'bar');
+        $controller = [new self(), 'controllerWithFooAndDefaultBar'];
+
+        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
+    }
+
+    public function testGetArgumentsFromClosure()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = function ($foo) {};
+
+        $this->assertEquals(['foo'], self::$resolver->getArguments($request, $controller));
+    }
+
+    public function testGetArgumentsUsesDefaultValueFromClosure()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = function ($foo, $bar = 'bar') {};
+
+        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller));
+    }
+
+    public function testGetArgumentsFromInvokableObject()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = new self();
+
+        $this->assertEquals(['foo', null], self::$resolver->getArguments($request, $controller));
+
+        // Test default bar overridden by request attribute
+        $request->attributes->set('bar', 'bar');
+
+        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller));
+    }
+
+    public function testGetArgumentsFromFunctionName()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('foobar', 'foobar');
+        $controller = __NAMESPACE__.'\controller_function';
+
+        $this->assertEquals(['foo', 'foobar'], self::$resolver->getArguments($request, $controller));
+    }
+
+    public function testGetArgumentsFailsOnUnresolvedValue()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('foobar', 'foobar');
+        $controller = [new self(), 'controllerWithFooBarFoobar'];
+
+        try {
+            self::$resolver->getArguments($request, $controller);
+            $this->fail('->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\RuntimeException', $e, '->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
+        }
+    }
+
+    public function testGetArgumentsInjectsRequest()
+    {
+        $request = Request::create('/');
+        $controller = [new self(), 'controllerWithRequest'];
+
+        $this->assertEquals([$request], self::$resolver->getArguments($request, $controller), '->getArguments() injects the request');
+    }
+
+    public function testGetArgumentsInjectsExtendingRequest()
+    {
+        $request = ExtendingRequest::create('/');
+        $controller = [new self(), 'controllerWithExtendingRequest'];
+
+        $this->assertEquals([$request], self::$resolver->getArguments($request, $controller), '->getArguments() injects the request when extended');
+    }
+
+    /**
+     * @requires PHP 5.6
+     */
+    public function testGetVariadicArguments()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('bar', ['foo', 'bar']);
+        $controller = [new VariadicController(), 'action'];
+
+        $this->assertEquals(['foo', 'foo', 'bar'], self::$resolver->getArguments($request, $controller));
+    }
+
+    /**
+     * @requires PHP 5.6
+     */
+    public function testGetVariadicArgumentsWithoutArrayInRequest()
+    {
+        $this->expectException('InvalidArgumentException');
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('bar', 'foo');
+        $controller = [new VariadicController(), 'action'];
+
+        self::$resolver->getArguments($request, $controller);
+    }
+
+    /**
+     * @requires PHP 5.6
+     */
+    public function testGetArgumentWithoutArray()
+    {
+        $this->expectException('InvalidArgumentException');
+        $factory = new ArgumentMetadataFactory();
+        $valueResolver = $this->getMockBuilder(ArgumentValueResolverInterface::class)->getMock();
+        $resolver = new ArgumentResolver($factory, [$valueResolver]);
+
+        $valueResolver->expects($this->any())->method('supports')->willReturn(true);
+        $valueResolver->expects($this->any())->method('resolve')->willReturn('foo');
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('bar', 'foo');
+        $controller = [$this, 'controllerWithFooAndDefaultBar'];
+        $resolver->getArguments($request, $controller);
+    }
+
+    public function testIfExceptionIsThrownWhenMissingAnArgument()
+    {
+        $this->expectException('RuntimeException');
+        $request = Request::create('/');
+        $controller = [$this, 'controllerWithFoo'];
+
+        self::$resolver->getArguments($request, $controller);
+    }
+
+    /**
+     * @requires PHP 7.1
+     */
+    public function testGetNullableArguments()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('bar', new \stdClass());
+        $request->attributes->set('mandatory', 'mandatory');
+        $controller = [new NullableController(), 'action'];
+
+        $this->assertEquals(['foo', new \stdClass(), 'value', 'mandatory'], self::$resolver->getArguments($request, $controller));
+    }
+
+    /**
+     * @requires PHP 7.1
+     */
+    public function testGetNullableArgumentsWithDefaults()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('mandatory', 'mandatory');
+        $controller = [new NullableController(), 'action'];
+
+        $this->assertEquals([null, null, 'value', 'mandatory'], self::$resolver->getArguments($request, $controller));
+    }
+
+    public function testGetSessionArguments()
+    {
+        $session = new Session(new MockArraySessionStorage());
+        $request = Request::create('/');
+        $request->setSession($session);
+        $controller = [$this, 'controllerWithSession'];
+
+        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
+    }
+
+    public function testGetSessionArgumentsWithExtendedSession()
+    {
+        $session = new ExtendingSession(new MockArraySessionStorage());
+        $request = Request::create('/');
+        $request->setSession($session);
+        $controller = [$this, 'controllerWithExtendingSession'];
+
+        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
+    }
+
+    public function testGetSessionArgumentsWithInterface()
+    {
+        $session = $this->getMockBuilder(SessionInterface::class)->getMock();
+        $request = Request::create('/');
+        $request->setSession($session);
+        $controller = [$this, 'controllerWithSessionInterface'];
+
+        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
+    }
+
+    public function testGetSessionMissMatchWithInterface()
+    {
+        $this->expectException('RuntimeException');
+        $session = $this->getMockBuilder(SessionInterface::class)->getMock();
+        $request = Request::create('/');
+        $request->setSession($session);
+        $controller = [$this, 'controllerWithExtendingSession'];
+
+        self::$resolver->getArguments($request, $controller);
+    }
+
+    public function testGetSessionMissMatchWithImplementation()
+    {
+        $this->expectException('RuntimeException');
+        $session = new Session(new MockArraySessionStorage());
+        $request = Request::create('/');
+        $request->setSession($session);
+        $controller = [$this, 'controllerWithExtendingSession'];
+
+        self::$resolver->getArguments($request, $controller);
+    }
+
+    public function testGetSessionMissMatchOnNull()
+    {
+        $this->expectException('RuntimeException');
+        $request = Request::create('/');
+        $controller = [$this, 'controllerWithExtendingSession'];
+
+        self::$resolver->getArguments($request, $controller);
+    }
+
+    public function __invoke($foo, $bar = null)
+    {
+    }
+
+    public function controllerWithFoo($foo)
+    {
+    }
+
+    public function controllerWithoutArguments()
+    {
+    }
+
+    protected function controllerWithFooAndDefaultBar($foo, $bar = null)
+    {
+    }
+
+    protected function controllerWithFooBarFoobar($foo, $bar, $foobar)
+    {
+    }
+
+    protected function controllerWithRequest(Request $request)
+    {
+    }
+
+    protected function controllerWithExtendingRequest(ExtendingRequest $request)
+    {
+    }
+
+    protected function controllerWithSession(Session $session)
+    {
+    }
+
+    protected function controllerWithSessionInterface(SessionInterface $session)
+    {
+    }
+
+    protected function controllerWithExtendingSession(ExtendingSession $session)
+    {
+    }
+}
+
+function controller_function($foo, $foobar)
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php b/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
new file mode 100644
index 000000000..1f8ddb831
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -0,0 +1,298 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Controller;
+
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
+
+class ContainerControllerResolverTest extends ControllerResolverTest
+{
+    public function testGetControllerService()
+    {
+        $container = $this->createMockContainer();
+        $container->expects($this->once())
+            ->method('has')
+            ->with('foo')
+            ->willReturn(true);
+        $container->expects($this->once())
+            ->method('get')
+            ->with('foo')
+            ->willReturn($this)
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'foo:controllerMethod1');
+
+        $controller = $resolver->getController($request);
+
+        $this->assertInstanceOf(\get_class($this), $controller[0]);
+        $this->assertSame('controllerMethod1', $controller[1]);
+    }
+
+    public function testGetControllerInvokableService()
+    {
+        $invokableController = new InvokableController('bar');
+
+        $container = $this->createMockContainer();
+        $container->expects($this->once())
+            ->method('has')
+            ->with('foo')
+            ->willReturn(true)
+        ;
+        $container->expects($this->once())
+            ->method('get')
+            ->with('foo')
+            ->willReturn($invokableController)
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'foo');
+
+        $controller = $resolver->getController($request);
+
+        $this->assertEquals($invokableController, $controller);
+    }
+
+    public function testGetControllerInvokableServiceWithClassNameAsName()
+    {
+        $invokableController = new InvokableController('bar');
+        $className = __NAMESPACE__.'\InvokableController';
+
+        $container = $this->createMockContainer();
+        $container->expects($this->once())
+            ->method('has')
+            ->with($className)
+            ->willReturn(true)
+        ;
+        $container->expects($this->once())
+            ->method('get')
+            ->with($className)
+            ->willReturn($invokableController)
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', $className);
+
+        $controller = $resolver->getController($request);
+
+        $this->assertEquals($invokableController, $controller);
+    }
+
+    public function testNonInstantiableController()
+    {
+        $container = $this->createMockContainer();
+        $container->expects($this->once())
+            ->method('has')
+            ->with(NonInstantiableController::class)
+            ->willReturn(false)
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', [NonInstantiableController::class, 'action']);
+
+        $controller = $resolver->getController($request);
+
+        $this->assertSame([NonInstantiableController::class, 'action'], $controller);
+    }
+
+    public function testNonConstructController()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Controller "Symfony\Component\HttpKernel\Tests\Controller\ImpossibleConstructController" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
+        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container->expects($this->at(0))
+            ->method('has')
+            ->with(ImpossibleConstructController::class)
+            ->willReturn(true)
+        ;
+
+        $container->expects($this->at(1))
+            ->method('has')
+            ->with(ImpossibleConstructController::class)
+            ->willReturn(false)
+        ;
+
+        $container->expects($this->atLeastOnce())
+            ->method('getRemovedIds')
+            ->with()
+            ->willReturn([ImpossibleConstructController::class => true])
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', [ImpossibleConstructController::class, 'action']);
+
+        if (\PHP_VERSION_ID < 70100) {
+            ErrorHandler::register();
+            try {
+                $resolver->getController($request);
+            } finally {
+                restore_error_handler();
+                restore_exception_handler();
+            }
+        } else {
+            $resolver->getController($request);
+        }
+    }
+
+    public function testNonInstantiableControllerWithCorrespondingService()
+    {
+        $service = new \stdClass();
+
+        $container = $this->createMockContainer();
+        $container->expects($this->atLeastOnce())
+            ->method('has')
+            ->with(NonInstantiableController::class)
+            ->willReturn(true)
+        ;
+        $container->expects($this->atLeastOnce())
+            ->method('get')
+            ->with(NonInstantiableController::class)
+            ->willReturn($service)
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+        $request = Request::create('/');
+        $request->attributes->set('_controller', [NonInstantiableController::class, 'action']);
+
+        $controller = $resolver->getController($request);
+
+        $this->assertSame([$service, 'action'], $controller);
+    }
+
+    public function testExceptionWhenUsingRemovedControllerService()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
+        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container->expects($this->at(0))
+            ->method('has')
+            ->with('app.my_controller')
+            ->willReturn(false)
+        ;
+
+        $container->expects($this->atLeastOnce())
+            ->method('getRemovedIds')
+            ->with()
+            ->willReturn(['app.my_controller' => true])
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'app.my_controller');
+        $resolver->getController($request);
+    }
+
+    public function testExceptionWhenUsingControllerWithoutAnInvokeMethod()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Controller "app.my_controller" cannot be called without a method name. Did you forget an "__invoke" method?');
+        $container = $this->getMockBuilder(Container::class)->getMock();
+        $container->expects($this->once())
+            ->method('has')
+            ->with('app.my_controller')
+            ->willReturn(true)
+        ;
+        $container->expects($this->once())
+            ->method('get')
+            ->with('app.my_controller')
+            ->willReturn(new ImpossibleConstructController('toto', 'controller'))
+        ;
+
+        $resolver = $this->createControllerResolver(null, $container);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'app.my_controller');
+        $resolver->getController($request);
+    }
+
+    /**
+     * @dataProvider getUndefinedControllers
+     */
+    public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
+    {
+        // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex
+        $resolver = $this->createControllerResolver();
+        $this->expectException($exceptionName);
+        $this->expectExceptionMessageRegExp($exceptionMessage);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', $controller);
+        $resolver->getController($request);
+    }
+
+    public function getUndefinedControllers()
+    {
+        return [
+            ['foo', \LogicException::class, '/Controller not found: service "foo" does not exist\./'],
+            ['oof::bar', \InvalidArgumentException::class, '/Class "oof" does not exist\./'],
+            ['stdClass', \LogicException::class, '/Controller not found: service "stdClass" does not exist\./'],
+            [
+                'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar',
+                \InvalidArgumentException::class,
+                '/.?[cC]ontroller(.*?) for URI "\/" is not callable\.( Expected method(.*) Available methods)?/',
+            ],
+        ];
+    }
+
+    protected function createControllerResolver(LoggerInterface $logger = null, ContainerInterface $container = null)
+    {
+        if (!$container) {
+            $container = $this->createMockContainer();
+        }
+
+        return new ContainerControllerResolver($container, $logger);
+    }
+
+    protected function createMockContainer()
+    {
+        return $this->getMockBuilder(ContainerInterface::class)->getMock();
+    }
+}
+
+class InvokableController
+{
+    public function __construct($bar) // mandatory argument to prevent automatic instantiation
+    {
+    }
+
+    public function __invoke()
+    {
+    }
+}
+
+abstract class NonInstantiableController
+{
+    public static function action()
+    {
+    }
+}
+
+class ImpossibleConstructController
+{
+    public function __construct($toto, $controller)
+    {
+    }
+
+    public function action()
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php b/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
new file mode 100644
index 000000000..e34427a32
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
@@ -0,0 +1,325 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Controller;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
+
+class ControllerResolverTest extends TestCase
+{
+    public function testGetControllerWithoutControllerParameter()
+    {
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $logger->expects($this->once())->method('warning')->with('Unable to look for the controller as the "_controller" parameter is missing.');
+        $resolver = $this->createControllerResolver($logger);
+
+        $request = Request::create('/');
+        $this->assertFalse($resolver->getController($request), '->getController() returns false when the request has no _controller attribute');
+    }
+
+    public function testGetControllerWithLambda()
+    {
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', $lambda = function () {});
+        $controller = $resolver->getController($request);
+        $this->assertSame($lambda, $controller);
+    }
+
+    public function testGetControllerWithObjectAndInvokeMethod()
+    {
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', $this);
+        $controller = $resolver->getController($request);
+        $this->assertSame($this, $controller);
+    }
+
+    public function testGetControllerWithObjectAndMethod()
+    {
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', [$this, 'controllerMethod1']);
+        $controller = $resolver->getController($request);
+        $this->assertSame([$this, 'controllerMethod1'], $controller);
+    }
+
+    public function testGetControllerWithClassAndMethod()
+    {
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', ['Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4']);
+        $controller = $resolver->getController($request);
+        $this->assertSame(['Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4'], $controller);
+    }
+
+    public function testGetControllerWithObjectAndMethodAsString()
+    {
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::controllerMethod1');
+        $controller = $resolver->getController($request);
+        $this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller[0], '->getController() returns a PHP callable');
+    }
+
+    public function testGetControllerWithClassAndInvokeMethod()
+    {
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest');
+        $controller = $resolver->getController($request);
+        $this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller);
+    }
+
+    public function testGetControllerOnObjectWithoutInvokeMethod()
+    {
+        $this->expectException('InvalidArgumentException');
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', new \stdClass());
+        $resolver->getController($request);
+    }
+
+    public function testGetControllerWithFunction()
+    {
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\some_controller_function');
+        $controller = $resolver->getController($request);
+        $this->assertSame('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function', $controller);
+    }
+
+    /**
+     * @dataProvider getUndefinedControllers
+     */
+    public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
+    {
+        $resolver = $this->createControllerResolver();
+        $this->expectException($exceptionName);
+        $this->expectExceptionMessage($exceptionMessage);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', $controller);
+        $resolver->getController($request);
+    }
+
+    public function getUndefinedControllers()
+    {
+        return [
+            [1, 'InvalidArgumentException', 'Unable to find controller "1".'],
+            ['foo', 'InvalidArgumentException', 'Unable to find controller "foo".'],
+            ['oof::bar', 'InvalidArgumentException', 'Class "oof" does not exist.'],
+            ['stdClass', 'InvalidArgumentException', 'Unable to find controller "stdClass".'],
+            ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::staticsAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Expected method "staticsAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest", did you mean "staticAction"?'],
+            ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::privateAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Method "privateAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'],
+            ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::protectedAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Method "protectedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'],
+            ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::undefinedAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Expected method "undefinedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest". Available methods: "publicAction", "staticAction"'],
+        ];
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetArguments()
+    {
+        $resolver = $this->createControllerResolver();
+
+        $request = Request::create('/');
+        $controller = [new self(), 'testGetArguments'];
+        $this->assertEquals([], $resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = [new self(), 'controllerMethod1'];
+        $this->assertEquals(['foo'], $resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = [new self(), 'controllerMethod2'];
+        $this->assertEquals(['foo', null], $resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
+
+        $request->attributes->set('bar', 'bar');
+        $this->assertEquals(['foo', 'bar'], $resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = function ($foo) {};
+        $this->assertEquals(['foo'], $resolver->getArguments($request, $controller));
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = function ($foo, $bar = 'bar') {};
+        $this->assertEquals(['foo', 'bar'], $resolver->getArguments($request, $controller));
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $controller = new self();
+        $this->assertEquals(['foo', null], $resolver->getArguments($request, $controller));
+        $request->attributes->set('bar', 'bar');
+        $this->assertEquals(['foo', 'bar'], $resolver->getArguments($request, $controller));
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('foobar', 'foobar');
+        $controller = 'Symfony\Component\HttpKernel\Tests\Controller\some_controller_function';
+        $this->assertEquals(['foo', 'foobar'], $resolver->getArguments($request, $controller));
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('foobar', 'foobar');
+        $controller = [new self(), 'controllerMethod3'];
+
+        try {
+            $resolver->getArguments($request, $controller);
+            $this->fail('->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('\RuntimeException', $e, '->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
+        }
+
+        $request = Request::create('/');
+        $controller = [new self(), 'controllerMethod5'];
+        $this->assertEquals([$request], $resolver->getArguments($request, $controller), '->getArguments() injects the request');
+    }
+
+    /**
+     * @requires PHP 5.6
+     * @group legacy
+     */
+    public function testGetVariadicArguments()
+    {
+        $resolver = new ControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('bar', ['foo', 'bar']);
+        $controller = [new VariadicController(), 'action'];
+        $this->assertEquals(['foo', 'foo', 'bar'], $resolver->getArguments($request, $controller));
+    }
+
+    public function testCreateControllerCanReturnAnyCallable()
+    {
+        $mock = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolver')->setMethods(['createController'])->getMock();
+        $mock->expects($this->once())->method('createController')->willReturn('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function');
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', 'foobar');
+        $mock->getController($request);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testIfExceptionIsThrownWhenMissingAnArgument()
+    {
+        $this->expectException('RuntimeException');
+        $resolver = new ControllerResolver();
+        $request = Request::create('/');
+
+        $controller = [$this, 'controllerMethod1'];
+
+        $resolver->getArguments($request, $controller);
+    }
+
+    /**
+     * @requires PHP 7.1
+     * @group legacy
+     */
+    public function testGetNullableArguments()
+    {
+        $resolver = new ControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'foo');
+        $request->attributes->set('bar', new \stdClass());
+        $request->attributes->set('mandatory', 'mandatory');
+        $controller = [new NullableController(), 'action'];
+        $this->assertEquals(['foo', new \stdClass(), 'value', 'mandatory'], $resolver->getArguments($request, $controller));
+    }
+
+    /**
+     * @requires PHP 7.1
+     * @group legacy
+     */
+    public function testGetNullableArgumentsWithDefaults()
+    {
+        $resolver = new ControllerResolver();
+
+        $request = Request::create('/');
+        $request->attributes->set('mandatory', 'mandatory');
+        $controller = [new NullableController(), 'action'];
+        $this->assertEquals([null, null, 'value', 'mandatory'], $resolver->getArguments($request, $controller));
+    }
+
+    protected function createControllerResolver(LoggerInterface $logger = null)
+    {
+        return new ControllerResolver($logger);
+    }
+
+    public function __invoke($foo, $bar = null)
+    {
+    }
+
+    public function controllerMethod1($foo)
+    {
+    }
+
+    protected function controllerMethod2($foo, $bar = null)
+    {
+    }
+
+    protected function controllerMethod3($foo, $bar, $foobar)
+    {
+    }
+
+    protected static function controllerMethod4()
+    {
+    }
+
+    protected function controllerMethod5(Request $request)
+    {
+    }
+}
+
+function some_controller_function($foo, $foobar)
+{
+}
+
+class ControllerTest
+{
+    public function publicAction()
+    {
+    }
+
+    private function privateAction()
+    {
+    }
+
+    protected function protectedAction()
+    {
+    }
+
+    public static function staticAction()
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
new file mode 100644
index 000000000..1c0c4648a
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
@@ -0,0 +1,148 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\ControllerMetadata;
+
+use Fake\ImportedAndFake;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\BasicTypesController;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
+
+class ArgumentMetadataFactoryTest extends TestCase
+{
+    /**
+     * @var ArgumentMetadataFactory
+     */
+    private $factory;
+
+    protected function setUp()
+    {
+        $this->factory = new ArgumentMetadataFactory();
+    }
+
+    public function testSignature1()
+    {
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature1']);
+
+        $this->assertEquals([
+            new ArgumentMetadata('foo', self::class, false, false, null),
+            new ArgumentMetadata('bar', 'array', false, false, null),
+            new ArgumentMetadata('baz', 'callable', false, false, null),
+        ], $arguments);
+    }
+
+    public function testSignature2()
+    {
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature2']);
+
+        $this->assertEquals([
+            new ArgumentMetadata('foo', self::class, false, true, null, true),
+            new ArgumentMetadata('bar', __NAMESPACE__.'\FakeClassThatDoesNotExist', false, true, null, true),
+            new ArgumentMetadata('baz', 'Fake\ImportedAndFake', false, true, null, true),
+        ], $arguments);
+    }
+
+    public function testSignature3()
+    {
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature3']);
+
+        $this->assertEquals([
+            new ArgumentMetadata('bar', __NAMESPACE__.'\FakeClassThatDoesNotExist', false, false, null),
+            new ArgumentMetadata('baz', 'Fake\ImportedAndFake', false, false, null),
+        ], $arguments);
+    }
+
+    public function testSignature4()
+    {
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature4']);
+
+        $this->assertEquals([
+            new ArgumentMetadata('foo', null, false, true, 'default'),
+            new ArgumentMetadata('bar', null, false, true, 500),
+            new ArgumentMetadata('baz', null, false, true, []),
+        ], $arguments);
+    }
+
+    public function testSignature5()
+    {
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature5']);
+
+        $this->assertEquals([
+            new ArgumentMetadata('foo', 'array', false, true, null, true),
+            new ArgumentMetadata('bar', null, false, false, null),
+        ], $arguments);
+    }
+
+    /**
+     * @requires PHP 5.6
+     */
+    public function testVariadicSignature()
+    {
+        $arguments = $this->factory->createArgumentMetadata([new VariadicController(), 'action']);
+
+        $this->assertEquals([
+            new ArgumentMetadata('foo', null, false, false, null),
+            new ArgumentMetadata('bar', null, true, false, null),
+        ], $arguments);
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testBasicTypesSignature()
+    {
+        $arguments = $this->factory->createArgumentMetadata([new BasicTypesController(), 'action']);
+
+        $this->assertEquals([
+            new ArgumentMetadata('foo', 'string', false, false, null),
+            new ArgumentMetadata('bar', 'int', false, false, null),
+            new ArgumentMetadata('baz', 'float', false, false, null),
+        ], $arguments);
+    }
+
+    /**
+     * @requires PHP 7.1
+     */
+    public function testNullableTypesSignature()
+    {
+        $arguments = $this->factory->createArgumentMetadata([new NullableController(), 'action']);
+
+        $this->assertEquals([
+            new ArgumentMetadata('foo', 'string', false, false, null, true),
+            new ArgumentMetadata('bar', \stdClass::class, false, false, null, true),
+            new ArgumentMetadata('baz', 'string', false, true, 'value', true),
+            new ArgumentMetadata('mandatory', null, false, false, null, true),
+        ], $arguments);
+    }
+
+    private function signature1(self $foo, array $bar, callable $baz)
+    {
+    }
+
+    private function signature2(self $foo = null, FakeClassThatDoesNotExist $bar = null, ImportedAndFake $baz = null)
+    {
+    }
+
+    private function signature3(FakeClassThatDoesNotExist $bar, ImportedAndFake $baz)
+    {
+    }
+
+    private function signature4($foo = 'default', $bar = 500, $baz = [])
+    {
+    }
+
+    private function signature5(array $foo = null, $bar)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataTest.php b/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
new file mode 100644
index 000000000..5ce4b1f76
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\ControllerMetadata;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+
+class ArgumentMetadataTest extends TestCase
+{
+    public function testWithBcLayerWithDefault()
+    {
+        $argument = new ArgumentMetadata('foo', 'string', false, true, 'default value');
+
+        $this->assertFalse($argument->isNullable());
+    }
+
+    public function testDefaultValueAvailable()
+    {
+        $argument = new ArgumentMetadata('foo', 'string', false, true, 'default value', true);
+
+        $this->assertTrue($argument->isNullable());
+        $this->assertTrue($argument->hasDefaultValue());
+        $this->assertSame('default value', $argument->getDefaultValue());
+    }
+
+    public function testDefaultValueUnavailable()
+    {
+        $this->expectException('LogicException');
+        $argument = new ArgumentMetadata('foo', 'string', false, false, null, false);
+
+        $this->assertFalse($argument->isNullable());
+        $this->assertFalse($argument->hasDefaultValue());
+        $argument->getDefaultValue();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/Compiler.log b/lib/symfony/http-kernel/Tests/DataCollector/Compiler.log
new file mode 100644
index 000000000..88b6840ea
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/Compiler.log
@@ -0,0 +1,4 @@
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "Psr\Container\ContainerInterface"; reason: private alias.
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "Symfony\Component\DependencyInjection\ContainerInterface"; reason: private alias.
+Some custom logging message
+With ending :
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
new file mode 100644
index 000000000..a858eabe1
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DataCollector;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector;
+use Symfony\Component\HttpKernel\Kernel;
+
+class ConfigDataCollectorTest extends TestCase
+{
+    public function testCollect()
+    {
+        $kernel = new KernelForTest('test', true);
+        $c = new ConfigDataCollector();
+        $c->setKernel($kernel);
+        $c->collect(new Request(), new Response());
+
+        $this->assertSame('test', $c->getEnv());
+        $this->assertTrue($c->isDebug());
+        $this->assertSame('config', $c->getName());
+        $this->assertSame('testkernel', $c->getAppName());
+        $this->assertRegExp('~^'.preg_quote($c->getPhpVersion(), '~').'~', PHP_VERSION);
+        $this->assertRegExp('~'.preg_quote((string) $c->getPhpVersionExtra(), '~').'$~', PHP_VERSION);
+        $this->assertSame(PHP_INT_SIZE * 8, $c->getPhpArchitecture());
+        $this->assertSame(class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a', $c->getPhpIntlLocale());
+        $this->assertSame(date_default_timezone_get(), $c->getPhpTimezone());
+        $this->assertSame(Kernel::VERSION, $c->getSymfonyVersion());
+        $this->assertNull($c->getToken());
+        $this->assertSame(\extension_loaded('xdebug'), $c->hasXDebug());
+        $this->assertSame(\extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN), $c->hasZendOpcache());
+        $this->assertSame(\extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN), $c->hasApcu());
+    }
+}
+
+class KernelForTest extends Kernel
+{
+    public function getName()
+    {
+        return 'testkernel';
+    }
+
+    public function registerBundles()
+    {
+    }
+
+    public function getBundles()
+    {
+        return [];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/DataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/DataCollectorTest.php
new file mode 100644
index 000000000..ae79a3c93
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/DataCollectorTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DataCollector;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Tests\Fixtures\DataCollector\CloneVarDataCollector;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+
+class DataCollectorTest extends TestCase
+{
+    public function testCloneVarStringWithScheme()
+    {
+        $c = new CloneVarDataCollector('scheme://foo');
+        $c->collect(new Request(), new Response());
+        $cloner = new VarCloner();
+
+        $this->assertEquals($cloner->cloneVar('scheme://foo'), $c->getData());
+    }
+
+    public function testCloneVarExistingFilePath()
+    {
+        $c = new CloneVarDataCollector([$filePath = tempnam(sys_get_temp_dir(), 'clone_var_data_collector_')]);
+        $c->collect(new Request(), new Response());
+
+        $this->assertSame($filePath, $c->getData()[0]);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
new file mode 100644
index 000000000..ebe50e378
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DataCollector;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DumpDataCollectorTest extends TestCase
+{
+    public function testDump()
+    {
+        $data = new Data([[123]]);
+
+        $collector = new DumpDataCollector();
+
+        $this->assertSame('dump', $collector->getName());
+
+        $collector->dump($data);
+        $line = __LINE__ - 1;
+        $this->assertSame(1, $collector->getDumpsCount());
+
+        $dump = $collector->getDumps('html');
+        $this->assertArrayHasKey('data', $dump[0]);
+        $dump[0]['data'] = preg_replace('/^.*?<pre/', '<pre', $dump[0]['data']);
+        $dump[0]['data'] = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump[0]['data']);
+
+        $xDump = [
+            [
+                'data' => "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-num>123</span>\n</pre><script>Sfdump(\"sf-dump\")</script>\n",
+                'name' => 'DumpDataCollectorTest.php',
+                'file' => __FILE__,
+                'line' => $line,
+                'fileExcerpt' => false,
+            ],
+        ];
+        $this->assertEquals($xDump, $dump);
+
+        $this->assertStringMatchesFormat('a:3:{i:0;a:5:{s:4:"data";%c:39:"Symfony\Component\VarDumper\Cloner\Data":%a', $collector->serialize());
+        $this->assertSame(0, $collector->getDumpsCount());
+        $this->assertSame('a:2:{i:0;b:0;i:1;s:5:"UTF-8";}', $collector->serialize());
+    }
+
+    public function testCollectDefault()
+    {
+        $data = new Data([[123]]);
+
+        $collector = new DumpDataCollector();
+
+        $collector->dump($data);
+        $line = __LINE__ - 1;
+
+        ob_start();
+        $collector->collect(new Request(), new Response());
+        $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean());
+
+        $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n123\n", $output);
+        $this->assertSame(1, $collector->getDumpsCount());
+        $collector->serialize();
+    }
+
+    public function testCollectHtml()
+    {
+        $data = new Data([[123]]);
+
+        $collector = new DumpDataCollector(null, 'test://%f:%l');
+
+        $collector->dump($data);
+        $line = __LINE__ - 1;
+        $file = __FILE__;
+        $xOutput = <<<EOTXT
+<pre class=sf-dump id=sf-dump data-indent-pad="  "><a href="test://{$file}:{$line}" title="{$file}"><span class=sf-dump-meta>DumpDataCollectorTest.php</span></a> on line <span class=sf-dump-meta>{$line}</span>:
+<span class=sf-dump-num>123</span>
+</pre>
+EOTXT;
+
+        ob_start();
+        $response = new Response();
+        $response->headers->set('Content-Type', 'text/html');
+        $collector->collect(new Request(), $response);
+        $output = ob_get_clean();
+        $output = preg_replace('#<(script|style).*?</\1>#s', '', $output);
+        $output = preg_replace('/sf-dump-\d+/', 'sf-dump', $output);
+
+        $this->assertSame($xOutput, trim($output));
+        $this->assertSame(1, $collector->getDumpsCount());
+        $collector->serialize();
+    }
+
+    public function testFlush()
+    {
+        $data = new Data([[456]]);
+        $collector = new DumpDataCollector();
+        $collector->dump($data);
+        $line = __LINE__ - 1;
+
+        ob_start();
+        $collector->__destruct();
+        $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean());
+        $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output);
+    }
+
+    public function testFlushNothingWhenDataDumperIsProvided()
+    {
+        $data = new Data([[456]]);
+        $dumper = new CliDumper('php://output');
+        $collector = new DumpDataCollector(null, null, null, null, $dumper);
+
+        ob_start();
+        $collector->dump($data);
+        $line = __LINE__ - 1;
+        $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean());
+
+        $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output);
+
+        ob_start();
+        $collector->__destruct();
+        $this->assertEmpty(ob_get_clean());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/ExceptionDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/ExceptionDataCollectorTest.php
new file mode 100644
index 000000000..1e8d186cc
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/ExceptionDataCollectorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DataCollector;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\Exception\FlattenException;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector;
+
+class ExceptionDataCollectorTest extends TestCase
+{
+    public function testCollect()
+    {
+        $e = new \Exception('foo', 500);
+        $c = new ExceptionDataCollector();
+        $flattened = FlattenException::create($e);
+        $trace = $flattened->getTrace();
+
+        $this->assertFalse($c->hasException());
+
+        $c->collect(new Request(), new Response(), $e);
+
+        $this->assertTrue($c->hasException());
+        $this->assertEquals($flattened, $c->getException());
+        $this->assertSame('foo', $c->getMessage());
+        $this->assertSame(500, $c->getCode());
+        $this->assertSame('exception', $c->getName());
+        $this->assertSame($trace, $c->getTrace());
+    }
+
+    public function testCollectWithoutException()
+    {
+        $c = new ExceptionDataCollector();
+        $c->collect(new Request(), new Response());
+
+        $this->assertFalse($c->hasException());
+    }
+
+    public function testReset()
+    {
+        $c = new ExceptionDataCollector();
+
+        $c->collect(new Request(), new Response(), new \Exception());
+        $c->reset();
+        $c->collect(new Request(), new Response());
+
+        $this->assertFalse($c->hasException());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
new file mode 100644
index 000000000..8b7fbe2a1
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DataCollector;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\Exception\SilencedErrorContext;
+use Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector;
+
+class LoggerDataCollectorTest extends TestCase
+{
+    public function testCollectWithUnexpectedFormat()
+    {
+        $logger = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
+            ->setMethods(['countErrors', 'getLogs', 'clear'])
+            ->getMock();
+        $logger->expects($this->once())->method('countErrors')->willReturn(123);
+        $logger->expects($this->exactly(2))->method('getLogs')->willReturn([]);
+
+        $c = new LoggerDataCollector($logger, __DIR__.'/');
+        $c->lateCollect();
+        $compilerLogs = $c->getCompilerLogs()->getValue('message');
+
+        $this->assertSame([
+            ['message' => 'Removed service "Psr\Container\ContainerInterface"; reason: private alias.'],
+            ['message' => 'Removed service "Symfony\Component\DependencyInjection\ContainerInterface"; reason: private alias.'],
+        ], $compilerLogs['Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass']);
+
+        $this->assertSame([
+            ['message' => 'Some custom logging message'],
+            ['message' => 'With ending :'],
+        ], $compilerLogs['Unknown Compiler Pass']);
+    }
+
+    /**
+     * @dataProvider getCollectTestData
+     */
+    public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount, $expectedScreamCount, $expectedPriorities = null)
+    {
+        $logger = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
+            ->setMethods(['countErrors', 'getLogs', 'clear'])
+            ->getMock();
+        $logger->expects($this->once())->method('countErrors')->willReturn($nb);
+        $logger->expects($this->exactly(2))->method('getLogs')->willReturn($logs);
+
+        $c = new LoggerDataCollector($logger);
+        $c->lateCollect();
+
+        $this->assertEquals('logger', $c->getName());
+        $this->assertEquals($nb, $c->countErrors());
+
+        $logs = array_map(function ($v) {
+            if (isset($v['context']['exception'])) {
+                $e = &$v['context']['exception'];
+                $e = isset($e["\0*\0message"]) ? [$e["\0*\0message"], $e["\0*\0severity"]] : [$e["\0Symfony\Component\Debug\Exception\SilencedErrorContext\0severity"]];
+            }
+
+            return $v;
+        }, $c->getLogs()->getValue(true));
+        $this->assertEquals($expectedLogs, $logs);
+        $this->assertEquals($expectedDeprecationCount, $c->countDeprecations());
+        $this->assertEquals($expectedScreamCount, $c->countScreams());
+
+        if (isset($expectedPriorities)) {
+            $this->assertSame($expectedPriorities, $c->getPriorities()->getValue(true));
+        }
+    }
+
+    public function testReset()
+    {
+        $logger = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
+            ->setMethods(['countErrors', 'getLogs', 'clear'])
+            ->getMock();
+        $logger->expects($this->once())->method('clear');
+
+        $c = new LoggerDataCollector($logger);
+        $c->reset();
+    }
+
+    public function getCollectTestData()
+    {
+        yield 'simple log' => [
+            1,
+            [['message' => 'foo', 'context' => [], 'priority' => 100, 'priorityName' => 'DEBUG']],
+            [['message' => 'foo', 'context' => [], 'priority' => 100, 'priorityName' => 'DEBUG']],
+            0,
+            0,
+        ];
+
+        yield 'log with a context' => [
+            1,
+            [['message' => 'foo', 'context' => ['foo' => 'bar'], 'priority' => 100, 'priorityName' => 'DEBUG']],
+            [['message' => 'foo', 'context' => ['foo' => 'bar'], 'priority' => 100, 'priorityName' => 'DEBUG']],
+            0,
+            0,
+        ];
+
+        if (!class_exists(SilencedErrorContext::class)) {
+            return;
+        }
+
+        yield 'logs with some deprecations' => [
+            1,
+            [
+                ['message' => 'foo3', 'context' => ['exception' => new \ErrorException('warning', 0, E_USER_WARNING)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo', 'context' => ['exception' => new \ErrorException('deprecated', 0, E_DEPRECATED)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo2', 'context' => ['exception' => new \ErrorException('deprecated', 0, E_USER_DEPRECATED)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+            ],
+            [
+                ['message' => 'foo3', 'context' => ['exception' => ['warning', E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo', 'context' => ['exception' => ['deprecated', E_DEPRECATED]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => false],
+                ['message' => 'foo2', 'context' => ['exception' => ['deprecated', E_USER_DEPRECATED]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => false],
+            ],
+            2,
+            0,
+            [100 => ['count' => 3, 'name' => 'DEBUG']],
+        ];
+
+        yield 'logs with some silent errors' => [
+            1,
+            [
+                ['message' => 'foo3', 'context' => ['exception' => new \ErrorException('warning', 0, E_USER_WARNING)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo3', 'context' => ['exception' => new SilencedErrorContext(E_USER_WARNING, __FILE__, __LINE__)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+            ],
+            [
+                ['message' => 'foo3', 'context' => ['exception' => ['warning', E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo3', 'context' => ['exception' => [E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => true],
+            ],
+            0,
+            1,
+        ];
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
new file mode 100644
index 000000000..63dd62ce7
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DataCollector;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector;
+
+class MemoryDataCollectorTest extends TestCase
+{
+    public function testCollect()
+    {
+        $collector = new MemoryDataCollector();
+        $collector->collect(new Request(), new Response());
+
+        $this->assertIsInt($collector->getMemory());
+        $this->assertIsInt($collector->getMemoryLimit());
+        $this->assertSame('memory', $collector->getName());
+    }
+
+    /** @dataProvider getBytesConversionTestData */
+    public function testBytesConversion($limit, $bytes)
+    {
+        $collector = new MemoryDataCollector();
+        $method = new \ReflectionMethod($collector, 'convertToBytes');
+        $method->setAccessible(true);
+        $this->assertEquals($bytes, $method->invoke($collector, $limit));
+    }
+
+    public function getBytesConversionTestData()
+    {
+        return [
+            ['2k', 2048],
+            ['2 k', 2048],
+            ['8m', 8 * 1024 * 1024],
+            ['+2 k', 2048],
+            ['+2???k', 2048],
+            ['0x10', 16],
+            ['0xf', 15],
+            ['010', 8],
+            ['+0x10 k', 16 * 1024],
+            ['1g', 1024 * 1024 * 1024],
+            ['1G', 1024 * 1024 * 1024],
+            ['-1', -1],
+            ['0', 0],
+            ['2mk', 2048], // the unit must be the last char, so in this case 'k', not 'm'
+        ];
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
new file mode 100644
index 000000000..5e97267da
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -0,0 +1,334 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DataCollector;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\ParameterBag;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class RequestDataCollectorTest extends TestCase
+{
+    public function testCollect()
+    {
+        $c = new RequestDataCollector();
+
+        $c->collect($request = $this->createRequest(), $this->createResponse());
+        $c->lateCollect();
+
+        $attributes = $c->getRequestAttributes();
+
+        $this->assertSame('request', $c->getName());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestHeaders());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestServer());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestCookies());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $attributes);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestRequest());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestQuery());
+        $this->assertInstanceOf(ParameterBag::class, $c->getResponseCookies());
+        $this->assertSame('html', $c->getFormat());
+        $this->assertEquals('foobar', $c->getRoute());
+        $this->assertEquals(['name' => 'foo'], $c->getRouteParams());
+        $this->assertSame([], $c->getSessionAttributes());
+        $this->assertSame('en', $c->getLocale());
+        $this->assertContains(__FILE__, $attributes->get('resource'));
+        $this->assertSame('stdClass', $attributes->get('object')->getType());
+
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getResponseHeaders());
+        $this->assertSame('OK', $c->getStatusText());
+        $this->assertSame(200, $c->getStatusCode());
+        $this->assertSame('application/json', $c->getContentType());
+    }
+
+    public function testCollectWithoutRouteParams()
+    {
+        $request = $this->createRequest([]);
+
+        $c = new RequestDataCollector();
+        $c->collect($request, $this->createResponse());
+        $c->lateCollect();
+
+        $this->assertEquals([], $c->getRouteParams());
+    }
+
+    /**
+     * @dataProvider provideControllerCallables
+     */
+    public function testControllerInspection($name, $callable, $expected)
+    {
+        $c = new RequestDataCollector();
+        $request = $this->createRequest();
+        $response = $this->createResponse();
+        $this->injectController($c, $callable, $request);
+        $c->collect($request, $response);
+        $c->lateCollect();
+
+        $this->assertSame($expected, $c->getController()->getValue(true), sprintf('Testing: %s', $name));
+    }
+
+    public function provideControllerCallables()
+    {
+        // make sure we always match the line number
+        $r1 = new \ReflectionMethod($this, 'testControllerInspection');
+        $r2 = new \ReflectionMethod($this, 'staticControllerMethod');
+        $r3 = new \ReflectionClass($this);
+
+        // test name, callable, expected
+        return [
+            [
+                '"Regular" callable',
+                [$this, 'testControllerInspection'],
+                [
+                    'class' => __NAMESPACE__.'\RequestDataCollectorTest',
+                    'method' => 'testControllerInspection',
+                    'file' => __FILE__,
+                    'line' => $r1->getStartLine(),
+                ],
+            ],
+
+            [
+                'Closure',
+                function () { return 'foo'; },
+                [
+                    'class' => __NAMESPACE__.'\{closure}',
+                    'method' => null,
+                    'file' => __FILE__,
+                    'line' => __LINE__ - 5,
+                ],
+            ],
+
+            [
+                'Static callback as string',
+                __NAMESPACE__.'\RequestDataCollectorTest::staticControllerMethod',
+                [
+                    'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
+                    'method' => 'staticControllerMethod',
+                    'file' => __FILE__,
+                    'line' => $r2->getStartLine(),
+                ],
+            ],
+
+            [
+                'Static callable with instance',
+                [$this, 'staticControllerMethod'],
+                [
+                    'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
+                    'method' => 'staticControllerMethod',
+                    'file' => __FILE__,
+                    'line' => $r2->getStartLine(),
+                ],
+            ],
+
+            [
+                'Static callable with class name',
+                ['Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', 'staticControllerMethod'],
+                [
+                    'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
+                    'method' => 'staticControllerMethod',
+                    'file' => __FILE__,
+                    'line' => $r2->getStartLine(),
+                ],
+            ],
+
+            [
+                'Callable with instance depending on __call()',
+                [$this, 'magicMethod'],
+                [
+                    'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
+                    'method' => 'magicMethod',
+                    'file' => 'n/a',
+                    'line' => 'n/a',
+                ],
+            ],
+
+            [
+                'Callable with class name depending on __callStatic()',
+                ['Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', 'magicMethod'],
+                [
+                    'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
+                    'method' => 'magicMethod',
+                    'file' => 'n/a',
+                    'line' => 'n/a',
+                ],
+            ],
+
+            [
+                'Invokable controller',
+                $this,
+                [
+                    'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
+                    'method' => null,
+                    'file' => __FILE__,
+                    'line' => $r3->getStartLine(),
+                ],
+            ],
+        ];
+    }
+
+    public function testItIgnoresInvalidCallables()
+    {
+        $request = $this->createRequestWithSession();
+        $response = new RedirectResponse('/');
+
+        $c = new RequestDataCollector();
+        $c->collect($request, $response);
+
+        $this->assertSame('n/a', $c->getController());
+    }
+
+    public function testItAddsRedirectedAttributesWhenRequestContainsSpecificCookie()
+    {
+        $request = $this->createRequest();
+        $request->cookies->add([
+            'sf_redirect' => '{}',
+        ]);
+
+        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
+
+        $c = new RequestDataCollector();
+        $c->onKernelResponse(new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $this->createResponse()));
+
+        $this->assertTrue($request->attributes->get('_redirected'));
+    }
+
+    public function testItSetsARedirectCookieIfTheResponseIsARedirection()
+    {
+        $c = new RequestDataCollector();
+
+        $response = $this->createResponse();
+        $response->setStatusCode(302);
+        $response->headers->set('Location', '/somewhere-else');
+
+        $c->collect($request = $this->createRequest(), $response);
+        $c->lateCollect();
+
+        $cookie = $this->getCookieByName($response, 'sf_redirect');
+
+        $this->assertNotEmpty($cookie->getValue());
+    }
+
+    public function testItCollectsTheRedirectionAndClearTheCookie()
+    {
+        $c = new RequestDataCollector();
+
+        $request = $this->createRequest();
+        $request->attributes->set('_redirected', true);
+        $request->cookies->add([
+            'sf_redirect' => '{"method": "POST"}',
+        ]);
+
+        $c->collect($request, $response = $this->createResponse());
+        $c->lateCollect();
+
+        $this->assertEquals('POST', $c->getRedirect()['method']);
+
+        $cookie = $this->getCookieByName($response, 'sf_redirect');
+        $this->assertNull($cookie->getValue());
+    }
+
+    protected function createRequest($routeParams = ['name' => 'foo'])
+    {
+        $request = Request::create('http://test.com/foo?bar=baz');
+        $request->attributes->set('foo', 'bar');
+        $request->attributes->set('_route', 'foobar');
+        $request->attributes->set('_route_params', $routeParams);
+        $request->attributes->set('resource', fopen(__FILE__, 'r'));
+        $request->attributes->set('object', new \stdClass());
+
+        return $request;
+    }
+
+    private function createRequestWithSession()
+    {
+        $request = $this->createRequest();
+        $request->attributes->set('_controller', 'Foo::bar');
+        $request->setSession(new Session(new MockArraySessionStorage()));
+        $request->getSession()->start();
+
+        return $request;
+    }
+
+    protected function createResponse()
+    {
+        $response = new Response();
+        $response->setStatusCode(200);
+        $response->headers->set('Content-Type', 'application/json');
+        $response->headers->set('X-Foo-Bar', null);
+        $response->headers->setCookie(new Cookie('foo', 'bar', 1, '/foo', 'localhost', true, true));
+        $response->headers->setCookie(new Cookie('bar', 'foo', new \DateTime('@946684800')));
+        $response->headers->setCookie(new Cookie('bazz', 'foo', '2000-12-12'));
+
+        return $response;
+    }
+
+    /**
+     * Inject the given controller callable into the data collector.
+     */
+    protected function injectController($collector, $controller, $request)
+    {
+        $resolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface')->getMock();
+        $httpKernel = new HttpKernel(new EventDispatcher(), $resolver, null, $this->getMockBuilder(ArgumentResolverInterface::class)->getMock());
+        $event = new FilterControllerEvent($httpKernel, $controller, $request, HttpKernelInterface::MASTER_REQUEST);
+        $collector->onKernelController($event);
+    }
+
+    /**
+     * Dummy method used as controller callable.
+     */
+    public static function staticControllerMethod()
+    {
+        throw new \LogicException('Unexpected method call');
+    }
+
+    /**
+     * Magic method to allow non existing methods to be called and delegated.
+     */
+    public function __call($method, $args)
+    {
+        throw new \LogicException('Unexpected method call');
+    }
+
+    /**
+     * Magic method to allow non existing methods to be called and delegated.
+     */
+    public static function __callStatic($method, $args)
+    {
+        throw new \LogicException('Unexpected method call');
+    }
+
+    public function __invoke()
+    {
+        throw new \LogicException('Unexpected method call');
+    }
+
+    private function getCookieByName(Response $response, $name)
+    {
+        foreach ($response->headers->getCookies() as $cookie) {
+            if ($cookie->getName() == $name) {
+                return $cookie;
+            }
+        }
+
+        throw new \InvalidArgumentException(sprintf('Cookie named "%s" is not in response', $name));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php b/lib/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
new file mode 100644
index 000000000..9de9eb599
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\DataCollector;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\TimeDataCollector;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+/**
+ * @group time-sensitive
+ */
+class TimeDataCollectorTest extends TestCase
+{
+    public function testCollect()
+    {
+        $c = new TimeDataCollector();
+
+        $request = new Request();
+        $request->server->set('REQUEST_TIME', 1);
+
+        $c->collect($request, new Response());
+
+        $this->assertEquals(0, $c->getStartTime());
+
+        $request->server->set('REQUEST_TIME_FLOAT', 2);
+
+        $c->collect($request, new Response());
+
+        $this->assertEquals(2000, $c->getStartTime());
+
+        $request = new Request();
+        $c->collect($request, new Response());
+        $this->assertEquals(0, $c->getStartTime());
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
+        $kernel->expects($this->once())->method('getStartTime')->willReturn(123456.0);
+
+        $c = new TimeDataCollector($kernel);
+        $request = new Request();
+        $request->server->set('REQUEST_TIME', 1);
+
+        $c->collect($request, new Response());
+        $this->assertEquals(123456000, $c->getStartTime());
+        $this->assertSame(class_exists(Stopwatch::class, false), $c->isStopwatchInstalled());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DataCollector/Util/ValueExporterTest.php b/lib/symfony/http-kernel/Tests/DataCollector/Util/ValueExporterTest.php
new file mode 100644
index 000000000..5fe92d60e
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DataCollector/Util/ValueExporterTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DataCollector\Util;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+
+/**
+ * @group legacy
+ */
+class ValueExporterTest extends TestCase
+{
+    /**
+     * @var ValueExporter
+     */
+    private $valueExporter;
+
+    protected function setUp()
+    {
+        $this->valueExporter = new ValueExporter();
+    }
+
+    public function testDateTime()
+    {
+        $dateTime = new \DateTime('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
+        $this->assertSame('Object(DateTime) - 2014-06-10T07:35:40+00:00', $this->valueExporter->exportValue($dateTime));
+    }
+
+    public function testDateTimeImmutable()
+    {
+        $dateTime = new \DateTimeImmutable('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
+        $this->assertSame('Object(DateTimeImmutable) - 2014-06-10T07:35:40+00:00', $this->valueExporter->exportValue($dateTime));
+    }
+
+    public function testIncompleteClass()
+    {
+        $foo = new \__PHP_Incomplete_Class();
+        $array = new \ArrayObject($foo);
+        $array['__PHP_Incomplete_Class_Name'] = 'AppBundle/Foo';
+        $this->assertSame('__PHP_Incomplete_Class(AppBundle/Foo)', $this->valueExporter->exportValue($foo));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Debug/FileLinkFormatterTest.php b/lib/symfony/http-kernel/Tests/Debug/FileLinkFormatterTest.php
new file mode 100644
index 000000000..5c93bd90e
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Debug/FileLinkFormatterTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Debug;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
+
+class FileLinkFormatterTest extends TestCase
+{
+    public function testWhenNoFileLinkFormatAndNoRequest()
+    {
+        $sut = new FileLinkFormatter();
+
+        $this->assertFalse($sut->format('/kernel/root/src/my/very/best/file.php', 3));
+    }
+
+    public function testWhenFileLinkFormatAndNoRequest()
+    {
+        $file = __DIR__.\DIRECTORY_SEPARATOR.'file.php';
+
+        $sut = new FileLinkFormatter('debug://open?url=file://%f&line=%l', new RequestStack());
+
+        $this->assertSame("debug://open?url=file://$file&line=3", $sut->format($file, 3));
+    }
+
+    public function testWhenFileLinkFormatAndRequest()
+    {
+        $file = __DIR__.\DIRECTORY_SEPARATOR.'file.php';
+        $requestStack = new RequestStack();
+        $request = new Request();
+        $requestStack->push($request);
+
+        $sut = new FileLinkFormatter('debug://open?url=file://%f&line=%l', $requestStack, __DIR__, '/_profiler/open?file=%f&line=%l#line%l');
+
+        $this->assertSame("debug://open?url=file://$file&line=3", $sut->format($file, 3));
+    }
+
+    public function testWhenNoFileLinkFormatAndRequest()
+    {
+        $file = __DIR__.\DIRECTORY_SEPARATOR.'file.php';
+        $requestStack = new RequestStack();
+        $request = new Request();
+        $requestStack->push($request);
+
+        $request->server->set('SERVER_NAME', 'www.example.org');
+        $request->server->set('SERVER_PORT', 80);
+        $request->server->set('SCRIPT_NAME', '/index.php');
+        $request->server->set('SCRIPT_FILENAME', '/public/index.php');
+        $request->server->set('REQUEST_URI', '/index.php/example');
+
+        $sut = new FileLinkFormatter(null, $requestStack, __DIR__, '/_profiler/open?file=%f&line=%l#line%l');
+
+        $this->assertSame('http://www.example.org/_profiler/open?file=file.php&line=3#line3', $sut->format($file, 3));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php b/lib/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
new file mode 100644
index 000000000..30c5ab5aa
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Debug;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+class TraceableEventDispatcherTest extends TestCase
+{
+    public function testStopwatchSections()
+    {
+        $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch = new Stopwatch());
+        $kernel = $this->getHttpKernel($dispatcher, function () { return new Response('', 200, ['X-Debug-Token' => '292e1e']); });
+        $request = Request::create('/');
+        $response = $kernel->handle($request);
+        $kernel->terminate($request, $response);
+
+        $events = $stopwatch->getSectionEvents($response->headers->get('X-Debug-Token'));
+        $this->assertEquals([
+            '__section__',
+            'kernel.request',
+            'kernel.controller',
+            'kernel.controller_arguments',
+            'controller',
+            'kernel.response',
+            'kernel.terminate',
+        ], array_keys($events));
+    }
+
+    public function testStopwatchCheckControllerOnRequestEvent()
+    {
+        $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')
+            ->setMethods(['isStarted'])
+            ->getMock();
+        $stopwatch->expects($this->once())
+            ->method('isStarted')
+            ->willReturn(false);
+
+        $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch);
+
+        $kernel = $this->getHttpKernel($dispatcher, function () { return new Response(); });
+        $request = Request::create('/');
+        $kernel->handle($request);
+    }
+
+    public function testStopwatchStopControllerOnRequestEvent()
+    {
+        $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')
+            ->setMethods(['isStarted', 'stop'])
+            ->getMock();
+        $stopwatch->expects($this->once())
+            ->method('isStarted')
+            ->willReturn(true);
+        $stopwatch->expects($this->once())
+            ->method('stop');
+
+        $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch);
+
+        $kernel = $this->getHttpKernel($dispatcher, function () { return new Response(); });
+        $request = Request::create('/');
+        $kernel->handle($request);
+    }
+
+    public function testAddListenerNested()
+    {
+        $called1 = false;
+        $called2 = false;
+        $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $dispatcher->addListener('my-event', function () use ($dispatcher, &$called1, &$called2) {
+            $called1 = true;
+            $dispatcher->addListener('my-event', function () use (&$called2) {
+                $called2 = true;
+            });
+        });
+        $dispatcher->dispatch('my-event');
+        $this->assertTrue($called1);
+        $this->assertFalse($called2);
+        $dispatcher->dispatch('my-event');
+        $this->assertTrue($called2);
+    }
+
+    public function testListenerCanRemoveItselfWhenExecuted()
+    {
+        $eventDispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $listener1 = function () use ($eventDispatcher, &$listener1) {
+            $eventDispatcher->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');
+    }
+
+    protected function getHttpKernel($dispatcher, $controller)
+    {
+        $controllerResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface')->getMock();
+        $controllerResolver->expects($this->once())->method('getController')->willReturn($controller);
+        $argumentResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface')->getMock();
+        $argumentResolver->expects($this->once())->method('getArguments')->willReturn([]);
+
+        return new HttpKernel($dispatcher, $controllerResolver, new RequestStack(), $argumentResolver);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php
new file mode 100644
index 000000000..914b1dd8d
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\DependencyInjection\AddAnnotatedClassesToCachePass;
+
+class AddAnnotatedClassesToCachePassTest extends TestCase
+{
+    public function testExpandClasses()
+    {
+        $r = new \ReflectionClass(AddAnnotatedClassesToCachePass::class);
+        $pass = $r->newInstanceWithoutConstructor();
+        $r = new \ReflectionMethod(AddAnnotatedClassesToCachePass::class, 'expandClasses');
+        $r->setAccessible(true);
+        $expand = $r->getClosure($pass);
+
+        $this->assertSame('Foo', $expand(['Foo'], [])[0]);
+        $this->assertSame('Foo', $expand(['\\Foo'], [])[0]);
+        $this->assertSame('Foo', $expand(['Foo'], ['\\Foo'])[0]);
+        $this->assertSame('Foo', $expand(['Foo'], ['Foo'])[0]);
+        $this->assertSame('Foo', $expand(['\\Foo'], ['\\Foo\\Bar'])[0]);
+        $this->assertSame('Foo', $expand(['Foo'], ['\\Foo\\Bar'])[0]);
+        $this->assertSame('Foo', $expand(['\\Foo'], ['\\Foo\\Bar\\Acme'])[0]);
+
+        $this->assertSame('Foo\\Bar', $expand(['Foo\\'], ['\\Foo\\Bar'])[0]);
+        $this->assertSame('Foo\\Bar\\Acme', $expand(['Foo\\'], ['\\Foo\\Bar\\Acme'])[0]);
+        $this->assertEmpty($expand(['Foo\\'], ['\\Foo']));
+
+        $this->assertSame('Acme\\Foo\\Bar', $expand(['**\\Foo\\'], ['\\Acme\\Foo\\Bar'])[0]);
+        $this->assertEmpty($expand(['**\\Foo\\'], ['\\Foo\\Bar']));
+        $this->assertEmpty($expand(['**\\Foo\\'], ['\\Acme\\Foo']));
+        $this->assertEmpty($expand(['**\\Foo\\'], ['\\Foo']));
+
+        $this->assertSame('Acme\\Foo', $expand(['**\\Foo'], ['\\Acme\\Foo'])[0]);
+        $this->assertEmpty($expand(['**\\Foo'], ['\\Acme\\Foo\\AcmeBundle']));
+        $this->assertEmpty($expand(['**\\Foo'], ['\\Acme\\FooBar\\AcmeBundle']));
+
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['Foo\\*\\Bar'], ['\\Foo\\Acme\\Bar'])[0]);
+        $this->assertEmpty($expand(['Foo\\*\\Bar'], ['\\Foo\\Acme\\Bundle\\Bar']));
+
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['Foo\\**\\Bar'], ['\\Foo\\Acme\\Bar'])[0]);
+        $this->assertSame('Foo\\Acme\\Bundle\\Bar', $expand(['Foo\\**\\Bar'], ['\\Foo\\Acme\\Bundle\\Bar'])[0]);
+
+        $this->assertSame('Acme\\Bar', $expand(['*\\Bar'], ['\\Acme\\Bar'])[0]);
+        $this->assertEmpty($expand(['*\\Bar'], ['\\Bar']));
+        $this->assertEmpty($expand(['*\\Bar'], ['\\Foo\\Acme\\Bar']));
+
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['**\\Bar'], ['\\Foo\\Acme\\Bar'])[0]);
+        $this->assertSame('Foo\\Acme\\Bundle\\Bar', $expand(['**\\Bar'], ['\\Foo\\Acme\\Bundle\\Bar'])[0]);
+        $this->assertEmpty($expand(['**\\Bar'], ['\\Bar']));
+
+        $this->assertSame('Foo\\Bar', $expand(['Foo\\*'], ['\\Foo\\Bar'])[0]);
+        $this->assertEmpty($expand(['Foo\\*'], ['\\Foo\\Acme\\Bar']));
+
+        $this->assertSame('Foo\\Bar', $expand(['Foo\\**'], ['\\Foo\\Bar'])[0]);
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['Foo\\**'], ['\\Foo\\Acme\\Bar'])[0]);
+
+        $this->assertSame(['Foo\\Bar'], $expand(['Foo\\*'], ['Foo\\Bar', 'Foo\\BarTest']));
+        $this->assertSame(['Foo\\Bar', 'Foo\\BarTest'], $expand(['Foo\\*', 'Foo\\*Test'], ['Foo\\Bar', 'Foo\\BarTest']));
+
+        $this->assertSame(
+            'Acme\\FooBundle\\Controller\\DefaultController',
+            $expand(['**Bundle\\Controller\\'], ['\\Acme\\FooBundle\\Controller\\DefaultController'])[0]
+        );
+
+        $this->assertSame(
+            'FooBundle\\Controller\\DefaultController',
+            $expand(['**Bundle\\Controller\\'], ['\\FooBundle\\Controller\\DefaultController'])[0]
+        );
+
+        $this->assertSame(
+            'Acme\\FooBundle\\Controller\\Bar\\DefaultController',
+            $expand(['**Bundle\\Controller\\'], ['\\Acme\\FooBundle\\Controller\\Bar\\DefaultController'])[0]
+        );
+
+        $this->assertSame(
+            'Bundle\\Controller\\Bar\\DefaultController',
+            $expand(['**Bundle\\Controller\\'], ['\\Bundle\\Controller\\Bar\\DefaultController'])[0]
+        );
+
+        $this->assertSame(
+            'Acme\\Bundle\\Controller\\Bar\\DefaultController',
+            $expand(['**Bundle\\Controller\\'], ['\\Acme\\Bundle\\Controller\\Bar\\DefaultController'])[0]
+        );
+
+        $this->assertSame('Foo\\Bar', $expand(['Foo\\Bar'], [])[0]);
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['Foo\\**'], ['\\Foo\\Acme\\Bar'])[0]);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
new file mode 100644
index 000000000..871b7e0ee
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
+
+class ControllerArgumentValueResolverPassTest extends TestCase
+{
+    public function testServicesAreOrderedAccordingToPriority()
+    {
+        $services = [
+            'n3' => [[]],
+            'n1' => [['priority' => 200]],
+            'n2' => [['priority' => 100]],
+        ];
+
+        $expected = [
+            new Reference('n1'),
+            new Reference('n2'),
+            new Reference('n3'),
+        ];
+
+        $definition = new Definition(ArgumentResolver::class, [null, []]);
+        $container = new ContainerBuilder();
+        $container->setDefinition('argument_resolver', $definition);
+
+        foreach ($services as $id => list($tag)) {
+            $container->register($id)->addTag('controller.argument_value_resolver', $tag);
+        }
+
+        (new ControllerArgumentValueResolverPass())->process($container);
+        $this->assertEquals($expected, $definition->getArgument(1)->getValues());
+    }
+
+    public function testReturningEmptyArrayWhenNoService()
+    {
+        $definition = new Definition(ArgumentResolver::class, [null, []]);
+        $container = new ContainerBuilder();
+        $container->setDefinition('argument_resolver', $definition);
+
+        (new ControllerArgumentValueResolverPass())->process($container);
+        $this->assertEquals([], $definition->getArgument(1)->getValues());
+    }
+
+    public function testNoArgumentResolver()
+    {
+        $container = new ContainerBuilder();
+
+        (new ControllerArgumentValueResolverPass())->process($container);
+
+        $this->assertFalse($container->hasDefinition('argument_resolver'));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
new file mode 100644
index 000000000..1d521368e
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\DependencyInjection\FragmentRendererPass;
+use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface;
+
+class FragmentRendererPassTest extends TestCase
+{
+    /**
+     * Tests that content rendering not implementing FragmentRendererInterface
+     * triggers an exception.
+     */
+    public function testContentRendererWithoutInterface()
+    {
+        $this->expectException('InvalidArgumentException');
+        $builder = new ContainerBuilder();
+        $fragmentHandlerDefinition = $builder->register('fragment.handler');
+        $builder->register('my_content_renderer', 'Symfony\Component\DependencyInjection\Definition')
+            ->addTag('kernel.fragment_renderer', ['alias' => 'foo']);
+
+        $pass = new FragmentRendererPass();
+        $pass->process($builder);
+
+        $this->assertEquals([['addRendererService', ['foo', 'my_content_renderer']]], $fragmentHandlerDefinition->getMethodCalls());
+    }
+
+    public function testValidContentRenderer()
+    {
+        $builder = new ContainerBuilder();
+        $fragmentHandlerDefinition = $builder->register('fragment.handler')
+            ->addArgument(null);
+        $builder->register('my_content_renderer', 'Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService')
+            ->addTag('kernel.fragment_renderer', ['alias' => 'foo']);
+
+        $pass = new FragmentRendererPass();
+        $pass->process($builder);
+
+        $serviceLocatorDefinition = $builder->getDefinition((string) $fragmentHandlerDefinition->getArgument(0));
+        $this->assertSame(ServiceLocator::class, $serviceLocatorDefinition->getClass());
+        $this->assertEquals(['foo' => new ServiceClosureArgument(new Reference('my_content_renderer'))], $serviceLocatorDefinition->getArgument(0));
+    }
+}
+
+class RendererService implements FragmentRendererInterface
+{
+    public function render($uri, Request $request = null, array $options = [])
+    {
+    }
+
+    public function getName()
+    {
+        return 'test';
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
new file mode 100644
index 000000000..953dc65cd
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler;
+
+class LazyLoadingFragmentHandlerTest extends TestCase
+{
+    /**
+     * @group legacy
+     * @expectedDeprecation The Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler::addRendererService() method is deprecated since Symfony 3.3 and will be removed in 4.0.
+     */
+    public function testRenderWithLegacyMapping()
+    {
+        $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
+        $renderer->expects($this->once())->method('getName')->willReturn('foo');
+        $renderer->expects($this->any())->method('render')->willReturn(new Response());
+
+        $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
+        $requestStack->expects($this->any())->method('getCurrentRequest')->willReturn(Request::create('/'));
+
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container->expects($this->once())->method('get')->willReturn($renderer);
+
+        $handler = new LazyLoadingFragmentHandler($container, $requestStack, false);
+        $handler->addRendererService('foo', 'foo');
+
+        $handler->render('/foo', 'foo');
+
+        // second call should not lazy-load anymore (see once() above on the get() method)
+        $handler->render('/foo', 'foo');
+    }
+
+    public function testRender()
+    {
+        $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
+        $renderer->expects($this->once())->method('getName')->willReturn('foo');
+        $renderer->expects($this->any())->method('render')->willReturn(new Response());
+
+        $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
+        $requestStack->expects($this->any())->method('getCurrentRequest')->willReturn(Request::create('/'));
+
+        $container = $this->getMockBuilder('Psr\Container\ContainerInterface')->getMock();
+        $container->expects($this->once())->method('has')->with('foo')->willReturn(true);
+        $container->expects($this->once())->method('get')->willReturn($renderer);
+
+        $handler = new LazyLoadingFragmentHandler($container, $requestStack, false);
+
+        $handler->render('/foo', 'foo');
+
+        // second call should not lazy-load anymore (see once() above on the get() method)
+        $handler->render('/foo', 'foo');
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/LoggerPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/LoggerPassTest.php
new file mode 100644
index 000000000..cb504877c
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/LoggerPassTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
+use Symfony\Component\HttpKernel\Log\Logger;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class LoggerPassTest extends TestCase
+{
+    public function testAlwaysSetAutowiringAlias()
+    {
+        $container = new ContainerBuilder();
+        $container->register('logger', 'Foo');
+
+        (new LoggerPass())->process($container);
+
+        $this->assertFalse($container->getAlias(LoggerInterface::class)->isPublic());
+    }
+
+    public function testDoNotOverrideExistingLogger()
+    {
+        $container = new ContainerBuilder();
+        $container->register('logger', 'Foo');
+
+        (new LoggerPass())->process($container);
+
+        $this->assertSame('Foo', $container->getDefinition('logger')->getClass());
+    }
+
+    public function testRegisterLogger()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+
+        (new LoggerPass())->process($container);
+
+        $definition = $container->getDefinition('logger');
+        $this->assertSame(Logger::class, $definition->getClass());
+        $this->assertFalse($definition->isPublic());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
new file mode 100644
index 000000000..7af756e0b
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
+
+class MergeExtensionConfigurationPassTest extends TestCase
+{
+    public function testAutoloadMainExtension()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new LoadedExtension());
+        $container->registerExtension(new NotLoadedExtension());
+        $container->loadFromExtension('loaded', []);
+
+        $configPass = new MergeExtensionConfigurationPass(['loaded', 'not_loaded']);
+        $configPass->process($container);
+
+        $this->assertTrue($container->hasDefinition('loaded.foo'));
+        $this->assertTrue($container->hasDefinition('not_loaded.bar'));
+    }
+}
+
+class LoadedExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $container->register('loaded.foo');
+    }
+}
+
+class NotLoadedExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $container->register('not_loaded.bar');
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
new file mode 100644
index 000000000..ef4c8b217
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -0,0 +1,397 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\TypedReference;
+use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
+
+class RegisterControllerArgumentLocatorsPassTest extends TestCase
+{
+    public function testInvalidClass()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Class "Symfony\Component\HttpKernel\Tests\DependencyInjection\NotFound" used for service "foo" cannot be found.');
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', NotFound::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+    }
+
+    public function testNoAction()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Missing "action" attribute on tag "controller.service_arguments" {"argument":"bar"} for service "foo".');
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments', ['argument' => 'bar'])
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+    }
+
+    public function testNoArgument()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Missing "argument" attribute on tag "controller.service_arguments" {"action":"fooAction"} for service "foo".');
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments', ['action' => 'fooAction'])
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+    }
+
+    public function testNoService()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Missing "id" attribute on tag "controller.service_arguments" {"action":"fooAction","argument":"bar"} for service "foo".');
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments', ['action' => 'fooAction', 'argument' => 'bar'])
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+    }
+
+    public function testInvalidMethod()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid "action" attribute on tag "controller.service_arguments" for service "foo": no public "barAction()" method found on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".');
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments', ['action' => 'barAction', 'argument' => 'bar', 'id' => 'bar_service'])
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+    }
+
+    public function testInvalidArgument()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid "controller.service_arguments" tag for service "foo": method "fooAction()" has no "baz" argument on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".');
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments', ['action' => 'fooAction', 'argument' => 'baz', 'id' => 'bar'])
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+    }
+
+    public function testAllActions()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+
+        $this->assertEquals(['foo:fooAction'], array_keys($locator));
+        $this->assertInstanceof(ServiceClosureArgument::class, $locator['foo:fooAction']);
+
+        $locator = $container->getDefinition((string) $locator['foo:fooAction']->getValues()[0]);
+
+        $this->assertSame(ServiceLocator::class, $locator->getClass());
+        $this->assertFalse($locator->isPublic());
+
+        $expected = ['bar' => new ServiceClosureArgument(new TypedReference(ControllerDummy::class, ControllerDummy::class, RegisterTestController::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE))];
+        $this->assertEquals($expected, $locator->getArgument(0));
+    }
+
+    public function testExplicitArgument()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments', ['action' => 'fooAction', 'argument' => 'bar', 'id' => 'bar'])
+            ->addTag('controller.service_arguments', ['action' => 'fooAction', 'argument' => 'bar', 'id' => 'baz']) // should be ignored, the first wins
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $locator = $container->getDefinition((string) $locator['foo:fooAction']->getValues()[0]);
+
+        $expected = ['bar' => new ServiceClosureArgument(new TypedReference('bar', ControllerDummy::class, RegisterTestController::class))];
+        $this->assertEquals($expected, $locator->getArgument(0));
+    }
+
+    public function testOptionalArgument()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments', ['action' => 'fooAction', 'argument' => 'bar', 'id' => '?bar'])
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $locator = $container->getDefinition((string) $locator['foo:fooAction']->getValues()[0]);
+
+        $expected = ['bar' => new ServiceClosureArgument(new TypedReference('bar', ControllerDummy::class, RegisterTestController::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE))];
+        $this->assertEquals($expected, $locator->getArgument(0));
+    }
+
+    public function testSkipSetContainer()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', ContainerAwareRegisterTestController::class)
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertSame(['foo:fooAction'], array_keys($locator));
+    }
+
+    public function testExceptionOnNonExistentTypeHint()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClass". Did you forget to add a use statement?');
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', NonExistentClassController::class)
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+    }
+
+    public function testExceptionOnNonExistentTypeHintDifferentNamespace()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassDifferentNamespaceController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Acme\NonExistentClass".');
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', NonExistentClassDifferentNamespaceController::class)
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+    }
+
+    public function testNoExceptionOnNonExistentTypeHintOptionalArg()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', NonExistentClassOptionalController::class)
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertSame(['foo:barAction', 'foo:fooAction'], array_keys($locator));
+    }
+
+    public function testArgumentWithNoTypeHintIsOk()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', ArgumentWithoutTypeController::class)
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertEmpty(array_keys($locator));
+    }
+
+    public function testControllersAreMadePublic()
+    {
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', ArgumentWithoutTypeController::class)
+            ->setPublic(false)
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $this->assertTrue($container->getDefinition('foo')->isPublic());
+    }
+
+    /**
+     * @dataProvider provideBindings
+     */
+    public function testBindings($bindingName)
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', RegisterTestController::class)
+            ->setBindings([$bindingName => new Reference('foo')])
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+
+        $locator = $container->getDefinition((string) $locator['foo:fooAction']->getValues()[0]);
+
+        $expected = ['bar' => new ServiceClosureArgument(new Reference('foo'))];
+        $this->assertEquals($expected, $locator->getArgument(0));
+    }
+
+    public function provideBindings()
+    {
+        return [[ControllerDummy::class], ['$bar']];
+    }
+
+    public function testDoNotBindScalarValueToControllerArgument()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', ArgumentWithoutTypeController::class)
+            ->setBindings(['$someArg' => '%foo%'])
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertEmpty($locator);
+    }
+
+    public function testBindingsOnChildDefinitions()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('parent', ArgumentWithoutTypeController::class);
+
+        $container->setDefinition('child', (new ChildDefinition('parent'))
+            ->setBindings(['$someArg' => new Reference('parent')])
+            ->addTag('controller.service_arguments')
+        );
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertInstanceOf(ServiceClosureArgument::class, $locator['child:fooAction']);
+
+        $locator = $container->getDefinition((string) $locator['child:fooAction']->getValues()[0])->getArgument(0);
+        $this->assertInstanceOf(ServiceClosureArgument::class, $locator['someArg']);
+        $this->assertEquals(new Reference('parent'), $locator['someArg']->getValues()[0]);
+    }
+}
+
+class RegisterTestController
+{
+    public function __construct(ControllerDummy $bar)
+    {
+    }
+
+    public function fooAction(ControllerDummy $bar)
+    {
+    }
+
+    protected function barAction(ControllerDummy $bar)
+    {
+    }
+}
+
+class ContainerAwareRegisterTestController implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function fooAction(ControllerDummy $bar)
+    {
+    }
+}
+
+class ControllerDummy
+{
+}
+
+class NonExistentClassController
+{
+    public function fooAction(NonExistentClass $nonExistent)
+    {
+    }
+}
+
+class NonExistentClassDifferentNamespaceController
+{
+    public function fooAction(\Acme\NonExistentClass $nonExistent)
+    {
+    }
+}
+
+class NonExistentClassOptionalController
+{
+    public function fooAction(NonExistentClass $nonExistent = null)
+    {
+    }
+
+    public function barAction(NonExistentClass $nonExistent = null, $bar)
+    {
+    }
+}
+
+class ArgumentWithoutTypeController
+{
+    public function fooAction($someArg)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
new file mode 100644
index 000000000..84d735156
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
@@ -0,0 +1,148 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\ResolveInvalidReferencesPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
+use Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass;
+
+class RemoveEmptyControllerArgumentLocatorsPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('stdClass', 'stdClass');
+        $container->register(TestCase::class, 'stdClass');
+        $container->register('c1', RemoveTestController1::class)->addTag('controller.service_arguments');
+        $container->register('c2', RemoveTestController2::class)->addTag('controller.service_arguments')
+            ->addMethodCall('setTestCase', [new Reference('c1')]);
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $controllers = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+
+        $this->assertCount(2, $container->getDefinition((string) $controllers['c1:fooAction']->getValues()[0])->getArgument(0));
+        $this->assertCount(1, $container->getDefinition((string) $controllers['c2:setTestCase']->getValues()[0])->getArgument(0));
+        $this->assertCount(1, $container->getDefinition((string) $controllers['c2:fooAction']->getValues()[0])->getArgument(0));
+
+        (new ResolveInvalidReferencesPass())->process($container);
+
+        $this->assertCount(1, $container->getDefinition((string) $controllers['c2:setTestCase']->getValues()[0])->getArgument(0));
+        $this->assertSame([], $container->getDefinition((string) $controllers['c2:fooAction']->getValues()[0])->getArgument(0));
+
+        (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
+
+        $controllers = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+
+        $this->assertSame(['c1:fooAction'], array_keys($controllers));
+        $this->assertSame(['bar'], array_keys($container->getDefinition((string) $controllers['c1:fooAction']->getValues()[0])->getArgument(0)));
+
+        $expectedLog = [
+            'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing service-argument resolver for controller "c2:fooAction": no corresponding services exist for the referenced types.',
+            'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing method "setTestCase" of service "c2" from controller candidates: the method is called at instantiation, thus cannot be an action.',
+        ];
+
+        $this->assertSame($expectedLog, $container->getCompiler()->getLog());
+    }
+
+    public function testSameIdClass()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register(RegisterTestController::class, RegisterTestController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        (new RegisterControllerArgumentLocatorsPass())->process($container);
+        (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
+
+        $expected = [
+            RegisterTestController::class.':fooAction',
+            RegisterTestController::class.'::fooAction',
+        ];
+        $this->assertEquals($expected, array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0)));
+    }
+
+    public function testInvoke()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('invokable', InvokableRegisterTestController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        (new RegisterControllerArgumentLocatorsPass())->process($container);
+        (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
+
+        $this->assertEquals(
+            ['invokable:__invoke', 'invokable'],
+            array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0))
+        );
+    }
+
+    public function testInvokeSameIdClass()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register(InvokableRegisterTestController::class, InvokableRegisterTestController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        (new RegisterControllerArgumentLocatorsPass())->process($container);
+        (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
+
+        $expected = [
+            InvokableRegisterTestController::class.':__invoke',
+            InvokableRegisterTestController::class.'::__invoke',
+            InvokableRegisterTestController::class,
+        ];
+        $this->assertEquals($expected, array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0)));
+    }
+}
+
+class RemoveTestController1
+{
+    public function fooAction(\stdClass $bar, ClassNotInContainer $baz)
+    {
+    }
+}
+
+class RemoveTestController2
+{
+    public function setTestCase(TestCase $test)
+    {
+    }
+
+    public function fooAction(ClassNotInContainer $bar)
+    {
+    }
+}
+
+class InvokableRegisterTestController
+{
+    public function __invoke(\stdClass $bar)
+    {
+    }
+}
+
+class ClassNotInContainer
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
new file mode 100644
index 000000000..d3c686932
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
+use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ClearableService;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ResettableService;
+
+class ResettableServicePassTest extends TestCase
+{
+    public function testCompilerPass()
+    {
+        $container = new ContainerBuilder();
+        $container->register('one', ResettableService::class)
+            ->setPublic(true)
+            ->addTag('kernel.reset', ['method' => 'reset']);
+        $container->register('two', ClearableService::class)
+            ->setPublic(true)
+            ->addTag('kernel.reset', ['method' => 'clear']);
+
+        $container->register('services_resetter', ServicesResetter::class)
+            ->setPublic(true)
+            ->setArguments([null, []]);
+        $container->addCompilerPass(new ResettableServicePass());
+
+        $container->compile();
+
+        $definition = $container->getDefinition('services_resetter');
+
+        $this->assertEquals(
+            [
+                new IteratorArgument([
+                    'one' => new Reference('one', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
+                    'two' => new Reference('two', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
+                ]),
+                [
+                    'one' => 'reset',
+                    'two' => 'clear',
+                ],
+            ],
+            $definition->getArguments()
+        );
+    }
+
+    public function testMissingMethod()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+        $this->expectExceptionMessage('Tag kernel.reset requires the "method" attribute to be set.');
+        $container = new ContainerBuilder();
+        $container->register(ResettableService::class)
+            ->addTag('kernel.reset');
+        $container->register('services_resetter', ServicesResetter::class)
+            ->setArguments([null, []]);
+        $container->addCompilerPass(new ResettableServicePass());
+
+        $container->compile();
+    }
+
+    public function testCompilerPassWithoutResetters()
+    {
+        $container = new ContainerBuilder();
+        $container->register('services_resetter', ServicesResetter::class)
+            ->setArguments([null, []]);
+        $container->addCompilerPass(new ResettableServicePass());
+
+        $container->compile();
+
+        $this->assertFalse($container->has('services_resetter'));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/DependencyInjection/ServicesResetterTest.php b/lib/symfony/http-kernel/Tests/DependencyInjection/ServicesResetterTest.php
new file mode 100644
index 000000000..86f1abdb0
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/DependencyInjection/ServicesResetterTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ClearableService;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ResettableService;
+
+class ServicesResetterTest extends TestCase
+{
+    protected function setUp()
+    {
+        ResettableService::$counter = 0;
+        ClearableService::$counter = 0;
+    }
+
+    public function testResetServices()
+    {
+        $resetter = new ServicesResetter(new \ArrayIterator([
+            'id1' => new ResettableService(),
+            'id2' => new ClearableService(),
+        ]), [
+            'id1' => 'reset',
+            'id2' => 'clear',
+        ]);
+
+        $resetter->reset();
+
+        $this->assertEquals(1, ResettableService::$counter);
+        $this->assertEquals(1, ClearableService::$counter);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Event/FilterControllerArgumentsEventTest.php b/lib/symfony/http-kernel/Tests/Event/FilterControllerArgumentsEventTest.php
new file mode 100644
index 000000000..abc51ac51
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Event/FilterControllerArgumentsEventTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Event;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\FilterControllerArgumentsEvent;
+use Symfony\Component\HttpKernel\Tests\TestHttpKernel;
+
+class FilterControllerArgumentsEventTest extends TestCase
+{
+    public function testFilterControllerArgumentsEvent()
+    {
+        $filterController = new FilterControllerArgumentsEvent(new TestHttpKernel(), function () {}, ['test'], new Request(), 1);
+        $this->assertEquals($filterController->getArguments(), ['test']);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Event/GetResponseForExceptionEventTest.php b/lib/symfony/http-kernel/Tests/Event/GetResponseForExceptionEventTest.php
new file mode 100644
index 000000000..724257930
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Event/GetResponseForExceptionEventTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Event;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Tests\TestHttpKernel;
+
+class GetResponseForExceptionEventTest extends TestCase
+{
+    public function testAllowSuccessfulResponseIsFalseByDefault()
+    {
+        $event = new GetResponseForExceptionEvent(new TestHttpKernel(), new Request(), 1, new \Exception());
+
+        $this->assertFalse($event->isAllowingCustomResponseCode());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/AddRequestFormatsListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/AddRequestFormatsListenerTest.php
new file mode 100644
index 000000000..4ab0a8fb1
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/AddRequestFormatsListenerTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\EventListener\AddRequestFormatsListener;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Test AddRequestFormatsListener class.
+ *
+ * @author Gildas Quemener <gildas.quemener@gmail.com>
+ */
+class AddRequestFormatsListenerTest extends TestCase
+{
+    /**
+     * @var AddRequestFormatsListener
+     */
+    private $listener;
+
+    protected function setUp()
+    {
+        $this->listener = new AddRequestFormatsListener(['csv' => ['text/csv', 'text/plain']]);
+    }
+
+    protected function tearDown()
+    {
+        $this->listener = null;
+    }
+
+    public function testIsAnEventSubscriber()
+    {
+        $this->assertInstanceOf('Symfony\Component\EventDispatcher\EventSubscriberInterface', $this->listener);
+    }
+
+    public function testRegisteredEvent()
+    {
+        $this->assertEquals(
+            [KernelEvents::REQUEST => ['onKernelRequest', 1]],
+            AddRequestFormatsListener::getSubscribedEvents()
+        );
+    }
+
+    public function testSetAdditionalFormats()
+    {
+        $request = $this->getRequestMock();
+        $event = $this->getGetResponseEventMock($request);
+
+        $request->expects($this->once())
+            ->method('setFormat')
+            ->with('csv', ['text/csv', 'text/plain']);
+
+        $this->listener->onKernelRequest($event);
+    }
+
+    protected function getRequestMock()
+    {
+        return $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+    }
+
+    protected function getGetResponseEventMock(Request $request)
+    {
+        $event = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $event->expects($this->any())
+            ->method('getRequest')
+            ->willReturn($request);
+
+        return $event;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/DebugHandlersListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/DebugHandlersListenerTest.php
new file mode 100644
index 000000000..44af0149f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/DebugHandlersListenerTest.php
@@ -0,0 +1,155 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LogLevel;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleEvent;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\KernelEvent;
+use Symfony\Component\HttpKernel\EventListener\DebugHandlersListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DebugHandlersListenerTest extends TestCase
+{
+    public function testConfigure()
+    {
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $userHandler = function () {};
+        $listener = new DebugHandlersListener($userHandler, $logger);
+        $xHandler = new ExceptionHandler();
+        $eHandler = new ErrorHandler();
+        $eHandler->setExceptionHandler([$xHandler, 'handle']);
+
+        $exception = null;
+        set_error_handler([$eHandler, 'handleError']);
+        set_exception_handler([$eHandler, 'handleException']);
+        try {
+            $listener->configure();
+        } catch (\Exception $exception) {
+        }
+        restore_exception_handler();
+        restore_error_handler();
+
+        if (null !== $exception) {
+            throw $exception;
+        }
+
+        $this->assertSame($userHandler, $xHandler->setHandler('var_dump'));
+
+        $loggers = $eHandler->setLoggers([]);
+
+        $this->assertArrayHasKey(E_DEPRECATED, $loggers);
+        $this->assertSame([$logger, LogLevel::INFO], $loggers[E_DEPRECATED]);
+    }
+
+    public function testConfigureForHttpKernelWithNoTerminateWithException()
+    {
+        $listener = new DebugHandlersListener(null);
+        $eHandler = new ErrorHandler();
+        $event = new KernelEvent(
+            $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
+            Request::create('/'),
+            HttpKernelInterface::MASTER_REQUEST
+        );
+
+        $exception = null;
+        $h = set_exception_handler([$eHandler, 'handleException']);
+        try {
+            $listener->configure($event);
+        } catch (\Exception $exception) {
+        }
+        restore_exception_handler();
+
+        if (null !== $exception) {
+            throw $exception;
+        }
+
+        $this->assertNull($h);
+    }
+
+    public function testConsoleEvent()
+    {
+        $dispatcher = new EventDispatcher();
+        $listener = new DebugHandlersListener(null);
+        $app = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
+        $app->expects($this->once())->method('getHelperSet')->willReturn(new HelperSet());
+        $command = new Command(__FUNCTION__);
+        $command->setApplication($app);
+        $event = new ConsoleEvent($command, new ArgvInput(), new ConsoleOutput());
+
+        $dispatcher->addSubscriber($listener);
+
+        $xListeners = [
+            KernelEvents::REQUEST => [[$listener, 'configure']],
+            ConsoleEvents::COMMAND => [[$listener, 'configure']],
+        ];
+        $this->assertSame($xListeners, $dispatcher->getListeners());
+
+        $exception = null;
+        $eHandler = new ErrorHandler();
+        set_error_handler([$eHandler, 'handleError']);
+        set_exception_handler([$eHandler, 'handleException']);
+        try {
+            $dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
+        } catch (\Exception $exception) {
+        }
+        restore_exception_handler();
+        restore_error_handler();
+
+        if (null !== $exception) {
+            throw $exception;
+        }
+
+        $xHandler = $eHandler->setExceptionHandler('var_dump');
+        $this->assertInstanceOf('Closure', $xHandler);
+
+        $app->expects($this->once())
+            ->method('renderException');
+
+        $xHandler(new \Exception());
+    }
+
+    public function testReplaceExistingExceptionHandler()
+    {
+        $userHandler = function () {};
+        $listener = new DebugHandlersListener($userHandler);
+        $eHandler = new ErrorHandler();
+        $eHandler->setExceptionHandler('var_dump');
+
+        $exception = null;
+        set_exception_handler([$eHandler, 'handleException']);
+        try {
+            $listener->configure();
+        } catch (\Exception $exception) {
+        }
+        restore_exception_handler();
+
+        if (null !== $exception) {
+            throw $exception;
+        }
+
+        $this->assertSame($userHandler, $eHandler->setExceptionHandler('var_dump'));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/DumpListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/DumpListenerTest.php
new file mode 100644
index 000000000..b86a7552f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/DumpListenerTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\HttpKernel\EventListener\DumpListener;
+use Symfony\Component\VarDumper\Cloner\ClonerInterface;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
+use Symfony\Component\VarDumper\VarDumper;
+
+/**
+ * DumpListenerTest.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DumpListenerTest extends TestCase
+{
+    public function testSubscribedEvents()
+    {
+        $this->assertSame(
+            [ConsoleEvents::COMMAND => ['configure', 1024]],
+            DumpListener::getSubscribedEvents()
+        );
+    }
+
+    public function testConfigure()
+    {
+        $prevDumper = VarDumper::setHandler('var_dump');
+        VarDumper::setHandler($prevDumper);
+
+        $cloner = new MockCloner();
+        $dumper = new MockDumper();
+
+        ob_start();
+        $exception = null;
+        $listener = new DumpListener($cloner, $dumper);
+
+        try {
+            $listener->configure();
+
+            VarDumper::dump('foo');
+            VarDumper::dump('bar');
+
+            $this->assertSame('+foo-+bar-', ob_get_clean());
+        } catch (\Exception $exception) {
+        }
+
+        VarDumper::setHandler($prevDumper);
+
+        if (null !== $exception) {
+            throw $exception;
+        }
+    }
+}
+
+class MockCloner implements ClonerInterface
+{
+    public function cloneVar($var)
+    {
+        return new Data([[$var.'-']]);
+    }
+}
+
+class MockDumper implements DataDumperInterface
+{
+    public function dump(Data $data)
+    {
+        echo '+'.$data->getValue();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php
new file mode 100644
index 000000000..fca60f192
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php
@@ -0,0 +1,178 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\EventListener\ExceptionListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
+use Symfony\Component\HttpKernel\Tests\Logger;
+
+/**
+ * ExceptionListenerTest.
+ *
+ * @author Robert Schönthal <seroscho@googlemail.com>
+ *
+ * @group time-sensitive
+ */
+class ExceptionListenerTest extends TestCase
+{
+    public function testConstruct()
+    {
+        $logger = new TestLogger();
+        $l = new ExceptionListener('foo', $logger);
+
+        $_logger = new \ReflectionProperty(\get_class($l), 'logger');
+        $_logger->setAccessible(true);
+        $_controller = new \ReflectionProperty(\get_class($l), 'controller');
+        $_controller->setAccessible(true);
+
+        $this->assertSame($logger, $_logger->getValue($l));
+        $this->assertSame('foo', $_controller->getValue($l));
+    }
+
+    /**
+     * @dataProvider provider
+     */
+    public function testHandleWithoutLogger($event, $event2)
+    {
+        $this->iniSet('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul');
+
+        $l = new ExceptionListener('foo');
+        $l->onKernelException($event);
+
+        $this->assertEquals(new Response('foo'), $event->getResponse());
+
+        try {
+            $l->onKernelException($event2);
+            $this->fail('RuntimeException expected');
+        } catch (\RuntimeException $e) {
+            $this->assertSame('bar', $e->getMessage());
+            $this->assertSame('foo', $e->getPrevious()->getMessage());
+        }
+    }
+
+    /**
+     * @dataProvider provider
+     */
+    public function testHandleWithLogger($event, $event2)
+    {
+        $logger = new TestLogger();
+
+        $l = new ExceptionListener('foo', $logger);
+        $l->onKernelException($event);
+
+        $this->assertEquals(new Response('foo'), $event->getResponse());
+
+        try {
+            $l->onKernelException($event2);
+            $this->fail('RuntimeException expected');
+        } catch (\RuntimeException $e) {
+            $this->assertSame('bar', $e->getMessage());
+            $this->assertSame('foo', $e->getPrevious()->getMessage());
+        }
+
+        $this->assertEquals(3, $logger->countErrors());
+        $this->assertCount(3, $logger->getLogs('critical'));
+    }
+
+    public function provider()
+    {
+        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
+            return [[null, null]];
+        }
+
+        $request = new Request();
+        $exception = new \Exception('foo');
+        $event = new GetResponseForExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MASTER_REQUEST, $exception);
+        $event2 = new GetResponseForExceptionEvent(new TestKernelThatThrowsException(), $request, HttpKernelInterface::MASTER_REQUEST, $exception);
+
+        return [
+            [$event, $event2],
+        ];
+    }
+
+    public function testSubRequestFormat()
+    {
+        $listener = new ExceptionListener('foo', $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock());
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $kernel->expects($this->once())->method('handle')->willReturnCallback(function (Request $request) {
+            return new Response($request->getRequestFormat());
+        });
+
+        $request = Request::create('/');
+        $request->setRequestFormat('xml');
+
+        $event = new GetResponseForExceptionEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, new \Exception('foo'));
+        $listener->onKernelException($event);
+
+        $response = $event->getResponse();
+        $this->assertEquals('xml', $response->getContent());
+    }
+
+    public function testCSPHeaderIsRemoved()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $kernel->expects($this->once())->method('handle')->willReturnCallback(function (Request $request) {
+            return new Response($request->getRequestFormat());
+        });
+
+        $listener = new ExceptionListener('foo', $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(), true);
+
+        $dispatcher->addSubscriber($listener);
+
+        $request = Request::create('/');
+        $event = new GetResponseForExceptionEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, new \Exception('foo'));
+        $dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
+
+        $response = new Response('', 200, ['content-security-policy' => "style-src 'self'"]);
+        $this->assertTrue($response->headers->has('content-security-policy'));
+
+        $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
+        $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+        $this->assertFalse($response->headers->has('content-security-policy'), 'CSP header has been removed');
+        $this->assertFalse($dispatcher->hasListeners(KernelEvents::RESPONSE), 'CSP removal listener has been removed');
+    }
+}
+
+class TestLogger extends Logger implements DebugLoggerInterface
+{
+    public function countErrors()
+    {
+        return \count($this->logs['critical']);
+    }
+}
+
+class TestKernel implements HttpKernelInterface
+{
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+        return new Response('foo');
+    }
+}
+
+class TestKernelThatThrowsException implements HttpKernelInterface
+{
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+        throw new \RuntimeException('bar');
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
new file mode 100644
index 000000000..0fb32eece
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\FragmentListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\UriSigner;
+
+class FragmentListenerTest extends TestCase
+{
+    public function testOnlyTriggeredOnFragmentRoute()
+    {
+        $request = Request::create('http://example.com/foo?_path=foo%3Dbar%26_controller%3Dfoo');
+
+        $listener = new FragmentListener(new UriSigner('foo'));
+        $event = $this->createGetResponseEvent($request);
+
+        $expected = $request->attributes->all();
+
+        $listener->onKernelRequest($event);
+
+        $this->assertEquals($expected, $request->attributes->all());
+        $this->assertTrue($request->query->has('_path'));
+    }
+
+    public function testOnlyTriggeredIfControllerWasNotDefinedYet()
+    {
+        $request = Request::create('http://example.com/_fragment?_path=foo%3Dbar%26_controller%3Dfoo');
+        $request->attributes->set('_controller', 'bar');
+
+        $listener = new FragmentListener(new UriSigner('foo'));
+        $event = $this->createGetResponseEvent($request, HttpKernelInterface::SUB_REQUEST);
+
+        $expected = $request->attributes->all();
+
+        $listener->onKernelRequest($event);
+
+        $this->assertEquals($expected, $request->attributes->all());
+    }
+
+    public function testAccessDeniedWithNonSafeMethods()
+    {
+        $this->expectException('Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException');
+        $request = Request::create('http://example.com/_fragment', 'POST');
+
+        $listener = new FragmentListener(new UriSigner('foo'));
+        $event = $this->createGetResponseEvent($request);
+
+        $listener->onKernelRequest($event);
+    }
+
+    public function testAccessDeniedWithWrongSignature()
+    {
+        $this->expectException('Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException');
+        $request = Request::create('http://example.com/_fragment', 'GET', [], [], [], ['REMOTE_ADDR' => '10.0.0.1']);
+
+        $listener = new FragmentListener(new UriSigner('foo'));
+        $event = $this->createGetResponseEvent($request);
+
+        $listener->onKernelRequest($event);
+    }
+
+    public function testWithSignature()
+    {
+        $signer = new UriSigner('foo');
+        $request = Request::create($signer->sign('http://example.com/_fragment?_path=foo%3Dbar%26_controller%3Dfoo'), 'GET', [], [], [], ['REMOTE_ADDR' => '10.0.0.1']);
+
+        $listener = new FragmentListener($signer);
+        $event = $this->createGetResponseEvent($request);
+
+        $listener->onKernelRequest($event);
+
+        $this->assertEquals(['foo' => 'bar', '_controller' => 'foo'], $request->attributes->get('_route_params'));
+        $this->assertFalse($request->query->has('_path'));
+    }
+
+    public function testRemovesPathWithControllerDefined()
+    {
+        $request = Request::create('http://example.com/_fragment?_path=foo%3Dbar%26_controller%3Dfoo');
+
+        $listener = new FragmentListener(new UriSigner('foo'));
+        $event = $this->createGetResponseEvent($request, HttpKernelInterface::SUB_REQUEST);
+
+        $listener->onKernelRequest($event);
+
+        $this->assertFalse($request->query->has('_path'));
+    }
+
+    public function testRemovesPathWithControllerNotDefined()
+    {
+        $signer = new UriSigner('foo');
+        $request = Request::create($signer->sign('http://example.com/_fragment?_path=foo%3Dbar'), 'GET', [], [], [], ['REMOTE_ADDR' => '10.0.0.1']);
+
+        $listener = new FragmentListener($signer);
+        $event = $this->createGetResponseEvent($request);
+
+        $listener->onKernelRequest($event);
+
+        $this->assertFalse($request->query->has('_path'));
+    }
+
+    private function createGetResponseEvent(Request $request, $requestType = HttpKernelInterface::MASTER_REQUEST)
+    {
+        return new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, $requestType);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/LocaleListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/LocaleListenerTest.php
new file mode 100644
index 000000000..5f96f7f7c
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/LocaleListenerTest.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\LocaleListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class LocaleListenerTest extends TestCase
+{
+    private $requestStack;
+
+    protected function setUp()
+    {
+        $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->disableOriginalConstructor()->getMock();
+    }
+
+    public function testDefaultLocaleWithoutSession()
+    {
+        $listener = new LocaleListener($this->requestStack, 'fr');
+        $event = $this->getEvent($request = Request::create('/'));
+
+        $listener->onKernelRequest($event);
+        $this->assertEquals('fr', $request->getLocale());
+    }
+
+    public function testLocaleFromRequestAttribute()
+    {
+        $request = Request::create('/');
+        $request->cookies->set(session_name(), 'value');
+
+        $request->attributes->set('_locale', 'es');
+        $listener = new LocaleListener($this->requestStack, 'fr');
+        $event = $this->getEvent($request);
+
+        $listener->onKernelRequest($event);
+        $this->assertEquals('es', $request->getLocale());
+    }
+
+    public function testLocaleSetForRoutingContext()
+    {
+        // the request context is updated
+        $context = $this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock();
+        $context->expects($this->once())->method('setParameter')->with('_locale', 'es');
+
+        $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(['getContext'])->disableOriginalConstructor()->getMock();
+        $router->expects($this->once())->method('getContext')->willReturn($context);
+
+        $request = Request::create('/');
+
+        $request->attributes->set('_locale', 'es');
+        $listener = new LocaleListener($this->requestStack, 'fr', $router);
+        $listener->onKernelRequest($this->getEvent($request));
+    }
+
+    public function testRouterResetWithParentRequestOnKernelFinishRequest()
+    {
+        // the request context is updated
+        $context = $this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock();
+        $context->expects($this->once())->method('setParameter')->with('_locale', 'es');
+
+        $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(['getContext'])->disableOriginalConstructor()->getMock();
+        $router->expects($this->once())->method('getContext')->willReturn($context);
+
+        $parentRequest = Request::create('/');
+        $parentRequest->setLocale('es');
+
+        $this->requestStack->expects($this->once())->method('getParentRequest')->willReturn($parentRequest);
+
+        $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\FinishRequestEvent')->disableOriginalConstructor()->getMock();
+
+        $listener = new LocaleListener($this->requestStack, 'fr', $router);
+        $listener->onKernelFinishRequest($event);
+    }
+
+    public function testRequestLocaleIsNotOverridden()
+    {
+        $request = Request::create('/');
+        $request->setLocale('de');
+        $listener = new LocaleListener($this->requestStack, 'fr');
+        $event = $this->getEvent($request);
+
+        $listener->onKernelRequest($event);
+        $this->assertEquals('de', $request->getLocale());
+    }
+
+    private function getEvent(Request $request)
+    {
+        return new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
new file mode 100644
index 000000000..780857888
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Event\PostResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\ProfilerListener;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\Profiler\Profile;
+
+class ProfilerListenerTest extends TestCase
+{
+    /**
+     * Test a master and sub request with an exception and `onlyException` profiler option enabled.
+     */
+    public function testKernelTerminate()
+    {
+        $profile = new Profile('token');
+
+        $profiler = $this->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $profiler->expects($this->once())
+            ->method('collect')
+            ->willReturn($profile);
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+
+        $masterRequest = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $subRequest = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $response = $this->getMockBuilder('Symfony\Component\HttpFoundation\Response')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $requestStack = new RequestStack();
+        $requestStack->push($masterRequest);
+
+        $onlyException = true;
+        $listener = new ProfilerListener($profiler, $requestStack, null, $onlyException);
+
+        // master request
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, $masterRequest, Kernel::MASTER_REQUEST, $response));
+
+        // sub request
+        $listener->onKernelException(new GetResponseForExceptionEvent($kernel, $subRequest, Kernel::SUB_REQUEST, new HttpException(404)));
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, $subRequest, Kernel::SUB_REQUEST, $response));
+
+        $listener->onKernelTerminate(new PostResponseEvent($kernel, $masterRequest, $response));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/ResponseListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/ResponseListenerTest.php
new file mode 100644
index 000000000..aeab68f3e
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/ResponseListenerTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\ResponseListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class ResponseListenerTest extends TestCase
+{
+    private $dispatcher;
+
+    private $kernel;
+
+    protected function setUp()
+    {
+        $this->dispatcher = new EventDispatcher();
+        $listener = new ResponseListener('UTF-8');
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+
+        $this->kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+    }
+
+    protected function tearDown()
+    {
+        $this->dispatcher = null;
+        $this->kernel = null;
+    }
+
+    public function testFilterDoesNothingForSubRequests()
+    {
+        $response = new Response('foo');
+
+        $event = new FilterResponseEvent($this->kernel, new Request(), HttpKernelInterface::SUB_REQUEST, $response);
+        $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+        $this->assertEquals('', $event->getResponse()->headers->get('content-type'));
+    }
+
+    public function testFilterSetsNonDefaultCharsetIfNotOverridden()
+    {
+        $listener = new ResponseListener('ISO-8859-15');
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+
+        $response = new Response('foo');
+
+        $event = new FilterResponseEvent($this->kernel, Request::create('/'), HttpKernelInterface::MASTER_REQUEST, $response);
+        $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+        $this->assertEquals('ISO-8859-15', $response->getCharset());
+    }
+
+    public function testFilterDoesNothingIfCharsetIsOverridden()
+    {
+        $listener = new ResponseListener('ISO-8859-15');
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+
+        $response = new Response('foo');
+        $response->setCharset('ISO-8859-1');
+
+        $event = new FilterResponseEvent($this->kernel, Request::create('/'), HttpKernelInterface::MASTER_REQUEST, $response);
+        $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+        $this->assertEquals('ISO-8859-1', $response->getCharset());
+    }
+
+    public function testFiltersSetsNonDefaultCharsetIfNotOverriddenOnNonTextContentType()
+    {
+        $listener = new ResponseListener('ISO-8859-15');
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+
+        $response = new Response('foo');
+        $request = Request::create('/');
+        $request->setRequestFormat('application/json');
+
+        $event = new FilterResponseEvent($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
+        $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+        $this->assertEquals('ISO-8859-15', $response->getCharset());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
new file mode 100644
index 000000000..dbe033d16
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
@@ -0,0 +1,222 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\ExceptionListener;
+use Symfony\Component\HttpKernel\EventListener\RouterListener;
+use Symfony\Component\HttpKernel\EventListener\ValidateRequestListener;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Routing\Exception\NoConfigurationException;
+use Symfony\Component\Routing\RequestContext;
+
+class RouterListenerTest extends TestCase
+{
+    private $requestStack;
+
+    protected function setUp()
+    {
+        $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->disableOriginalConstructor()->getMock();
+    }
+
+    /**
+     * @dataProvider getPortData
+     */
+    public function testPort($defaultHttpPort, $defaultHttpsPort, $uri, $expectedHttpPort, $expectedHttpsPort)
+    {
+        $urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $context = new RequestContext();
+        $context->setHttpPort($defaultHttpPort);
+        $context->setHttpsPort($defaultHttpsPort);
+        $urlMatcher->expects($this->any())
+            ->method('getContext')
+            ->willReturn($context);
+
+        $listener = new RouterListener($urlMatcher, $this->requestStack);
+        $event = $this->createGetResponseEventForUri($uri);
+        $listener->onKernelRequest($event);
+
+        $this->assertEquals($expectedHttpPort, $context->getHttpPort());
+        $this->assertEquals($expectedHttpsPort, $context->getHttpsPort());
+        $this->assertEquals(0 === strpos($uri, 'https') ? 'https' : 'http', $context->getScheme());
+    }
+
+    public function getPortData()
+    {
+        return [
+            [80, 443, 'http://localhost/', 80, 443],
+            [80, 443, 'http://localhost:90/', 90, 443],
+            [80, 443, 'https://localhost/', 80, 443],
+            [80, 443, 'https://localhost:90/', 80, 90],
+        ];
+    }
+
+    /**
+     * @param string $uri
+     *
+     * @return GetResponseEvent
+     */
+    private function createGetResponseEventForUri($uri)
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create($uri);
+        $request->attributes->set('_controller', null); // Prevents going in to routing process
+
+        return new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+    }
+
+    public function testInvalidMatcher()
+    {
+        $this->expectException('InvalidArgumentException');
+        new RouterListener(new \stdClass(), $this->requestStack);
+    }
+
+    public function testRequestMatcher()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('http://localhost/');
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+        $requestMatcher->expects($this->once())
+                       ->method('matchRequest')
+                       ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
+                       ->willReturn([]);
+
+        $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext());
+        $listener->onKernelRequest($event);
+    }
+
+    public function testSubRequestWithDifferentMethod()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('http://localhost/', 'post');
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+        $requestMatcher->expects($this->any())
+                       ->method('matchRequest')
+                       ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
+                       ->willReturn([]);
+
+        $context = new RequestContext();
+
+        $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext());
+        $listener->onKernelRequest($event);
+
+        // sub-request with another HTTP method
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('http://localhost/', 'get');
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST);
+
+        $listener->onKernelRequest($event);
+
+        $this->assertEquals('GET', $context->getMethod());
+    }
+
+    /**
+     * @dataProvider getLoggingParameterData
+     */
+    public function testLoggingParameter($parameter, $log, $parameters)
+    {
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+        $requestMatcher->expects($this->once())
+            ->method('matchRequest')
+            ->willReturn($parameter);
+
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $logger->expects($this->once())
+            ->method('info')
+            ->with($this->equalTo($log), $this->equalTo($parameters));
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('http://localhost/');
+
+        $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext(), $logger);
+        $listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
+    }
+
+    public function getLoggingParameterData()
+    {
+        return [
+            [['_route' => 'foo'], 'Matched route "{route}".', ['route' => 'foo', 'route_parameters' => ['_route' => 'foo'], 'request_uri' => 'http://localhost/', 'method' => 'GET']],
+            [[], 'Matched route "{route}".', ['route' => 'n/a', 'route_parameters' => [], 'request_uri' => 'http://localhost/', 'method' => 'GET']],
+        ];
+    }
+
+    public function testWithBadRequest()
+    {
+        $requestStack = new RequestStack();
+
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+        $requestMatcher->expects($this->never())->method('matchRequest');
+
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addSubscriber(new ValidateRequestListener());
+        $dispatcher->addSubscriber(new RouterListener($requestMatcher, $requestStack, new RequestContext()));
+        $dispatcher->addSubscriber(new ExceptionListener(function () {
+            return new Response('Exception handled', 400);
+        }));
+
+        $kernel = new HttpKernel($dispatcher, new ControllerResolver(), $requestStack, new ArgumentResolver());
+
+        $request = Request::create('http://localhost/');
+        $request->headers->set('host', '###');
+        $response = $kernel->handle($request);
+        $this->assertSame(400, $response->getStatusCode());
+    }
+
+    public function testNoRoutingConfigurationResponse()
+    {
+        $requestStack = new RequestStack();
+
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+        $requestMatcher
+            ->expects($this->once())
+            ->method('matchRequest')
+            ->willThrowException(new NoConfigurationException())
+        ;
+
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addSubscriber(new RouterListener($requestMatcher, $requestStack, new RequestContext()));
+
+        $kernel = new HttpKernel($dispatcher, new ControllerResolver(), $requestStack, new ArgumentResolver());
+
+        $request = Request::create('http://localhost/');
+        $response = $kernel->handle($request);
+        $this->assertSame(404, $response->getStatusCode());
+        $this->assertStringContainsString('Welcome', $response->getContent());
+    }
+
+    public function testRequestWithBadHost()
+    {
+        $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('http://bad host %22/');
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+
+        $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+
+        $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext());
+        $listener->onKernelRequest($event);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/SaveSessionListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/SaveSessionListenerTest.php
new file mode 100644
index 000000000..5492c3d78
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/SaveSessionListenerTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\SaveSessionListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class SaveSessionListenerTest extends TestCase
+{
+    public function testOnlyTriggeredOnMasterRequest()
+    {
+        $listener = new SaveSessionListener();
+        $event = $this->getMockBuilder(FilterResponseEvent::class)->disableOriginalConstructor()->getMock();
+        $event->expects($this->once())->method('isMasterRequest')->willReturn(false);
+        $event->expects($this->never())->method('getRequest');
+
+        // sub request
+        $listener->onKernelResponse($event);
+    }
+
+    public function testSessionSaved()
+    {
+        $listener = new SaveSessionListener();
+        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
+
+        $session = $this->getMockBuilder(SessionInterface::class)->disableOriginalConstructor()->getMock();
+        $session->expects($this->once())->method('isStarted')->willReturn(true);
+        $session->expects($this->once())->method('save');
+
+        $request = new Request();
+        $request->setSession($session);
+        $response = new Response();
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
new file mode 100644
index 000000000..e8ab0deed
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
@@ -0,0 +1,121 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\AbstractSessionListener;
+use Symfony\Component\HttpKernel\EventListener\SessionListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class SessionListenerTest extends TestCase
+{
+    public function testOnlyTriggeredOnMasterRequest()
+    {
+        $listener = $this->getMockForAbstractClass(AbstractSessionListener::class);
+        $event = $this->getMockBuilder(GetResponseEvent::class)->disableOriginalConstructor()->getMock();
+        $event->expects($this->once())->method('isMasterRequest')->willReturn(false);
+        $event->expects($this->never())->method('getRequest');
+
+        // sub request
+        $listener->onKernelRequest($event);
+    }
+
+    public function testSessionIsSet()
+    {
+        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+
+        $container = new Container();
+        $container->set('session', $session);
+
+        $request = new Request();
+        $listener = new SessionListener($container);
+
+        $event = $this->getMockBuilder(GetResponseEvent::class)->disableOriginalConstructor()->getMock();
+        $event->expects($this->once())->method('isMasterRequest')->willReturn(true);
+        $event->expects($this->once())->method('getRequest')->willReturn($request);
+
+        $listener->onKernelRequest($event);
+
+        $this->assertTrue($request->hasSession());
+        $this->assertSame($session, $request->getSession());
+    }
+
+    public function testResponseIsPrivate()
+    {
+        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1));
+
+        $container = new Container();
+        $container->set('session', $session);
+
+        $listener = new SessionListener($container);
+        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
+
+        $request = new Request();
+        $response = new Response();
+        $listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response));
+
+        $this->assertTrue($response->headers->hasCacheControlDirective('private'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
+
+        $this->assertTrue($response->headers->has('Expires'));
+        $this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
+    }
+
+    public function testSurrogateMasterRequestIsPublic()
+    {
+        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session->expects($this->exactly(4))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1, 1, 1));
+
+        $container = new Container();
+        $container->set('session', $session);
+
+        $listener = new SessionListener($container);
+        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
+
+        $request = new Request();
+        $response = new Response();
+        $response->setCache(['public' => true, 'max_age' => '30']);
+        $listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
+        $this->assertTrue($request->hasSession());
+
+        $subRequest = clone $request;
+        $this->assertSame($request->getSession(), $subRequest->getSession());
+        $listener->onKernelRequest(new GetResponseEvent($kernel, $subRequest, HttpKernelInterface::MASTER_REQUEST));
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, $subRequest, HttpKernelInterface::MASTER_REQUEST, $response));
+        $listener->onFinishRequest(new FinishRequestEvent($kernel, $subRequest, HttpKernelInterface::MASTER_REQUEST));
+
+        $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertSame('30', $response->headers->getCacheControlDirective('max-age'));
+
+        $this->assertFalse($response->headers->has('Expires'));
+
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response));
+
+        $this->assertTrue($response->headers->hasCacheControlDirective('private'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
+
+        $this->assertTrue($response->headers->has('Expires'));
+        $this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/SurrogateListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/SurrogateListenerTest.php
new file mode 100644
index 000000000..66e119f12
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/SurrogateListenerTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\SurrogateListener;
+use Symfony\Component\HttpKernel\HttpCache\Esi;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class SurrogateListenerTest extends TestCase
+{
+    public function testFilterDoesNothingForSubRequests()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $response = new Response('foo <esi:include src="" />');
+        $listener = new SurrogateListener(new Esi());
+
+        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+        $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::SUB_REQUEST, $response);
+        $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+        $this->assertEquals('', $event->getResponse()->headers->get('Surrogate-Control'));
+    }
+
+    public function testFilterWhenThereIsSomeEsiIncludes()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $response = new Response('foo <esi:include src="" />');
+        $listener = new SurrogateListener(new Esi());
+
+        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+        $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+        $this->assertEquals('content="ESI/1.0"', $event->getResponse()->headers->get('Surrogate-Control'));
+    }
+
+    public function testFilterWhenThereIsNoEsiIncludes()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $response = new Response('foo');
+        $listener = new SurrogateListener(new Esi());
+
+        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+        $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+        $this->assertEquals('', $event->getResponse()->headers->get('Surrogate-Control'));
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php
new file mode 100644
index 000000000..7187c7d1f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php
@@ -0,0 +1,221 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\SessionListener;
+use Symfony\Component\HttpKernel\EventListener\TestSessionListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * SessionListenerTest.
+ *
+ * Tests SessionListener.
+ *
+ * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
+ */
+class TestSessionListenerTest extends TestCase
+{
+    /**
+     * @var TestSessionListener
+     */
+    private $listener;
+
+    /**
+     * @var SessionInterface
+     */
+    private $session;
+
+    protected function setUp()
+    {
+        $this->listener = $this->getMockForAbstractClass('Symfony\Component\HttpKernel\EventListener\AbstractTestSessionListener');
+        $this->session = $this->getSession();
+        $this->listener->expects($this->any())
+             ->method('getSession')
+             ->willReturn($this->session);
+    }
+
+    public function testShouldSaveMasterRequestSession()
+    {
+        $this->sessionHasBeenStarted();
+        $this->sessionMustBeSaved();
+
+        $this->filterResponse(new Request());
+    }
+
+    public function testShouldNotSaveSubRequestSession()
+    {
+        $this->sessionMustNotBeSaved();
+
+        $this->filterResponse(new Request(), HttpKernelInterface::SUB_REQUEST);
+    }
+
+    public function testDoesNotDeleteCookieIfUsingSessionLifetime()
+    {
+        $this->sessionHasBeenStarted();
+
+        @ini_set('session.cookie_lifetime', 0);
+
+        $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST);
+        $cookies = $response->headers->getCookies();
+
+        $this->assertEquals(0, reset($cookies)->getExpiresTime());
+    }
+
+    /**
+     * @requires function \Symfony\Component\HttpFoundation\Session\Session::isEmpty
+     */
+    public function testEmptySessionDoesNotSendCookie()
+    {
+        $this->sessionHasBeenStarted();
+        $this->sessionIsEmpty();
+
+        $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST);
+
+        $this->assertSame([], $response->headers->getCookies());
+    }
+
+    public function testEmptySessionWithNewSessionIdDoesSendCookie()
+    {
+        $this->sessionHasBeenStarted();
+        $this->sessionIsEmpty();
+        $this->fixSessionId('456');
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('/', 'GET', [], ['MOCKSESSID' => '123']);
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+        $this->listener->onKernelRequest($event);
+
+        $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST);
+
+        $this->assertNotEmpty($response->headers->getCookies());
+    }
+
+    /**
+     * @dataProvider anotherCookieProvider
+     */
+    public function testSessionWithNewSessionIdAndNewCookieDoesNotSendAnotherCookie($existing, array $expected)
+    {
+        $this->sessionHasBeenStarted();
+        $this->sessionIsEmpty();
+        $this->fixSessionId('456');
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('/', 'GET', [], ['MOCKSESSID' => '123']);
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+        $this->listener->onKernelRequest($event);
+
+        $response = new Response('', 200, ['Set-Cookie' => $existing]);
+
+        $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $this->assertSame($expected, $response->headers->get('Set-Cookie', null, false));
+    }
+
+    public function anotherCookieProvider()
+    {
+        return [
+            'same' => ['MOCKSESSID=789; path=/', ['MOCKSESSID=789; path=/']],
+            'different domain' => ['MOCKSESSID=789; path=/; domain=example.com', ['MOCKSESSID=789; path=/; domain=example.com', 'MOCKSESSID=456; path=/']],
+            'different path' => ['MOCKSESSID=789; path=/foo', ['MOCKSESSID=789; path=/foo', 'MOCKSESSID=456; path=/']],
+        ];
+    }
+
+    public function testUnstartedSessionIsNotSave()
+    {
+        $this->sessionHasNotBeenStarted();
+        $this->sessionMustNotBeSaved();
+
+        $this->filterResponse(new Request());
+    }
+
+    public function testDoesNotImplementServiceSubscriberInterface()
+    {
+        $this->assertTrue(interface_exists(ServiceSubscriberInterface::class));
+        $this->assertTrue(class_exists(SessionListener::class));
+        $this->assertTrue(class_exists(TestSessionListener::class));
+        $this->assertFalse(is_subclass_of(SessionListener::class, ServiceSubscriberInterface::class), 'Implementing ServiceSubscriberInterface would create a dep on the DI component, which eg Silex cannot afford');
+        $this->assertFalse(is_subclass_of(TestSessionListener::class, ServiceSubscriberInterface::class, 'Implementing ServiceSubscriberInterface would create a dep on the DI component, which eg Silex cannot afford'));
+    }
+
+    private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, Response $response = null)
+    {
+        $request->setSession($this->session);
+        $response = $response ?: new Response();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $event = new FilterResponseEvent($kernel, $request, $type, $response);
+
+        $this->listener->onKernelResponse($event);
+
+        $this->assertSame($response, $event->getResponse());
+
+        return $response;
+    }
+
+    private function sessionMustNotBeSaved()
+    {
+        $this->session->expects($this->never())
+            ->method('save');
+    }
+
+    private function sessionMustBeSaved()
+    {
+        $this->session->expects($this->once())
+            ->method('save');
+    }
+
+    private function sessionHasBeenStarted()
+    {
+        $this->session->expects($this->once())
+            ->method('isStarted')
+            ->willReturn(true);
+    }
+
+    private function sessionHasNotBeenStarted()
+    {
+        $this->session->expects($this->once())
+            ->method('isStarted')
+            ->willReturn(false);
+    }
+
+    private function sessionIsEmpty()
+    {
+        $this->session->expects($this->once())
+            ->method('isEmpty')
+            ->willReturn(true);
+    }
+
+    private function fixSessionId($sessionId)
+    {
+        $this->session->expects($this->any())
+            ->method('getId')
+            ->willReturn($sessionId);
+    }
+
+    private function getSession()
+    {
+        $mock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // set return value for getName()
+        $mock->expects($this->any())->method('getName')->willReturn('MOCKSESSID');
+
+        return $mock;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/TranslatorListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/TranslatorListenerTest.php
new file mode 100644
index 000000000..77c2c1c69
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/TranslatorListenerTest.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\TranslatorListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class TranslatorListenerTest extends TestCase
+{
+    private $listener;
+    private $translator;
+    private $requestStack;
+
+    protected function setUp()
+    {
+        $this->translator = $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock();
+        $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
+        $this->listener = new TranslatorListener($this->translator, $this->requestStack);
+    }
+
+    public function testLocaleIsSetInOnKernelRequest()
+    {
+        $this->translator
+            ->expects($this->once())
+            ->method('setLocale')
+            ->with($this->equalTo('fr'));
+
+        $event = new GetResponseEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+        $this->listener->onKernelRequest($event);
+    }
+
+    public function testDefaultLocaleIsUsedOnExceptionsInOnKernelRequest()
+    {
+        $this->translator
+            ->expects($this->at(0))
+            ->method('setLocale')
+            ->willThrowException(new \InvalidArgumentException());
+        $this->translator
+            ->expects($this->at(1))
+            ->method('setLocale')
+            ->with($this->equalTo('en'));
+
+        $event = new GetResponseEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+        $this->listener->onKernelRequest($event);
+    }
+
+    public function testLocaleIsSetInOnKernelFinishRequestWhenParentRequestExists()
+    {
+        $this->translator
+            ->expects($this->once())
+            ->method('setLocale')
+            ->with($this->equalTo('fr'));
+
+        $this->setMasterRequest($this->createRequest('fr'));
+        $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+        $this->listener->onKernelFinishRequest($event);
+    }
+
+    public function testLocaleIsNotSetInOnKernelFinishRequestWhenParentRequestDoesNotExist()
+    {
+        $this->translator
+            ->expects($this->never())
+            ->method('setLocale');
+
+        $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+        $this->listener->onKernelFinishRequest($event);
+    }
+
+    public function testDefaultLocaleIsUsedOnExceptionsInOnKernelFinishRequest()
+    {
+        $this->translator
+            ->expects($this->at(0))
+            ->method('setLocale')
+            ->willThrowException(new \InvalidArgumentException());
+        $this->translator
+            ->expects($this->at(1))
+            ->method('setLocale')
+            ->with($this->equalTo('en'));
+
+        $this->setMasterRequest($this->createRequest('fr'));
+        $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+        $this->listener->onKernelFinishRequest($event);
+    }
+
+    private function createHttpKernel()
+    {
+        return $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+    }
+
+    private function createRequest($locale)
+    {
+        $request = new Request();
+        $request->setLocale($locale);
+
+        return $request;
+    }
+
+    private function setMasterRequest($request)
+    {
+        $this->requestStack
+            ->expects($this->any())
+            ->method('getParentRequest')
+            ->willReturn($request);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php b/lib/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
new file mode 100644
index 000000000..7d63cb45f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\ValidateRequestListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class ValidateRequestListenerTest extends TestCase
+{
+    protected function tearDown()
+    {
+        Request::setTrustedProxies([], -1);
+    }
+
+    public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
+    {
+        $this->expectException('Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException');
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+
+        $request = new Request();
+        $request->setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_FORWARDED);
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('FORWARDED', 'for=2.2.2.2');
+        $request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
+
+        $dispatcher->addListener(KernelEvents::REQUEST, [new ValidateRequestListener(), 'onKernelRequest']);
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+
+        $dispatcher->dispatch(KernelEvents::REQUEST, $event);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/AccessDeniedHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/AccessDeniedHttpExceptionTest.php
new file mode 100644
index 000000000..2bfcb2bf8
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/AccessDeniedHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+
+class AccessDeniedHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new AccessDeniedHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/BadRequestHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/BadRequestHttpExceptionTest.php
new file mode 100644
index 000000000..5fd54ccf4
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/BadRequestHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+class BadRequestHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new BadRequestHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/ConflictHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/ConflictHttpExceptionTest.php
new file mode 100644
index 000000000..63cb49e6e
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/ConflictHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+
+class ConflictHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new ConflictHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/GoneHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/GoneHttpExceptionTest.php
new file mode 100644
index 000000000..ec5339d2a
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/GoneHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\GoneHttpException;
+
+class GoneHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new GoneHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/HttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/HttpExceptionTest.php
new file mode 100644
index 000000000..f5fe97255
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/HttpExceptionTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class HttpExceptionTest extends TestCase
+{
+    public function headerDataProvider()
+    {
+        return [
+            [['X-Test' => 'Test']],
+            [['X-Test' => 1]],
+            [
+                [
+                    ['X-Test' => 'Test'],
+                    ['X-Test-2' => 'Test-2'],
+                ],
+            ],
+        ];
+    }
+
+    public function testHeadersDefault()
+    {
+        $exception = $this->createException();
+        $this->assertSame([], $exception->getHeaders());
+    }
+
+    /**
+     * @dataProvider headerDataProvider
+     */
+    public function testHeadersConstructor($headers)
+    {
+        $exception = new HttpException(200, null, null, $headers);
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+
+    /**
+     * @dataProvider headerDataProvider
+     */
+    public function testHeadersSetter($headers)
+    {
+        $exception = $this->createException();
+        $exception->setHeaders($headers);
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+
+    protected function createException()
+    {
+        return new HttpException(200);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/LengthRequiredHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/LengthRequiredHttpExceptionTest.php
new file mode 100644
index 000000000..462d3ca4f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/LengthRequiredHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\LengthRequiredHttpException;
+
+class LengthRequiredHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new LengthRequiredHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
new file mode 100644
index 000000000..31dbf2f03
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+
+class MethodNotAllowedHttpExceptionTest extends HttpExceptionTest
+{
+    public function testHeadersDefault()
+    {
+        $exception = new MethodNotAllowedHttpException(['GET', 'PUT']);
+        $this->assertSame(['Allow' => 'GET, PUT'], $exception->getHeaders());
+    }
+
+    /**
+     * @dataProvider headerDataProvider
+     */
+    public function testHeadersSetter($headers)
+    {
+        $exception = new MethodNotAllowedHttpException(['GET']);
+        $exception->setHeaders($headers);
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/NotAcceptableHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/NotAcceptableHttpExceptionTest.php
new file mode 100644
index 000000000..4c0db7a3c
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/NotAcceptableHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
+
+class NotAcceptableHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new NotAcceptableHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/NotFoundHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/NotFoundHttpExceptionTest.php
new file mode 100644
index 000000000..62ede5b4b
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/NotFoundHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class NotFoundHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new NotFoundHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php
new file mode 100644
index 000000000..809252b75
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\PreconditionFailedHttpException;
+
+class PreconditionFailedHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new PreconditionFailedHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php
new file mode 100644
index 000000000..69d362e3f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\PreconditionRequiredHttpException;
+
+class PreconditionRequiredHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new PreconditionRequiredHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
new file mode 100644
index 000000000..cefde951c
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
+
+class ServiceUnavailableHttpExceptionTest extends HttpExceptionTest
+{
+    public function testHeadersDefaultRetryAfter()
+    {
+        $exception = new ServiceUnavailableHttpException(10);
+        $this->assertSame(['Retry-After' => 10], $exception->getHeaders());
+    }
+
+    /**
+     * @dataProvider headerDataProvider
+     */
+    public function testHeadersSetter($headers)
+    {
+        $exception = new ServiceUnavailableHttpException(10);
+        $exception->setHeaders($headers);
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+
+    protected function createException()
+    {
+        return new ServiceUnavailableHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
new file mode 100644
index 000000000..73ee91a77
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
+
+class TooManyRequestsHttpExceptionTest extends HttpExceptionTest
+{
+    public function testHeadersDefaultRertyAfter()
+    {
+        $exception = new TooManyRequestsHttpException(10);
+        $this->assertSame(['Retry-After' => 10], $exception->getHeaders());
+    }
+
+    /**
+     * @dataProvider headerDataProvider
+     */
+    public function testHeadersSetter($headers)
+    {
+        $exception = new TooManyRequestsHttpException(10);
+        $exception->setHeaders($headers);
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+
+    protected function createException()
+    {
+        return new TooManyRequestsHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/UnauthorizedHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
new file mode 100644
index 000000000..a8cc19aef
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
+
+class UnauthorizedHttpExceptionTest extends HttpExceptionTest
+{
+    public function testHeadersDefault()
+    {
+        $exception = new UnauthorizedHttpException('Challenge');
+        $this->assertSame(['WWW-Authenticate' => 'Challenge'], $exception->getHeaders());
+    }
+
+    /**
+     * @dataProvider headerDataProvider
+     */
+    public function testHeadersSetter($headers)
+    {
+        $exception = new UnauthorizedHttpException('Challenge');
+        $exception->setHeaders($headers);
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php
new file mode 100644
index 000000000..05d8d787a
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+
+class UnprocessableEntityHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new UnprocessableEntityHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php b/lib/symfony/http-kernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php
new file mode 100644
index 000000000..4dae039c1
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Exception;
+
+use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException;
+
+class UnsupportedMediaTypeHttpExceptionTest extends HttpExceptionTest
+{
+    protected function createException()
+    {
+        return new UnsupportedMediaTypeHttpException();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/123/Kernel123.php b/lib/symfony/http-kernel/Tests/Fixtures/123/Kernel123.php
new file mode 100644
index 000000000..70c4026f0
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/123/Kernel123.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\_123;
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
+
+class Kernel123 extends Kernel
+{
+    public function registerBundles()
+    {
+        return [];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/kernel123/cache/'.$this->environment;
+    }
+
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/kernel123/logs';
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/BaseBundle/Resources/foo.txt b/lib/symfony/http-kernel/Tests/Fixtures/BaseBundle/Resources/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/BaseBundle/Resources/hide.txt b/lib/symfony/http-kernel/Tests/Fixtures/BaseBundle/Resources/hide.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/Resources/foo.txt b/lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/Resources/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/bar.txt b/lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/bar.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/foo.txt b/lib/symfony/http-kernel/Tests/Fixtures/Bundle1Bundle/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Bundle2Bundle/foo.txt b/lib/symfony/http-kernel/Tests/Fixtures/Bundle2Bundle/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ChildBundle/Resources/foo.txt b/lib/symfony/http-kernel/Tests/Fixtures/ChildBundle/Resources/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ChildBundle/Resources/hide.txt b/lib/symfony/http-kernel/Tests/Fixtures/ChildBundle/Resources/hide.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ClearableService.php b/lib/symfony/http-kernel/Tests/Fixtures/ClearableService.php
new file mode 100644
index 000000000..35acb419c
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/ClearableService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures;
+
+class ClearableService
+{
+    public static $counter = 0;
+
+    public function clear()
+    {
+        ++self::$counter;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Controller/BasicTypesController.php b/lib/symfony/http-kernel/Tests/Fixtures/Controller/BasicTypesController.php
new file mode 100644
index 000000000..e8e0b6034
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/Controller/BasicTypesController.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
+
+class BasicTypesController
+{
+    public function action(string $foo, int $bar, float $baz)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Controller/ExtendingRequest.php b/lib/symfony/http-kernel/Tests/Fixtures/Controller/ExtendingRequest.php
new file mode 100644
index 000000000..9b4754b46
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/Controller/ExtendingRequest.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+
+class ExtendingRequest extends Request
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Controller/ExtendingSession.php b/lib/symfony/http-kernel/Tests/Fixtures/Controller/ExtendingSession.php
new file mode 100644
index 000000000..9fa54ee8b
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/Controller/ExtendingSession.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\Controller;
+
+use Symfony\Component\HttpFoundation\Session\Session;
+
+class ExtendingSession extends Session
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Controller/NullableController.php b/lib/symfony/http-kernel/Tests/Fixtures/Controller/NullableController.php
new file mode 100644
index 000000000..9db4df7b4
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/Controller/NullableController.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
+
+class NullableController
+{
+    public function action(?string $foo, ?\stdClass $bar, ?string $baz = 'value', $mandatory)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Controller/VariadicController.php b/lib/symfony/http-kernel/Tests/Fixtures/Controller/VariadicController.php
new file mode 100644
index 000000000..c39812453
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/Controller/VariadicController.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
+
+class VariadicController
+{
+    public function action($foo, ...$bar)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php b/lib/symfony/http-kernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
new file mode 100644
index 000000000..4f5de182f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\DataCollector;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+
+class CloneVarDataCollector extends DataCollector
+{
+    private $varToClone;
+
+    public function __construct($varToClone)
+    {
+        $this->varToClone = $varToClone;
+    }
+
+    public function collect(Request $request, Response $response, \Exception $exception = null)
+    {
+        $this->data = $this->cloneVar($this->varToClone);
+    }
+
+    public function reset()
+    {
+        $this->data = [];
+    }
+
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    public function getName()
+    {
+        return 'clone_var';
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ExtensionAbsentBundle/ExtensionAbsentBundle.php b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionAbsentBundle/ExtensionAbsentBundle.php
new file mode 100644
index 000000000..c8bfd36e6
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionAbsentBundle/ExtensionAbsentBundle.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\ExtensionAbsentBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ExtensionAbsentBundle extends Bundle
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ExtensionNotValidBundle/DependencyInjection/ExtensionNotValidExtension.php b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionNotValidBundle/DependencyInjection/ExtensionNotValidExtension.php
new file mode 100644
index 000000000..0fd64316f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionNotValidBundle/DependencyInjection/ExtensionNotValidExtension.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\ExtensionNotValidBundle\DependencyInjection;
+
+class ExtensionNotValidExtension
+{
+    public function getAlias()
+    {
+        return 'extension_not_valid';
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ExtensionNotValidBundle/ExtensionNotValidBundle.php b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionNotValidBundle/ExtensionNotValidBundle.php
new file mode 100644
index 000000000..34e292039
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionNotValidBundle/ExtensionNotValidBundle.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\ExtensionNotValidBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ExtensionNotValidBundle extends Bundle
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/Command/FooCommand.php b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/Command/FooCommand.php
new file mode 100644
index 000000000..c6570aa04
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/Command/FooCommand.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+
+class FooCommand extends Command
+{
+    protected function configure()
+    {
+        $this->setName('foo');
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php
new file mode 100644
index 000000000..108571718
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\ExtensionPresentBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+
+class ExtensionPresentExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/ExtensionPresentBundle.php b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/ExtensionPresentBundle.php
new file mode 100644
index 000000000..36a7ad404
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/ExtensionPresentBundle/ExtensionPresentBundle.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\ExtensionPresentBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ExtensionPresentBundle extends Bundle
+{
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/KernelForOverrideName.php b/lib/symfony/http-kernel/Tests/Fixtures/KernelForOverrideName.php
new file mode 100644
index 000000000..f7baaa632
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/KernelForOverrideName.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
+
+class KernelForOverrideName extends Kernel
+{
+    protected $name = 'overridden';
+
+    public function registerBundles()
+    {
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/KernelForTest.php b/lib/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
new file mode 100644
index 000000000..8c3571281
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
+
+class KernelForTest extends Kernel
+{
+    public function getBundleMap()
+    {
+        return $this->bundleMap;
+    }
+
+    public function registerBundles()
+    {
+        return [];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+
+    public function isBooted()
+    {
+        return $this->booted;
+    }
+
+    public function getProjectDir()
+    {
+        return __DIR__;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/KernelWithoutBundles.php b/lib/symfony/http-kernel/Tests/Fixtures/KernelWithoutBundles.php
new file mode 100644
index 000000000..1f5a45606
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/KernelWithoutBundles.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel;
+
+class KernelWithoutBundles extends Kernel
+{
+    public function registerBundles()
+    {
+        return [];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+
+    protected function build(ContainerBuilder $container)
+    {
+        $container->setParameter('test_executed', true);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/ResettableService.php b/lib/symfony/http-kernel/Tests/Fixtures/ResettableService.php
new file mode 100644
index 000000000..ffb72a35a
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/ResettableService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures;
+
+class ResettableService
+{
+    public static $counter = 0;
+
+    public function reset()
+    {
+        ++self::$counter;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Resources/BaseBundle/hide.txt b/lib/symfony/http-kernel/Tests/Fixtures/Resources/BaseBundle/hide.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Resources/Bundle1Bundle/foo.txt b/lib/symfony/http-kernel/Tests/Fixtures/Resources/Bundle1Bundle/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Resources/ChildBundle/foo.txt b/lib/symfony/http-kernel/Tests/Fixtures/Resources/ChildBundle/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/Resources/FooBundle/foo.txt b/lib/symfony/http-kernel/Tests/Fixtures/Resources/FooBundle/foo.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/http-kernel/Tests/Fixtures/TestClient.php b/lib/symfony/http-kernel/Tests/Fixtures/TestClient.php
new file mode 100644
index 000000000..e7d60cff3
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fixtures/TestClient.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\HttpKernel\Client;
+
+class TestClient extends Client
+{
+    protected function getScript($request)
+    {
+        $script = parent::getScript($request);
+
+        $autoload = file_exists(__DIR__.'/../../vendor/autoload.php')
+            ? __DIR__.'/../../vendor/autoload.php'
+            : __DIR__.'/../../../../../../vendor/autoload.php'
+        ;
+
+        $script = preg_replace('/(\->register\(\);)/', "$0\nrequire_once '$autoload';\n", $script);
+
+        return $script;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
new file mode 100644
index 000000000..d8ba8aed8
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fragment;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
+use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
+use Symfony\Component\HttpKernel\HttpCache\Esi;
+use Symfony\Component\HttpKernel\UriSigner;
+
+class EsiFragmentRendererTest extends TestCase
+{
+    public function testRenderFallbackToInlineStrategyIfEsiNotSupported()
+    {
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true));
+        $strategy->render('/', Request::create('/'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated %s.
+     */
+    public function testRenderFallbackWithObjectAttributesIsDeprecated()
+    {
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
+        $request = Request::create('/');
+        $reference = new ControllerReference('main_controller', ['foo' => new \stdClass()], []);
+        $strategy->render($reference, $request);
+    }
+
+    public function testRenderFallbackWithScalarIsNotDeprecated()
+    {
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
+        $request = Request::create('/');
+        $reference = new ControllerReference('main_controller', ['foo' => [true]], []);
+        $strategy->render($reference, $request);
+    }
+
+    public function testRender()
+    {
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy());
+
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->headers->set('Surrogate-Capability', 'ESI/1.0');
+
+        $this->assertEquals('<esi:include src="/" />', $strategy->render('/', $request)->getContent());
+        $this->assertEquals("<esi:comment text=\"This is a comment\" />\n<esi:include src=\"/\" />", $strategy->render('/', $request, ['comment' => 'This is a comment'])->getContent());
+        $this->assertEquals('<esi:include src="/" alt="foo" />', $strategy->render('/', $request, ['alt' => 'foo'])->getContent());
+    }
+
+    public function testRenderControllerReference()
+    {
+        $signer = new UriSigner('foo');
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(), $signer);
+
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->headers->set('Surrogate-Capability', 'ESI/1.0');
+
+        $reference = new ControllerReference('main_controller', [], []);
+        $altReference = new ControllerReference('alt_controller', [], []);
+
+        $this->assertEquals(
+            '<esi:include src="/_fragment?_hash=Jz1P8NErmhKTeI6onI1EdAXTB85359MY3RIk5mSJ60w%3D&_path=_format%3Dhtml%26_locale%3Dfr%26_controller%3Dmain_controller" alt="/_fragment?_hash=iPJEdRoUpGrM1ztqByiorpfMPtiW%2FOWwdH1DBUXHhEc%3D&_path=_format%3Dhtml%26_locale%3Dfr%26_controller%3Dalt_controller" />',
+            $strategy->render($reference, $request, ['alt' => $altReference])->getContent()
+        );
+    }
+
+    public function testRenderControllerReferenceWithoutSignerThrowsException()
+    {
+        $this->expectException('LogicException');
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy());
+
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->headers->set('Surrogate-Capability', 'ESI/1.0');
+
+        $strategy->render(new ControllerReference('main_controller'), $request);
+    }
+
+    public function testRenderAltControllerReferenceWithoutSignerThrowsException()
+    {
+        $this->expectException('LogicException');
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy());
+
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->headers->set('Surrogate-Capability', 'ESI/1.0');
+
+        $strategy->render('/', $request, ['alt' => new ControllerReference('alt_controller')]);
+    }
+
+    private function getInlineStrategy($called = false)
+    {
+        $inline = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer')->disableOriginalConstructor()->getMock();
+
+        if ($called) {
+            $inline->expects($this->once())->method('render');
+        }
+
+        return $inline;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php b/lib/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
new file mode 100644
index 000000000..6da4e73e3
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fragment;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
+
+/**
+ * @group time-sensitive
+ */
+class FragmentHandlerTest extends TestCase
+{
+    private $requestStack;
+
+    protected function setUp()
+    {
+        $this->requestStack = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+        $this->requestStack
+            ->expects($this->any())
+            ->method('getCurrentRequest')
+            ->willReturn(Request::create('/'))
+        ;
+    }
+
+    public function testRenderWhenRendererDoesNotExist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $handler = new FragmentHandler($this->requestStack);
+        $handler->render('/', 'foo');
+    }
+
+    public function testRenderWithUnknownRenderer()
+    {
+        $this->expectException('InvalidArgumentException');
+        $handler = $this->getHandler($this->returnValue(new Response('foo')));
+
+        $handler->render('/', 'bar');
+    }
+
+    public function testDeliverWithUnsuccessfulResponse()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Error when rendering "http://localhost/" (Status code is 404).');
+        $handler = $this->getHandler($this->returnValue(new Response('foo', 404)));
+
+        $handler->render('/', 'foo');
+    }
+
+    public function testRender()
+    {
+        $handler = $this->getHandler($this->returnValue(new Response('foo')), ['/', Request::create('/'), ['foo' => 'foo', 'ignore_errors' => true]]);
+
+        $this->assertEquals('foo', $handler->render('/', 'foo', ['foo' => 'foo']));
+    }
+
+    protected function getHandler($returnValue, $arguments = [])
+    {
+        $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
+        $renderer
+            ->expects($this->any())
+            ->method('getName')
+            ->willReturn('foo')
+        ;
+        $e = $renderer
+            ->expects($this->any())
+            ->method('render')
+            ->will($returnValue)
+        ;
+
+        if ($arguments) {
+            \call_user_func_array([$e, 'with'], $arguments);
+        }
+
+        $handler = new FragmentHandler($this->requestStack);
+        $handler->addRenderer($renderer);
+
+        return $handler;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
new file mode 100644
index 000000000..43248f8e9
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fragment;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
+use Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer;
+use Symfony\Component\HttpKernel\UriSigner;
+
+class HIncludeFragmentRendererTest extends TestCase
+{
+    public function testRenderExceptionWhenControllerAndNoSigner()
+    {
+        $this->expectException('LogicException');
+        $strategy = new HIncludeFragmentRenderer();
+        $strategy->render(new ControllerReference('main_controller', [], []), Request::create('/'));
+    }
+
+    public function testRenderWithControllerAndSigner()
+    {
+        $strategy = new HIncludeFragmentRenderer(null, new UriSigner('foo'));
+
+        $this->assertEquals('<hx:include src="/_fragment?_hash=BP%2BOzCD5MRUI%2BHJpgPDOmoju00FnzLhP3TGcSHbbBLs%3D&amp;_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller"></hx:include>', $strategy->render(new ControllerReference('main_controller', [], []), Request::create('/'))->getContent());
+    }
+
+    public function testRenderWithUri()
+    {
+        $strategy = new HIncludeFragmentRenderer();
+        $this->assertEquals('<hx:include src="/foo"></hx:include>', $strategy->render('/foo', Request::create('/'))->getContent());
+
+        $strategy = new HIncludeFragmentRenderer(null, new UriSigner('foo'));
+        $this->assertEquals('<hx:include src="/foo"></hx:include>', $strategy->render('/foo', Request::create('/'))->getContent());
+    }
+
+    public function testRenderWithDefault()
+    {
+        // only default
+        $strategy = new HIncludeFragmentRenderer();
+        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default'])->getContent());
+
+        // only global default
+        $strategy = new HIncludeFragmentRenderer(null, null, 'global_default');
+        $this->assertEquals('<hx:include src="/foo">global_default</hx:include>', $strategy->render('/foo', Request::create('/'), [])->getContent());
+
+        // global default and default
+        $strategy = new HIncludeFragmentRenderer(null, null, 'global_default');
+        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default'])->getContent());
+    }
+
+    public function testRenderWithAttributesOptions()
+    {
+        // with id
+        $strategy = new HIncludeFragmentRenderer();
+        $this->assertEquals('<hx:include src="/foo" id="bar">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default', 'id' => 'bar'])->getContent());
+
+        // with attributes
+        $strategy = new HIncludeFragmentRenderer();
+        $this->assertEquals('<hx:include src="/foo" p1="v1" p2="v2">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default', 'attributes' => ['p1' => 'v1', 'p2' => 'v2']])->getContent());
+
+        // with id & attributes
+        $strategy = new HIncludeFragmentRenderer();
+        $this->assertEquals('<hx:include src="/foo" p1="v1" p2="v2" id="bar">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default', 'id' => 'bar', 'attributes' => ['p1' => 'v1', 'p2' => 'v2']])->getContent());
+    }
+
+    public function testRenderWithDefaultText()
+    {
+        $engine = $this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
+        $engine->expects($this->once())
+            ->method('exists')
+            ->with('default')
+            ->willThrowException(new \InvalidArgumentException());
+
+        // only default
+        $strategy = new HIncludeFragmentRenderer($engine);
+        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default'])->getContent());
+    }
+
+    public function testRenderWithEngineAndDefaultText()
+    {
+        $engine = $this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
+        $engine->expects($this->once())
+            ->method('exists')
+            ->with('loading...')
+            ->willThrowException(new \RuntimeException());
+
+        // only default
+        $strategy = new HIncludeFragmentRenderer($engine);
+        $this->assertEquals('<hx:include src="/foo">loading...</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'loading...'])->getContent());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
new file mode 100644
index 000000000..0dfe8425f
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -0,0 +1,318 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fragment;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
+use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class InlineFragmentRendererTest extends TestCase
+{
+    public function testRender()
+    {
+        $strategy = new InlineFragmentRenderer($this->getKernel($this->returnValue(new Response('foo'))));
+
+        $this->assertEquals('foo', $strategy->render('/', Request::create('/'))->getContent());
+    }
+
+    public function testRenderWithControllerReference()
+    {
+        $strategy = new InlineFragmentRenderer($this->getKernel($this->returnValue(new Response('foo'))));
+
+        $this->assertEquals('foo', $strategy->render(new ControllerReference('main_controller', [], []), Request::create('/'))->getContent());
+    }
+
+    public function testRenderWithObjectsAsAttributes()
+    {
+        $object = new \stdClass();
+
+        $subRequest = Request::create('/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller');
+        $subRequest->attributes->replace(['object' => $object, '_format' => 'html', '_controller' => 'main_controller', '_locale' => 'en']);
+        $subRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $subRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
+        $subRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $subRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($subRequest));
+
+        $this->assertSame('foo', $strategy->render(new ControllerReference('main_controller', ['object' => $object], []), Request::create('/'))->getContent());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheControllerLegacy()
+    {
+        $resolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver')->setMethods(['getController'])->getMock();
+        $resolver
+            ->expects($this->once())
+            ->method('getController')
+            ->willReturn(function (\stdClass $object, Bar $object1) {
+                return new Response($object1->getBar());
+            })
+        ;
+
+        $kernel = new HttpKernel(new EventDispatcher(), $resolver, new RequestStack());
+        $renderer = new InlineFragmentRenderer($kernel);
+
+        $response = $renderer->render(new ControllerReference('main_controller', ['object' => new \stdClass(), 'object1' => new Bar()], []), Request::create('/'));
+        $this->assertEquals('bar', $response->getContent());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheController()
+    {
+        $resolver = $this->getMockBuilder(ControllerResolverInterface::class)->getMock();
+        $resolver
+            ->expects($this->once())
+            ->method('getController')
+            ->willReturn(function (\stdClass $object, Bar $object1) {
+                return new Response($object1->getBar());
+            })
+        ;
+
+        $kernel = new HttpKernel(new EventDispatcher(), $resolver, new RequestStack(), new ArgumentResolver());
+        $renderer = new InlineFragmentRenderer($kernel);
+
+        $response = $renderer->render(new ControllerReference('main_controller', ['object' => new \stdClass(), 'object1' => new Bar()], []), Request::create('/'));
+        $this->assertEquals('bar', $response->getContent());
+    }
+
+    public function testRenderWithTrustedHeaderDisabled()
+    {
+        Request::setTrustedProxies([], 0);
+
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+        $this->assertSame('foo', $strategy->render('/', Request::create('/'))->getContent());
+
+        Request::setTrustedProxies([], -1);
+    }
+
+    public function testRenderExceptionNoIgnoreErrors()
+    {
+        $this->expectException('RuntimeException');
+        $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+        $dispatcher->expects($this->never())->method('dispatch');
+
+        $strategy = new InlineFragmentRenderer($this->getKernel($this->throwException(new \RuntimeException('foo'))), $dispatcher);
+
+        $this->assertEquals('foo', $strategy->render('/', Request::create('/'))->getContent());
+    }
+
+    public function testRenderExceptionIgnoreErrors()
+    {
+        $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+        $dispatcher->expects($this->once())->method('dispatch')->with(KernelEvents::EXCEPTION);
+
+        $strategy = new InlineFragmentRenderer($this->getKernel($this->throwException(new \RuntimeException('foo'))), $dispatcher);
+
+        $this->assertEmpty($strategy->render('/', Request::create('/'), ['ignore_errors' => true])->getContent());
+    }
+
+    public function testRenderExceptionIgnoreErrorsWithAlt()
+    {
+        $strategy = new InlineFragmentRenderer($this->getKernel($this->onConsecutiveCalls(
+            $this->throwException(new \RuntimeException('foo')),
+            $this->returnValue(new Response('bar'))
+        )));
+
+        $this->assertEquals('bar', $strategy->render('/', Request::create('/'), ['ignore_errors' => true, 'alt' => '/foo'])->getContent());
+    }
+
+    private function getKernel($returnValue)
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $kernel
+            ->expects($this->any())
+            ->method('handle')
+            ->will($returnValue)
+        ;
+
+        return $kernel;
+    }
+
+    public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
+    {
+        $controllerResolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface')->getMock();
+        $controllerResolver
+            ->expects($this->once())
+            ->method('getController')
+            ->willReturn(function () {
+                ob_start();
+                echo 'bar';
+                throw new \RuntimeException();
+            })
+        ;
+
+        $argumentResolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolverInterface')->getMock();
+        $argumentResolver
+            ->expects($this->once())
+            ->method('getArguments')
+            ->willReturn([])
+        ;
+
+        $kernel = new HttpKernel(new EventDispatcher(), $controllerResolver, new RequestStack(), $argumentResolver);
+        $renderer = new InlineFragmentRenderer($kernel);
+
+        // simulate a main request with output buffering
+        ob_start();
+        echo 'Foo';
+
+        // simulate a sub-request with output buffering and an exception
+        $renderer->render('/', Request::create('/'), ['ignore_errors' => true]);
+
+        $this->assertEquals('Foo', ob_get_clean());
+    }
+
+    public function testLocaleAndFormatAreIsKeptInSubrequest()
+    {
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->attributes->set('_format', 'foo');
+        $expectedSubRequest->setLocale('fr');
+        if (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) {
+            $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+            $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        }
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+
+        $request = Request::create('/');
+        $request->attributes->set('_format', 'foo');
+        $request->setLocale('fr');
+        $strategy->render('/', $request);
+    }
+
+    public function testESIHeaderIsKeptInSubrequest()
+    {
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+
+        if (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) {
+            $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+            $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        }
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $strategy->render('/', $request);
+    }
+
+    public function testESIHeaderIsKeptInSubrequestWithTrustedHeaderDisabled()
+    {
+        Request::setTrustedProxies([], Request::HEADER_FORWARDED);
+
+        $this->testESIHeaderIsKeptInSubrequest();
+
+        Request::setTrustedProxies([], -1);
+    }
+
+    public function testHeadersPossiblyResultingIn304AreNotAssignedToSubrequest()
+    {
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
+        $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_IF_MODIFIED_SINCE' => 'Fri, 01 Jan 2016 00:00:00 GMT', 'HTTP_IF_NONE_MATCH' => '*']);
+        $strategy->render('/', $request);
+    }
+
+    public function testFirstTrustedProxyIsSetAsRemote()
+    {
+        Request::setTrustedProxies(['1.1.1.1'], -1);
+
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $expectedSubRequest->server->set('REMOTE_ADDR', '127.0.0.1');
+        $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
+        $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $strategy->render('/', $request);
+
+        Request::setTrustedProxies([], -1);
+    }
+
+    public function testIpAddressOfRangedTrustedProxyIsSetAsRemote()
+    {
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $expectedSubRequest->server->set('REMOTE_ADDR', '127.0.0.1');
+        $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
+        $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        Request::setTrustedProxies(['1.1.1.1/24'], -1);
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $strategy->render('/', $request);
+
+        Request::setTrustedProxies([], -1);
+    }
+
+    /**
+     * Creates a Kernel expecting a request equals to $request
+     * Allows delta in comparison in case REQUEST_TIME changed by 1 second.
+     */
+    private function getKernelExpectingRequest(Request $request, $strict = false)
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $kernel
+            ->expects($this->once())
+            ->method('handle')
+            ->with($this->equalTo($request, 1))
+            ->willReturn(new Response('foo'));
+
+        return $kernel;
+    }
+}
+
+class Bar
+{
+    public $bar = 'bar';
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
new file mode 100644
index 000000000..151adb0e9
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fragment/RoutableFragmentRendererTest.php
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fragment;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
+
+class RoutableFragmentRendererTest extends TestCase
+{
+    /**
+     * @dataProvider getGenerateFragmentUriData
+     */
+    public function testGenerateFragmentUri($uri, $controller)
+    {
+        $this->assertEquals($uri, $this->callGenerateFragmentUriMethod($controller, Request::create('/')));
+    }
+
+    /**
+     * @dataProvider getGenerateFragmentUriData
+     */
+    public function testGenerateAbsoluteFragmentUri($uri, $controller)
+    {
+        $this->assertEquals('http://localhost'.$uri, $this->callGenerateFragmentUriMethod($controller, Request::create('/'), true));
+    }
+
+    public function getGenerateFragmentUriData()
+    {
+        return [
+            ['/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', [], [])],
+            ['/_fragment?_path=_format%3Dxml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', ['_format' => 'xml'], [])],
+            ['/_fragment?_path=foo%3Dfoo%26_format%3Djson%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', ['foo' => 'foo', '_format' => 'json'], [])],
+            ['/_fragment?bar=bar&_path=foo%3Dfoo%26_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', ['foo' => 'foo'], ['bar' => 'bar'])],
+            ['/_fragment?foo=foo&_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', [], ['foo' => 'foo'])],
+            ['/_fragment?_path=foo%255B0%255D%3Dfoo%26foo%255B1%255D%3Dbar%26_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', ['foo' => ['foo', 'bar']], [])],
+        ];
+    }
+
+    public function testGenerateFragmentUriWithARequest()
+    {
+        $request = Request::create('/');
+        $request->attributes->set('_format', 'json');
+        $request->setLocale('fr');
+        $controller = new ControllerReference('controller', [], []);
+
+        $this->assertEquals('/_fragment?_path=_format%3Djson%26_locale%3Dfr%26_controller%3Dcontroller', $this->callGenerateFragmentUriMethod($controller, $request));
+    }
+
+    /**
+     * @dataProvider getGenerateFragmentUriDataWithNonScalar
+     */
+    public function testGenerateFragmentUriWithNonScalar($controller)
+    {
+        $this->expectException('LogicException');
+        $this->callGenerateFragmentUriMethod($controller, Request::create('/'));
+    }
+
+    public function getGenerateFragmentUriDataWithNonScalar()
+    {
+        return [
+            [new ControllerReference('controller', ['foo' => new Foo(), 'bar' => 'bar'], [])],
+            [new ControllerReference('controller', ['foo' => ['foo' => 'foo'], 'bar' => ['bar' => new Foo()]], [])],
+        ];
+    }
+
+    private function callGenerateFragmentUriMethod(ControllerReference $reference, Request $request, $absolute = false)
+    {
+        $renderer = $this->getMockForAbstractClass('Symfony\Component\HttpKernel\Fragment\RoutableFragmentRenderer');
+        $r = new \ReflectionObject($renderer);
+        $m = $r->getMethod('generateFragmentUri');
+        $m->setAccessible(true);
+
+        return $m->invoke($renderer, $reference, $request, $absolute);
+    }
+}
+
+class Foo
+{
+    public $foo;
+
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php b/lib/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
new file mode 100644
index 000000000..df30e6772
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fragment;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
+use Symfony\Component\HttpKernel\Fragment\SsiFragmentRenderer;
+use Symfony\Component\HttpKernel\HttpCache\Ssi;
+use Symfony\Component\HttpKernel\UriSigner;
+
+class SsiFragmentRendererTest extends TestCase
+{
+    public function testRenderFallbackToInlineStrategyIfSsiNotSupported()
+    {
+        $strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy(true));
+        $strategy->render('/', Request::create('/'));
+    }
+
+    public function testRender()
+    {
+        $strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy());
+
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->headers->set('Surrogate-Capability', 'SSI/1.0');
+
+        $this->assertEquals('<!--#include virtual="/" -->', $strategy->render('/', $request)->getContent());
+        $this->assertEquals('<!--#include virtual="/" -->', $strategy->render('/', $request, ['comment' => 'This is a comment'])->getContent(), 'Strategy options should not impact the ssi include tag');
+    }
+
+    public function testRenderControllerReference()
+    {
+        $signer = new UriSigner('foo');
+        $strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy(), $signer);
+
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->headers->set('Surrogate-Capability', 'SSI/1.0');
+
+        $reference = new ControllerReference('main_controller', [], []);
+        $altReference = new ControllerReference('alt_controller', [], []);
+
+        $this->assertEquals(
+            '<!--#include virtual="/_fragment?_hash=Jz1P8NErmhKTeI6onI1EdAXTB85359MY3RIk5mSJ60w%3D&_path=_format%3Dhtml%26_locale%3Dfr%26_controller%3Dmain_controller" -->',
+            $strategy->render($reference, $request, ['alt' => $altReference])->getContent()
+        );
+    }
+
+    public function testRenderControllerReferenceWithoutSignerThrowsException()
+    {
+        $this->expectException('LogicException');
+        $strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy());
+
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->headers->set('Surrogate-Capability', 'SSI/1.0');
+
+        $strategy->render(new ControllerReference('main_controller'), $request);
+    }
+
+    public function testRenderAltControllerReferenceWithoutSignerThrowsException()
+    {
+        $this->expectException('LogicException');
+        $strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy());
+
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->headers->set('Surrogate-Capability', 'SSI/1.0');
+
+        $strategy->render('/', $request, ['alt' => new ControllerReference('alt_controller')]);
+    }
+
+    private function getInlineStrategy($called = false)
+    {
+        $inline = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer')->disableOriginalConstructor()->getMock();
+
+        if ($called) {
+            $inline->expects($this->once())->method('render');
+        }
+
+        return $inline;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/EsiTest.php b/lib/symfony/http-kernel/Tests/HttpCache/EsiTest.php
new file mode 100644
index 000000000..2aca5459c
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/EsiTest.php
@@ -0,0 +1,244 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\HttpCache;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\Esi;
+
+class EsiTest extends TestCase
+{
+    public function testHasSurrogateEsiCapability()
+    {
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $this->assertTrue($esi->hasSurrogateCapability($request));
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'foobar');
+        $this->assertFalse($esi->hasSurrogateCapability($request));
+
+        $request = Request::create('/');
+        $this->assertFalse($esi->hasSurrogateCapability($request));
+    }
+
+    public function testAddSurrogateEsiCapability()
+    {
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $esi->addSurrogateCapability($request);
+        $this->assertEquals('symfony="ESI/1.0"', $request->headers->get('Surrogate-Capability'));
+
+        $esi->addSurrogateCapability($request);
+        $this->assertEquals('symfony="ESI/1.0", symfony="ESI/1.0"', $request->headers->get('Surrogate-Capability'));
+    }
+
+    public function testAddSurrogateControl()
+    {
+        $esi = new Esi();
+
+        $response = new Response('foo <esi:include src="" />');
+        $esi->addSurrogateControl($response);
+        $this->assertEquals('content="ESI/1.0"', $response->headers->get('Surrogate-Control'));
+
+        $response = new Response('foo');
+        $esi->addSurrogateControl($response);
+        $this->assertEquals('', $response->headers->get('Surrogate-Control'));
+    }
+
+    public function testNeedsEsiParsing()
+    {
+        $esi = new Esi();
+
+        $response = new Response();
+        $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
+        $this->assertTrue($esi->needsParsing($response));
+
+        $response = new Response();
+        $this->assertFalse($esi->needsParsing($response));
+    }
+
+    public function testRenderIncludeTag()
+    {
+        $esi = new Esi();
+
+        $this->assertEquals('<esi:include src="/" onerror="continue" alt="/alt" />', $esi->renderIncludeTag('/', '/alt', true));
+        $this->assertEquals('<esi:include src="/" alt="/alt" />', $esi->renderIncludeTag('/', '/alt', false));
+        $this->assertEquals('<esi:include src="/" onerror="continue" />', $esi->renderIncludeTag('/'));
+        $this->assertEquals('<esi:comment text="some comment" />'."\n".'<esi:include src="/" onerror="continue" alt="/alt" />', $esi->renderIncludeTag('/', '/alt', true, 'some comment'));
+    }
+
+    public function testProcessDoesNothingIfContentTypeIsNotHtml()
+    {
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $response = new Response();
+        $response->headers->set('Content-Type', 'text/plain');
+        $this->assertSame($response, $esi->process($request, $response));
+
+        $this->assertFalse($response->headers->has('x-body-eval'));
+    }
+
+    public function testMultilineEsiRemoveTagsAreRemoved()
+    {
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $response = new Response('<esi:remove> <a href="http://www.example.com">www.example.com</a> </esi:remove> Keep this'."<esi:remove>\n <a>www.example.com</a> </esi:remove> And this");
+        $this->assertSame($response, $esi->process($request, $response));
+
+        $this->assertEquals(' Keep this And this', $response->getContent());
+    }
+
+    public function testCommentTagsAreRemoved()
+    {
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $response = new Response('<esi:comment text="some comment &gt;" /> Keep this');
+        $this->assertSame($response, $esi->process($request, $response));
+
+        $this->assertEquals(' Keep this', $response->getContent());
+    }
+
+    public function testProcess()
+    {
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $response = new Response('foo <esi:comment text="some comment" /><esi:include src="..." alt="alt" onerror="continue" />');
+        $this->assertSame($response, $esi->process($request, $response));
+
+        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'alt\', true) ?>'."\n", $response->getContent());
+        $this->assertEquals('ESI', $response->headers->get('x-body-eval'));
+
+        $response = new Response('foo <esi:comment text="some comment" /><esi:include src="foo\'" alt="bar\'" onerror="continue" />');
+        $this->assertSame($response, $esi->process($request, $response));
+
+        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'foo\\\'\', \'bar\\\'\', true) ?>'."\n", $response->getContent());
+
+        $response = new Response('foo <esi:include src="..." />');
+        $this->assertSame($response, $esi->process($request, $response));
+
+        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+
+        $response = new Response('foo <esi:include src="..."></esi:include>');
+        $this->assertSame($response, $esi->process($request, $response));
+
+        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+    }
+
+    public function testProcessEscapesPhpTags()
+    {
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $response = new Response('<?php <? <% <script language=php>');
+        $this->assertSame($response, $esi->process($request, $response));
+
+        $this->assertEquals('<?php echo "<?"; ?>php <?php echo "<?"; ?> <?php echo "<%"; ?> <?php echo "<s"; ?>cript language=php>', $response->getContent());
+    }
+
+    public function testProcessWhenNoSrcInAnEsi()
+    {
+        $this->expectException('RuntimeException');
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $response = new Response('foo <esi:include />');
+        $this->assertSame($response, $esi->process($request, $response));
+    }
+
+    public function testProcessRemoveSurrogateControlHeader()
+    {
+        $esi = new Esi();
+
+        $request = Request::create('/');
+        $response = new Response('foo <esi:include src="..." />');
+        $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
+        $this->assertSame($response, $esi->process($request, $response));
+        $this->assertEquals('ESI', $response->headers->get('x-body-eval'));
+
+        $response->headers->set('Surrogate-Control', 'no-store, content="ESI/1.0"');
+        $this->assertSame($response, $esi->process($request, $response));
+        $this->assertEquals('ESI', $response->headers->get('x-body-eval'));
+        $this->assertEquals('no-store', $response->headers->get('surrogate-control'));
+
+        $response->headers->set('Surrogate-Control', 'content="ESI/1.0", no-store');
+        $this->assertSame($response, $esi->process($request, $response));
+        $this->assertEquals('ESI', $response->headers->get('x-body-eval'));
+        $this->assertEquals('no-store', $response->headers->get('surrogate-control'));
+    }
+
+    public function testHandle()
+    {
+        $esi = new Esi();
+        $cache = $this->getCache(Request::create('/'), new Response('foo'));
+        $this->assertEquals('foo', $esi->handle($cache, '/', '/alt', true));
+    }
+
+    public function testHandleWhenResponseIsNot200()
+    {
+        $this->expectException('RuntimeException');
+        $esi = new Esi();
+        $response = new Response('foo');
+        $response->setStatusCode(404);
+        $cache = $this->getCache(Request::create('/'), $response);
+        $esi->handle($cache, '/', '/alt', false);
+    }
+
+    public function testHandleWhenResponseIsNot200AndErrorsAreIgnored()
+    {
+        $esi = new Esi();
+        $response = new Response('foo');
+        $response->setStatusCode(404);
+        $cache = $this->getCache(Request::create('/'), $response);
+        $this->assertEquals('', $esi->handle($cache, '/', '/alt', true));
+    }
+
+    public function testHandleWhenResponseIsNot200AndAltIsPresent()
+    {
+        $esi = new Esi();
+        $response1 = new Response('foo');
+        $response1->setStatusCode(404);
+        $response2 = new Response('bar');
+        $cache = $this->getCache(Request::create('/'), [$response1, $response2]);
+        $this->assertEquals('bar', $esi->handle($cache, '/', '/alt', false));
+    }
+
+    protected function getCache($request, $response)
+    {
+        $cache = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\HttpCache')->setMethods(['getRequest', 'handle'])->disableOriginalConstructor()->getMock();
+        $cache->expects($this->any())
+              ->method('getRequest')
+              ->willReturn($request)
+        ;
+        if (\is_array($response)) {
+            $cache->expects($this->any())
+                  ->method('handle')
+                  ->will(\call_user_func_array([$this, 'onConsecutiveCalls'], $response))
+            ;
+        } else {
+            $cache->expects($this->any())
+                  ->method('handle')
+                  ->willReturn($response)
+            ;
+        }
+
+        return $cache;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php b/lib/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
new file mode 100644
index 000000000..93d92eb11
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
@@ -0,0 +1,1526 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\HttpCache;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\Esi;
+use Symfony\Component\HttpKernel\HttpCache\HttpCache;
+use Symfony\Component\HttpKernel\HttpCache\Store;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * @group time-sensitive
+ */
+class HttpCacheTest extends HttpCacheTestCase
+{
+    public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
+    {
+        $storeMock = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\HttpCache\\StoreInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // does not implement TerminableInterface
+        $kernel = new TestKernel();
+        $httpCache = new HttpCache($kernel, $storeMock);
+        $httpCache->terminate(Request::create('/'), new Response());
+
+        $this->assertFalse($kernel->terminateCalled, 'terminate() is never called if the kernel class does not implement TerminableInterface');
+
+        // implements TerminableInterface
+        $kernelMock = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Kernel')
+            ->disableOriginalConstructor()
+            ->setMethods(['terminate', 'registerBundles', 'registerContainerConfiguration'])
+            ->getMock();
+
+        $kernelMock->expects($this->once())
+            ->method('terminate');
+
+        $kernel = new HttpCache($kernelMock, $storeMock);
+        $kernel->terminate(Request::create('/'), new Response());
+    }
+
+    public function testPassesOnNonGetHeadRequests()
+    {
+        $this->setNextResponse(200);
+        $this->request('POST', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertResponseOk();
+        $this->assertTraceContains('pass');
+        $this->assertFalse($this->response->headers->has('Age'));
+    }
+
+    public function testInvalidatesOnPostPutDeleteRequests()
+    {
+        foreach (['post', 'put', 'delete'] as $method) {
+            $this->setNextResponse(200);
+            $this->request($method, '/');
+
+            $this->assertHttpKernelIsCalled();
+            $this->assertResponseOk();
+            $this->assertTraceContains('invalidate');
+            $this->assertTraceContains('pass');
+        }
+    }
+
+    public function testDoesNotCacheWithAuthorizationRequestHeaderAndNonPublicResponse()
+    {
+        $this->setNextResponse(200, ['ETag' => '"Foo"']);
+        $this->request('GET', '/', ['HTTP_AUTHORIZATION' => 'basic foobarbaz']);
+
+        $this->assertHttpKernelIsCalled();
+        $this->assertResponseOk();
+        $this->assertEquals('private', $this->response->headers->get('Cache-Control'));
+
+        $this->assertTraceContains('miss');
+        $this->assertTraceNotContains('store');
+        $this->assertFalse($this->response->headers->has('Age'));
+    }
+
+    public function testDoesCacheWithAuthorizationRequestHeaderAndPublicResponse()
+    {
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '"Foo"']);
+        $this->request('GET', '/', ['HTTP_AUTHORIZATION' => 'basic foobarbaz']);
+
+        $this->assertHttpKernelIsCalled();
+        $this->assertResponseOk();
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertTrue($this->response->headers->has('Age'));
+        $this->assertEquals('public', $this->response->headers->get('Cache-Control'));
+    }
+
+    public function testDoesNotCacheWithCookieHeaderAndNonPublicResponse()
+    {
+        $this->setNextResponse(200, ['ETag' => '"Foo"']);
+        $this->request('GET', '/', [], ['foo' => 'bar']);
+
+        $this->assertHttpKernelIsCalled();
+        $this->assertResponseOk();
+        $this->assertEquals('private', $this->response->headers->get('Cache-Control'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceNotContains('store');
+        $this->assertFalse($this->response->headers->has('Age'));
+    }
+
+    public function testDoesNotCacheRequestsWithACookieHeader()
+    {
+        $this->setNextResponse(200);
+        $this->request('GET', '/', [], ['foo' => 'bar']);
+
+        $this->assertHttpKernelIsCalled();
+        $this->assertResponseOk();
+        $this->assertEquals('private', $this->response->headers->get('Cache-Control'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceNotContains('store');
+        $this->assertFalse($this->response->headers->has('Age'));
+    }
+
+    public function testRespondsWith304WhenIfModifiedSinceMatchesLastModified()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822), 'Content-Type' => 'text/plain'], 'Hello World');
+        $this->request('GET', '/', ['HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
+
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(304, $this->response->getStatusCode());
+        $this->assertEquals('', $this->response->headers->get('Content-Type'));
+        $this->assertEmpty($this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+    }
+
+    public function testRespondsWith304WhenIfNoneMatchMatchesETag()
+    {
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '12345', 'Content-Type' => 'text/plain'], 'Hello World');
+        $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345']);
+
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(304, $this->response->getStatusCode());
+        $this->assertEquals('', $this->response->headers->get('Content-Type'));
+        $this->assertTrue($this->response->headers->has('ETag'));
+        $this->assertEmpty($this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+    }
+
+    public function testRespondsWith304OnlyIfIfNoneMatchAndIfModifiedSinceBothMatch()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+
+        $this->setNextResponse(200, [], '', function ($request, $response) use ($time) {
+            $response->setStatusCode(200);
+            $response->headers->set('ETag', '12345');
+            $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
+            $response->headers->set('Content-Type', 'text/plain');
+            $response->setContent('Hello World');
+        });
+
+        // only ETag matches
+        $t = \DateTime::createFromFormat('U', time() - 3600);
+        $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $t->format(DATE_RFC2822)]);
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+
+        // only Last-Modified matches
+        $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '1234', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+
+        // Both matches
+        $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(304, $this->response->getStatusCode());
+    }
+
+    public function testIncrementsMaxAgeWhenNoDateIsSpecifiedEventWhenUsingETag()
+    {
+        $this->setNextResponse(
+            200,
+            [
+                'ETag' => '1234',
+                'Cache-Control' => 'public, s-maxage=60',
+            ]
+        );
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+
+        sleep(2);
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertEquals(2, $this->response->headers->get('Age'));
+    }
+
+    public function testValidatesPrivateResponsesCachedOnTheClient()
+    {
+        $this->setNextResponse(200, [], '', function ($request, $response) {
+            $etags = preg_split('/\s*,\s*/', $request->headers->get('IF_NONE_MATCH'));
+            if ($request->cookies->has('authenticated')) {
+                $response->headers->set('Cache-Control', 'private, no-store');
+                $response->setETag('"private tag"');
+                if (\in_array('"private tag"', $etags)) {
+                    $response->setStatusCode(304);
+                } else {
+                    $response->setStatusCode(200);
+                    $response->headers->set('Content-Type', 'text/plain');
+                    $response->setContent('private data');
+                }
+            } else {
+                $response->headers->set('Cache-Control', 'public');
+                $response->setETag('"public tag"');
+                if (\in_array('"public tag"', $etags)) {
+                    $response->setStatusCode(304);
+                } else {
+                    $response->setStatusCode(200);
+                    $response->headers->set('Content-Type', 'text/plain');
+                    $response->setContent('public data');
+                }
+            }
+        });
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('"public tag"', $this->response->headers->get('ETag'));
+        $this->assertEquals('public data', $this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+
+        $this->request('GET', '/', [], ['authenticated' => '']);
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('"private tag"', $this->response->headers->get('ETag'));
+        $this->assertEquals('private data', $this->response->getContent());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('invalid');
+        $this->assertTraceNotContains('store');
+    }
+
+    public function testStoresResponsesWhenNoCacheRequestDirectivePresent()
+    {
+        $time = \DateTime::createFromFormat('U', time() + 5);
+
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
+
+        $this->assertHttpKernelIsCalled();
+        $this->assertTraceContains('store');
+        $this->assertTrue($this->response->headers->has('Age'));
+    }
+
+    public function testReloadsResponsesWhenCacheHitsButNoCacheRequestDirectivePresentWhenAllowReloadIsSetTrue()
+    {
+        $count = 0;
+
+        $this->setNextResponse(200, ['Cache-Control' => 'public, max-age=10000'], '', function ($request, $response) use (&$count) {
+            ++$count;
+            $response->setContent(1 == $count ? 'Hello World' : 'Goodbye World');
+        });
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('store');
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('fresh');
+
+        $this->cacheConfig['allow_reload'] = true;
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Goodbye World', $this->response->getContent());
+        $this->assertTraceContains('reload');
+        $this->assertTraceContains('store');
+    }
+
+    public function testDoesNotReloadResponsesWhenAllowReloadIsSetFalseDefault()
+    {
+        $count = 0;
+
+        $this->setNextResponse(200, ['Cache-Control' => 'public, max-age=10000'], '', function ($request, $response) use (&$count) {
+            ++$count;
+            $response->setContent(1 == $count ? 'Hello World' : 'Goodbye World');
+        });
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('store');
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('fresh');
+
+        $this->cacheConfig['allow_reload'] = false;
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceNotContains('reload');
+
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceNotContains('reload');
+    }
+
+    public function testRevalidatesFreshCacheEntryWhenMaxAgeRequestDirectiveIsExceededWhenAllowRevalidateOptionIsSetTrue()
+    {
+        $count = 0;
+
+        $this->setNextResponse(200, [], '', function ($request, $response) use (&$count) {
+            ++$count;
+            $response->headers->set('Cache-Control', 'public, max-age=10000');
+            $response->setETag($count);
+            $response->setContent(1 == $count ? 'Hello World' : 'Goodbye World');
+        });
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('store');
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('fresh');
+
+        $this->cacheConfig['allow_revalidate'] = true;
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Goodbye World', $this->response->getContent());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('invalid');
+        $this->assertTraceContains('store');
+    }
+
+    public function testDoesNotRevalidateFreshCacheEntryWhenEnableRevalidateOptionIsSetFalseDefault()
+    {
+        $count = 0;
+
+        $this->setNextResponse(200, [], '', function ($request, $response) use (&$count) {
+            ++$count;
+            $response->headers->set('Cache-Control', 'public, max-age=10000');
+            $response->setETag($count);
+            $response->setContent(1 == $count ? 'Hello World' : 'Goodbye World');
+        });
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('store');
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('fresh');
+
+        $this->cacheConfig['allow_revalidate'] = false;
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceNotContains('stale');
+        $this->assertTraceNotContains('invalid');
+        $this->assertTraceContains('fresh');
+
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceNotContains('stale');
+        $this->assertTraceNotContains('invalid');
+        $this->assertTraceContains('fresh');
+    }
+
+    public function testFetchesResponseFromBackendWhenCacheMisses()
+    {
+        $time = \DateTime::createFromFormat('U', time() + 5);
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('miss');
+        $this->assertTrue($this->response->headers->has('Age'));
+    }
+
+    public function testDoesNotCacheSomeStatusCodeResponses()
+    {
+        foreach (array_merge(range(201, 202), range(204, 206), range(303, 305), range(400, 403), range(405, 409), range(411, 417), range(500, 505)) as $code) {
+            $time = \DateTime::createFromFormat('U', time() + 5);
+            $this->setNextResponse($code, ['Expires' => $time->format(DATE_RFC2822)]);
+
+            $this->request('GET', '/');
+            $this->assertEquals($code, $this->response->getStatusCode());
+            $this->assertTraceNotContains('store');
+            $this->assertFalse($this->response->headers->has('Age'));
+        }
+    }
+
+    public function testDoesNotCacheResponsesWithExplicitNoStoreDirective()
+    {
+        $time = \DateTime::createFromFormat('U', time() + 5);
+        $this->setNextResponse(200, ['Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'no-store']);
+
+        $this->request('GET', '/');
+        $this->assertTraceNotContains('store');
+        $this->assertFalse($this->response->headers->has('Age'));
+    }
+
+    public function testDoesNotCacheResponsesWithoutFreshnessInformationOrAValidator()
+    {
+        $this->setNextResponse();
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceNotContains('store');
+    }
+
+    public function testCachesResponsesWithExplicitNoCacheDirective()
+    {
+        $time = \DateTime::createFromFormat('U', time() + 5);
+        $this->setNextResponse(200, ['Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, no-cache']);
+
+        $this->request('GET', '/');
+        $this->assertTraceContains('store');
+        $this->assertTrue($this->response->headers->has('Age'));
+    }
+
+    public function testCachesResponsesWithAnExpirationHeader()
+    {
+        $time = \DateTime::createFromFormat('U', time() + 5);
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertNotNull($this->response->headers->get('Date'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+
+        $values = $this->getMetaStorageValues();
+        $this->assertCount(1, $values);
+    }
+
+    public function testCachesResponsesWithAMaxAgeDirective()
+    {
+        $this->setNextResponse(200, ['Cache-Control' => 'public, max-age=5']);
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertNotNull($this->response->headers->get('Date'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+
+        $values = $this->getMetaStorageValues();
+        $this->assertCount(1, $values);
+    }
+
+    public function testCachesResponsesWithASMaxAgeDirective()
+    {
+        $this->setNextResponse(200, ['Cache-Control' => 's-maxage=5']);
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertNotNull($this->response->headers->get('Date'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+
+        $values = $this->getMetaStorageValues();
+        $this->assertCount(1, $values);
+    }
+
+    public function testCachesResponsesWithALastModifiedValidatorButNoFreshnessInformation()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822)]);
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+    }
+
+    public function testCachesResponsesWithAnETagValidatorButNoFreshnessInformation()
+    {
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '"123456"']);
+
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+    }
+
+    public function testHitsCachedResponsesWithExpiresHeader()
+    {
+        $time1 = \DateTime::createFromFormat('U', time() - 5);
+        $time2 = \DateTime::createFromFormat('U', time() + 5);
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Date' => $time1->format(DATE_RFC2822), 'Expires' => $time2->format(DATE_RFC2822)]);
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertNotNull($this->response->headers->get('Date'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertLessThan(2, strtotime($this->responses[0]->headers->get('Date')) - strtotime($this->response->headers->get('Date')));
+        $this->assertGreaterThan(0, $this->response->headers->get('Age'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+    }
+
+    public function testHitsCachedResponseWithMaxAgeDirective()
+    {
+        $time = \DateTime::createFromFormat('U', time() - 5);
+        $this->setNextResponse(200, ['Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, max-age=10']);
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertNotNull($this->response->headers->get('Date'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertLessThan(2, strtotime($this->responses[0]->headers->get('Date')) - strtotime($this->response->headers->get('Date')));
+        $this->assertGreaterThan(0, $this->response->headers->get('Age'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+    }
+
+    public function testDegradationWhenCacheLocked()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Skips on windows to avoid permissions issues.');
+        }
+
+        $this->cacheConfig['stale_while_revalidate'] = 10;
+
+        // The prescence of Last-Modified makes this cacheable (because Response::isValidateable() then).
+        $this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=5', 'Last-Modified' => 'some while ago'], 'Old response');
+        $this->request('GET', '/'); // warm the cache
+
+        // Now, lock the cache
+        $concurrentRequest = Request::create('/', 'GET');
+        $this->store->lock($concurrentRequest);
+
+        /*
+         *  After 10s, the cached response has become stale. Yet, we're still within the "stale_while_revalidate"
+         *  timeout so we may serve the stale response.
+         */
+        sleep(10);
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('stale-while-revalidate');
+        $this->assertEquals('Old response', $this->response->getContent());
+
+        /*
+         * Another 10s later, stale_while_revalidate is over. Resort to serving the old response, but
+         * do so with a "server unavailable" message.
+         */
+        sleep(10);
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(503, $this->response->getStatusCode());
+        $this->assertEquals('Old response', $this->response->getContent());
+    }
+
+    public function testHitsCachedResponseWithSMaxAgeDirective()
+    {
+        $time = \DateTime::createFromFormat('U', time() - 5);
+        $this->setNextResponse(200, ['Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 's-maxage=10, max-age=0']);
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertNotNull($this->response->headers->get('Date'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertLessThan(2, strtotime($this->responses[0]->headers->get('Date')) - strtotime($this->response->headers->get('Date')));
+        $this->assertGreaterThan(0, $this->response->headers->get('Age'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+    }
+
+    public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformation()
+    {
+        $this->setNextResponse();
+
+        $this->cacheConfig['default_ttl'] = 10;
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=10/', $this->response->headers->get('Cache-Control'));
+
+        $this->cacheConfig['default_ttl'] = 10;
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=10/', $this->response->headers->get('Cache-Control'));
+    }
+
+    public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAfterTtlWasExpired()
+    {
+        $this->setNextResponse();
+
+        $this->cacheConfig['default_ttl'] = 2;
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
+
+        // expires the cache
+        $values = $this->getMetaStorageValues();
+        $this->assertCount(1, $values);
+        $tmp = unserialize($values[0]);
+        $time = \DateTime::createFromFormat('U', time() - 5);
+        $tmp[0][1]['date'] = $time->format(DATE_RFC2822);
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('save');
+        $m->setAccessible(true);
+        $m->invoke($this->store, 'md'.hash('sha256', 'http://localhost/'), serialize($tmp));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('invalid');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
+
+        $this->setNextResponse();
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
+    }
+
+    public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAfterTtlWasExpiredWithStatus304()
+    {
+        $this->setNextResponse();
+
+        $this->cacheConfig['default_ttl'] = 2;
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+
+        // expires the cache
+        $values = $this->getMetaStorageValues();
+        $this->assertCount(1, $values);
+        $tmp = unserialize($values[0]);
+        $time = \DateTime::createFromFormat('U', time() - 5);
+        $tmp[0][1]['date'] = $time->format(DATE_RFC2822);
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('save');
+        $m->setAccessible(true);
+        $m->invoke($this->store, 'md'.hash('sha256', 'http://localhost/'), serialize($tmp));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('valid');
+        $this->assertTraceContains('store');
+        $this->assertTraceNotContains('miss');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertRegExp('/s-maxage=(2|3)/', $this->response->headers->get('Cache-Control'));
+    }
+
+    public function testDoesNotAssignDefaultTtlWhenResponseHasMustRevalidateDirective()
+    {
+        $this->setNextResponse(200, ['Cache-Control' => 'must-revalidate']);
+
+        $this->cacheConfig['default_ttl'] = 10;
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('miss');
+        $this->assertTraceNotContains('store');
+        $this->assertNotRegExp('/s-maxage/', $this->response->headers->get('Cache-Control'));
+        $this->assertEquals('Hello World', $this->response->getContent());
+    }
+
+    public function testFetchesFullResponseWhenCacheStaleAndNoValidatorsPresent()
+    {
+        $time = \DateTime::createFromFormat('U', time() + 5);
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
+
+        // build initial request
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertNotNull($this->response->headers->get('Date'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertNotNull($this->response->headers->get('Age'));
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+
+        // go in and play around with the cached metadata directly ...
+        $values = $this->getMetaStorageValues();
+        $this->assertCount(1, $values);
+        $tmp = unserialize($values[0]);
+        $time = \DateTime::createFromFormat('U', time());
+        $tmp[0][1]['expires'] = $time->format(DATE_RFC2822);
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('save');
+        $m->setAccessible(true);
+        $m->invoke($this->store, 'md'.hash('sha256', 'http://localhost/'), serialize($tmp));
+
+        // build subsequent request; should be found but miss due to freshness
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertLessThanOrEqual(1, $this->response->headers->get('Age'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertTraceContains('stale');
+        $this->assertTraceNotContains('fresh');
+        $this->assertTraceNotContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Hello World', $this->response->getContent());
+    }
+
+    public function testValidatesCachedResponsesWithLastModifiedAndNoFreshnessInformation()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time) {
+            $response->headers->set('Cache-Control', 'public');
+            $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
+            if ($time->format(DATE_RFC2822) == $request->headers->get('IF_MODIFIED_SINCE')) {
+                $response->setStatusCode(304);
+                $response->setContent('');
+            }
+        });
+
+        // build initial request
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertNotNull($this->response->headers->get('Last-Modified'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertTraceNotContains('stale');
+
+        // build subsequent request; should be found but miss due to freshness
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertNotNull($this->response->headers->get('Last-Modified'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertLessThanOrEqual(1, $this->response->headers->get('Age'));
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('valid');
+        $this->assertTraceContains('store');
+        $this->assertTraceNotContains('miss');
+    }
+
+    public function testValidatesCachedResponsesUseSameHttpMethod()
+    {
+        $test = $this;
+
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($test) {
+            $test->assertSame('OPTIONS', $request->getMethod());
+        });
+
+        // build initial request
+        $this->request('OPTIONS', '/');
+
+        // build subsequent request
+        $this->request('OPTIONS', '/');
+    }
+
+    public function testValidatesCachedResponsesWithETagAndNoFreshnessInformation()
+    {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
+            $this->assertFalse($request->headers->has('If-Modified-Since'));
+            $response->headers->set('Cache-Control', 'public');
+            $response->headers->set('ETag', '"12345"');
+            if ($response->getETag() == $request->headers->get('IF_NONE_MATCH')) {
+                $response->setStatusCode(304);
+                $response->setContent('');
+            }
+        });
+
+        // build initial request
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertNotNull($this->response->headers->get('ETag'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+
+        // build subsequent request; should be found but miss due to freshness
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertNotNull($this->response->headers->get('ETag'));
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $this->assertLessThanOrEqual(1, $this->response->headers->get('Age'));
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('valid');
+        $this->assertTraceContains('store');
+        $this->assertTraceNotContains('miss');
+    }
+
+    public function testServesResponseWhileFreshAndRevalidatesWithLastModifiedInformation()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+
+        $this->setNextResponse(200, [], 'Hello World', function (Request $request, Response $response) use ($time) {
+            $response->setSharedMaxAge(10);
+            $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
+        });
+
+        // prime the cache
+        $this->request('GET', '/');
+
+        // next request before s-maxage has expired: Serve from cache
+        // without hitting the backend
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('fresh');
+
+        sleep(15); // expire the cache
+
+        $this->setNextResponse(304, [], '', function (Request $request, Response $response) use ($time) {
+            $this->assertEquals($time->format(DATE_RFC2822), $request->headers->get('IF_MODIFIED_SINCE'));
+        });
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('valid');
+    }
+
+    public function testReplacesCachedResponsesWhenValidationResultsInNon304Response()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+        $count = 0;
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time, &$count) {
+            $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
+            $response->headers->set('Cache-Control', 'public');
+            switch (++$count) {
+                case 1:
+                    $response->setContent('first response');
+                    break;
+                case 2:
+                    $response->setContent('second response');
+                    break;
+                case 3:
+                    $response->setContent('');
+                    $response->setStatusCode(304);
+                    break;
+            }
+        });
+
+        // first request should fetch from backend and store in cache
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('first response', $this->response->getContent());
+
+        // second request is validated, is invalid, and replaces cached entry
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('second response', $this->response->getContent());
+
+        // third response is validated, valid, and returns cached entry
+        $this->request('GET', '/');
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('second response', $this->response->getContent());
+
+        $this->assertEquals(3, $count);
+    }
+
+    public function testPassesHeadRequestsThroughDirectlyOnPass()
+    {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
+            $response->setContent('');
+            $response->setStatusCode(200);
+            $this->assertEquals('HEAD', $request->getMethod());
+        });
+
+        $this->request('HEAD', '/', ['HTTP_EXPECT' => 'something ...']);
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals('', $this->response->getContent());
+    }
+
+    public function testUsesCacheToRespondToHeadRequestsWhenFresh()
+    {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
+            $response->headers->set('Cache-Control', 'public, max-age=10');
+            $response->setContent('Hello World');
+            $response->setStatusCode(200);
+            $this->assertNotEquals('HEAD', $request->getMethod());
+        });
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals('Hello World', $this->response->getContent());
+
+        $this->request('HEAD', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('', $this->response->getContent());
+        $this->assertEquals(\strlen('Hello World'), $this->response->headers->get('Content-Length'));
+    }
+
+    public function testSendsNoContentWhenFresh()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time) {
+            $response->headers->set('Cache-Control', 'public, max-age=10');
+            $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
+        });
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals('Hello World', $this->response->getContent());
+
+        $this->request('GET', '/', ['HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(304, $this->response->getStatusCode());
+        $this->assertEquals('', $this->response->getContent());
+    }
+
+    public function testInvalidatesCachedResponsesOnPost()
+    {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
+            if ('GET' == $request->getMethod()) {
+                $response->setStatusCode(200);
+                $response->headers->set('Cache-Control', 'public, max-age=500');
+                $response->setContent('Hello World');
+            } elseif ('POST' == $request->getMethod()) {
+                $response->setStatusCode(303);
+                $response->headers->set('Location', '/');
+                $response->headers->remove('Cache-Control');
+                $response->setContent('');
+            }
+        });
+
+        // build initial request to enter into the cache
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+
+        // make sure it is valid
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('fresh');
+
+        // now POST to same URL
+        $this->request('POST', '/helloworld');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals('/', $this->response->headers->get('Location'));
+        $this->assertTraceContains('invalidate');
+        $this->assertTraceContains('pass');
+        $this->assertEquals('', $this->response->getContent());
+
+        // now make sure it was actually invalidated
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Hello World', $this->response->getContent());
+        $this->assertTraceContains('stale');
+        $this->assertTraceContains('invalid');
+        $this->assertTraceContains('store');
+    }
+
+    public function testServesFromCacheWhenHeadersMatch()
+    {
+        $count = 0;
+        $this->setNextResponse(200, ['Cache-Control' => 'max-age=10000'], '', function ($request, $response) use (&$count) {
+            $response->headers->set('Vary', 'Accept User-Agent Foo');
+            $response->headers->set('Cache-Control', 'public, max-age=10');
+            $response->headers->set('X-Response-Count', ++$count);
+            $response->setContent($request->headers->get('USER_AGENT'));
+        });
+
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Bob/1.0', $this->response->getContent());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Bob/1.0', $this->response->getContent());
+        $this->assertTraceContains('fresh');
+        $this->assertTraceNotContains('store');
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+    }
+
+    public function testStoresMultipleResponsesWhenHeadersDiffer()
+    {
+        $count = 0;
+        $this->setNextResponse(200, ['Cache-Control' => 'max-age=10000'], '', function ($request, $response) use (&$count) {
+            $response->headers->set('Vary', 'Accept User-Agent Foo');
+            $response->headers->set('Cache-Control', 'public, max-age=10');
+            $response->headers->set('X-Response-Count', ++$count);
+            $response->setContent($request->headers->get('USER_AGENT'));
+        });
+
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals('Bob/1.0', $this->response->getContent());
+        $this->assertEquals(1, $this->response->headers->get('X-Response-Count'));
+
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0']);
+        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertTraceContains('miss');
+        $this->assertTraceContains('store');
+        $this->assertEquals('Bob/2.0', $this->response->getContent());
+        $this->assertEquals(2, $this->response->headers->get('X-Response-Count'));
+
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
+        $this->assertTraceContains('fresh');
+        $this->assertEquals('Bob/1.0', $this->response->getContent());
+        $this->assertEquals(1, $this->response->headers->get('X-Response-Count'));
+
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0']);
+        $this->assertTraceContains('fresh');
+        $this->assertEquals('Bob/2.0', $this->response->getContent());
+        $this->assertEquals(2, $this->response->headers->get('X-Response-Count'));
+
+        $this->request('GET', '/', ['HTTP_USER_AGENT' => 'Bob/2.0']);
+        $this->assertTraceContains('miss');
+        $this->assertEquals('Bob/2.0', $this->response->getContent());
+        $this->assertEquals(3, $this->response->headers->get('X-Response-Count'));
+    }
+
+    public function testShouldCatchExceptions()
+    {
+        $this->catchExceptions();
+
+        $this->setNextResponse();
+        $this->request('GET', '/');
+
+        $this->assertExceptionsAreCaught();
+    }
+
+    public function testShouldCatchExceptionsWhenReloadingAndNoCacheRequest()
+    {
+        $this->catchExceptions();
+
+        $this->setNextResponse();
+        $this->cacheConfig['allow_reload'] = true;
+        $this->request('GET', '/', [], [], false, ['Pragma' => 'no-cache']);
+
+        $this->assertExceptionsAreCaught();
+    }
+
+    public function testShouldNotCatchExceptions()
+    {
+        $this->catchExceptions(false);
+
+        $this->setNextResponse();
+        $this->request('GET', '/');
+
+        $this->assertExceptionsAreNotCaught();
+    }
+
+    public function testEsiCacheSendsTheLowestTtl()
+    {
+        $responses = [
+            [
+                'status' => 200,
+                'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
+                'headers' => [
+                    'Cache-Control' => 's-maxage=300',
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ],
+            ],
+            [
+                'status' => 200,
+                'body' => 'Hello World!',
+                'headers' => ['Cache-Control' => 's-maxage=200'],
+            ],
+            [
+                'status' => 200,
+                'body' => 'My name is Bobby.',
+                'headers' => ['Cache-Control' => 's-maxage=100'],
+            ],
+        ];
+
+        $this->setNextResponses($responses);
+
+        $this->request('GET', '/', [], [], true);
+        $this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
+
+        $this->assertEquals(100, $this->response->getTtl());
+    }
+
+    public function testEsiCacheSendsTheLowestTtlForHeadRequests()
+    {
+        $responses = [
+            [
+                'status' => 200,
+                'body' => 'I am a long-lived master response, but I embed a short-lived resource: <esi:include src="/foo" />',
+                'headers' => [
+                    'Cache-Control' => 's-maxage=300',
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ],
+            ],
+            [
+                'status' => 200,
+                'body' => 'I am a short-lived resource',
+                'headers' => ['Cache-Control' => 's-maxage=100'],
+            ],
+        ];
+
+        $this->setNextResponses($responses);
+
+        $this->request('HEAD', '/', [], [], true);
+
+        $this->assertEmpty($this->response->getContent());
+        $this->assertEquals(100, $this->response->getTtl());
+    }
+
+    public function testEsiCacheForceValidation()
+    {
+        $responses = [
+            [
+                'status' => 200,
+                'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
+                'headers' => [
+                    'Cache-Control' => 's-maxage=300',
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ],
+            ],
+            [
+                'status' => 200,
+                'body' => 'Hello World!',
+                'headers' => ['ETag' => 'foobar'],
+            ],
+            [
+                'status' => 200,
+                'body' => 'My name is Bobby.',
+                'headers' => ['Cache-Control' => 's-maxage=100'],
+            ],
+        ];
+
+        $this->setNextResponses($responses);
+
+        $this->request('GET', '/', [], [], true);
+        $this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
+        $this->assertNull($this->response->getTtl());
+        $this->assertTrue($this->response->mustRevalidate());
+        $this->assertTrue($this->response->headers->hasCacheControlDirective('private'));
+        $this->assertTrue($this->response->headers->hasCacheControlDirective('no-cache'));
+    }
+
+    public function testEsiCacheForceValidationForHeadRequests()
+    {
+        $responses = [
+            [
+                'status' => 200,
+                'body' => 'I am the master response and use expiration caching, but I embed another resource: <esi:include src="/foo" />',
+                'headers' => [
+                    'Cache-Control' => 's-maxage=300',
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ],
+            ],
+            [
+                'status' => 200,
+                'body' => 'I am the embedded resource and use validation caching',
+                'headers' => ['ETag' => 'foobar'],
+            ],
+        ];
+
+        $this->setNextResponses($responses);
+
+        $this->request('HEAD', '/', [], [], true);
+
+        // The response has been assembled from expiration and validation based resources
+        // This can neither be cached nor revalidated, so it should be private/no cache
+        $this->assertEmpty($this->response->getContent());
+        $this->assertNull($this->response->getTtl());
+        $this->assertTrue($this->response->mustRevalidate());
+        $this->assertTrue($this->response->headers->hasCacheControlDirective('private'));
+        $this->assertTrue($this->response->headers->hasCacheControlDirective('no-cache'));
+    }
+
+    public function testEsiRecalculateContentLengthHeader()
+    {
+        $responses = [
+            [
+                'status' => 200,
+                'body' => '<esi:include src="/foo" />',
+                'headers' => [
+                    'Content-Length' => 26,
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ],
+            ],
+            [
+                'status' => 200,
+                'body' => 'Hello World!',
+                'headers' => [],
+            ],
+        ];
+
+        $this->setNextResponses($responses);
+
+        $this->request('GET', '/', [], [], true);
+        $this->assertEquals('Hello World!', $this->response->getContent());
+        $this->assertEquals(12, $this->response->headers->get('Content-Length'));
+    }
+
+    public function testEsiRecalculateContentLengthHeaderForHeadRequest()
+    {
+        $responses = [
+            [
+                'status' => 200,
+                'body' => '<esi:include src="/foo" />',
+                'headers' => [
+                    'Content-Length' => 26,
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                ],
+            ],
+            [
+                'status' => 200,
+                'body' => 'Hello World!',
+                'headers' => [],
+            ],
+        ];
+
+        $this->setNextResponses($responses);
+
+        $this->request('HEAD', '/', [], [], true);
+
+        // https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13
+        // "The Content-Length entity-header field indicates the size of the entity-body,
+        // in decimal number of OCTETs, sent to the recipient or, in the case of the HEAD
+        // method, the size of the entity-body that would have been sent had the request
+        // been a GET."
+        $this->assertEmpty($this->response->getContent());
+        $this->assertEquals(12, $this->response->headers->get('Content-Length'));
+    }
+
+    public function testClientIpIsAlwaysLocalhostForForwardedRequests()
+    {
+        $this->setNextResponse();
+        $this->request('GET', '/', ['REMOTE_ADDR' => '10.0.0.1']);
+
+        $this->kernel->assert(function ($backendRequest) {
+            $this->assertSame('127.0.0.1', $backendRequest->server->get('REMOTE_ADDR'));
+        });
+    }
+
+    /**
+     * @dataProvider getTrustedProxyData
+     */
+    public function testHttpCacheIsSetAsATrustedProxy(array $existing)
+    {
+        Request::setTrustedProxies($existing, Request::HEADER_X_FORWARDED_ALL);
+
+        $this->setNextResponse();
+        $this->request('GET', '/', ['REMOTE_ADDR' => '10.0.0.1']);
+        $this->assertSame($existing, Request::getTrustedProxies());
+
+        $existing = array_unique(array_merge($existing, ['127.0.0.1']));
+        $this->kernel->assert(function ($backendRequest) use ($existing) {
+            $this->assertSame($existing, Request::getTrustedProxies());
+            $this->assertsame('10.0.0.1', $backendRequest->getClientIp());
+        });
+
+        Request::setTrustedProxies([], -1);
+    }
+
+    public function getTrustedProxyData()
+    {
+        return [
+            [[]],
+            [['10.0.0.2']],
+            [['10.0.0.2', '127.0.0.1']],
+        ];
+    }
+
+    /**
+     * @dataProvider getForwardedData
+     */
+    public function testForwarderHeaderForForwardedRequests($forwarded, $expected)
+    {
+        $this->setNextResponse();
+        $server = ['REMOTE_ADDR' => '10.0.0.1'];
+        if (null !== $forwarded) {
+            Request::setTrustedProxies($server, -1);
+            $server['HTTP_FORWARDED'] = $forwarded;
+        }
+        $this->request('GET', '/', $server);
+
+        $this->kernel->assert(function ($backendRequest) use ($expected) {
+            $this->assertSame($expected, $backendRequest->headers->get('Forwarded'));
+        });
+
+        Request::setTrustedProxies([], -1);
+    }
+
+    public function getForwardedData()
+    {
+        return [
+            [null, 'for="10.0.0.1";host="localhost";proto=http'],
+            ['for=10.0.0.2', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.1"'],
+            ['for=10.0.0.2, for=10.0.0.3', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.3", for="10.0.0.1"'],
+        ];
+    }
+
+    public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+
+        $responses = [
+            [
+                'status' => 200,
+                'body' => '<esi:include src="/hey" />',
+                'headers' => [
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                    'ETag' => 'hey',
+                    'Last-Modified' => $time->format(DATE_RFC2822),
+                ],
+            ],
+            [
+                'status' => 200,
+                'body' => 'Hey!',
+                'headers' => [],
+            ],
+        ];
+
+        $this->setNextResponses($responses);
+
+        $this->request('GET', '/', [], [], true);
+        $this->assertNull($this->response->getETag());
+        $this->assertNull($this->response->getLastModified());
+    }
+
+    public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponsesAndHeadRequest()
+    {
+        $time = \DateTime::createFromFormat('U', time());
+
+        $responses = [
+            [
+                'status' => 200,
+                'body' => '<esi:include src="/hey" />',
+                'headers' => [
+                    'Surrogate-Control' => 'content="ESI/1.0"',
+                    'ETag' => 'hey',
+                    'Last-Modified' => $time->format(DATE_RFC2822),
+                ],
+            ],
+            [
+                'status' => 200,
+                'body' => 'Hey!',
+                'headers' => [],
+            ],
+        ];
+
+        $this->setNextResponses($responses);
+
+        $this->request('HEAD', '/', [], [], true);
+        $this->assertEmpty($this->response->getContent());
+        $this->assertNull($this->response->getETag());
+        $this->assertNull($this->response->getLastModified());
+    }
+
+    public function testDoesNotCacheOptionsRequest()
+    {
+        $this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=60'], 'get');
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsCalled();
+
+        $this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=60'], 'options');
+        $this->request('OPTIONS', '/');
+        $this->assertHttpKernelIsCalled();
+
+        $this->request('GET', '/');
+        $this->assertHttpKernelIsNotCalled();
+        $this->assertSame('get', $this->response->getContent());
+    }
+
+    public function testUsesOriginalRequestForSurrogate()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $store = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\StoreInterface')->getMock();
+
+        $kernel
+            ->expects($this->exactly(2))
+            ->method('handle')
+            ->willReturnCallback(function (Request $request) {
+                $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+
+                return new Response();
+            });
+
+        $cache = new HttpCache($kernel,
+            $store,
+            new Esi()
+        );
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+
+        // Main request
+        $cache->handle($request, HttpKernelInterface::MASTER_REQUEST);
+
+        // Main request was now modified by HttpCache
+        // The surrogate will ask for the request using $this->cache->getRequest()
+        // which MUST return the original request so the surrogate
+        // can actually behave like a reverse proxy like e.g. Varnish would.
+        $this->assertSame('10.0.0.1', $cache->getRequest()->getClientIp());
+        $this->assertSame('10.0.0.1', $cache->getRequest()->server->get('REMOTE_ADDR'));
+
+        // Surrogate request
+        $cache->handle($request, HttpKernelInterface::SUB_REQUEST);
+    }
+}
+
+class TestKernel implements HttpKernelInterface
+{
+    public $terminateCalled = false;
+
+    public function terminate(Request $request, Response $response)
+    {
+        $this->terminateCalled = true;
+    }
+
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/HttpCacheTestCase.php b/lib/symfony/http-kernel/Tests/HttpCache/HttpCacheTestCase.php
new file mode 100644
index 000000000..1eb461744
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/HttpCacheTestCase.php
@@ -0,0 +1,185 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\HttpCache;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpCache\Esi;
+use Symfony\Component\HttpKernel\HttpCache\HttpCache;
+use Symfony\Component\HttpKernel\HttpCache\Store;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class HttpCacheTestCase extends TestCase
+{
+    protected $kernel;
+    protected $cache;
+    protected $caches;
+    protected $cacheConfig;
+    protected $request;
+    protected $response;
+    protected $responses;
+    protected $catch;
+    protected $esi;
+
+    /**
+     * @var Store
+     */
+    protected $store;
+
+    protected function setUp()
+    {
+        $this->kernel = null;
+
+        $this->cache = null;
+        $this->esi = null;
+        $this->caches = [];
+        $this->cacheConfig = [];
+
+        $this->request = null;
+        $this->response = null;
+        $this->responses = [];
+
+        $this->catch = false;
+
+        $this->clearDirectory(sys_get_temp_dir().'/http_cache');
+    }
+
+    protected function tearDown()
+    {
+        if ($this->cache) {
+            $this->cache->getStore()->cleanup();
+        }
+        $this->kernel = null;
+        $this->cache = null;
+        $this->caches = null;
+        $this->request = null;
+        $this->response = null;
+        $this->responses = null;
+        $this->cacheConfig = null;
+        $this->catch = null;
+        $this->esi = null;
+
+        $this->clearDirectory(sys_get_temp_dir().'/http_cache');
+    }
+
+    public function assertHttpKernelIsCalled()
+    {
+        $this->assertTrue($this->kernel->hasBeenCalled());
+    }
+
+    public function assertHttpKernelIsNotCalled()
+    {
+        $this->assertFalse($this->kernel->hasBeenCalled());
+    }
+
+    public function assertResponseOk()
+    {
+        $this->assertEquals(200, $this->response->getStatusCode());
+    }
+
+    public function assertTraceContains($trace)
+    {
+        $traces = $this->cache->getTraces();
+        $traces = current($traces);
+
+        $this->assertRegExp('/'.$trace.'/', implode(', ', $traces));
+    }
+
+    public function assertTraceNotContains($trace)
+    {
+        $traces = $this->cache->getTraces();
+        $traces = current($traces);
+
+        $this->assertNotRegExp('/'.$trace.'/', implode(', ', $traces));
+    }
+
+    public function assertExceptionsAreCaught()
+    {
+        $this->assertTrue($this->kernel->isCatchingExceptions());
+    }
+
+    public function assertExceptionsAreNotCaught()
+    {
+        $this->assertFalse($this->kernel->isCatchingExceptions());
+    }
+
+    public function request($method, $uri = '/', $server = [], $cookies = [], $esi = false, $headers = [])
+    {
+        if (null === $this->kernel) {
+            throw new \LogicException('You must call setNextResponse() before calling request().');
+        }
+
+        $this->kernel->reset();
+
+        $this->store = new Store(sys_get_temp_dir().'/http_cache');
+
+        $this->cacheConfig['debug'] = true;
+
+        $this->esi = $esi ? new Esi() : null;
+        $this->cache = new HttpCache($this->kernel, $this->store, $this->esi, $this->cacheConfig);
+        $this->request = Request::create($uri, $method, [], $cookies, [], $server);
+        $this->request->headers->add($headers);
+
+        $this->response = $this->cache->handle($this->request, HttpKernelInterface::MASTER_REQUEST, $this->catch);
+
+        $this->responses[] = $this->response;
+    }
+
+    public function getMetaStorageValues()
+    {
+        $values = [];
+        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(sys_get_temp_dir().'/http_cache/md', \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
+            $values[] = file_get_contents($file);
+        }
+
+        return $values;
+    }
+
+    // A basic response with 200 status code and a tiny body.
+    public function setNextResponse($statusCode = 200, array $headers = [], $body = 'Hello World', \Closure $customizer = null)
+    {
+        $this->kernel = new TestHttpKernel($body, $statusCode, $headers, $customizer);
+    }
+
+    public function setNextResponses($responses)
+    {
+        $this->kernel = new TestMultipleHttpKernel($responses);
+    }
+
+    public function catchExceptions($catch = true)
+    {
+        $this->catch = $catch;
+    }
+
+    public static function clearDirectory($directory)
+    {
+        if (!is_dir($directory)) {
+            return;
+        }
+
+        $fp = opendir($directory);
+        while (false !== $file = readdir($fp)) {
+            if (!\in_array($file, ['.', '..'])) {
+                if (is_link($directory.'/'.$file)) {
+                    unlink($directory.'/'.$file);
+                } elseif (is_dir($directory.'/'.$file)) {
+                    self::clearDirectory($directory.'/'.$file);
+                    rmdir($directory.'/'.$file);
+                } else {
+                    unlink($directory.'/'.$file);
+                }
+            }
+        }
+
+        closedir($fp);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/ResponseCacheStrategyTest.php b/lib/symfony/http-kernel/Tests/HttpCache/ResponseCacheStrategyTest.php
new file mode 100644
index 000000000..22cadf712
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/ResponseCacheStrategyTest.php
@@ -0,0 +1,469 @@
+<?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\Tests\HttpCache;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategy;
+
+class ResponseCacheStrategyTest extends TestCase
+{
+    public function testMinimumSharedMaxAgeWins()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $response1 = new Response();
+        $response1->setSharedMaxAge(60);
+        $cacheStrategy->add($response1);
+
+        $response2 = new Response();
+        $response2->setSharedMaxAge(3600);
+        $cacheStrategy->add($response2);
+
+        $response = new Response();
+        $response->setSharedMaxAge(86400);
+        $cacheStrategy->update($response);
+
+        $this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage'));
+    }
+
+    public function testSharedMaxAgeNotSetIfNotSetInAnyEmbeddedRequest()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $response1 = new Response();
+        $response1->setSharedMaxAge(60);
+        $cacheStrategy->add($response1);
+
+        $response2 = new Response();
+        $cacheStrategy->add($response2);
+
+        $response = new Response();
+        $response->setSharedMaxAge(86400);
+        $cacheStrategy->update($response);
+
+        $this->assertFalse($response->headers->hasCacheControlDirective('s-maxage'));
+    }
+
+    public function testSharedMaxAgeNotSetIfNotSetInMasterRequest()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $response1 = new Response();
+        $response1->setSharedMaxAge(60);
+        $cacheStrategy->add($response1);
+
+        $response2 = new Response();
+        $response2->setSharedMaxAge(3600);
+        $cacheStrategy->add($response2);
+
+        $response = new Response();
+        $cacheStrategy->update($response);
+
+        $this->assertFalse($response->headers->hasCacheControlDirective('s-maxage'));
+    }
+
+    public function testMasterResponseNotCacheableWhenEmbeddedResponseRequiresValidation()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $embeddedResponse = new Response();
+        $embeddedResponse->setLastModified(new \DateTime());
+        $cacheStrategy->add($embeddedResponse);
+
+        $masterResponse = new Response();
+        $masterResponse->setSharedMaxAge(3600);
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('no-cache'));
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertFalse($masterResponse->isFresh());
+    }
+
+    public function testValidationOnMasterResponseIsNotPossibleWhenItContainsEmbeddedResponses()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        // This master response uses the "validation" model
+        $masterResponse = new Response();
+        $masterResponse->setLastModified(new \DateTime());
+        $masterResponse->setEtag('foo');
+
+        // Embedded response uses "expiry" model
+        $embeddedResponse = new Response();
+        $masterResponse->setSharedMaxAge(3600);
+        $cacheStrategy->add($embeddedResponse);
+
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertFalse($masterResponse->isValidateable());
+        $this->assertFalse($masterResponse->headers->has('Last-Modified'));
+        $this->assertFalse($masterResponse->headers->has('ETag'));
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('no-cache'));
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('must-revalidate'));
+    }
+
+    public function testMasterResponseWithValidationIsUnchangedWhenThereIsNoEmbeddedResponse()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $masterResponse = new Response();
+        $masterResponse->setLastModified(new \DateTime());
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertTrue($masterResponse->isValidateable());
+    }
+
+    public function testMasterResponseWithExpirationIsUnchangedWhenThereIsNoEmbeddedResponse()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $masterResponse = new Response();
+        $masterResponse->setSharedMaxAge(3600);
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertTrue($masterResponse->isFresh());
+    }
+
+    public function testMasterResponseIsNotCacheableWhenEmbeddedResponseIsNotCacheable()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $masterResponse = new Response();
+        $masterResponse->setSharedMaxAge(3600); // Public, cacheable
+
+        /* This response has no validation or expiration information.
+           That makes it uncacheable, it is always stale.
+           (It does *not* make this private, though.) */
+        $embeddedResponse = new Response();
+        $this->assertFalse($embeddedResponse->isFresh()); // not fresh, as no lifetime is provided
+
+        $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('no-cache'));
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertFalse($masterResponse->isFresh());
+    }
+
+    public function testEmbeddingPrivateResponseMakesMainResponsePrivate()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $masterResponse = new Response();
+        $masterResponse->setSharedMaxAge(3600); // public, cacheable
+
+        // The embedded response might for example contain per-user data that remains valid for 60 seconds
+        $embeddedResponse = new Response();
+        $embeddedResponse->setPrivate();
+        $embeddedResponse->setMaxAge(60); // this would implicitly set "private" as well, but let's be explicit
+
+        $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('private'));
+        $this->assertFalse($masterResponse->headers->hasCacheControlDirective('public'));
+    }
+
+    public function testEmbeddingPublicResponseDoesNotMakeMainResponsePublic()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $masterResponse = new Response();
+        $masterResponse->setPrivate(); // this is the default, but let's be explicit
+        $masterResponse->setMaxAge(100);
+
+        $embeddedResponse = new Response();
+        $embeddedResponse->setPublic();
+        $embeddedResponse->setSharedMaxAge(100);
+
+        $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('private'));
+        $this->assertFalse($masterResponse->headers->hasCacheControlDirective('public'));
+    }
+
+    public function testResponseIsExiprableWhenEmbeddedResponseCombinesExpiryAndValidation()
+    {
+        /* When "expiration wins over validation" (https://symfony.com/doc/current/http_cache/validation.html)
+         * and both the main and embedded response provide s-maxage, then the more restricting value of both
+         * should be fine, regardless of whether the embedded response can be validated later on or must be
+         * completely regenerated.
+         */
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $masterResponse = new Response();
+        $masterResponse->setSharedMaxAge(3600);
+
+        $embeddedResponse = new Response();
+        $embeddedResponse->setSharedMaxAge(60);
+        $embeddedResponse->setEtag('foo');
+
+        $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertSame('60', $masterResponse->headers->getCacheControlDirective('s-maxage'));
+    }
+
+    public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombinesExpirationAndValidation()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $masterResponse = new Response();
+        $masterResponse->setSharedMaxAge(3600);
+        $masterResponse->setEtag('foo');
+        $masterResponse->setLastModified(new \DateTime());
+
+        $embeddedResponse = new Response();
+        $embeddedResponse->setSharedMaxAge(60);
+
+        $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertSame('60', $masterResponse->headers->getCacheControlDirective('s-maxage'));
+        $this->assertFalse($masterResponse->isValidateable());
+    }
+
+    /**
+     * @dataProvider cacheControlMergingProvider
+     */
+    public function testCacheControlMerging(array $expects, array $master, array $surrogates)
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+        $buildResponse = function ($config) {
+            $response = new Response();
+
+            foreach ($config as $key => $value) {
+                switch ($key) {
+                    case 'age':
+                        $response->headers->set('Age', $value);
+                        break;
+
+                    case 'expires':
+                        $expires = clone $response->getDate();
+                        $expires->modify('+'.$value.' seconds');
+                        $response->setExpires($expires);
+                        break;
+
+                    case 'max-age':
+                        $response->setMaxAge($value);
+                        break;
+
+                    case 's-maxage':
+                        $response->setSharedMaxAge($value);
+                        break;
+
+                    case 'private':
+                        $response->setPrivate();
+                        break;
+
+                    case 'public':
+                        $response->setPublic();
+                        break;
+
+                    default:
+                        $response->headers->addCacheControlDirective($key, $value);
+                }
+            }
+
+            return $response;
+        };
+
+        foreach ($surrogates as $config) {
+            $cacheStrategy->add($buildResponse($config));
+        }
+
+        $response = $buildResponse($master);
+        $cacheStrategy->update($response);
+
+        foreach ($expects as $key => $value) {
+            if ('expires' === $key) {
+                $this->assertSame($value, $response->getExpires()->format('U') - $response->getDate()->format('U'));
+            } elseif ('age' === $key) {
+                $this->assertSame($value, $response->getAge());
+            } elseif (true === $value) {
+                $this->assertTrue($response->headers->hasCacheControlDirective($key), sprintf('Cache-Control header must have "%s" flag', $key));
+            } elseif (false === $value) {
+                $this->assertFalse(
+                    $response->headers->hasCacheControlDirective($key),
+                    sprintf('Cache-Control header must NOT have "%s" flag', $key)
+                );
+            } else {
+                $this->assertSame($value, $response->headers->getCacheControlDirective($key), sprintf('Cache-Control flag "%s" should be "%s"', $key, $value));
+            }
+        }
+    }
+
+    public function cacheControlMergingProvider()
+    {
+        yield 'result is public if all responses are public' => [
+            ['private' => false, 'public' => true],
+            ['public' => true],
+            [
+                ['public' => true],
+            ],
+        ];
+
+        yield 'result is private by default' => [
+            ['private' => true, 'public' => false],
+            ['public' => true],
+            [
+                [],
+            ],
+        ];
+
+        yield 'combines public and private responses' => [
+            ['must-revalidate' => false, 'private' => true, 'public' => false],
+            ['public' => true],
+            [
+                ['private' => true],
+            ],
+        ];
+
+        yield 'inherits no-cache from surrogates' => [
+            ['no-cache' => true, 'public' => false],
+            ['public' => true],
+            [
+                ['no-cache' => true],
+            ],
+        ];
+
+        yield 'inherits no-store from surrogate' => [
+            ['no-store' => true, 'public' => false],
+            ['public' => true],
+            [
+                ['no-store' => true],
+            ],
+        ];
+
+        yield 'resolve to lowest possible max-age' => [
+            ['public' => false, 'private' => true, 's-maxage' => false, 'max-age' => '60'],
+            ['public' => true, 'max-age' => 3600],
+            [
+                ['private' => true, 'max-age' => 60],
+            ],
+        ];
+
+        yield 'resolves multiple max-age' => [
+            ['public' => false, 'private' => true, 's-maxage' => false, 'max-age' => '60'],
+            ['private' => true, 'max-age' => 100],
+            [
+                ['private' => true, 'max-age' => 3600],
+                ['public' => true, 'max-age' => 60, 's-maxage' => 60],
+                ['private' => true, 'max-age' => 60],
+            ],
+        ];
+
+        yield 'merge max-age and s-maxage' => [
+            ['public' => true, 's-maxage' => '60', 'max-age' => null],
+            ['public' => true, 's-maxage' => 3600],
+            [
+                ['public' => true, 'max-age' => 60],
+            ],
+        ];
+
+        yield 'result is private when combining private responses' => [
+            ['no-cache' => false, 'must-revalidate' => false, 'private' => true],
+            ['s-maxage' => 60, 'private' => true],
+            [
+                ['s-maxage' => 60, 'private' => true],
+            ],
+        ];
+
+        yield 'result can have s-maxage and max-age' => [
+            ['public' => true, 'private' => false, 's-maxage' => '60', 'max-age' => '30'],
+            ['s-maxage' => 100, 'max-age' => 2000],
+            [
+                ['s-maxage' => 1000, 'max-age' => 30],
+                ['s-maxage' => 500, 'max-age' => 500],
+                ['s-maxage' => 60, 'max-age' => 1000],
+            ],
+        ];
+
+        yield 'does not set headers without value' => [
+            ['max-age' => null, 's-maxage' => null, 'public' => null],
+            ['private' => true],
+            [
+                ['private' => true],
+            ],
+        ];
+
+        yield 'max-age 0 is sent to the client' => [
+            ['private' => true, 'max-age' => '0'],
+            ['max-age' => 0, 'private' => true],
+            [
+                ['max-age' => 60, 'private' => true],
+            ],
+        ];
+
+        yield 'max-age is relative to age' => [
+            ['max-age' => '240', 'age' => 60],
+            ['max-age' => 180],
+            [
+                ['max-age' => 600, 'age' => 60],
+            ],
+        ];
+
+        yield 'retains lowest age of all responses' => [
+            ['max-age' => '160', 'age' => 60],
+            ['max-age' => 600, 'age' => 60],
+            [
+                ['max-age' => 120, 'age' => 20],
+            ],
+        ];
+
+        yield 'max-age can be less than age, essentially expiring the response' => [
+            ['age' => 120, 'max-age' => '90'],
+            ['max-age' => 90, 'age' => 120],
+            [
+                ['max-age' => 120, 'age' => 60],
+            ],
+        ];
+
+        yield 'max-age is 0 regardless of age' => [
+            ['max-age' => '0'],
+            ['max-age' => 60],
+            [
+                ['max-age' => 0, 'age' => 60],
+            ],
+        ];
+
+        yield 'max-age is not negative' => [
+            ['max-age' => '0'],
+            ['max-age' => 0],
+            [
+                ['max-age' => 0, 'age' => 60],
+            ],
+        ];
+
+        yield 'calculates lowest Expires header' => [
+            ['expires' => 60],
+            ['expires' => 60],
+            [
+                ['expires' => 120],
+            ],
+        ];
+
+        yield 'calculates Expires header relative to age' => [
+            ['expires' => 210, 'age' => 120],
+            ['expires' => 90],
+            [
+                ['expires' => 600, 'age' => '120'],
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/SsiTest.php b/lib/symfony/http-kernel/Tests/HttpCache/SsiTest.php
new file mode 100644
index 000000000..f50005540
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/SsiTest.php
@@ -0,0 +1,211 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\HttpCache;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\Ssi;
+
+class SsiTest extends TestCase
+{
+    public function testHasSurrogateSsiCapability()
+    {
+        $ssi = new Ssi();
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'abc="SSI/1.0"');
+        $this->assertTrue($ssi->hasSurrogateCapability($request));
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'foobar');
+        $this->assertFalse($ssi->hasSurrogateCapability($request));
+
+        $request = Request::create('/');
+        $this->assertFalse($ssi->hasSurrogateCapability($request));
+    }
+
+    public function testAddSurrogateSsiCapability()
+    {
+        $ssi = new Ssi();
+
+        $request = Request::create('/');
+        $ssi->addSurrogateCapability($request);
+        $this->assertEquals('symfony="SSI/1.0"', $request->headers->get('Surrogate-Capability'));
+
+        $ssi->addSurrogateCapability($request);
+        $this->assertEquals('symfony="SSI/1.0", symfony="SSI/1.0"', $request->headers->get('Surrogate-Capability'));
+    }
+
+    public function testAddSurrogateControl()
+    {
+        $ssi = new Ssi();
+
+        $response = new Response('foo <!--#include virtual="" -->');
+        $ssi->addSurrogateControl($response);
+        $this->assertEquals('content="SSI/1.0"', $response->headers->get('Surrogate-Control'));
+
+        $response = new Response('foo');
+        $ssi->addSurrogateControl($response);
+        $this->assertEquals('', $response->headers->get('Surrogate-Control'));
+    }
+
+    public function testNeedsSsiParsing()
+    {
+        $ssi = new Ssi();
+
+        $response = new Response();
+        $response->headers->set('Surrogate-Control', 'content="SSI/1.0"');
+        $this->assertTrue($ssi->needsParsing($response));
+
+        $response = new Response();
+        $this->assertFalse($ssi->needsParsing($response));
+    }
+
+    public function testRenderIncludeTag()
+    {
+        $ssi = new Ssi();
+
+        $this->assertEquals('<!--#include virtual="/" -->', $ssi->renderIncludeTag('/', '/alt', true));
+        $this->assertEquals('<!--#include virtual="/" -->', $ssi->renderIncludeTag('/', '/alt', false));
+        $this->assertEquals('<!--#include virtual="/" -->', $ssi->renderIncludeTag('/'));
+    }
+
+    public function testProcessDoesNothingIfContentTypeIsNotHtml()
+    {
+        $ssi = new Ssi();
+
+        $request = Request::create('/');
+        $response = new Response();
+        $response->headers->set('Content-Type', 'text/plain');
+        $ssi->process($request, $response);
+
+        $this->assertFalse($response->headers->has('x-body-eval'));
+    }
+
+    public function testProcess()
+    {
+        $ssi = new Ssi();
+
+        $request = Request::create('/');
+        $response = new Response('foo <!--#include virtual="..." -->');
+        $ssi->process($request, $response);
+
+        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+        $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
+
+        $response = new Response('foo <!--#include virtual="foo\'" -->');
+        $ssi->process($request, $response);
+
+        $this->assertEquals("foo <?php echo \$this->surrogate->handle(\$this, 'foo\\'', '', false) ?>"."\n", $response->getContent());
+    }
+
+    public function testProcessEscapesPhpTags()
+    {
+        $ssi = new Ssi();
+
+        $request = Request::create('/');
+        $response = new Response('<?php <? <% <script language=php>');
+        $ssi->process($request, $response);
+
+        $this->assertEquals('<?php echo "<?"; ?>php <?php echo "<?"; ?> <?php echo "<%"; ?> <?php echo "<s"; ?>cript language=php>', $response->getContent());
+    }
+
+    public function testProcessWhenNoSrcInAnSsi()
+    {
+        $this->expectException('RuntimeException');
+        $ssi = new Ssi();
+
+        $request = Request::create('/');
+        $response = new Response('foo <!--#include -->');
+        $ssi->process($request, $response);
+    }
+
+    public function testProcessRemoveSurrogateControlHeader()
+    {
+        $ssi = new Ssi();
+
+        $request = Request::create('/');
+        $response = new Response('foo <!--#include virtual="..." -->');
+        $response->headers->set('Surrogate-Control', 'content="SSI/1.0"');
+        $ssi->process($request, $response);
+        $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
+
+        $response->headers->set('Surrogate-Control', 'no-store, content="SSI/1.0"');
+        $ssi->process($request, $response);
+        $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
+        $this->assertEquals('no-store', $response->headers->get('surrogate-control'));
+
+        $response->headers->set('Surrogate-Control', 'content="SSI/1.0", no-store');
+        $ssi->process($request, $response);
+        $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
+        $this->assertEquals('no-store', $response->headers->get('surrogate-control'));
+    }
+
+    public function testHandle()
+    {
+        $ssi = new Ssi();
+        $cache = $this->getCache(Request::create('/'), new Response('foo'));
+        $this->assertEquals('foo', $ssi->handle($cache, '/', '/alt', true));
+    }
+
+    public function testHandleWhenResponseIsNot200()
+    {
+        $this->expectException('RuntimeException');
+        $ssi = new Ssi();
+        $response = new Response('foo');
+        $response->setStatusCode(404);
+        $cache = $this->getCache(Request::create('/'), $response);
+        $ssi->handle($cache, '/', '/alt', false);
+    }
+
+    public function testHandleWhenResponseIsNot200AndErrorsAreIgnored()
+    {
+        $ssi = new Ssi();
+        $response = new Response('foo');
+        $response->setStatusCode(404);
+        $cache = $this->getCache(Request::create('/'), $response);
+        $this->assertEquals('', $ssi->handle($cache, '/', '/alt', true));
+    }
+
+    public function testHandleWhenResponseIsNot200AndAltIsPresent()
+    {
+        $ssi = new Ssi();
+        $response1 = new Response('foo');
+        $response1->setStatusCode(404);
+        $response2 = new Response('bar');
+        $cache = $this->getCache(Request::create('/'), [$response1, $response2]);
+        $this->assertEquals('bar', $ssi->handle($cache, '/', '/alt', false));
+    }
+
+    protected function getCache($request, $response)
+    {
+        $cache = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\HttpCache')->setMethods(['getRequest', 'handle'])->disableOriginalConstructor()->getMock();
+        $cache->expects($this->any())
+              ->method('getRequest')
+              ->willReturn($request)
+        ;
+        if (\is_array($response)) {
+            $cache->expects($this->any())
+                  ->method('handle')
+                  ->will(\call_user_func_array([$this, 'onConsecutiveCalls'], $response))
+            ;
+        } else {
+            $cache->expects($this->any())
+                  ->method('handle')
+                  ->willReturn($response)
+            ;
+        }
+
+        return $cache;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/StoreTest.php b/lib/symfony/http-kernel/Tests/HttpCache/StoreTest.php
new file mode 100644
index 000000000..77cb34cfa
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/StoreTest.php
@@ -0,0 +1,301 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\HttpCache;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\Store;
+
+class StoreTest extends TestCase
+{
+    protected $request;
+    protected $response;
+
+    /**
+     * @var Store
+     */
+    protected $store;
+
+    protected function setUp()
+    {
+        $this->request = Request::create('/');
+        $this->response = new Response('hello world', 200, []);
+
+        HttpCacheTestCase::clearDirectory(sys_get_temp_dir().'/http_cache');
+
+        $this->store = new Store(sys_get_temp_dir().'/http_cache');
+    }
+
+    protected function tearDown()
+    {
+        $this->store = null;
+        $this->request = null;
+        $this->response = null;
+
+        HttpCacheTestCase::clearDirectory(sys_get_temp_dir().'/http_cache');
+    }
+
+    public function testReadsAnEmptyArrayWithReadWhenNothingCachedAtKey()
+    {
+        $this->assertEmpty($this->getStoreMetadata('/nothing'));
+    }
+
+    public function testUnlockFileThatDoesExist()
+    {
+        $this->storeSimpleEntry();
+        $this->store->lock($this->request);
+
+        $this->assertTrue($this->store->unlock($this->request));
+    }
+
+    public function testUnlockFileThatDoesNotExist()
+    {
+        $this->assertFalse($this->store->unlock($this->request));
+    }
+
+    public function testRemovesEntriesForKeyWithPurge()
+    {
+        $request = Request::create('/foo');
+        $this->store->write($request, new Response('foo'));
+
+        $metadata = $this->getStoreMetadata($request);
+        $this->assertNotEmpty($metadata);
+
+        $this->assertTrue($this->store->purge('/foo'));
+        $this->assertEmpty($this->getStoreMetadata($request));
+
+        // cached content should be kept after purging
+        $path = $this->store->getPath($metadata[0][1]['x-content-digest'][0]);
+        $this->assertTrue(is_file($path));
+
+        $this->assertFalse($this->store->purge('/bar'));
+    }
+
+    public function testStoresACacheEntry()
+    {
+        $cacheKey = $this->storeSimpleEntry();
+
+        $this->assertNotEmpty($this->getStoreMetadata($cacheKey));
+    }
+
+    public function testSetsTheXContentDigestResponseHeaderBeforeStoring()
+    {
+        $cacheKey = $this->storeSimpleEntry();
+        $entries = $this->getStoreMetadata($cacheKey);
+        list(, $res) = $entries[0];
+
+        $this->assertEquals('en9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08', $res['x-content-digest'][0]);
+    }
+
+    public function testFindsAStoredEntryWithLookup()
+    {
+        $this->storeSimpleEntry();
+        $response = $this->store->lookup($this->request);
+
+        $this->assertNotNull($response);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
+    }
+
+    public function testDoesNotFindAnEntryWithLookupWhenNoneExists()
+    {
+        $request = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+
+        $this->assertNull($this->store->lookup($request));
+    }
+
+    public function testCanonizesUrlsForCacheKeys()
+    {
+        $this->storeSimpleEntry($path = '/test?x=y&p=q');
+        $hitsReq = Request::create($path);
+        $missReq = Request::create('/test?p=x');
+
+        $this->assertNotNull($this->store->lookup($hitsReq));
+        $this->assertNull($this->store->lookup($missReq));
+    }
+
+    public function testDoesNotFindAnEntryWithLookupWhenTheBodyDoesNotExist()
+    {
+        $this->storeSimpleEntry();
+        $this->assertNotNull($this->response->headers->get('X-Content-Digest'));
+        $path = $this->getStorePath($this->response->headers->get('X-Content-Digest'));
+        @unlink($path);
+        $this->assertNull($this->store->lookup($this->request));
+    }
+
+    public function testRestoresResponseHeadersProperlyWithLookup()
+    {
+        $this->storeSimpleEntry();
+        $response = $this->store->lookup($this->request);
+
+        $this->assertEquals($response->headers->all(), array_merge(['content-length' => 4, 'x-body-file' => [$this->getStorePath($response->headers->get('X-Content-Digest'))]], $this->response->headers->all()));
+    }
+
+    public function testRestoresResponseContentFromEntityStoreWithLookup()
+    {
+        $this->storeSimpleEntry();
+        $response = $this->store->lookup($this->request);
+        $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test')), $response->getContent());
+    }
+
+    public function testInvalidatesMetaAndEntityStoreEntriesWithInvalidate()
+    {
+        $this->storeSimpleEntry();
+        $this->store->invalidate($this->request);
+        $response = $this->store->lookup($this->request);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
+        $this->assertFalse($response->isFresh());
+    }
+
+    public function testSucceedsQuietlyWhenInvalidateCalledWithNoMatchingEntries()
+    {
+        $req = Request::create('/test');
+        $this->store->invalidate($req);
+        $this->assertNull($this->store->lookup($this->request));
+    }
+
+    public function testDoesNotReturnEntriesThatVaryWithLookup()
+    {
+        $req1 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $req2 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam']);
+        $res = new Response('test', 200, ['Vary' => 'Foo Bar']);
+        $this->store->write($req1, $res);
+
+        $this->assertNull($this->store->lookup($req2));
+    }
+
+    public function testDoesNotReturnEntriesThatSlightlyVaryWithLookup()
+    {
+        $req1 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $req2 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bam']);
+        $res = new Response('test', 200, ['Vary' => ['Foo', 'Bar']]);
+        $this->store->write($req1, $res);
+
+        $this->assertNull($this->store->lookup($req2));
+    }
+
+    public function testStoresMultipleResponsesForEachVaryCombination()
+    {
+        $req1 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $res1 = new Response('test 1', 200, ['Vary' => 'Foo Bar']);
+        $key = $this->store->write($req1, $res1);
+
+        $req2 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam']);
+        $res2 = new Response('test 2', 200, ['Vary' => 'Foo Bar']);
+        $this->store->write($req2, $res2);
+
+        $req3 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Baz', 'HTTP_BAR' => 'Boom']);
+        $res3 = new Response('test 3', 200, ['Vary' => 'Foo Bar']);
+        $this->store->write($req3, $res3);
+
+        $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 3')), $this->store->lookup($req3)->getContent());
+        $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 2')), $this->store->lookup($req2)->getContent());
+        $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 1')), $this->store->lookup($req1)->getContent());
+
+        $this->assertCount(3, $this->getStoreMetadata($key));
+    }
+
+    public function testOverwritesNonVaryingResponseWithStore()
+    {
+        $req1 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $res1 = new Response('test 1', 200, ['Vary' => 'Foo Bar']);
+        $this->store->write($req1, $res1);
+        $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 1')), $this->store->lookup($req1)->getContent());
+
+        $req2 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam']);
+        $res2 = new Response('test 2', 200, ['Vary' => 'Foo Bar']);
+        $this->store->write($req2, $res2);
+        $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 2')), $this->store->lookup($req2)->getContent());
+
+        $req3 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $res3 = new Response('test 3', 200, ['Vary' => 'Foo Bar']);
+        $key = $this->store->write($req3, $res3);
+        $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 3')), $this->store->lookup($req3)->getContent());
+
+        $this->assertCount(2, $this->getStoreMetadata($key));
+    }
+
+    public function testLocking()
+    {
+        $req = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $this->assertTrue($this->store->lock($req));
+
+        $this->store->lock($req);
+        $this->assertTrue($this->store->isLocked($req));
+
+        $this->store->unlock($req);
+        $this->assertFalse($this->store->isLocked($req));
+    }
+
+    public function testPurgeHttps()
+    {
+        $request = Request::create('https://example.com/foo');
+        $this->store->write($request, new Response('foo'));
+
+        $this->assertNotEmpty($this->getStoreMetadata($request));
+
+        $this->assertTrue($this->store->purge('https://example.com/foo'));
+        $this->assertEmpty($this->getStoreMetadata($request));
+    }
+
+    public function testPurgeHttpAndHttps()
+    {
+        $requestHttp = Request::create('https://example.com/foo');
+        $this->store->write($requestHttp, new Response('foo'));
+
+        $requestHttps = Request::create('http://example.com/foo');
+        $this->store->write($requestHttps, new Response('foo'));
+
+        $this->assertNotEmpty($this->getStoreMetadata($requestHttp));
+        $this->assertNotEmpty($this->getStoreMetadata($requestHttps));
+
+        $this->assertTrue($this->store->purge('http://example.com/foo'));
+        $this->assertEmpty($this->getStoreMetadata($requestHttp));
+        $this->assertEmpty($this->getStoreMetadata($requestHttps));
+    }
+
+    protected function storeSimpleEntry($path = null, $headers = [])
+    {
+        if (null === $path) {
+            $path = '/test';
+        }
+
+        $this->request = Request::create($path, 'get', [], [], [], $headers);
+        $this->response = new Response('test', 200, ['Cache-Control' => 'max-age=420']);
+
+        return $this->store->write($this->request, $this->response);
+    }
+
+    protected function getStoreMetadata($key)
+    {
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('getMetadata');
+        $m->setAccessible(true);
+
+        if ($key instanceof Request) {
+            $m1 = $r->getMethod('getCacheKey');
+            $m1->setAccessible(true);
+            $key = $m1->invoke($this->store, $key);
+        }
+
+        return $m->invoke($this->store, $key);
+    }
+
+    protected function getStorePath($key)
+    {
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('getPath');
+        $m->setAccessible(true);
+
+        return $m->invoke($this->store, $key);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/SubRequestHandlerTest.php b/lib/symfony/http-kernel/Tests/HttpCache/SubRequestHandlerTest.php
new file mode 100644
index 000000000..67b637bfe
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/SubRequestHandlerTest.php
@@ -0,0 +1,153 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\HttpCache;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\SubRequestHandler;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class SubRequestHandlerTest extends TestCase
+{
+    private static $globalState;
+
+    protected function setUp()
+    {
+        self::$globalState = $this->getGlobalState();
+    }
+
+    protected function tearDown()
+    {
+        Request::setTrustedProxies(self::$globalState[0], self::$globalState[1]);
+    }
+
+    public function testTrustedHeadersAreKept()
+    {
+        Request::setTrustedProxies(['10.0.0.1'], -1);
+        $globalState = $this->getGlobalState();
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+        $request->headers->set('X-Forwarded-For', '10.0.0.2');
+        $request->headers->set('X-Forwarded-Host', 'Good');
+        $request->headers->set('X-Forwarded-Port', '1234');
+        $request->headers->set('X-Forwarded-Proto', 'https');
+
+        $kernel = new TestSubRequestHandlerKernel(function ($request, $type, $catch) {
+            $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+            $this->assertSame('10.0.0.2', $request->getClientIp());
+            $this->assertSame('Good', $request->headers->get('X-Forwarded-Host'));
+            $this->assertSame('1234', $request->headers->get('X-Forwarded-Port'));
+            $this->assertSame('https', $request->headers->get('X-Forwarded-Proto'));
+        });
+
+        SubRequestHandler::handle($kernel, $request, HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertSame($globalState, $this->getGlobalState());
+    }
+
+    public function testUntrustedHeadersAreRemoved()
+    {
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+        $request->headers->set('X-Forwarded-For', '10.0.0.2');
+        $request->headers->set('X-Forwarded-Host', 'Evil');
+        $request->headers->set('X-Forwarded-Port', '1234');
+        $request->headers->set('X-Forwarded-Proto', 'http');
+        $request->headers->set('Forwarded', 'Evil2');
+
+        $kernel = new TestSubRequestHandlerKernel(function ($request, $type, $catch) {
+            $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+            $this->assertSame('10.0.0.1', $request->getClientIp());
+            $this->assertFalse($request->headers->has('X-Forwarded-Host'));
+            $this->assertFalse($request->headers->has('X-Forwarded-Port'));
+            $this->assertFalse($request->headers->has('X-Forwarded-Proto'));
+            $this->assertSame('for="10.0.0.1";host="localhost";proto=http', $request->headers->get('Forwarded'));
+        });
+
+        SubRequestHandler::handle($kernel, $request, HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertSame(self::$globalState, $this->getGlobalState());
+    }
+
+    public function testTrustedForwardedHeader()
+    {
+        Request::setTrustedProxies(['10.0.0.1'], -1);
+        $globalState = $this->getGlobalState();
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+        $request->headers->set('Forwarded', 'for="10.0.0.2";host="foo.bar:1234";proto=https');
+
+        $kernel = new TestSubRequestHandlerKernel(function ($request, $type, $catch) {
+            $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+            $this->assertSame('10.0.0.2', $request->getClientIp());
+            $this->assertSame('foo.bar:1234', $request->getHttpHost());
+            $this->assertSame('https', $request->getScheme());
+            $this->assertSame(1234, $request->getPort());
+        });
+
+        SubRequestHandler::handle($kernel, $request, HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertSame($globalState, $this->getGlobalState());
+    }
+
+    public function testTrustedXForwardedForHeader()
+    {
+        Request::setTrustedProxies(['10.0.0.1'], -1);
+        $globalState = $this->getGlobalState();
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+        $request->headers->set('X-Forwarded-For', '10.0.0.2');
+        $request->headers->set('X-Forwarded-Host', 'foo.bar');
+        $request->headers->set('X-Forwarded-Proto', 'https');
+
+        $kernel = new TestSubRequestHandlerKernel(function ($request, $type, $catch) {
+            $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+            $this->assertSame('10.0.0.2', $request->getClientIp());
+            $this->assertSame('foo.bar', $request->getHttpHost());
+            $this->assertSame('https', $request->getScheme());
+        });
+
+        SubRequestHandler::handle($kernel, $request, HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertSame($globalState, $this->getGlobalState());
+    }
+
+    private function getGlobalState()
+    {
+        return [
+            Request::getTrustedProxies(),
+            Request::getTrustedHeaderSet(),
+        ];
+    }
+}
+
+class TestSubRequestHandlerKernel implements HttpKernelInterface
+{
+    private $assertCallback;
+
+    public function __construct(\Closure $assertCallback)
+    {
+        $this->assertCallback = $assertCallback;
+    }
+
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+        $assertCallback = $this->assertCallback;
+        $assertCallback($request, $type, $catch);
+
+        return new Response();
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/TestHttpKernel.php b/lib/symfony/http-kernel/Tests/HttpCache/TestHttpKernel.php
new file mode 100644
index 000000000..304ff9d9e
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/TestHttpKernel.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\HttpCache;
+
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class TestHttpKernel extends HttpKernel implements ControllerResolverInterface, ArgumentResolverInterface
+{
+    protected $body;
+    protected $status;
+    protected $headers;
+    protected $called = false;
+    protected $customizer;
+    protected $catch = false;
+    protected $backendRequest;
+
+    public function __construct($body, $status, $headers, \Closure $customizer = null)
+    {
+        $this->body = $body;
+        $this->status = $status;
+        $this->headers = $headers;
+        $this->customizer = $customizer;
+
+        parent::__construct(new EventDispatcher(), $this, null, $this);
+    }
+
+    public function assert(\Closure $callback)
+    {
+        $trustedConfig = [Request::getTrustedProxies(), Request::getTrustedHeaderSet()];
+
+        list($trustedProxies, $trustedHeaderSet, $backendRequest) = $this->backendRequest;
+        Request::setTrustedProxies($trustedProxies, $trustedHeaderSet);
+
+        try {
+            $callback($backendRequest);
+        } finally {
+            list($trustedProxies, $trustedHeaderSet) = $trustedConfig;
+            Request::setTrustedProxies($trustedProxies, $trustedHeaderSet);
+        }
+    }
+
+    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)
+    {
+        $this->catch = $catch;
+        $this->backendRequest = [Request::getTrustedProxies(), Request::getTrustedHeaderSet(), $request];
+
+        return parent::handle($request, $type, $catch);
+    }
+
+    public function isCatchingExceptions()
+    {
+        return $this->catch;
+    }
+
+    public function getController(Request $request)
+    {
+        return [$this, 'callController'];
+    }
+
+    public function getArguments(Request $request, $controller)
+    {
+        return [$request];
+    }
+
+    public function callController(Request $request)
+    {
+        $this->called = true;
+
+        $response = new Response($this->body, $this->status, $this->headers);
+
+        if (null !== $customizer = $this->customizer) {
+            $customizer($request, $response);
+        }
+
+        return $response;
+    }
+
+    public function hasBeenCalled()
+    {
+        return $this->called;
+    }
+
+    public function reset()
+    {
+        $this->called = false;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpCache/TestMultipleHttpKernel.php b/lib/symfony/http-kernel/Tests/HttpCache/TestMultipleHttpKernel.php
new file mode 100644
index 000000000..010bee868
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpCache/TestMultipleHttpKernel.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\HttpCache;
+
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInterface, ArgumentResolverInterface
+{
+    protected $bodies = [];
+    protected $statuses = [];
+    protected $headers = [];
+    protected $called = false;
+    protected $backendRequest;
+
+    public function __construct($responses)
+    {
+        foreach ($responses as $response) {
+            $this->bodies[] = $response['body'];
+            $this->statuses[] = $response['status'];
+            $this->headers[] = $response['headers'];
+        }
+
+        parent::__construct(new EventDispatcher(), $this, null, $this);
+    }
+
+    public function getBackendRequest()
+    {
+        return $this->backendRequest;
+    }
+
+    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)
+    {
+        $this->backendRequest = $request;
+
+        return parent::handle($request, $type, $catch);
+    }
+
+    public function getController(Request $request)
+    {
+        return [$this, 'callController'];
+    }
+
+    public function getArguments(Request $request, $controller)
+    {
+        return [$request];
+    }
+
+    public function callController(Request $request)
+    {
+        $this->called = true;
+
+        $response = new Response(array_shift($this->bodies), array_shift($this->statuses), array_shift($this->headers));
+
+        return $response;
+    }
+
+    public function hasBeenCalled()
+    {
+        return $this->called;
+    }
+
+    public function reset()
+    {
+        $this->called = false;
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/HttpKernelTest.php b/lib/symfony/http-kernel/Tests/HttpKernelTest.php
new file mode 100644
index 000000000..af81f021e
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/HttpKernelTest.php
@@ -0,0 +1,395 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\Event\FilterControllerArgumentsEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class HttpKernelTest extends TestCase
+{
+    public function testHandleWhenControllerThrowsAnExceptionAndCatchIsTrue()
+    {
+        $this->expectException('RuntimeException');
+        $kernel = $this->getHttpKernel(new EventDispatcher(), function () { throw new \RuntimeException(); });
+
+        $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
+    }
+
+    public function testHandleWhenControllerThrowsAnExceptionAndCatchIsFalseAndNoListenerIsRegistered()
+    {
+        $this->expectException('RuntimeException');
+        $kernel = $this->getHttpKernel(new EventDispatcher(), function () { throw new \RuntimeException(); });
+
+        $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, false);
+    }
+
+    public function testHandleWhenControllerThrowsAnExceptionAndCatchIsTrueWithAHandlingListener()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::EXCEPTION, function ($event) {
+            $event->setResponse(new Response($event->getException()->getMessage()));
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function () { throw new \RuntimeException('foo'); });
+        $response = $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertEquals('500', $response->getStatusCode());
+        $this->assertEquals('foo', $response->getContent());
+    }
+
+    public function testHandleWhenControllerThrowsAnExceptionAndCatchIsTrueWithANonHandlingListener()
+    {
+        $exception = new \RuntimeException();
+
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::EXCEPTION, function ($event) {
+            // should set a response, but does not
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function () use ($exception) { throw $exception; });
+
+        try {
+            $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
+            $this->fail('LogicException expected');
+        } catch (\RuntimeException $e) {
+            $this->assertSame($exception, $e);
+        }
+    }
+
+    public function testHandleExceptionWithARedirectionResponse()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::EXCEPTION, function ($event) {
+            $event->setResponse(new RedirectResponse('/login', 301));
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function () { throw new AccessDeniedHttpException(); });
+        $response = $kernel->handle(new Request());
+
+        $this->assertEquals('301', $response->getStatusCode());
+        $this->assertEquals('/login', $response->headers->get('Location'));
+    }
+
+    public function testHandleHttpException()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::EXCEPTION, function ($event) {
+            $event->setResponse(new Response($event->getException()->getMessage()));
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function () { throw new MethodNotAllowedHttpException(['POST']); });
+        $response = $kernel->handle(new Request());
+
+        $this->assertEquals('405', $response->getStatusCode());
+        $this->assertEquals('POST', $response->headers->get('Allow'));
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getStatusCodes
+     */
+    public function testLegacyHandleWhenAnExceptionIsHandledWithASpecificStatusCode($responseStatusCode, $expectedStatusCode)
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::EXCEPTION, function ($event) use ($responseStatusCode, $expectedStatusCode) {
+            $event->setResponse(new Response('', $responseStatusCode, ['X-Status-Code' => $expectedStatusCode]));
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function () { throw new \RuntimeException(); });
+        $response = $kernel->handle(new Request());
+
+        $this->assertEquals($expectedStatusCode, $response->getStatusCode());
+        $this->assertFalse($response->headers->has('X-Status-Code'));
+    }
+
+    public function getStatusCodes()
+    {
+        return [
+            [200, 404],
+            [404, 200],
+            [301, 200],
+            [500, 200],
+        ];
+    }
+
+    /**
+     * @dataProvider getSpecificStatusCodes
+     */
+    public function testHandleWhenAnExceptionIsHandledWithASpecificStatusCode($expectedStatusCode)
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::EXCEPTION, function (GetResponseForExceptionEvent $event) use ($expectedStatusCode) {
+            $event->allowCustomResponseCode();
+            $event->setResponse(new Response('', $expectedStatusCode));
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function () { throw new \RuntimeException(); });
+        $response = $kernel->handle(new Request());
+
+        $this->assertEquals($expectedStatusCode, $response->getStatusCode());
+    }
+
+    public function getSpecificStatusCodes()
+    {
+        return [
+            [200],
+            [302],
+            [403],
+        ];
+    }
+
+    public function testHandleWhenAListenerReturnsAResponse()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::REQUEST, function ($event) {
+            $event->setResponse(new Response('hello'));
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher);
+
+        $this->assertEquals('hello', $kernel->handle(new Request())->getContent());
+    }
+
+    public function testHandleWhenNoControllerIsFound()
+    {
+        $this->expectException('Symfony\Component\HttpKernel\Exception\NotFoundHttpException');
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher, false);
+
+        $kernel->handle(new Request());
+    }
+
+    public function testHandleWhenTheControllerIsAClosure()
+    {
+        $response = new Response('foo');
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher, function () use ($response) { return $response; });
+
+        $this->assertSame($response, $kernel->handle(new Request()));
+    }
+
+    public function testHandleWhenTheControllerIsAnObjectWithInvoke()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher, new TestController());
+
+        $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
+    }
+
+    public function testHandleWhenTheControllerIsAFunction()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher, 'Symfony\Component\HttpKernel\Tests\controller_func');
+
+        $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
+    }
+
+    public function testHandleWhenTheControllerIsAnArray()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher, [new TestController(), 'controller']);
+
+        $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
+    }
+
+    public function testHandleWhenTheControllerIsAStaticArray()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher, ['Symfony\Component\HttpKernel\Tests\TestController', 'staticcontroller']);
+
+        $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
+    }
+
+    public function testHandleWhenTheControllerDoesNotReturnAResponse()
+    {
+        $this->expectException('LogicException');
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher, function () { return 'foo'; });
+
+        $kernel->handle(new Request());
+    }
+
+    public function testHandleWhenTheControllerDoesNotReturnAResponseButAViewIsRegistered()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::VIEW, function ($event) {
+            $event->setResponse(new Response($event->getControllerResult()));
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function () { return 'foo'; });
+
+        $this->assertEquals('foo', $kernel->handle(new Request())->getContent());
+    }
+
+    public function testHandleWithAResponseListener()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::RESPONSE, function ($event) {
+            $event->setResponse(new Response('foo'));
+        });
+        $kernel = $this->getHttpKernel($dispatcher);
+
+        $this->assertEquals('foo', $kernel->handle(new Request())->getContent());
+    }
+
+    public function testHandleAllowChangingControllerArguments()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::CONTROLLER_ARGUMENTS, function (FilterControllerArgumentsEvent $event) {
+            $event->setArguments(['foo']);
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function ($content) { return new Response($content); });
+
+        $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
+    }
+
+    public function testHandleAllowChangingControllerAndArguments()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::CONTROLLER_ARGUMENTS, function (FilterControllerArgumentsEvent $event) {
+            $oldController = $event->getController();
+            $oldArguments = $event->getArguments();
+
+            $newController = function ($id) use ($oldController, $oldArguments) {
+                $response = \call_user_func_array($oldController, $oldArguments);
+
+                $response->headers->set('X-Id', $id);
+
+                return $response;
+            };
+
+            $event->setController($newController);
+            $event->setArguments(['bar']);
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher, function ($content) { return new Response($content); }, null, ['foo']);
+
+        $this->assertResponseEquals(new Response('foo', 200, ['X-Id' => 'bar']), $kernel->handle(new Request()));
+    }
+
+    public function testTerminate()
+    {
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher);
+        $dispatcher->addListener(KernelEvents::TERMINATE, function ($event) use (&$called, &$capturedKernel, &$capturedRequest, &$capturedResponse) {
+            $called = true;
+            $capturedKernel = $event->getKernel();
+            $capturedRequest = $event->getRequest();
+            $capturedResponse = $event->getResponse();
+        });
+
+        $kernel->terminate($request = Request::create('/'), $response = new Response());
+        $this->assertTrue($called);
+        $this->assertEquals($kernel, $capturedKernel);
+        $this->assertEquals($request, $capturedRequest);
+        $this->assertEquals($response, $capturedResponse);
+    }
+
+    public function testVerifyRequestStackPushPopDuringHandle()
+    {
+        $request = new Request();
+
+        $stack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(['push', 'pop'])->getMock();
+        $stack->expects($this->at(0))->method('push')->with($this->equalTo($request));
+        $stack->expects($this->at(1))->method('pop');
+
+        $dispatcher = new EventDispatcher();
+        $kernel = $this->getHttpKernel($dispatcher, null, $stack);
+
+        $kernel->handle($request, HttpKernelInterface::MASTER_REQUEST);
+    }
+
+    public function testInconsistentClientIpsOnMasterRequests()
+    {
+        $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+        $request = new Request();
+        $request->setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_FORWARDED);
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('FORWARDED', 'for=2.2.2.2');
+        $request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
+
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(KernelEvents::REQUEST, function ($event) {
+            $event->getRequest()->getClientIp();
+        });
+
+        $kernel = $this->getHttpKernel($dispatcher);
+        $kernel->handle($request, $kernel::MASTER_REQUEST, false);
+
+        Request::setTrustedProxies([], -1);
+    }
+
+    private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = [])
+    {
+        if (null === $controller) {
+            $controller = function () { return new Response('Hello'); };
+        }
+
+        $controllerResolver = $this->getMockBuilder(ControllerResolverInterface::class)->getMock();
+        $controllerResolver
+            ->expects($this->any())
+            ->method('getController')
+            ->willReturn($controller);
+
+        $argumentResolver = $this->getMockBuilder(ArgumentResolverInterface::class)->getMock();
+        $argumentResolver
+            ->expects($this->any())
+            ->method('getArguments')
+            ->willReturn($arguments);
+
+        return new HttpKernel($eventDispatcher, $controllerResolver, $requestStack, $argumentResolver);
+    }
+
+    private function assertResponseEquals(Response $expected, Response $actual)
+    {
+        $expected->setDate($actual->getDate());
+        $this->assertEquals($expected, $actual);
+    }
+}
+
+class TestController
+{
+    public function __invoke()
+    {
+        return new Response('foo');
+    }
+
+    public function controller()
+    {
+        return new Response('foo');
+    }
+
+    public static function staticController()
+    {
+        return new Response('foo');
+    }
+}
+
+function controller_func()
+{
+    return new Response('foo');
+}
diff --git a/lib/symfony/http-kernel/Tests/KernelTest.php b/lib/symfony/http-kernel/Tests/KernelTest.php
new file mode 100644
index 000000000..e4e2e0727
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/KernelTest.php
@@ -0,0 +1,1073 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Filesystem\Filesystem;
+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\DependencyInjection\ResettableServicePass;
+use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForOverrideName;
+use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest;
+use Symfony\Component\HttpKernel\Tests\Fixtures\KernelWithoutBundles;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ResettableService;
+
+class KernelTest extends TestCase
+{
+    public static function tearDownAfterClass()
+    {
+        $fs = new Filesystem();
+        $fs->remove(__DIR__.'/Fixtures/cache');
+    }
+
+    public function testConstructor()
+    {
+        $env = 'test_env';
+        $debug = true;
+        $kernel = new KernelForTest($env, $debug);
+
+        $this->assertEquals($env, $kernel->getEnvironment());
+        $this->assertEquals($debug, $kernel->isDebug());
+        $this->assertFalse($kernel->isBooted());
+        $this->assertLessThanOrEqual(microtime(true), $kernel->getStartTime());
+        $this->assertNull($kernel->getContainer());
+    }
+
+    public function testClone()
+    {
+        $env = 'test_env';
+        $debug = true;
+        $kernel = new KernelForTest($env, $debug);
+
+        $clone = clone $kernel;
+
+        $this->assertEquals($env, $clone->getEnvironment());
+        $this->assertEquals($debug, $clone->isDebug());
+        $this->assertFalse($clone->isBooted());
+        $this->assertLessThanOrEqual(microtime(true), $clone->getStartTime());
+        $this->assertNull($clone->getContainer());
+    }
+
+    public function testInitializeContainerClearsOldContainers()
+    {
+        $fs = new Filesystem();
+        $legacyContainerDir = __DIR__.'/Fixtures/cache/custom/ContainerA123456';
+        $fs->mkdir($legacyContainerDir);
+        touch($legacyContainerDir.'.legacy');
+
+        $kernel = new CustomProjectDirKernel();
+        $kernel->boot();
+
+        $containerDir = __DIR__.'/Fixtures/cache/custom/'.substr(\get_class($kernel->getContainer()), 0, 16);
+        $this->assertTrue(unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta'));
+        $this->assertFileExists($containerDir);
+        $this->assertFileNotExists($containerDir.'.legacy');
+
+        $kernel = new CustomProjectDirKernel(function ($container) { $container->register('foo', 'stdClass')->setPublic(true); });
+        $kernel->boot();
+
+        $this->assertFileExists($containerDir);
+        $this->assertFileExists($containerDir.'.legacy');
+
+        $this->assertFileNotExists($legacyContainerDir);
+        $this->assertFileNotExists($legacyContainerDir.'.legacy');
+    }
+
+    public function testBootInitializesBundlesAndContainer()
+    {
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer']);
+        $kernel->expects($this->once())
+            ->method('initializeBundles');
+        $kernel->expects($this->once())
+            ->method('initializeContainer');
+
+        $kernel->boot();
+    }
+
+    public function testBootSetsTheContainerToTheBundles()
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
+        $bundle->expects($this->once())
+            ->method('setContainer');
+
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer', 'getBundles']);
+        $kernel->expects($this->once())
+            ->method('getBundles')
+            ->willReturn([$bundle]);
+
+        $kernel->boot();
+    }
+
+    public function testBootSetsTheBootedFlagToTrue()
+    {
+        // use test kernel to access isBooted()
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer']);
+        $kernel->boot();
+
+        $this->assertTrue($kernel->isBooted());
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testClassCacheIsLoaded()
+    {
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer', 'doLoadClassCache']);
+        $kernel->loadClassCache('name', '.extension');
+        $kernel->expects($this->once())
+            ->method('doLoadClassCache')
+            ->with('name', '.extension');
+
+        $kernel->boot();
+    }
+
+    public function testClassCacheIsNotLoadedByDefault()
+    {
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer', 'doLoadClassCache']);
+        $kernel->expects($this->never())
+            ->method('doLoadClassCache');
+
+        $kernel->boot();
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testClassCacheIsNotLoadedWhenKernelIsNotBooted()
+    {
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer', 'doLoadClassCache']);
+        $kernel->loadClassCache();
+        $kernel->expects($this->never())
+            ->method('doLoadClassCache');
+    }
+
+    public function testEnvParametersResourceIsAdded()
+    {
+        $container = new ContainerBuilder();
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
+            ->disableOriginalConstructor()
+            ->setMethods(['getContainerBuilder', 'prepareContainer', 'getCacheDir', 'getLogDir'])
+            ->getMock();
+        $kernel->expects($this->any())
+            ->method('getContainerBuilder')
+            ->willReturn($container);
+        $kernel->expects($this->any())
+            ->method('prepareContainer')
+            ->willReturn(null);
+        $kernel->expects($this->any())
+            ->method('getCacheDir')
+            ->willReturn(sys_get_temp_dir());
+        $kernel->expects($this->any())
+            ->method('getLogDir')
+            ->willReturn(sys_get_temp_dir());
+
+        $reflection = new \ReflectionClass(\get_class($kernel));
+        $method = $reflection->getMethod('buildContainer');
+        $method->setAccessible(true);
+        $method->invoke($kernel);
+
+        $found = false;
+        foreach ($container->getResources() as $resource) {
+            if ($resource instanceof EnvParametersResource) {
+                $found = true;
+                break;
+            }
+        }
+
+        $this->assertTrue($found);
+    }
+
+    public function testBootKernelSeveralTimesOnlyInitializesBundlesOnce()
+    {
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer']);
+        $kernel->expects($this->once())
+            ->method('initializeBundles');
+
+        $kernel->boot();
+        $kernel->boot();
+    }
+
+    public function testShutdownCallsShutdownOnAllBundles()
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
+        $bundle->expects($this->once())
+            ->method('shutdown');
+
+        $kernel = $this->getKernel([], [$bundle]);
+
+        $kernel->boot();
+        $kernel->shutdown();
+    }
+
+    public function testShutdownGivesNullContainerToAllBundles()
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
+        $bundle->expects($this->at(3))
+            ->method('setContainer')
+            ->with(null);
+
+        $kernel = $this->getKernel(['getBundles']);
+        $kernel->expects($this->any())
+            ->method('getBundles')
+            ->willReturn([$bundle]);
+
+        $kernel->boot();
+        $kernel->shutdown();
+    }
+
+    public function testHandleCallsHandleOnHttpKernel()
+    {
+        $type = HttpKernelInterface::MASTER_REQUEST;
+        $catch = true;
+        $request = new Request();
+
+        $httpKernelMock = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernel')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $httpKernelMock
+            ->expects($this->once())
+            ->method('handle')
+            ->with($request, $type, $catch);
+
+        $kernel = $this->getKernel(['getHttpKernel']);
+        $kernel->expects($this->once())
+            ->method('getHttpKernel')
+            ->willReturn($httpKernelMock);
+
+        $kernel->handle($request, $type, $catch);
+    }
+
+    public function testHandleBootsTheKernel()
+    {
+        $type = HttpKernelInterface::MASTER_REQUEST;
+        $catch = true;
+        $request = new Request();
+
+        $httpKernelMock = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernel')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $kernel = $this->getKernel(['getHttpKernel', 'boot']);
+        $kernel->expects($this->once())
+            ->method('getHttpKernel')
+            ->willReturn($httpKernelMock);
+
+        $kernel->expects($this->once())
+            ->method('boot');
+
+        $kernel->handle($request, $type, $catch);
+    }
+
+    public function testStripComments()
+    {
+        $source = <<<'EOF'
+<?php
+
+$string = 'string should not be   modified';
+
+$string = 'string should not be
+
+modified';
+
+
+$heredoc = <<<HD
+
+
+Heredoc should not be   modified {$a[1+$b]}
+
+
+HD;
+
+$nowdoc = <<<'ND'
+
+
+Nowdoc should not be   modified
+
+
+ND;
+
+/**
+ * some class comments to strip
+ */
+class TestClass
+{
+    /**
+     * some method comments to strip
+     */
+    public function doStuff()
+    {
+        // inline comment
+    }
+}
+EOF;
+        $expected = <<<'EOF'
+<?php
+$string = 'string should not be   modified';
+$string = 'string should not be
+
+modified';
+$heredoc = <<<HD
+
+
+Heredoc should not be   modified {$a[1+$b]}
+
+
+HD;
+$nowdoc = <<<'ND'
+
+
+Nowdoc should not be   modified
+
+
+ND;
+class TestClass
+{
+    public function doStuff()
+    {
+        }
+}
+EOF;
+
+        $output = Kernel::stripComments($source);
+
+        // Heredocs are preserved, making the output mixing Unix and Windows line
+        // endings, switching to "\n" everywhere on Windows to avoid failure.
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $expected = str_replace("\r\n", "\n", $expected);
+            $output = str_replace("\r\n", "\n", $output);
+        }
+
+        $this->assertEquals($expected, $output);
+    }
+
+    public function testGetRootDir()
+    {
+        $kernel = new KernelForTest('test', true);
+
+        $this->assertEquals(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures', realpath($kernel->getRootDir()));
+    }
+
+    public function testGetName()
+    {
+        $kernel = new KernelForTest('test', true);
+
+        $this->assertEquals('Fixtures', $kernel->getName());
+    }
+
+    public function testOverrideGetName()
+    {
+        $kernel = new KernelForOverrideName('test', true);
+
+        $this->assertEquals('overridden', $kernel->getName());
+    }
+
+    public function testSerialize()
+    {
+        $env = 'test_env';
+        $debug = true;
+        $kernel = new KernelForTest($env, $debug);
+
+        $expected = serialize([$env, $debug]);
+        $this->assertEquals($expected, $kernel->serialize());
+    }
+
+    public function testLocateResourceThrowsExceptionWhenNameIsNotValid()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->getKernel()->locateResource('Foo');
+    }
+
+    public function testLocateResourceThrowsExceptionWhenNameIsUnsafe()
+    {
+        $this->expectException('RuntimeException');
+        $this->getKernel()->locateResource('@FooBundle/../bar');
+    }
+
+    public function testLocateResourceThrowsExceptionWhenBundleDoesNotExist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->getKernel()->locateResource('@FooBundle/config/routing.xml');
+    }
+
+    public function testLocateResourceThrowsExceptionWhenResourceDoesNotExist()
+    {
+        $this->expectException('InvalidArgumentException');
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->once())
+            ->method('getBundle')
+            ->willReturn([$this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')])
+        ;
+
+        $kernel->locateResource('@Bundle1Bundle/config/routing.xml');
+    }
+
+    public function testLocateResourceReturnsTheFirstThatMatches()
+    {
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->once())
+            ->method('getBundle')
+            ->willReturn([$this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')])
+        ;
+
+        $this->assertEquals(__DIR__.'/Fixtures/Bundle1Bundle/foo.txt', $kernel->locateResource('@Bundle1Bundle/foo.txt'));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLocateResourceReturnsTheFirstThatMatchesWithParent()
+    {
+        $parent = $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle');
+        $child = $this->getBundle(__DIR__.'/Fixtures/Bundle2Bundle');
+
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->exactly(2))
+            ->method('getBundle')
+            ->willReturn([$child, $parent])
+        ;
+
+        $this->assertEquals(__DIR__.'/Fixtures/Bundle2Bundle/foo.txt', $kernel->locateResource('@ParentAABundle/foo.txt'));
+        $this->assertEquals(__DIR__.'/Fixtures/Bundle1Bundle/bar.txt', $kernel->locateResource('@ParentAABundle/bar.txt'));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLocateResourceReturnsAllMatches()
+    {
+        $parent = $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle');
+        $child = $this->getBundle(__DIR__.'/Fixtures/Bundle2Bundle');
+
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->once())
+            ->method('getBundle')
+            ->willReturn([$child, $parent])
+        ;
+
+        $this->assertEquals([
+            __DIR__.'/Fixtures/Bundle2Bundle/foo.txt',
+            __DIR__.'/Fixtures/Bundle1Bundle/foo.txt', ],
+            $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLocateResourceReturnsAllMatchesBis()
+    {
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->once())
+            ->method('getBundle')
+            ->willReturn([
+                $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'),
+                $this->getBundle(__DIR__.'/Foobar'),
+            ])
+        ;
+
+        $this->assertEquals(
+            [__DIR__.'/Fixtures/Bundle1Bundle/foo.txt'],
+            $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false)
+        );
+    }
+
+    public function testLocateResourceIgnoresDirOnNonResource()
+    {
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->once())
+            ->method('getBundle')
+            ->willReturn([$this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')])
+        ;
+
+        $this->assertEquals(
+            __DIR__.'/Fixtures/Bundle1Bundle/foo.txt',
+            $kernel->locateResource('@Bundle1Bundle/foo.txt', __DIR__.'/Fixtures')
+        );
+    }
+
+    public function testLocateResourceReturnsTheDirOneForResources()
+    {
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->once())
+            ->method('getBundle')
+            ->willReturn([$this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle')])
+        ;
+
+        $this->assertEquals(
+            __DIR__.'/Fixtures/Resources/FooBundle/foo.txt',
+            $kernel->locateResource('@FooBundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources')
+        );
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLocateResourceReturnsTheDirOneForResourcesAndBundleOnes()
+    {
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->once())
+            ->method('getBundle')
+            ->willReturn([$this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle', null, null, 'Bundle1Bundle')])
+        ;
+
+        $this->assertEquals([
+            __DIR__.'/Fixtures/Resources/Bundle1Bundle/foo.txt',
+            __DIR__.'/Fixtures/Bundle1Bundle/Resources/foo.txt', ],
+            $kernel->locateResource('@Bundle1Bundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources', false)
+        );
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLocateResourceOverrideBundleAndResourcesFolders()
+    {
+        $parent = $this->getBundle(__DIR__.'/Fixtures/BaseBundle', null, 'BaseBundle', 'BaseBundle');
+        $child = $this->getBundle(__DIR__.'/Fixtures/ChildBundle', 'ParentBundle', 'ChildBundle', 'ChildBundle');
+
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->exactly(4))
+            ->method('getBundle')
+            ->willReturn([$child, $parent])
+        ;
+
+        $this->assertEquals([
+            __DIR__.'/Fixtures/Resources/ChildBundle/foo.txt',
+            __DIR__.'/Fixtures/ChildBundle/Resources/foo.txt',
+            __DIR__.'/Fixtures/BaseBundle/Resources/foo.txt',
+            ],
+            $kernel->locateResource('@BaseBundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources', false)
+        );
+
+        $this->assertEquals(
+            __DIR__.'/Fixtures/Resources/ChildBundle/foo.txt',
+            $kernel->locateResource('@BaseBundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources')
+        );
+
+        try {
+            $kernel->locateResource('@BaseBundle/Resources/hide.txt', __DIR__.'/Fixtures/Resources', false);
+            $this->fail('Hidden resources should raise an exception when returning an array of matching paths');
+        } catch (\RuntimeException $e) {
+        }
+
+        try {
+            $kernel->locateResource('@BaseBundle/Resources/hide.txt', __DIR__.'/Fixtures/Resources', true);
+            $this->fail('Hidden resources should raise an exception when returning the first matching path');
+        } catch (\RuntimeException $e) {
+        }
+    }
+
+    public function testLocateResourceOnDirectories()
+    {
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->exactly(2))
+            ->method('getBundle')
+            ->willReturn([$this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle')])
+        ;
+
+        $this->assertEquals(
+            __DIR__.'/Fixtures/Resources/FooBundle/',
+            $kernel->locateResource('@FooBundle/Resources/', __DIR__.'/Fixtures/Resources')
+        );
+        $this->assertEquals(
+            __DIR__.'/Fixtures/Resources/FooBundle',
+            $kernel->locateResource('@FooBundle/Resources', __DIR__.'/Fixtures/Resources')
+        );
+
+        $kernel = $this->getKernel(['getBundle']);
+        $kernel
+            ->expects($this->exactly(2))
+            ->method('getBundle')
+            ->willReturn([$this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle', null, null, 'Bundle1Bundle')])
+        ;
+
+        $this->assertEquals(
+            __DIR__.'/Fixtures/Bundle1Bundle/Resources/',
+            $kernel->locateResource('@Bundle1Bundle/Resources/')
+        );
+        $this->assertEquals(
+            __DIR__.'/Fixtures/Bundle1Bundle/Resources',
+            $kernel->locateResource('@Bundle1Bundle/Resources')
+        );
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInitializeBundles()
+    {
+        $parent = $this->getBundle(null, null, 'ParentABundle');
+        $child = $this->getBundle(null, 'ParentABundle', 'ChildABundle');
+
+        // use test kernel so we can access getBundleMap()
+        $kernel = $this->getKernelForTest(['registerBundles']);
+        $kernel
+            ->expects($this->once())
+            ->method('registerBundles')
+            ->willReturn([$parent, $child])
+        ;
+        $kernel->boot();
+
+        $map = $kernel->getBundleMap();
+        $this->assertEquals([$child, $parent], $map['ParentABundle']);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInitializeBundlesSupportInheritanceCascade()
+    {
+        $grandparent = $this->getBundle(null, null, 'GrandParentBBundle');
+        $parent = $this->getBundle(null, 'GrandParentBBundle', 'ParentBBundle');
+        $child = $this->getBundle(null, 'ParentBBundle', 'ChildBBundle');
+
+        // use test kernel so we can access getBundleMap()
+        $kernel = $this->getKernelForTest(['registerBundles']);
+        $kernel
+            ->expects($this->once())
+            ->method('registerBundles')
+            ->willReturn([$grandparent, $parent, $child])
+        ;
+        $kernel->boot();
+
+        $map = $kernel->getBundleMap();
+        $this->assertEquals([$child, $parent, $grandparent], $map['GrandParentBBundle']);
+        $this->assertEquals([$child, $parent], $map['ParentBBundle']);
+        $this->assertEquals([$child], $map['ChildBBundle']);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInitializeBundlesThrowsExceptionWhenAParentDoesNotExists()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Bundle "ChildCBundle" extends bundle "FooBar", which is not registered.');
+        $child = $this->getBundle(null, 'FooBar', 'ChildCBundle');
+        $kernel = $this->getKernel([], [$child]);
+        $kernel->boot();
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInitializeBundlesSupportsArbitraryBundleRegistrationOrder()
+    {
+        $grandparent = $this->getBundle(null, null, 'GrandParentCBundle');
+        $parent = $this->getBundle(null, 'GrandParentCBundle', 'ParentCBundle');
+        $child = $this->getBundle(null, 'ParentCBundle', 'ChildCBundle');
+
+        // use test kernel so we can access getBundleMap()
+        $kernel = $this->getKernelForTest(['registerBundles']);
+        $kernel
+            ->expects($this->once())
+            ->method('registerBundles')
+            ->willReturn([$parent, $grandparent, $child])
+        ;
+        $kernel->boot();
+
+        $map = $kernel->getBundleMap();
+        $this->assertEquals([$child, $parent, $grandparent], $map['GrandParentCBundle']);
+        $this->assertEquals([$child, $parent], $map['ParentCBundle']);
+        $this->assertEquals([$child], $map['ChildCBundle']);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInitializeBundlesThrowsExceptionWhenABundleIsDirectlyExtendedByTwoBundles()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Bundle "ParentCBundle" is directly extended by two bundles "ChildC2Bundle" and "ChildC1Bundle".');
+        $parent = $this->getBundle(null, null, 'ParentCBundle');
+        $child1 = $this->getBundle(null, 'ParentCBundle', 'ChildC1Bundle');
+        $child2 = $this->getBundle(null, 'ParentCBundle', 'ChildC2Bundle');
+
+        $kernel = $this->getKernel([], [$parent, $child1, $child2]);
+        $kernel->boot();
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInitializeBundleThrowsExceptionWhenRegisteringTwoBundlesWithTheSameName()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Trying to register two bundles with the same name "DuplicateName"');
+        $fooBundle = $this->getBundle(__DIR__.'/Fixtures/FooBundle', null, 'FooBundle', 'DuplicateName');
+        $barBundle = $this->getBundle(__DIR__.'/Fixtures/BarBundle', null, 'BarBundle', 'DuplicateName');
+
+        $kernel = $this->getKernel([], [$fooBundle, $barBundle]);
+        $kernel->boot();
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testInitializeBundleThrowsExceptionWhenABundleExtendsItself()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('Bundle "CircularRefBundle" can not extend itself.');
+        $circularRef = $this->getBundle(null, 'CircularRefBundle', 'CircularRefBundle');
+
+        $kernel = $this->getKernel([], [$circularRef]);
+        $kernel->boot();
+    }
+
+    public function testTerminateReturnsSilentlyIfKernelIsNotBooted()
+    {
+        $kernel = $this->getKernel(['getHttpKernel']);
+        $kernel->expects($this->never())
+            ->method('getHttpKernel');
+
+        $kernel->terminate(Request::create('/'), new Response());
+    }
+
+    public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
+    {
+        // does not implement TerminableInterface
+        $httpKernel = new TestKernel();
+
+        $kernel = $this->getKernel(['getHttpKernel']);
+        $kernel->expects($this->once())
+            ->method('getHttpKernel')
+            ->willReturn($httpKernel);
+
+        $kernel->boot();
+        $kernel->terminate(Request::create('/'), new Response());
+
+        $this->assertFalse($httpKernel->terminateCalled, 'terminate() is never called if the kernel class does not implement TerminableInterface');
+
+        // implements TerminableInterface
+        $httpKernelMock = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernel')
+            ->disableOriginalConstructor()
+            ->setMethods(['terminate'])
+            ->getMock();
+
+        $httpKernelMock
+            ->expects($this->once())
+            ->method('terminate');
+
+        $kernel = $this->getKernel(['getHttpKernel']);
+        $kernel->expects($this->exactly(2))
+            ->method('getHttpKernel')
+            ->willReturn($httpKernelMock);
+
+        $kernel->boot();
+        $kernel->terminate(Request::create('/'), new Response());
+    }
+
+    public function testKernelWithoutBundles()
+    {
+        $kernel = new KernelWithoutBundles('test', true);
+        $kernel->boot();
+
+        $this->assertTrue($kernel->getContainer()->getParameter('test_executed'));
+    }
+
+    public function testKernelRootDirNameStartingWithANumber()
+    {
+        $dir = __DIR__.'/Fixtures/123';
+        require_once $dir.'/Kernel123.php';
+        $kernel = new \Symfony\Component\HttpKernel\Tests\Fixtures\_123\Kernel123('dev', true);
+        $this->assertEquals('_123', $kernel->getName());
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The "Symfony\Component\HttpKernel\Kernel::getEnvParameters()" method is deprecated as of 3.3 and will be removed in 4.0. Use the %cenv()%c syntax to get the value of any environment variable from configuration files instead.
+     * @expectedDeprecation The support of special environment variables that start with SYMFONY__ (such as "SYMFONY__FOO__BAR") is deprecated as of 3.3 and will be removed in 4.0. Use the %cenv()%c syntax instead to get the value of environment variables in configuration files.
+     */
+    public function testSymfonyEnvironmentVariables()
+    {
+        $_SERVER['SYMFONY__FOO__BAR'] = 'baz';
+
+        $kernel = $this->getKernel();
+        $method = new \ReflectionMethod($kernel, 'getEnvParameters');
+        $method->setAccessible(true);
+
+        $envParameters = $method->invoke($kernel);
+        $this->assertSame('baz', $envParameters['foo.bar']);
+
+        unset($_SERVER['SYMFONY__FOO__BAR']);
+    }
+
+    public function testProjectDirExtension()
+    {
+        $kernel = new CustomProjectDirKernel();
+        $kernel->boot();
+
+        $this->assertSame('foo', $kernel->getProjectDir());
+        $this->assertSame('foo', $kernel->getContainer()->getParameter('kernel.project_dir'));
+    }
+
+    public function testKernelReset()
+    {
+        (new Filesystem())->remove(__DIR__.'/Fixtures/cache');
+
+        $kernel = new CustomProjectDirKernel();
+        $kernel->boot();
+
+        $containerClass = \get_class($kernel->getContainer());
+        $containerFile = (new \ReflectionClass($kernel->getContainer()))->getFileName();
+        unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta');
+
+        $kernel = new CustomProjectDirKernel();
+        $kernel->boot();
+
+        $this->assertInstanceOf($containerClass, $kernel->getContainer());
+        $this->assertFileExists($containerFile);
+        unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta');
+
+        $kernel = new CustomProjectDirKernel(function ($container) { $container->register('foo', 'stdClass')->setPublic(true); });
+        $kernel->boot();
+
+        $this->assertNotInstanceOf($containerClass, $kernel->getContainer());
+        $this->assertFileExists($containerFile);
+        $this->assertFileExists(\dirname($containerFile).'.legacy');
+    }
+
+    public function testKernelPass()
+    {
+        $kernel = new PassKernel();
+        $kernel->boot();
+
+        $this->assertTrue($kernel->getContainer()->getParameter('test.processed'));
+    }
+
+    public function testServicesResetter()
+    {
+        $httpKernelMock = $this->getMockBuilder(HttpKernelInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $httpKernelMock
+            ->expects($this->exactly(2))
+            ->method('handle');
+
+        $kernel = new CustomProjectDirKernel(function ($container) {
+            $container->addCompilerPass(new ResettableServicePass());
+            $container->register('one', ResettableService::class)
+                ->setPublic(true)
+                ->addTag('kernel.reset', ['method' => 'reset']);
+            $container->register('services_resetter', ServicesResetter::class)->setPublic(true);
+        }, $httpKernelMock, 'resetting');
+
+        ResettableService::$counter = 0;
+
+        $request = new Request();
+
+        $kernel->handle($request);
+        $kernel->getContainer()->get('one');
+
+        $this->assertEquals(0, ResettableService::$counter);
+        $this->assertFalse($kernel->getContainer()->initialized('services_resetter'));
+
+        $kernel->handle($request);
+
+        $this->assertEquals(1, ResettableService::$counter);
+    }
+
+    /**
+     * @group time-sensitive
+     */
+    public function testKernelStartTimeIsResetWhileBootingAlreadyBootedKernel()
+    {
+        $kernel = $this->getKernel(['initializeBundles'], [], true);
+        $kernel->boot();
+        $preReBoot = $kernel->getStartTime();
+
+        sleep(3600); //Intentionally large value to detect if ClockMock ever breaks
+        $kernel->reboot(null);
+
+        $this->assertGreaterThan($preReBoot, $kernel->getStartTime());
+    }
+
+    /**
+     * Returns a mock for the BundleInterface.
+     *
+     * @return BundleInterface
+     */
+    protected function getBundle($dir = null, $parent = null, $className = null, $bundleName = null)
+    {
+        $bundle = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')
+            ->setMethods(['getPath', 'getParent', 'getName'])
+            ->disableOriginalConstructor()
+        ;
+
+        if ($className) {
+            $bundle->setMockClassName($className);
+        }
+
+        $bundle = $bundle->getMockForAbstractClass();
+
+        $bundle
+            ->expects($this->any())
+            ->method('getName')
+            ->willReturn(null === $bundleName ? \get_class($bundle) : $bundleName)
+        ;
+
+        $bundle
+            ->expects($this->any())
+            ->method('getPath')
+            ->willReturn($dir)
+        ;
+
+        $bundle
+            ->expects($this->any())
+            ->method('getParent')
+            ->willReturn($parent)
+        ;
+
+        return $bundle;
+    }
+
+    /**
+     * Returns a mock for the abstract kernel.
+     *
+     * @param array $methods Additional methods to mock (besides the abstract ones)
+     * @param array $bundles Bundles to register
+     *
+     * @return Kernel
+     */
+    protected function getKernel(array $methods = [], array $bundles = [], $debug = false)
+    {
+        $methods[] = 'registerBundles';
+
+        $kernel = $this
+            ->getMockBuilder(KernelForTest::class)
+            ->setMethods($methods)
+            ->setConstructorArgs(['test', $debug])
+            ->getMock()
+        ;
+        $kernel->expects($this->any())
+            ->method('registerBundles')
+            ->willReturn($bundles)
+        ;
+        $p = new \ReflectionProperty($kernel, 'rootDir');
+        $p->setAccessible(true);
+        $p->setValue($kernel, __DIR__.'/Fixtures');
+
+        return $kernel;
+    }
+
+    protected function getKernelForTest(array $methods = [], $debug = false)
+    {
+        $kernel = $this->getMockBuilder(KernelForTest::class)
+            ->setConstructorArgs(['test', $debug])
+            ->setMethods($methods)
+            ->getMock()
+        ;
+        $p = new \ReflectionProperty($kernel, 'rootDir');
+        $p->setAccessible(true);
+        $p->setValue($kernel, __DIR__.'/Fixtures');
+
+        return $kernel;
+    }
+}
+
+class TestKernel implements HttpKernelInterface
+{
+    public $terminateCalled = false;
+
+    public function terminate()
+    {
+        $this->terminateCalled = true;
+    }
+
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+    }
+
+    public function getProjectDir()
+    {
+        return __DIR__.'/Fixtures';
+    }
+}
+
+class CustomProjectDirKernel extends Kernel
+{
+    private $baseDir;
+    private $buildContainer;
+    private $httpKernel;
+
+    public function __construct(\Closure $buildContainer = null, HttpKernelInterface $httpKernel = null, $name = 'custom')
+    {
+        parent::__construct($name, true);
+
+        $this->baseDir = 'foo';
+        $this->buildContainer = $buildContainer;
+        $this->httpKernel = $httpKernel;
+    }
+
+    public function registerBundles()
+    {
+        return [];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+
+    public function getProjectDir()
+    {
+        return $this->baseDir;
+    }
+
+    public function getRootDir()
+    {
+        return __DIR__.'/Fixtures';
+    }
+
+    protected function build(ContainerBuilder $container)
+    {
+        if ($build = $this->buildContainer) {
+            $build($container);
+        }
+    }
+
+    protected function getHttpKernel()
+    {
+        return $this->httpKernel;
+    }
+}
+
+class PassKernel extends CustomProjectDirKernel implements CompilerPassInterface
+{
+    public function __construct()
+    {
+        parent::__construct();
+        Kernel::__construct('pass', true);
+    }
+
+    public function process(ContainerBuilder $container)
+    {
+        $container->setParameter('test.processed', true);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Log/LoggerTest.php b/lib/symfony/http-kernel/Tests/Log/LoggerTest.php
new file mode 100644
index 000000000..7439ae137
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Log/LoggerTest.php
@@ -0,0 +1,206 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Log;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Symfony\Component\HttpKernel\Log\Logger;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class LoggerTest extends TestCase
+{
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var string
+     */
+    private $tmpFile;
+
+    protected function setUp()
+    {
+        $this->tmpFile = tempnam(sys_get_temp_dir(), 'log');
+        $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile);
+    }
+
+    protected function tearDown()
+    {
+        if (!@unlink($this->tmpFile)) {
+            file_put_contents($this->tmpFile, '');
+        }
+    }
+
+    public static function assertLogsMatch(array $expected, array $given)
+    {
+        foreach ($given as $k => $line) {
+            self::assertThat(1 === preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}[\+-][0-9]{2}:[0-9]{2} '.preg_quote($expected[$k]).'/', $line), self::isTrue(), "\"$line\" do not match expected pattern \"$expected[$k]\"");
+        }
+    }
+
+    /**
+     * Return the log messages in order.
+     *
+     * @return string[]
+     */
+    public function getLogs()
+    {
+        return file($this->tmpFile, FILE_IGNORE_NEW_LINES);
+    }
+
+    public function testImplements()
+    {
+        $this->assertInstanceOf(LoggerInterface::class, $this->logger);
+    }
+
+    /**
+     * @dataProvider provideLevelsAndMessages
+     */
+    public function testLogsAtAllLevels($level, $message)
+    {
+        $this->logger->{$level}($message, ['user' => 'Bob']);
+        $this->logger->log($level, $message, ['user' => 'Bob']);
+
+        $expected = [
+            "[$level] message of level $level with context: Bob",
+            "[$level] message of level $level with context: Bob",
+        ];
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function provideLevelsAndMessages()
+    {
+        return [
+            LogLevel::EMERGENCY => [LogLevel::EMERGENCY, 'message of level emergency with context: {user}'],
+            LogLevel::ALERT => [LogLevel::ALERT, 'message of level alert with context: {user}'],
+            LogLevel::CRITICAL => [LogLevel::CRITICAL, 'message of level critical with context: {user}'],
+            LogLevel::ERROR => [LogLevel::ERROR, 'message of level error with context: {user}'],
+            LogLevel::WARNING => [LogLevel::WARNING, 'message of level warning with context: {user}'],
+            LogLevel::NOTICE => [LogLevel::NOTICE, 'message of level notice with context: {user}'],
+            LogLevel::INFO => [LogLevel::INFO, 'message of level info with context: {user}'],
+            LogLevel::DEBUG => [LogLevel::DEBUG, 'message of level debug with context: {user}'],
+        ];
+    }
+
+    public function testLogLevelDisabled()
+    {
+        $this->logger = new Logger(LogLevel::INFO, $this->tmpFile);
+
+        $this->logger->debug('test', ['user' => 'Bob']);
+        $this->logger->log(LogLevel::DEBUG, 'test', ['user' => 'Bob']);
+
+        // Will always be true, but asserts than an exception isn't thrown
+        $this->assertSame([], $this->getLogs());
+    }
+
+    public function testThrowsOnInvalidLevel()
+    {
+        $this->expectException('Psr\Log\InvalidArgumentException');
+        $this->logger->log('invalid level', 'Foo');
+    }
+
+    public function testThrowsOnInvalidMinLevel()
+    {
+        $this->expectException('Psr\Log\InvalidArgumentException');
+        new Logger('invalid');
+    }
+
+    public function testInvalidOutput()
+    {
+        $this->expectException('Psr\Log\InvalidArgumentException');
+        new Logger(LogLevel::DEBUG, '/');
+    }
+
+    public function testContextReplacement()
+    {
+        $logger = $this->logger;
+        $logger->info('{Message {nothing} {user} {foo.bar} a}', ['user' => 'Bob', 'foo.bar' => 'Bar']);
+
+        $expected = ['[info] {Message {nothing} Bob Bar a}'];
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function testObjectCastToString()
+    {
+        if (method_exists($this, 'createPartialMock')) {
+            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
+        } else {
+            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
+        }
+        $dummy->expects($this->atLeastOnce())
+            ->method('__toString')
+            ->willReturn('DUMMY');
+
+        $this->logger->warning($dummy);
+
+        $expected = ['[warning] DUMMY'];
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function testContextCanContainAnything()
+    {
+        $context = [
+            'bool' => true,
+            'null' => null,
+            'string' => 'Foo',
+            'int' => 0,
+            'float' => 0.5,
+            'nested' => ['with object' => new DummyTest()],
+            'object' => new \DateTime(),
+            'resource' => fopen('php://memory', 'r'),
+        ];
+
+        $this->logger->warning('Crazy context data', $context);
+
+        $expected = ['[warning] Crazy context data'];
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
+    {
+        $logger = $this->logger;
+        $logger->warning('Random message', ['exception' => 'oops']);
+        $logger->critical('Uncaught Exception!', ['exception' => new \LogicException('Fail')]);
+
+        $expected = [
+            '[warning] Random message',
+            '[critical] Uncaught Exception!',
+        ];
+        $this->assertLogsMatch($expected, $this->getLogs());
+    }
+
+    public function testFormatter()
+    {
+        $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, function ($level, $message, $context) {
+            return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).\PHP_EOL;
+        });
+
+        $this->logger->error('An error', ['foo' => 'bar']);
+        $this->logger->warning('A warning', ['baz' => 'bar']);
+        $this->assertSame([
+            '{"level":"error","message":"An error","context":{"foo":"bar"}}',
+            '{"level":"warning","message":"A warning","context":{"baz":"bar"}}',
+        ], $this->getLogs());
+    }
+}
+
+class DummyTest
+{
+    public function __toString()
+    {
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Logger.php b/lib/symfony/http-kernel/Tests/Logger.php
new file mode 100644
index 000000000..47529a2d3
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Logger.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use Psr\Log\LoggerInterface;
+
+class Logger implements LoggerInterface
+{
+    protected $logs;
+
+    public function __construct()
+    {
+        $this->clear();
+    }
+
+    /**
+     * @return array
+     */
+    public function getLogs($level = false)
+    {
+        return false === $level ? $this->logs : $this->logs[$level];
+    }
+
+    public function clear()
+    {
+        $this->logs = [
+            'emergency' => [],
+            'alert' => [],
+            'critical' => [],
+            'error' => [],
+            'warning' => [],
+            'notice' => [],
+            'info' => [],
+            'debug' => [],
+        ];
+    }
+
+    public function log($level, $message, array $context = [])
+    {
+        $this->logs[$level][] = $message;
+    }
+
+    public function emergency($message, array $context = [])
+    {
+        $this->log('emergency', $message, $context);
+    }
+
+    public function alert($message, array $context = [])
+    {
+        $this->log('alert', $message, $context);
+    }
+
+    public function critical($message, array $context = [])
+    {
+        $this->log('critical', $message, $context);
+    }
+
+    public function error($message, array $context = [])
+    {
+        $this->log('error', $message, $context);
+    }
+
+    public function warning($message, array $context = [])
+    {
+        $this->log('warning', $message, $context);
+    }
+
+    public function notice($message, array $context = [])
+    {
+        $this->log('notice', $message, $context);
+    }
+
+    public function info($message, array $context = [])
+    {
+        $this->log('info', $message, $context);
+    }
+
+    public function debug($message, array $context = [])
+    {
+        $this->log('debug', $message, $context);
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Profiler/FileProfilerStorageTest.php b/lib/symfony/http-kernel/Tests/Profiler/FileProfilerStorageTest.php
new file mode 100644
index 000000000..1cc05e41e
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Profiler/FileProfilerStorageTest.php
@@ -0,0 +1,350 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Profiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage;
+use Symfony\Component\HttpKernel\Profiler\Profile;
+
+class FileProfilerStorageTest extends TestCase
+{
+    private $tmpDir;
+    private $storage;
+
+    protected function setUp()
+    {
+        $this->tmpDir = sys_get_temp_dir().'/sf2_profiler_file_storage';
+        if (is_dir($this->tmpDir)) {
+            self::cleanDir();
+        }
+        $this->storage = new FileProfilerStorage('file:'.$this->tmpDir);
+        $this->storage->purge();
+    }
+
+    protected function tearDown()
+    {
+        self::cleanDir();
+    }
+
+    public function testStore()
+    {
+        for ($i = 0; $i < 10; ++$i) {
+            $profile = new Profile('token_'.$i);
+            $profile->setIp('127.0.0.1');
+            $profile->setUrl('http://foo.bar');
+            $profile->setMethod('GET');
+            $this->storage->write($profile);
+        }
+        $this->assertCount(10, $this->storage->find('127.0.0.1', 'http://foo.bar', 20, 'GET'), '->write() stores data in the storage');
+    }
+
+    public function testChildren()
+    {
+        $parentProfile = new Profile('token_parent');
+        $parentProfile->setIp('127.0.0.1');
+        $parentProfile->setUrl('http://foo.bar/parent');
+
+        $childProfile = new Profile('token_child');
+        $childProfile->setIp('127.0.0.1');
+        $childProfile->setUrl('http://foo.bar/child');
+
+        $parentProfile->addChild($childProfile);
+
+        $this->storage->write($parentProfile);
+        $this->storage->write($childProfile);
+
+        // Load them from storage
+        $parentProfile = $this->storage->read('token_parent');
+        $childProfile = $this->storage->read('token_child');
+
+        // Check child has link to parent
+        $this->assertNotNull($childProfile->getParent());
+        $this->assertEquals($parentProfile->getToken(), $childProfile->getParentToken());
+
+        // Check parent has child
+        $children = $parentProfile->getChildren();
+        $this->assertCount(1, $children);
+        $this->assertEquals($childProfile->getToken(), $children[0]->getToken());
+    }
+
+    public function testStoreSpecialCharsInUrl()
+    {
+        // The storage accepts special characters in URLs (Even though URLs are not
+        // supposed to contain them)
+        $profile = new Profile('simple_quote');
+        $profile->setUrl('http://foo.bar/\'');
+        $this->storage->write($profile);
+        $this->assertNotFalse($this->storage->read('simple_quote'), '->write() accepts single quotes in URL');
+
+        $profile = new Profile('double_quote');
+        $profile->setUrl('http://foo.bar/"');
+        $this->storage->write($profile);
+        $this->assertNotFalse($this->storage->read('double_quote'), '->write() accepts double quotes in URL');
+
+        $profile = new Profile('backslash');
+        $profile->setUrl('http://foo.bar/\\');
+        $this->storage->write($profile);
+        $this->assertNotFalse($this->storage->read('backslash'), '->write() accepts backslash in URL');
+
+        $profile = new Profile('comma');
+        $profile->setUrl('http://foo.bar/,');
+        $this->storage->write($profile);
+        $this->assertNotFalse($this->storage->read('comma'), '->write() accepts comma in URL');
+    }
+
+    public function testStoreDuplicateToken()
+    {
+        $profile = new Profile('token');
+        $profile->setUrl('http://example.com/');
+
+        $this->assertTrue($this->storage->write($profile), '->write() returns true when the token is unique');
+
+        $profile->setUrl('http://example.net/');
+
+        $this->assertTrue($this->storage->write($profile), '->write() returns true when the token is already present in the storage');
+        $this->assertEquals('http://example.net/', $this->storage->read('token')->getUrl(), '->write() overwrites the current profile data');
+
+        $this->assertCount(1, $this->storage->find('', '', 1000, ''), '->find() does not return the same profile twice');
+    }
+
+    public function testRetrieveByIp()
+    {
+        $profile = new Profile('token');
+        $profile->setIp('127.0.0.1');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $this->assertCount(1, $this->storage->find('127.0.0.1', '', 10, 'GET'), '->find() retrieve a record by IP');
+        $this->assertCount(0, $this->storage->find('127.0.%.1', '', 10, 'GET'), '->find() does not interpret a "%" as a wildcard in the IP');
+        $this->assertCount(0, $this->storage->find('127.0._.1', '', 10, 'GET'), '->find() does not interpret a "_" as a wildcard in the IP');
+    }
+
+    public function testRetrieveByStatusCode()
+    {
+        $profile200 = new Profile('statuscode200');
+        $profile200->setStatusCode(200);
+        $this->storage->write($profile200);
+
+        $profile404 = new Profile('statuscode404');
+        $profile404->setStatusCode(404);
+        $this->storage->write($profile404);
+
+        $this->assertCount(1, $this->storage->find(null, null, 10, null, null, null, '200'), '->find() retrieve a record by Status code 200');
+        $this->assertCount(1, $this->storage->find(null, null, 10, null, null, null, '404'), '->find() retrieve a record by Status code 404');
+    }
+
+    public function testRetrieveByUrl()
+    {
+        $profile = new Profile('simple_quote');
+        $profile->setIp('127.0.0.1');
+        $profile->setUrl('http://foo.bar/\'');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $profile = new Profile('double_quote');
+        $profile->setIp('127.0.0.1');
+        $profile->setUrl('http://foo.bar/"');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $profile = new Profile('backslash');
+        $profile->setIp('127.0.0.1');
+        $profile->setUrl('http://foo\\bar/');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $profile = new Profile('percent');
+        $profile->setIp('127.0.0.1');
+        $profile->setUrl('http://foo.bar/%');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $profile = new Profile('underscore');
+        $profile->setIp('127.0.0.1');
+        $profile->setUrl('http://foo.bar/_');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $profile = new Profile('semicolon');
+        $profile->setIp('127.0.0.1');
+        $profile->setUrl('http://foo.bar/;');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $this->assertCount(1, $this->storage->find('127.0.0.1', 'http://foo.bar/\'', 10, 'GET'), '->find() accepts single quotes in URLs');
+        $this->assertCount(1, $this->storage->find('127.0.0.1', 'http://foo.bar/"', 10, 'GET'), '->find() accepts double quotes in URLs');
+        $this->assertCount(1, $this->storage->find('127.0.0.1', 'http://foo\\bar/', 10, 'GET'), '->find() accepts backslash in URLs');
+        $this->assertCount(1, $this->storage->find('127.0.0.1', 'http://foo.bar/;', 10, 'GET'), '->find() accepts semicolon in URLs');
+        $this->assertCount(1, $this->storage->find('127.0.0.1', 'http://foo.bar/%', 10, 'GET'), '->find() does not interpret a "%" as a wildcard in the URL');
+        $this->assertCount(1, $this->storage->find('127.0.0.1', 'http://foo.bar/_', 10, 'GET'), '->find() does not interpret a "_" as a wildcard in the URL');
+    }
+
+    public function testStoreTime()
+    {
+        $dt = new \DateTime('now');
+        $start = $dt->getTimestamp();
+
+        for ($i = 0; $i < 3; ++$i) {
+            $dt->modify('+1 minute');
+            $profile = new Profile('time_'.$i);
+            $profile->setIp('127.0.0.1');
+            $profile->setUrl('http://foo.bar');
+            $profile->setTime($dt->getTimestamp());
+            $profile->setMethod('GET');
+            $this->storage->write($profile);
+        }
+
+        $records = $this->storage->find('', '', 3, 'GET', $start, time() + 3 * 60);
+        $this->assertCount(3, $records, '->find() returns all previously added records');
+        $this->assertEquals($records[0]['token'], 'time_2', '->find() returns records ordered by time in descendant order');
+        $this->assertEquals($records[1]['token'], 'time_1', '->find() returns records ordered by time in descendant order');
+        $this->assertEquals($records[2]['token'], 'time_0', '->find() returns records ordered by time in descendant order');
+
+        $records = $this->storage->find('', '', 3, 'GET', $start, time() + 2 * 60);
+        $this->assertCount(2, $records, '->find() should return only first two of the previously added records');
+    }
+
+    public function testRetrieveByEmptyUrlAndIp()
+    {
+        for ($i = 0; $i < 5; ++$i) {
+            $profile = new Profile('token_'.$i);
+            $profile->setMethod('GET');
+            $this->storage->write($profile);
+        }
+        $this->assertCount(5, $this->storage->find('', '', 10, 'GET'), '->find() returns all previously added records');
+        $this->storage->purge();
+    }
+
+    public function testRetrieveByMethodAndLimit()
+    {
+        foreach (['POST', 'GET'] as $method) {
+            for ($i = 0; $i < 5; ++$i) {
+                $profile = new Profile('token_'.$i.$method);
+                $profile->setMethod($method);
+                $this->storage->write($profile);
+            }
+        }
+
+        $this->assertCount(5, $this->storage->find('', '', 5, 'POST'));
+
+        $this->storage->purge();
+    }
+
+    public function testPurge()
+    {
+        $profile = new Profile('token1');
+        $profile->setIp('127.0.0.1');
+        $profile->setUrl('http://example.com/');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $this->assertNotFalse($this->storage->read('token1'));
+        $this->assertCount(1, $this->storage->find('127.0.0.1', '', 10, 'GET'));
+
+        $profile = new Profile('token2');
+        $profile->setIp('127.0.0.1');
+        $profile->setUrl('http://example.net/');
+        $profile->setMethod('GET');
+        $this->storage->write($profile);
+
+        $this->assertNotFalse($this->storage->read('token2'));
+        $this->assertCount(2, $this->storage->find('127.0.0.1', '', 10, 'GET'));
+
+        $this->storage->purge();
+
+        $this->assertEmpty($this->storage->read('token'), '->purge() removes all data stored by profiler');
+        $this->assertCount(0, $this->storage->find('127.0.0.1', '', 10, 'GET'), '->purge() removes all items from index');
+    }
+
+    public function testDuplicates()
+    {
+        for ($i = 1; $i <= 5; ++$i) {
+            $profile = new Profile('foo'.$i);
+            $profile->setIp('127.0.0.1');
+            $profile->setUrl('http://example.net/');
+            $profile->setMethod('GET');
+
+            ///three duplicates
+            $this->storage->write($profile);
+            $this->storage->write($profile);
+            $this->storage->write($profile);
+        }
+        $this->assertCount(3, $this->storage->find('127.0.0.1', 'http://example.net/', 3, 'GET'), '->find() method returns incorrect number of entries');
+    }
+
+    public function testStatusCode()
+    {
+        $profile = new Profile('token1');
+        $profile->setStatusCode(200);
+        $this->storage->write($profile);
+
+        $profile = new Profile('token2');
+        $profile->setStatusCode(404);
+        $this->storage->write($profile);
+
+        $tokens = $this->storage->find('', '', 10, '');
+        $this->assertCount(2, $tokens);
+        $this->assertContains($tokens[0]['status_code'], [200, 404]);
+        $this->assertContains($tokens[1]['status_code'], [200, 404]);
+    }
+
+    public function testMultiRowIndexFile()
+    {
+        $iteration = 3;
+        for ($i = 0; $i < $iteration; ++$i) {
+            $profile = new Profile('token'.$i);
+            $profile->setIp('127.0.0.'.$i);
+            $profile->setUrl('http://foo.bar/'.$i);
+
+            $this->storage->write($profile);
+            $this->storage->write($profile);
+            $this->storage->write($profile);
+        }
+
+        $handle = fopen($this->tmpDir.'/index.csv', 'r');
+        for ($i = 0; $i < $iteration; ++$i) {
+            $row = fgetcsv($handle);
+            $this->assertEquals('token'.$i, $row[0]);
+            $this->assertEquals('127.0.0.'.$i, $row[1]);
+            $this->assertEquals('http://foo.bar/'.$i, $row[3]);
+        }
+        $this->assertFalse(fgetcsv($handle));
+    }
+
+    public function testReadLineFromFile()
+    {
+        $r = new \ReflectionMethod($this->storage, 'readLineFromFile');
+
+        $r->setAccessible(true);
+
+        $h = tmpfile();
+
+        fwrite($h, "line1\n\n\nline2\n");
+        fseek($h, 0, SEEK_END);
+
+        $this->assertEquals('line2', $r->invoke($this->storage, $h));
+        $this->assertEquals('line1', $r->invoke($this->storage, $h));
+    }
+
+    protected function cleanDir()
+    {
+        $flags = \FilesystemIterator::SKIP_DOTS;
+        $iterator = new \RecursiveDirectoryIterator($this->tmpDir, $flags);
+        $iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::SELF_FIRST);
+
+        foreach ($iterator as $file) {
+            if (is_file($file)) {
+                unlink($file);
+            }
+        }
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/Profiler/ProfilerTest.php b/lib/symfony/http-kernel/Tests/Profiler/ProfilerTest.php
new file mode 100644
index 000000000..8f12e013a
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/Profiler/ProfilerTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Profiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
+use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
+use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage;
+use Symfony\Component\HttpKernel\Profiler\Profiler;
+
+class ProfilerTest extends TestCase
+{
+    private $tmp;
+    private $storage;
+
+    public function testCollect()
+    {
+        $request = new Request();
+        $request->query->set('foo', 'bar');
+        $response = new Response('', 204);
+        $collector = new RequestDataCollector();
+
+        $profiler = new Profiler($this->storage);
+        $profiler->add($collector);
+        $profile = $profiler->collect($request, $response);
+        $profiler->saveProfile($profile);
+
+        $this->assertSame(204, $profile->getStatusCode());
+        $this->assertSame('GET', $profile->getMethod());
+        $this->assertSame('bar', $profile->getCollector('request')->getRequestQuery()->all()['foo']->getValue());
+    }
+
+    public function testReset()
+    {
+        $collector = $this->getMockBuilder(DataCollectorInterface::class)
+            ->setMethods(['collect', 'getName', 'reset'])
+            ->getMock();
+        $collector->expects($this->any())->method('getName')->willReturn('mock');
+        $collector->expects($this->once())->method('reset');
+
+        $profiler = new Profiler($this->storage);
+        $profiler->add($collector);
+        $profiler->reset();
+    }
+
+    public function testFindWorksWithDates()
+    {
+        $profiler = new Profiler($this->storage);
+
+        $this->assertCount(0, $profiler->find(null, null, null, null, '7th April 2014', '9th April 2014'));
+    }
+
+    public function testFindWorksWithTimestamps()
+    {
+        $profiler = new Profiler($this->storage);
+
+        $this->assertCount(0, $profiler->find(null, null, null, null, '1396828800', '1397001600'));
+    }
+
+    public function testFindWorksWithInvalidDates()
+    {
+        $profiler = new Profiler($this->storage);
+
+        $this->assertCount(0, $profiler->find(null, null, null, null, 'some string', ''));
+    }
+
+    public function testFindWorksWithStatusCode()
+    {
+        $profiler = new Profiler($this->storage);
+
+        $this->assertCount(0, $profiler->find(null, null, null, null, null, null, '204'));
+    }
+
+    protected function setUp()
+    {
+        $this->tmp = tempnam(sys_get_temp_dir(), 'sf2_profiler');
+        if (file_exists($this->tmp)) {
+            @unlink($this->tmp);
+        }
+
+        $this->storage = new FileProfilerStorage('file:'.$this->tmp);
+        $this->storage->purge();
+    }
+
+    protected function tearDown()
+    {
+        if (null !== $this->storage) {
+            $this->storage->purge();
+            $this->storage = null;
+
+            @unlink($this->tmp);
+        }
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/TestHttpKernel.php b/lib/symfony/http-kernel/Tests/TestHttpKernel.php
new file mode 100644
index 000000000..27ba2d6f8
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/TestHttpKernel.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\HttpKernel;
+
+class TestHttpKernel extends HttpKernel implements ControllerResolverInterface, ArgumentResolverInterface
+{
+    public function __construct()
+    {
+        parent::__construct(new EventDispatcher(), $this, null, $this);
+    }
+
+    public function getController(Request $request)
+    {
+        return [$this, 'callController'];
+    }
+
+    public function getArguments(Request $request, $controller)
+    {
+        return [$request];
+    }
+
+    public function callController(Request $request)
+    {
+        return new Response('Request: '.$request->getRequestUri());
+    }
+}
diff --git a/lib/symfony/http-kernel/Tests/UriSignerTest.php b/lib/symfony/http-kernel/Tests/UriSignerTest.php
new file mode 100644
index 000000000..b2eb59206
--- /dev/null
+++ b/lib/symfony/http-kernel/Tests/UriSignerTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\UriSigner;
+
+class UriSignerTest extends TestCase
+{
+    public function testSign()
+    {
+        $signer = new UriSigner('foobar');
+
+        $this->assertStringContainsString('?_hash=', $signer->sign('http://example.com/foo'));
+        $this->assertStringContainsString('?_hash=', $signer->sign('http://example.com/foo?foo=bar'));
+        $this->assertStringContainsString('&foo=', $signer->sign('http://example.com/foo?foo=bar'));
+    }
+
+    public function testCheck()
+    {
+        $signer = new UriSigner('foobar');
+
+        $this->assertFalse($signer->check('http://example.com/foo?_hash=foo'));
+        $this->assertFalse($signer->check('http://example.com/foo?foo=bar&_hash=foo'));
+        $this->assertFalse($signer->check('http://example.com/foo?foo=bar&_hash=foo&bar=foo'));
+
+        $this->assertTrue($signer->check($signer->sign('http://example.com/foo')));
+        $this->assertTrue($signer->check($signer->sign('http://example.com/foo?foo=bar')));
+        $this->assertTrue($signer->check($signer->sign('http://example.com/foo?foo=bar&0=integer')));
+
+        $this->assertSame($signer->sign('http://example.com/foo?foo=bar&bar=foo'), $signer->sign('http://example.com/foo?bar=foo&foo=bar'));
+    }
+
+    public function testCheckWithDifferentArgSeparator()
+    {
+        $this->iniSet('arg_separator.output', '&amp;');
+        $signer = new UriSigner('foobar');
+
+        $this->assertSame(
+            'http://example.com/foo?_hash=rIOcC%2FF3DoEGo%2FvnESjSp7uU9zA9S%2F%2BOLhxgMexoPUM%3D&baz=bay&foo=bar',
+            $signer->sign('http://example.com/foo?foo=bar&baz=bay')
+        );
+        $this->assertTrue($signer->check($signer->sign('http://example.com/foo?foo=bar&baz=bay')));
+    }
+
+    public function testCheckWithDifferentParameter()
+    {
+        $signer = new UriSigner('foobar', 'qux');
+
+        $this->assertSame(
+            'http://example.com/foo?baz=bay&foo=bar&qux=rIOcC%2FF3DoEGo%2FvnESjSp7uU9zA9S%2F%2BOLhxgMexoPUM%3D',
+            $signer->sign('http://example.com/foo?foo=bar&baz=bay')
+        );
+        $this->assertTrue($signer->check($signer->sign('http://example.com/foo?foo=bar&baz=bay')));
+    }
+
+    public function testSignerWorksWithFragments()
+    {
+        $signer = new UriSigner('foobar');
+
+        $this->assertSame(
+            'http://example.com/foo?_hash=EhpAUyEobiM3QTrKxoLOtQq5IsWyWedoXDPqIjzNj5o%3D&bar=foo&foo=bar#foobar',
+            $signer->sign('http://example.com/foo?bar=foo&foo=bar#foobar')
+        );
+        $this->assertTrue($signer->check($signer->sign('http://example.com/foo?bar=foo&foo=bar#foobar')));
+    }
+}
diff --git a/lib/symfony/routing/Tests/Annotation/RouteTest.php b/lib/symfony/routing/Tests/Annotation/RouteTest.php
new file mode 100644
index 000000000..b698be8f6
--- /dev/null
+++ b/lib/symfony/routing/Tests/Annotation/RouteTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Annotation;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Annotation\Route;
+
+class RouteTest extends TestCase
+{
+    public function testInvalidRouteParameter()
+    {
+        $this->expectException('BadMethodCallException');
+        new Route(['foo' => 'bar']);
+    }
+
+    /**
+     * @dataProvider getValidParameters
+     */
+    public function testRouteParameters($parameter, $value, $getter)
+    {
+        $route = new Route([$parameter => $value]);
+        $this->assertEquals($route->$getter(), $value);
+    }
+
+    public function getValidParameters()
+    {
+        return [
+            ['value', '/Blog', 'getPath'],
+            ['requirements', ['locale' => 'en'], 'getRequirements'],
+            ['options', ['compiler_class' => 'RouteCompiler'], 'getOptions'],
+            ['name', 'blog_index', 'getName'],
+            ['defaults', ['_controller' => 'MyBlogBundle:Blog:index'], 'getDefaults'],
+            ['schemes', ['https'], 'getSchemes'],
+            ['methods', ['GET', 'POST'], 'getMethods'],
+            ['host', '{locale}.example.com', 'getHost'],
+            ['condition', 'context.getMethod() == "GET"', 'getCondition'],
+        ];
+    }
+}
diff --git a/lib/symfony/routing/Tests/CompiledRouteTest.php b/lib/symfony/routing/Tests/CompiledRouteTest.php
new file mode 100644
index 000000000..9c9f4f286
--- /dev/null
+++ b/lib/symfony/routing/Tests/CompiledRouteTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\CompiledRoute;
+
+class CompiledRouteTest extends TestCase
+{
+    public function testAccessors()
+    {
+        $compiled = new CompiledRoute('prefix', 'regex', ['tokens'], [], null, [], [], ['variables']);
+        $this->assertEquals('prefix', $compiled->getStaticPrefix(), '__construct() takes a static prefix as its second argument');
+        $this->assertEquals('regex', $compiled->getRegex(), '__construct() takes a regexp as its third argument');
+        $this->assertEquals(['tokens'], $compiled->getTokens(), '__construct() takes an array of tokens as its fourth argument');
+        $this->assertEquals(['variables'], $compiled->getVariables(), '__construct() takes an array of variables as its ninth argument');
+    }
+}
diff --git a/lib/symfony/routing/Tests/DependencyInjection/RoutingResolverPassTest.php b/lib/symfony/routing/Tests/DependencyInjection/RoutingResolverPassTest.php
new file mode 100644
index 000000000..30c7516e5
--- /dev/null
+++ b/lib/symfony/routing/Tests/DependencyInjection/RoutingResolverPassTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
+
+class RoutingResolverPassTest extends TestCase
+{
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $container->register('routing.resolver', LoaderResolver::class);
+        $container->register('loader1')->addTag('routing.loader');
+        $container->register('loader2')->addTag('routing.loader');
+
+        (new RoutingResolverPass())->process($container);
+
+        $this->assertEquals(
+            [['addLoader', [new Reference('loader1')]], ['addLoader', [new Reference('loader2')]]],
+            $container->getDefinition('routing.resolver')->getMethodCalls()
+        );
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/AbstractClass.php b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/AbstractClass.php
new file mode 100644
index 000000000..bd7ea962c
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/AbstractClass.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\AnnotatedClasses;
+
+abstract class AbstractClass
+{
+    abstract public function abstractRouteAction();
+
+    public function routeAction($arg1, $arg2 = 'defaultValue2', $arg3 = 'defaultValue3')
+    {
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/BarClass.php b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/BarClass.php
new file mode 100644
index 000000000..a3882773c
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/BarClass.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;
+
+class BarClass
+{
+    public function routeAction($arg1, $arg2 = 'defaultValue2', $arg3 = 'defaultValue3')
+    {
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/BazClass.php b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/BazClass.php
new file mode 100644
index 000000000..471968b57
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/BazClass.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;
+
+class BazClass
+{
+    public function __invoke()
+    {
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/EncodingClass.php b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/EncodingClass.php
new file mode 100644
index 000000000..dac72e3dd
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/EncodingClass.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;
+
+class EncodingClass
+{
+    public function routeÀction()
+    {
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/FooClass.php b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/FooClass.php
new file mode 100644
index 000000000..320dc3500
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/FooClass.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\AnnotatedClasses;
+
+class FooClass
+{
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php
new file mode 100644
index 000000000..c06fb43f6
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/AnnotatedClasses/FooTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;
+
+trait FooTrait
+{
+    public function doBar()
+    {
+        self::class;
+        if (true) {
+        }
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/CustomCompiledRoute.php b/lib/symfony/routing/Tests/Fixtures/CustomCompiledRoute.php
new file mode 100644
index 000000000..0f6e198c9
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/CustomCompiledRoute.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Routing\CompiledRoute;
+
+class CustomCompiledRoute extends CompiledRoute
+{
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/CustomRouteCompiler.php b/lib/symfony/routing/Tests/Fixtures/CustomRouteCompiler.php
new file mode 100644
index 000000000..22b942d7b
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/CustomRouteCompiler.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCompiler;
+
+class CustomRouteCompiler extends RouteCompiler
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function compile(Route $route)
+    {
+        return new CustomCompiledRoute('', '', [], []);
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php b/lib/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php
new file mode 100644
index 000000000..b7a02b60b
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Config\Util\XmlUtils;
+use Symfony\Component\Routing\Loader\XmlFileLoader;
+
+/**
+ * XmlFileLoader with schema validation turned off.
+ */
+class CustomXmlFileLoader extends XmlFileLoader
+{
+    protected function loadFile($file)
+    {
+        return XmlUtils::loadFile($file, function () { return true; });
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/AnonymousClassInTrait.php b/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/AnonymousClassInTrait.php
new file mode 100644
index 000000000..de8789564
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/AnonymousClassInTrait.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures\OtherAnnotatedClasses;
+
+trait AnonymousClassInTrait
+{
+    public function test()
+    {
+        return new class() {
+            public function foo()
+            {
+            }
+        };
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/NoStartTagClass.php b/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/NoStartTagClass.php
new file mode 100644
index 000000000..8900d34e5
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/NoStartTagClass.php
@@ -0,0 +1,3 @@
+class NoStartTagClass
+{
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/VariadicClass.php b/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/VariadicClass.php
new file mode 100644
index 000000000..729c9b4d0
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/OtherAnnotatedClasses/VariadicClass.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Tests\Fixtures\OtherAnnotatedClasses;
+
+class VariadicClass
+{
+    public function routeAction(...$params)
+    {
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/RedirectableUrlMatcher.php b/lib/symfony/routing/Tests/Fixtures/RedirectableUrlMatcher.php
new file mode 100644
index 000000000..79ae1cce5
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/RedirectableUrlMatcher.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Fixtures;
+
+use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class RedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatcherInterface
+{
+    public function redirect($path, $route, $scheme = null)
+    {
+        return [
+            '_controller' => 'Some controller reference...',
+            'path' => $path,
+            'scheme' => $scheme,
+        ];
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/annotated.php b/lib/symfony/routing/Tests/Fixtures/annotated.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/routing/Tests/Fixtures/bad_format.yml b/lib/symfony/routing/Tests/Fixtures/bad_format.yml
new file mode 100644
index 000000000..8ba50e2e4
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/bad_format.yml
@@ -0,0 +1,3 @@
+blog_show:
+	path:     /blog/{slug}
+	defaults: { _controller: "MyBundle:Blog:show" }
diff --git a/lib/symfony/routing/Tests/Fixtures/bar.xml b/lib/symfony/routing/Tests/Fixtures/bar.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/import__controller.xml b/lib/symfony/routing/Tests/Fixtures/controller/import__controller.xml
new file mode 100644
index 000000000..5c62914f9
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/import__controller.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <import resource="routing.xml">
+        <default key="_controller">FrameworkBundle:Template:template</default>
+    </import>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/import__controller.yml b/lib/symfony/routing/Tests/Fixtures/controller/import__controller.yml
new file mode 100644
index 000000000..4240b74dc
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/import__controller.yml
@@ -0,0 +1,4 @@
+_static:
+    resource: routing.yml
+    defaults:
+        _controller: FrameworkBundle:Template:template
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/import_controller.xml b/lib/symfony/routing/Tests/Fixtures/controller/import_controller.xml
new file mode 100644
index 000000000..8f52c4ec1
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/import_controller.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <import resource="routing.xml" controller="FrameworkBundle:Template:template" />
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/import_controller.yml b/lib/symfony/routing/Tests/Fixtures/controller/import_controller.yml
new file mode 100644
index 000000000..1a71c62b2
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/import_controller.yml
@@ -0,0 +1,3 @@
+_static:
+    resource: routing.yml
+    controller: FrameworkBundle:Template:template
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/import_override_defaults.xml b/lib/symfony/routing/Tests/Fixtures/controller/import_override_defaults.xml
new file mode 100644
index 000000000..e092500fb
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/import_override_defaults.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <import resource="routing.xml" controller="FrameworkBundle:Template:template">
+        <default key="_controller">AppBundle:Blog:index</default>
+    </import>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/import_override_defaults.yml b/lib/symfony/routing/Tests/Fixtures/controller/import_override_defaults.yml
new file mode 100644
index 000000000..db1ab3cbe
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/import_override_defaults.yml
@@ -0,0 +1,5 @@
+_static:
+    resource: routing.yml
+    controller: FrameworkBundle:Template:template
+    defaults:
+        _controller: AppBundle:Homepage:show
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/override_defaults.xml b/lib/symfony/routing/Tests/Fixtures/controller/override_defaults.xml
new file mode 100644
index 000000000..f665ddbbc
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/override_defaults.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="app_blog" path="/blog" controller="AppBundle:Homepage:show">
+        <default key="_controller">AppBundle:Blog:index</default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/override_defaults.yml b/lib/symfony/routing/Tests/Fixtures/controller/override_defaults.yml
new file mode 100644
index 000000000..00a2c0e97
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/override_defaults.yml
@@ -0,0 +1,5 @@
+app_blog:
+    path: /blog
+    controller: AppBundle:Homepage:show
+    defaults:
+        _controller: AppBundle:Blog:index
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/routing.xml b/lib/symfony/routing/Tests/Fixtures/controller/routing.xml
new file mode 100644
index 000000000..f35e3e0a8
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/routing.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="app_homepage" path="/" controller="AppBundle:Homepage:show" />
+
+    <route id="app_blog" path="/blog">
+        <default key="_controller">AppBundle:Blog:list</default>
+    </route>
+
+    <route id="app_logout" path="/logout" />
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/controller/routing.yml b/lib/symfony/routing/Tests/Fixtures/controller/routing.yml
new file mode 100644
index 000000000..cb71ec3b7
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/controller/routing.yml
@@ -0,0 +1,11 @@
+app_homepage:
+    path: /
+    controller: AppBundle:Homepage:show
+
+app_blog:
+    path: /blog
+    defaults:
+        _controller: AppBundle:Blog:list
+
+app_logout:
+    path: /logout
diff --git a/lib/symfony/routing/Tests/Fixtures/directory/recurse/routes1.yml b/lib/symfony/routing/Tests/Fixtures/directory/recurse/routes1.yml
new file mode 100644
index 000000000..d07883662
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/directory/recurse/routes1.yml
@@ -0,0 +1,2 @@
+route1:
+    path: /route/1
diff --git a/lib/symfony/routing/Tests/Fixtures/directory/recurse/routes2.yml b/lib/symfony/routing/Tests/Fixtures/directory/recurse/routes2.yml
new file mode 100644
index 000000000..938fb2457
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/directory/recurse/routes2.yml
@@ -0,0 +1,2 @@
+route2:
+    path: /route/2
diff --git a/lib/symfony/routing/Tests/Fixtures/directory/routes3.yml b/lib/symfony/routing/Tests/Fixtures/directory/routes3.yml
new file mode 100644
index 000000000..088cfb4d4
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/directory/routes3.yml
@@ -0,0 +1,2 @@
+route3:
+    path: /route/3
diff --git a/lib/symfony/routing/Tests/Fixtures/directory_import/import.yml b/lib/symfony/routing/Tests/Fixtures/directory_import/import.yml
new file mode 100644
index 000000000..af829e58c
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/directory_import/import.yml
@@ -0,0 +1,3 @@
+_directory:
+    resource: "../directory"
+    type: directory
diff --git a/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php
new file mode 100644
index 000000000..4978093fa
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php
@@ -0,0 +1,37 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = [];
+        $pathinfo = rawurldecode($rawPathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request ?: $this->createRequest($pathinfo);
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        if ('/' === $pathinfo && !$allow) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php
new file mode 100644
index 000000000..16fcc3e50
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php
@@ -0,0 +1,318 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = [];
+        $pathinfo = rawurldecode($rawPathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request ?: $this->createRequest($pathinfo);
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        if (0 === strpos($pathinfo, '/foo')) {
+            // foo
+            if (preg_match('#^/foo/(?P<bar>baz|symfony)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo']), array (  'def' => 'test',));
+            }
+
+            // foofoo
+            if ('/foofoo' === $pathinfo) {
+                return array (  'def' => 'test',  '_route' => 'foofoo',);
+            }
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/bar')) {
+            // bar
+            if (preg_match('#^/bar/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'bar']), array ());
+                if (!in_array($canonicalMethod, ['GET', 'HEAD'])) {
+                    $allow = array_merge($allow, ['GET', 'HEAD']);
+                    goto not_bar;
+                }
+
+                return $ret;
+            }
+            not_bar:
+
+            // barhead
+            if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'barhead']), array ());
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_barhead;
+                }
+
+                return $ret;
+            }
+            not_barhead:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/test')) {
+            if (0 === strpos($pathinfo, '/test/baz')) {
+                // baz
+                if ('/test/baz' === $pathinfo) {
+                    return ['_route' => 'baz'];
+                }
+
+                // baz2
+                if ('/test/baz.html' === $pathinfo) {
+                    return ['_route' => 'baz2'];
+                }
+
+                // baz3
+                if ('/test/baz3/' === $pathinfo) {
+                    return ['_route' => 'baz3'];
+                }
+
+            }
+
+            // baz4
+            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'baz4']), array ());
+            }
+
+            // baz5
+            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz5']), array ());
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_baz5;
+                }
+
+                return $ret;
+            }
+            not_baz5:
+
+            // baz.baz6
+            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz.baz6']), array ());
+                if (!in_array($requestMethod, ['PUT'])) {
+                    $allow = array_merge($allow, ['PUT']);
+                    goto not_bazbaz6;
+                }
+
+                return $ret;
+            }
+            not_bazbaz6:
+
+        }
+
+        // quoter
+        if (preg_match('#^/(?P<quoter>[\']+)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'quoter']), array ());
+        }
+
+        // space
+        if ('/spa ce' === $pathinfo) {
+            return ['_route' => 'space'];
+        }
+
+        if (0 === strpos($pathinfo, '/a')) {
+            if (0 === strpos($pathinfo, '/a/b\'b')) {
+                // foo1
+                if (preg_match('#^/a/b\'b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo1']), array ());
+                }
+
+                // bar1
+                if (preg_match('#^/a/b\'b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar1']), array ());
+                }
+
+            }
+
+            // overridden
+            if (preg_match('#^/a/(?P<var>.*)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'overridden']), array ());
+            }
+
+            if (0 === strpos($pathinfo, '/a/b\'b')) {
+                // foo2
+                if (preg_match('#^/a/b\'b/(?P<foo1>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo2']), array ());
+                }
+
+                // bar2
+                if (preg_match('#^/a/b\'b/(?P<bar1>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar2']), array ());
+                }
+
+            }
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/multi')) {
+            // helloWorld
+            if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P<who>[^/]++))?$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'helloWorld']), array (  'who' => 'World!',));
+            }
+
+            // hey
+            if ('/multi/hey/' === $pathinfo) {
+                return ['_route' => 'hey'];
+            }
+
+            // overridden2
+            if ('/multi/new' === $pathinfo) {
+                return ['_route' => 'overridden2'];
+            }
+
+        }
+
+        // foo3
+        if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo3']), array ());
+        }
+
+        // bar3
+        if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar3']), array ());
+        }
+
+        if (0 === strpos($pathinfo, '/aba')) {
+            // ababa
+            if ('/ababa' === $pathinfo) {
+                return ['_route' => 'ababa'];
+            }
+
+            // foo4
+            if (preg_match('#^/aba/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo4']), array ());
+            }
+
+        }
+
+        $host = $context->getHost();
+
+        if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route1
+            if ('/route1' === $pathinfo) {
+                return ['_route' => 'route1'];
+            }
+
+            // route2
+            if ('/c2/route2' === $pathinfo) {
+                return ['_route' => 'route2'];
+            }
+
+        }
+
+        if (preg_match('#^b\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route3
+            if ('/c2/route3' === $pathinfo) {
+                return ['_route' => 'route3'];
+            }
+
+        }
+
+        if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route4
+            if ('/route4' === $pathinfo) {
+                return ['_route' => 'route4'];
+            }
+
+        }
+
+        if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route5
+            if ('/route5' === $pathinfo) {
+                return ['_route' => 'route5'];
+            }
+
+        }
+
+        // route6
+        if ('/route6' === $pathinfo) {
+            return ['_route' => 'route6'];
+        }
+
+        if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', $host, $hostMatches)) {
+            if (0 === strpos($pathinfo, '/route1')) {
+                // route11
+                if ('/route11' === $pathinfo) {
+                    return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route11']), array ());
+                }
+
+                // route12
+                if ('/route12' === $pathinfo) {
+                    return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route12']), array (  'var1' => 'val',));
+                }
+
+                // route13
+                if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route13']), array ());
+                }
+
+                // route14
+                if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route14']), array (  'var1' => 'val',));
+                }
+
+            }
+
+        }
+
+        if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route15
+            if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'route15']), array ());
+            }
+
+        }
+
+        // route16
+        if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'route16']), array (  'var1' => 'val',));
+        }
+
+        // route17
+        if ('/route17' === $pathinfo) {
+            return ['_route' => 'route17'];
+        }
+
+        // a
+        if ('/a/a...' === $pathinfo) {
+            return ['_route' => 'a'];
+        }
+
+        if (0 === strpos($pathinfo, '/a/b')) {
+            // b
+            if (preg_match('#^/a/b/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'b']), array ());
+            }
+
+            // c
+            if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'c']), array ());
+            }
+
+        }
+
+        if ('/' === $pathinfo && !$allow) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php
new file mode 100644
index 000000000..2b80be57a
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php
@@ -0,0 +1,380 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = [];
+        $pathinfo = rawurldecode($rawPathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request ?: $this->createRequest($pathinfo);
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        if (0 === strpos($pathinfo, '/foo')) {
+            // foo
+            if (preg_match('#^/foo/(?P<bar>baz|symfony)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo']), array (  'def' => 'test',));
+            }
+
+            // foofoo
+            if ('/foofoo' === $pathinfo) {
+                return array (  'def' => 'test',  '_route' => 'foofoo',);
+            }
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/bar')) {
+            // bar
+            if (preg_match('#^/bar/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'bar']), array ());
+                if (!in_array($canonicalMethod, ['GET', 'HEAD'])) {
+                    $allow = array_merge($allow, ['GET', 'HEAD']);
+                    goto not_bar;
+                }
+
+                return $ret;
+            }
+            not_bar:
+
+            // barhead
+            if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'barhead']), array ());
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_barhead;
+                }
+
+                return $ret;
+            }
+            not_barhead:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/test')) {
+            if (0 === strpos($pathinfo, '/test/baz')) {
+                // baz
+                if ('/test/baz' === $pathinfo) {
+                    return ['_route' => 'baz'];
+                }
+
+                // baz2
+                if ('/test/baz.html' === $pathinfo) {
+                    return ['_route' => 'baz2'];
+                }
+
+                // baz3
+                if ('/test/baz3' === $trimmedPathinfo) {
+                    $ret = ['_route' => 'baz3'];
+                    if ('/' === substr($pathinfo, -1)) {
+                        // no-op
+                    } elseif ('GET' !== $canonicalMethod) {
+                        goto not_baz3;
+                    } else {
+                        return array_replace($ret, $this->redirect($rawPathinfo.'/', 'baz3'));
+                    }
+
+                    return $ret;
+                }
+                not_baz3:
+
+            }
+
+            // baz4
+            if (preg_match('#^/test/(?P<foo>[^/]++)/?$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz4']), array ());
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_baz4;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'baz4'));
+                }
+
+                return $ret;
+            }
+            not_baz4:
+
+            // baz5
+            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz5']), array ());
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_baz5;
+                }
+
+                return $ret;
+            }
+            not_baz5:
+
+            // baz.baz6
+            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz.baz6']), array ());
+                if (!in_array($requestMethod, ['PUT'])) {
+                    $allow = array_merge($allow, ['PUT']);
+                    goto not_bazbaz6;
+                }
+
+                return $ret;
+            }
+            not_bazbaz6:
+
+        }
+
+        // quoter
+        if (preg_match('#^/(?P<quoter>[\']+)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'quoter']), array ());
+        }
+
+        // space
+        if ('/spa ce' === $pathinfo) {
+            return ['_route' => 'space'];
+        }
+
+        if (0 === strpos($pathinfo, '/a')) {
+            if (0 === strpos($pathinfo, '/a/b\'b')) {
+                // foo1
+                if (preg_match('#^/a/b\'b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo1']), array ());
+                }
+
+                // bar1
+                if (preg_match('#^/a/b\'b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar1']), array ());
+                }
+
+            }
+
+            // overridden
+            if (preg_match('#^/a/(?P<var>.*)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'overridden']), array ());
+            }
+
+            if (0 === strpos($pathinfo, '/a/b\'b')) {
+                // foo2
+                if (preg_match('#^/a/b\'b/(?P<foo1>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo2']), array ());
+                }
+
+                // bar2
+                if (preg_match('#^/a/b\'b/(?P<bar1>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar2']), array ());
+                }
+
+            }
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/multi')) {
+            // helloWorld
+            if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P<who>[^/]++))?$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'helloWorld']), array (  'who' => 'World!',));
+            }
+
+            // hey
+            if ('/multi/hey' === $trimmedPathinfo) {
+                $ret = ['_route' => 'hey'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_hey;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'hey'));
+                }
+
+                return $ret;
+            }
+            not_hey:
+
+            // overridden2
+            if ('/multi/new' === $pathinfo) {
+                return ['_route' => 'overridden2'];
+            }
+
+        }
+
+        // foo3
+        if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo3']), array ());
+        }
+
+        // bar3
+        if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar3']), array ());
+        }
+
+        if (0 === strpos($pathinfo, '/aba')) {
+            // ababa
+            if ('/ababa' === $pathinfo) {
+                return ['_route' => 'ababa'];
+            }
+
+            // foo4
+            if (preg_match('#^/aba/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo4']), array ());
+            }
+
+        }
+
+        $host = $context->getHost();
+
+        if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route1
+            if ('/route1' === $pathinfo) {
+                return ['_route' => 'route1'];
+            }
+
+            // route2
+            if ('/c2/route2' === $pathinfo) {
+                return ['_route' => 'route2'];
+            }
+
+        }
+
+        if (preg_match('#^b\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route3
+            if ('/c2/route3' === $pathinfo) {
+                return ['_route' => 'route3'];
+            }
+
+        }
+
+        if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route4
+            if ('/route4' === $pathinfo) {
+                return ['_route' => 'route4'];
+            }
+
+        }
+
+        if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route5
+            if ('/route5' === $pathinfo) {
+                return ['_route' => 'route5'];
+            }
+
+        }
+
+        // route6
+        if ('/route6' === $pathinfo) {
+            return ['_route' => 'route6'];
+        }
+
+        if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', $host, $hostMatches)) {
+            if (0 === strpos($pathinfo, '/route1')) {
+                // route11
+                if ('/route11' === $pathinfo) {
+                    return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route11']), array ());
+                }
+
+                // route12
+                if ('/route12' === $pathinfo) {
+                    return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route12']), array (  'var1' => 'val',));
+                }
+
+                // route13
+                if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route13']), array ());
+                }
+
+                // route14
+                if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
+                    return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route14']), array (  'var1' => 'val',));
+                }
+
+            }
+
+        }
+
+        if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
+            // route15
+            if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'route15']), array ());
+            }
+
+        }
+
+        // route16
+        if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'route16']), array (  'var1' => 'val',));
+        }
+
+        // route17
+        if ('/route17' === $pathinfo) {
+            return ['_route' => 'route17'];
+        }
+
+        // a
+        if ('/a/a...' === $pathinfo) {
+            return ['_route' => 'a'];
+        }
+
+        if (0 === strpos($pathinfo, '/a/b')) {
+            // b
+            if (preg_match('#^/a/b/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'b']), array ());
+            }
+
+            // c
+            if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'c']), array ());
+            }
+
+        }
+
+        // secure
+        if ('/secure' === $pathinfo) {
+            $ret = ['_route' => 'secure'];
+            $requiredSchemes = array (  'https' => 0,);
+            if (!isset($requiredSchemes[$context->getScheme()])) {
+                if ('GET' !== $canonicalMethod) {
+                    goto not_secure;
+                }
+
+                return array_replace($ret, $this->redirect($rawPathinfo, 'secure', key($requiredSchemes)));
+            }
+
+            return $ret;
+        }
+        not_secure:
+
+        // nonsecure
+        if ('/nonsecure' === $pathinfo) {
+            $ret = ['_route' => 'nonsecure'];
+            $requiredSchemes = array (  'http' => 0,);
+            if (!isset($requiredSchemes[$context->getScheme()])) {
+                if ('GET' !== $canonicalMethod) {
+                    goto not_nonsecure;
+                }
+
+                return array_replace($ret, $this->redirect($rawPathinfo, 'nonsecure', key($requiredSchemes)));
+            }
+
+            return $ret;
+        }
+        not_nonsecure:
+
+        if ('/' === $pathinfo && !$allow) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php
new file mode 100644
index 000000000..03e540f69
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php
@@ -0,0 +1,55 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = [];
+        $pathinfo = rawurldecode($rawPathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request ?: $this->createRequest($pathinfo);
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        if (0 === strpos($pathinfo, '/rootprefix')) {
+            // static
+            if ('/rootprefix/test' === $pathinfo) {
+                return ['_route' => 'static'];
+            }
+
+            // dynamic
+            if (preg_match('#^/rootprefix/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'dynamic']), array ());
+            }
+
+        }
+
+        // with-condition
+        if ('/with-condition' === $pathinfo && ($context->getMethod() == "GET")) {
+            return ['_route' => 'with-condition'];
+        }
+
+        if ('/' === $pathinfo && !$allow) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php
new file mode 100644
index 000000000..2585f12fe
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php
@@ -0,0 +1,112 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = [];
+        $pathinfo = rawurldecode($rawPathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request ?: $this->createRequest($pathinfo);
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        // just_head
+        if ('/just_head' === $pathinfo) {
+            $ret = ['_route' => 'just_head'];
+            if (!in_array($requestMethod, ['HEAD'])) {
+                $allow = array_merge($allow, ['HEAD']);
+                goto not_just_head;
+            }
+
+            return $ret;
+        }
+        not_just_head:
+
+        // head_and_get
+        if ('/head_and_get' === $pathinfo) {
+            $ret = ['_route' => 'head_and_get'];
+            if (!in_array($canonicalMethod, ['HEAD', 'GET'])) {
+                $allow = array_merge($allow, ['HEAD', 'GET']);
+                goto not_head_and_get;
+            }
+
+            return $ret;
+        }
+        not_head_and_get:
+
+        // get_and_head
+        if ('/get_and_head' === $pathinfo) {
+            $ret = ['_route' => 'get_and_head'];
+            if (!in_array($canonicalMethod, ['GET', 'HEAD'])) {
+                $allow = array_merge($allow, ['GET', 'HEAD']);
+                goto not_get_and_head;
+            }
+
+            return $ret;
+        }
+        not_get_and_head:
+
+        // post_and_head
+        if ('/post_and_head' === $pathinfo) {
+            $ret = ['_route' => 'post_and_head'];
+            if (!in_array($requestMethod, ['POST', 'HEAD'])) {
+                $allow = array_merge($allow, ['POST', 'HEAD']);
+                goto not_post_and_head;
+            }
+
+            return $ret;
+        }
+        not_post_and_head:
+
+        if (0 === strpos($pathinfo, '/put_and_post')) {
+            // put_and_post
+            if ('/put_and_post' === $pathinfo) {
+                $ret = ['_route' => 'put_and_post'];
+                if (!in_array($requestMethod, ['PUT', 'POST'])) {
+                    $allow = array_merge($allow, ['PUT', 'POST']);
+                    goto not_put_and_post;
+                }
+
+                return $ret;
+            }
+            not_put_and_post:
+
+            // put_and_get_and_head
+            if ('/put_and_post' === $pathinfo) {
+                $ret = ['_route' => 'put_and_get_and_head'];
+                if (!in_array($canonicalMethod, ['PUT', 'GET', 'HEAD'])) {
+                    $allow = array_merge($allow, ['PUT', 'GET', 'HEAD']);
+                    goto not_put_and_get_and_head;
+                }
+
+                return $ret;
+            }
+            not_put_and_get_and_head:
+
+        }
+
+        if ('/' === $pathinfo && !$allow) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php
new file mode 100644
index 000000000..ba0622343
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php
@@ -0,0 +1,209 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = [];
+        $pathinfo = rawurldecode($rawPathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request ?: $this->createRequest($pathinfo);
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        if (0 === strpos($pathinfo, '/a')) {
+            // a_first
+            if ('/a/11' === $pathinfo) {
+                return ['_route' => 'a_first'];
+            }
+
+            // a_second
+            if ('/a/22' === $pathinfo) {
+                return ['_route' => 'a_second'];
+            }
+
+            // a_third
+            if ('/a/333' === $pathinfo) {
+                return ['_route' => 'a_third'];
+            }
+
+        }
+
+        // a_wildcard
+        if (preg_match('#^/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'a_wildcard']), array ());
+        }
+
+        if (0 === strpos($pathinfo, '/a')) {
+            // a_fourth
+            if ('/a/44' === $trimmedPathinfo) {
+                $ret = ['_route' => 'a_fourth'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_a_fourth;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_fourth'));
+                }
+
+                return $ret;
+            }
+            not_a_fourth:
+
+            // a_fifth
+            if ('/a/55' === $trimmedPathinfo) {
+                $ret = ['_route' => 'a_fifth'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_a_fifth;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_fifth'));
+                }
+
+                return $ret;
+            }
+            not_a_fifth:
+
+            // a_sixth
+            if ('/a/66' === $trimmedPathinfo) {
+                $ret = ['_route' => 'a_sixth'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_a_sixth;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_sixth'));
+                }
+
+                return $ret;
+            }
+            not_a_sixth:
+
+        }
+
+        // nested_wildcard
+        if (0 === strpos($pathinfo, '/nested') && preg_match('#^/nested/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+            return $this->mergeDefaults(array_replace($matches, ['_route' => 'nested_wildcard']), array ());
+        }
+
+        if (0 === strpos($pathinfo, '/nested/group')) {
+            // nested_a
+            if ('/nested/group/a' === $trimmedPathinfo) {
+                $ret = ['_route' => 'nested_a'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_nested_a;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_a'));
+                }
+
+                return $ret;
+            }
+            not_nested_a:
+
+            // nested_b
+            if ('/nested/group/b' === $trimmedPathinfo) {
+                $ret = ['_route' => 'nested_b'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_nested_b;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_b'));
+                }
+
+                return $ret;
+            }
+            not_nested_b:
+
+            // nested_c
+            if ('/nested/group/c' === $trimmedPathinfo) {
+                $ret = ['_route' => 'nested_c'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_nested_c;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_c'));
+                }
+
+                return $ret;
+            }
+            not_nested_c:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/slashed/group')) {
+            // slashed_a
+            if ('/slashed/group' === $trimmedPathinfo) {
+                $ret = ['_route' => 'slashed_a'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_slashed_a;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_a'));
+                }
+
+                return $ret;
+            }
+            not_slashed_a:
+
+            // slashed_b
+            if ('/slashed/group/b' === $trimmedPathinfo) {
+                $ret = ['_route' => 'slashed_b'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_slashed_b;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_b'));
+                }
+
+                return $ret;
+            }
+            not_slashed_b:
+
+            // slashed_c
+            if ('/slashed/group/c' === $trimmedPathinfo) {
+                $ret = ['_route' => 'slashed_c'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_slashed_c;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_c'));
+                }
+
+                return $ret;
+            }
+            not_slashed_c:
+
+        }
+
+        if ('/' === $pathinfo && !$allow) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php
new file mode 100644
index 000000000..a668f09d9
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php
@@ -0,0 +1,213 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = [];
+        $pathinfo = rawurldecode($rawPathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request ?: $this->createRequest($pathinfo);
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        if (0 === strpos($pathinfo, '/trailing/simple')) {
+            // simple_trailing_slash_no_methods
+            if ('/trailing/simple/no-methods/' === $pathinfo) {
+                return ['_route' => 'simple_trailing_slash_no_methods'];
+            }
+
+            // simple_trailing_slash_GET_method
+            if ('/trailing/simple/get-method/' === $pathinfo) {
+                $ret = ['_route' => 'simple_trailing_slash_GET_method'];
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_simple_trailing_slash_GET_method;
+                }
+
+                return $ret;
+            }
+            not_simple_trailing_slash_GET_method:
+
+            // simple_trailing_slash_HEAD_method
+            if ('/trailing/simple/head-method/' === $pathinfo) {
+                $ret = ['_route' => 'simple_trailing_slash_HEAD_method'];
+                if (!in_array($requestMethod, ['HEAD'])) {
+                    $allow = array_merge($allow, ['HEAD']);
+                    goto not_simple_trailing_slash_HEAD_method;
+                }
+
+                return $ret;
+            }
+            not_simple_trailing_slash_HEAD_method:
+
+            // simple_trailing_slash_POST_method
+            if ('/trailing/simple/post-method/' === $pathinfo) {
+                $ret = ['_route' => 'simple_trailing_slash_POST_method'];
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_simple_trailing_slash_POST_method;
+                }
+
+                return $ret;
+            }
+            not_simple_trailing_slash_POST_method:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/trailing/regex')) {
+            // regex_trailing_slash_no_methods
+            if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_no_methods']), array ());
+            }
+
+            // regex_trailing_slash_GET_method
+            if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_GET_method']), array ());
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_regex_trailing_slash_GET_method;
+                }
+
+                return $ret;
+            }
+            not_regex_trailing_slash_GET_method:
+
+            // regex_trailing_slash_HEAD_method
+            if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_HEAD_method']), array ());
+                if (!in_array($requestMethod, ['HEAD'])) {
+                    $allow = array_merge($allow, ['HEAD']);
+                    goto not_regex_trailing_slash_HEAD_method;
+                }
+
+                return $ret;
+            }
+            not_regex_trailing_slash_HEAD_method:
+
+            // regex_trailing_slash_POST_method
+            if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_POST_method']), array ());
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_regex_trailing_slash_POST_method;
+                }
+
+                return $ret;
+            }
+            not_regex_trailing_slash_POST_method:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/not-trailing/simple')) {
+            // simple_not_trailing_slash_no_methods
+            if ('/not-trailing/simple/no-methods' === $pathinfo) {
+                return ['_route' => 'simple_not_trailing_slash_no_methods'];
+            }
+
+            // simple_not_trailing_slash_GET_method
+            if ('/not-trailing/simple/get-method' === $pathinfo) {
+                $ret = ['_route' => 'simple_not_trailing_slash_GET_method'];
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_simple_not_trailing_slash_GET_method;
+                }
+
+                return $ret;
+            }
+            not_simple_not_trailing_slash_GET_method:
+
+            // simple_not_trailing_slash_HEAD_method
+            if ('/not-trailing/simple/head-method' === $pathinfo) {
+                $ret = ['_route' => 'simple_not_trailing_slash_HEAD_method'];
+                if (!in_array($requestMethod, ['HEAD'])) {
+                    $allow = array_merge($allow, ['HEAD']);
+                    goto not_simple_not_trailing_slash_HEAD_method;
+                }
+
+                return $ret;
+            }
+            not_simple_not_trailing_slash_HEAD_method:
+
+            // simple_not_trailing_slash_POST_method
+            if ('/not-trailing/simple/post-method' === $pathinfo) {
+                $ret = ['_route' => 'simple_not_trailing_slash_POST_method'];
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_simple_not_trailing_slash_POST_method;
+                }
+
+                return $ret;
+            }
+            not_simple_not_trailing_slash_POST_method:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/not-trailing/regex')) {
+            // regex_not_trailing_slash_no_methods
+            if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_no_methods']), array ());
+            }
+
+            // regex_not_trailing_slash_GET_method
+            if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_GET_method']), array ());
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_regex_not_trailing_slash_GET_method;
+                }
+
+                return $ret;
+            }
+            not_regex_not_trailing_slash_GET_method:
+
+            // regex_not_trailing_slash_HEAD_method
+            if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_HEAD_method']), array ());
+                if (!in_array($requestMethod, ['HEAD'])) {
+                    $allow = array_merge($allow, ['HEAD']);
+                    goto not_regex_not_trailing_slash_HEAD_method;
+                }
+
+                return $ret;
+            }
+            not_regex_not_trailing_slash_HEAD_method:
+
+            // regex_not_trailing_slash_POST_method
+            if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_POST_method']), array ());
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_regex_not_trailing_slash_POST_method;
+                }
+
+                return $ret;
+            }
+            not_regex_not_trailing_slash_POST_method:
+
+        }
+
+        if ('/' === $pathinfo && !$allow) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php
new file mode 100644
index 000000000..c7f8852c5
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php
@@ -0,0 +1,249 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = [];
+        $pathinfo = rawurldecode($rawPathinfo);
+        $trimmedPathinfo = rtrim($pathinfo, '/');
+        $context = $this->context;
+        $request = $this->request ?: $this->createRequest($pathinfo);
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        if (0 === strpos($pathinfo, '/trailing/simple')) {
+            // simple_trailing_slash_no_methods
+            if ('/trailing/simple/no-methods' === $trimmedPathinfo) {
+                $ret = ['_route' => 'simple_trailing_slash_no_methods'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_simple_trailing_slash_no_methods;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_no_methods'));
+                }
+
+                return $ret;
+            }
+            not_simple_trailing_slash_no_methods:
+
+            // simple_trailing_slash_GET_method
+            if ('/trailing/simple/get-method' === $trimmedPathinfo) {
+                $ret = ['_route' => 'simple_trailing_slash_GET_method'];
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_simple_trailing_slash_GET_method;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_GET_method'));
+                }
+
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_simple_trailing_slash_GET_method;
+                }
+
+                return $ret;
+            }
+            not_simple_trailing_slash_GET_method:
+
+            // simple_trailing_slash_HEAD_method
+            if ('/trailing/simple/head-method/' === $pathinfo) {
+                $ret = ['_route' => 'simple_trailing_slash_HEAD_method'];
+                if (!in_array($requestMethod, ['HEAD'])) {
+                    $allow = array_merge($allow, ['HEAD']);
+                    goto not_simple_trailing_slash_HEAD_method;
+                }
+
+                return $ret;
+            }
+            not_simple_trailing_slash_HEAD_method:
+
+            // simple_trailing_slash_POST_method
+            if ('/trailing/simple/post-method/' === $pathinfo) {
+                $ret = ['_route' => 'simple_trailing_slash_POST_method'];
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_simple_trailing_slash_POST_method;
+                }
+
+                return $ret;
+            }
+            not_simple_trailing_slash_POST_method:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/trailing/regex')) {
+            // regex_trailing_slash_no_methods
+            if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P<param>[^/]++)/?$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_no_methods']), array ());
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_regex_trailing_slash_no_methods;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_no_methods'));
+                }
+
+                return $ret;
+            }
+            not_regex_trailing_slash_no_methods:
+
+            // regex_trailing_slash_GET_method
+            if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P<param>[^/]++)/?$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_GET_method']), array ());
+                if ('/' === substr($pathinfo, -1)) {
+                    // no-op
+                } elseif ('GET' !== $canonicalMethod) {
+                    goto not_regex_trailing_slash_GET_method;
+                } else {
+                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_GET_method'));
+                }
+
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_regex_trailing_slash_GET_method;
+                }
+
+                return $ret;
+            }
+            not_regex_trailing_slash_GET_method:
+
+            // regex_trailing_slash_HEAD_method
+            if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_HEAD_method']), array ());
+                if (!in_array($requestMethod, ['HEAD'])) {
+                    $allow = array_merge($allow, ['HEAD']);
+                    goto not_regex_trailing_slash_HEAD_method;
+                }
+
+                return $ret;
+            }
+            not_regex_trailing_slash_HEAD_method:
+
+            // regex_trailing_slash_POST_method
+            if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_POST_method']), array ());
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_regex_trailing_slash_POST_method;
+                }
+
+                return $ret;
+            }
+            not_regex_trailing_slash_POST_method:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/not-trailing/simple')) {
+            // simple_not_trailing_slash_no_methods
+            if ('/not-trailing/simple/no-methods' === $pathinfo) {
+                return ['_route' => 'simple_not_trailing_slash_no_methods'];
+            }
+
+            // simple_not_trailing_slash_GET_method
+            if ('/not-trailing/simple/get-method' === $pathinfo) {
+                $ret = ['_route' => 'simple_not_trailing_slash_GET_method'];
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_simple_not_trailing_slash_GET_method;
+                }
+
+                return $ret;
+            }
+            not_simple_not_trailing_slash_GET_method:
+
+            // simple_not_trailing_slash_HEAD_method
+            if ('/not-trailing/simple/head-method' === $pathinfo) {
+                $ret = ['_route' => 'simple_not_trailing_slash_HEAD_method'];
+                if (!in_array($requestMethod, ['HEAD'])) {
+                    $allow = array_merge($allow, ['HEAD']);
+                    goto not_simple_not_trailing_slash_HEAD_method;
+                }
+
+                return $ret;
+            }
+            not_simple_not_trailing_slash_HEAD_method:
+
+            // simple_not_trailing_slash_POST_method
+            if ('/not-trailing/simple/post-method' === $pathinfo) {
+                $ret = ['_route' => 'simple_not_trailing_slash_POST_method'];
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_simple_not_trailing_slash_POST_method;
+                }
+
+                return $ret;
+            }
+            not_simple_not_trailing_slash_POST_method:
+
+        }
+
+        elseif (0 === strpos($pathinfo, '/not-trailing/regex')) {
+            // regex_not_trailing_slash_no_methods
+            if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+                return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_no_methods']), array ());
+            }
+
+            // regex_not_trailing_slash_GET_method
+            if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_GET_method']), array ());
+                if (!in_array($canonicalMethod, ['GET'])) {
+                    $allow = array_merge($allow, ['GET']);
+                    goto not_regex_not_trailing_slash_GET_method;
+                }
+
+                return $ret;
+            }
+            not_regex_not_trailing_slash_GET_method:
+
+            // regex_not_trailing_slash_HEAD_method
+            if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_HEAD_method']), array ());
+                if (!in_array($requestMethod, ['HEAD'])) {
+                    $allow = array_merge($allow, ['HEAD']);
+                    goto not_regex_not_trailing_slash_HEAD_method;
+                }
+
+                return $ret;
+            }
+            not_regex_not_trailing_slash_HEAD_method:
+
+            // regex_not_trailing_slash_POST_method
+            if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
+                $ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_POST_method']), array ());
+                if (!in_array($requestMethod, ['POST'])) {
+                    $allow = array_merge($allow, ['POST']);
+                    goto not_regex_not_trailing_slash_POST_method;
+                }
+
+                return $ret;
+            }
+            not_regex_not_trailing_slash_POST_method:
+
+        }
+
+        if ('/' === $pathinfo && !$allow) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Fixtures/empty.yml b/lib/symfony/routing/Tests/Fixtures/empty.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/routing/Tests/Fixtures/file_resource.yml b/lib/symfony/routing/Tests/Fixtures/file_resource.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/routing/Tests/Fixtures/foo.xml b/lib/symfony/routing/Tests/Fixtures/foo.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/routing/Tests/Fixtures/foo1.xml b/lib/symfony/routing/Tests/Fixtures/foo1.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/bar.xml b/lib/symfony/routing/Tests/Fixtures/glob/bar.xml
new file mode 100644
index 000000000..8a0410c5e
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/bar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="bar_route" path="/bar" controller="AppBundle:Bar:view" />
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/bar.yml b/lib/symfony/routing/Tests/Fixtures/glob/bar.yml
new file mode 100644
index 000000000..ba3bc2294
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/bar.yml
@@ -0,0 +1,4 @@
+bar_route:
+    path: /bar
+    defaults:
+        _controller: AppBundle:Bar:view
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/baz.xml b/lib/symfony/routing/Tests/Fixtures/glob/baz.xml
new file mode 100644
index 000000000..4b48a0f3d
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/baz.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="baz_route" path="/baz" controller="AppBundle:Baz:view" />
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/baz.yml b/lib/symfony/routing/Tests/Fixtures/glob/baz.yml
new file mode 100644
index 000000000..f7d8c67f2
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/baz.yml
@@ -0,0 +1,4 @@
+baz_route:
+    path: /baz
+    defaults:
+        _controller: AppBundle:Baz:view
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/import_multiple.xml b/lib/symfony/routing/Tests/Fixtures/glob/import_multiple.xml
new file mode 100644
index 000000000..a08e96d65
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/import_multiple.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <import resource="ba?.xml" />
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/import_multiple.yml b/lib/symfony/routing/Tests/Fixtures/glob/import_multiple.yml
new file mode 100644
index 000000000..d1ae5854a
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/import_multiple.yml
@@ -0,0 +1,2 @@
+_static:
+    resource: ba?.yml
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/import_single.xml b/lib/symfony/routing/Tests/Fixtures/glob/import_single.xml
new file mode 100644
index 000000000..3b26eef11
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/import_single.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <import resource="b?r.xml" />
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/import_single.yml b/lib/symfony/routing/Tests/Fixtures/glob/import_single.yml
new file mode 100644
index 000000000..f56ddbd0b
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/import_single.yml
@@ -0,0 +1,2 @@
+_static:
+    resource: b?r.yml
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/php_dsl.php b/lib/symfony/routing/Tests/Fixtures/glob/php_dsl.php
new file mode 100644
index 000000000..897fa11f2
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/php_dsl.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    return $routes->import('php_dsl_ba?.php');
+};
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/php_dsl_bar.php b/lib/symfony/routing/Tests/Fixtures/glob/php_dsl_bar.php
new file mode 100644
index 000000000..e6ccf24f4
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/php_dsl_bar.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    $collection = $routes->collection();
+
+    $collection->add('bar_route', '/bar')
+        ->defaults(['_controller' => 'AppBundle:Bar:view']);
+
+    return $collection;
+};
diff --git a/lib/symfony/routing/Tests/Fixtures/glob/php_dsl_baz.php b/lib/symfony/routing/Tests/Fixtures/glob/php_dsl_baz.php
new file mode 100644
index 000000000..cce65d705
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/glob/php_dsl_baz.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    $collection = $routes->collection();
+
+    $collection->add('baz_route', '/baz')
+        ->defaults(['_controller' => 'AppBundle:Baz:view']);
+
+    return $collection;
+};
diff --git a/lib/symfony/routing/Tests/Fixtures/incomplete.yml b/lib/symfony/routing/Tests/Fixtures/incomplete.yml
new file mode 100644
index 000000000..df64d324f
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/incomplete.yml
@@ -0,0 +1,2 @@
+blog_show:
+    defaults:  { _controller: MyBlogBundle:Blog:show }
diff --git a/lib/symfony/routing/Tests/Fixtures/list_defaults.xml b/lib/symfony/routing/Tests/Fixtures/list_defaults.xml
new file mode 100644
index 000000000..01be7c186
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/list_defaults.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="values">
+            <list>
+                <bool>true</bool>
+                <int>1</int>
+                <float>3.5</float>
+                <string>foo</string>
+            </list>
+        </default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/list_in_list_defaults.xml b/lib/symfony/routing/Tests/Fixtures/list_in_list_defaults.xml
new file mode 100644
index 000000000..65baabe33
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/list_in_list_defaults.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="values">
+            <list>
+                <list>
+                    <bool>true</bool>
+                    <int>1</int>
+                    <float>3.5</float>
+                    <string>foo</string>
+                </list>
+            </list>
+        </default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/list_in_map_defaults.xml b/lib/symfony/routing/Tests/Fixtures/list_in_map_defaults.xml
new file mode 100644
index 000000000..f0d972d1f
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/list_in_map_defaults.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="values">
+            <map>
+                <list key="list">
+                    <bool>true</bool>
+                    <int>1</int>
+                    <float>3.5</float>
+                    <string>foo</string>
+                </list>
+            </map>
+        </default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/list_null_values.xml b/lib/symfony/routing/Tests/Fixtures/list_null_values.xml
new file mode 100644
index 000000000..45bdd9da4
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/list_null_values.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="list">
+            <list>
+                <bool xsi:nil="true" />
+                <int xsi:nil="true" />
+                <float xsi:nil="1" />
+                <string xsi:nil="true" />
+                <list xsi:nil="true" />
+                <map xsi:nil="true" />
+            </list>
+        </default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/localized/utf8.xml b/lib/symfony/routing/Tests/Fixtures/localized/utf8.xml
new file mode 100644
index 000000000..95aff20cf
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/localized/utf8.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        http://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="app_utf8" path="/utf8">
+        <option key="utf8">true</option>
+    </route>
+    <route id="app_no_utf8" path="/no-utf8">
+        <option key="utf8">false</option>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/map_defaults.xml b/lib/symfony/routing/Tests/Fixtures/map_defaults.xml
new file mode 100644
index 000000000..9f0804432
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/map_defaults.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="values">
+            <map>
+                <bool key="public">true</bool>
+                <int key="page">1</int>
+                <float key="price">3.5</float>
+                <string key="title">foo</string>
+            </map>
+        </default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/map_in_list_defaults.xml b/lib/symfony/routing/Tests/Fixtures/map_in_list_defaults.xml
new file mode 100644
index 000000000..1c8b87df3
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/map_in_list_defaults.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="values">
+            <list>
+                <map>
+                    <bool key="public">true</bool>
+                    <int key="page">1</int>
+                    <float key="price">3.5</float>
+                    <string key="title">foo</string>
+                </map>
+            </list>
+        </default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/map_in_map_defaults.xml b/lib/symfony/routing/Tests/Fixtures/map_in_map_defaults.xml
new file mode 100644
index 000000000..a3af49283
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/map_in_map_defaults.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="values">
+            <map>
+                <map key="map">
+                    <bool key="public">true</bool>
+                    <int key="page">1</int>
+                    <float key="price">3.5</float>
+                    <string key="title">foo</string>
+                </map>
+            </map>
+        </default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/map_null_values.xml b/lib/symfony/routing/Tests/Fixtures/map_null_values.xml
new file mode 100644
index 000000000..a8153ad1f
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/map_null_values.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="map">
+            <map>
+                <bool key="boolean" xsi:nil="true" />
+                <int key="integer" xsi:nil="true" />
+                <float key="float" xsi:nil="true" />
+                <string key="string" xsi:nil="1" />
+                <list key="list" xsi:nil="true" />
+                <map key="map" xsi:nil="true" />
+            </map>
+        </default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/missing_id.xml b/lib/symfony/routing/Tests/Fixtures/missing_id.xml
new file mode 100644
index 000000000..fa42e98b7
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/missing_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route path="/test"></route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/missing_path.xml b/lib/symfony/routing/Tests/Fixtures/missing_path.xml
new file mode 100644
index 000000000..d048adb17
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/missing_path.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="myroute"></route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/namespaceprefix.xml b/lib/symfony/routing/Tests/Fixtures/namespaceprefix.xml
new file mode 100644
index 000000000..f303464d6
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/namespaceprefix.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<r:routes xmlns:r="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <r:route id="blog_show" path="/blog/{slug}" host="{_locale}.example.com">
+        <r:default key="_controller">MyBundle:Blog:show</r:default>
+        <requirement xmlns="http://symfony.com/schema/routing" key="slug">\w+</requirement>
+        <r2:requirement xmlns:r2="http://symfony.com/schema/routing" key="_locale">en|fr|de</r2:requirement>
+        <r:option key="compiler_class">RouteCompiler</r:option>
+        <r:default key="page">
+            <r3:int xmlns:r3="http://symfony.com/schema/routing">1</r3:int>
+        </r:default>
+    </r:route>
+</r:routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/nonesense_resource_plus_path.yml b/lib/symfony/routing/Tests/Fixtures/nonesense_resource_plus_path.yml
new file mode 100644
index 000000000..a3e947372
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/nonesense_resource_plus_path.yml
@@ -0,0 +1,3 @@
+blog_show:
+    resource: validpattern.yml
+    path:     /test
diff --git a/lib/symfony/routing/Tests/Fixtures/nonesense_type_without_resource.yml b/lib/symfony/routing/Tests/Fixtures/nonesense_type_without_resource.yml
new file mode 100644
index 000000000..547cda3b6
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/nonesense_type_without_resource.yml
@@ -0,0 +1,3 @@
+blog_show:
+    path:    /blog/{slug}
+    type:    custom
diff --git a/lib/symfony/routing/Tests/Fixtures/nonvalid.xml b/lib/symfony/routing/Tests/Fixtures/nonvalid.xml
new file mode 100644
index 000000000..07f5f801c
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/nonvalid.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog_show" path="/blog/{slug}">
+        <default key="_controller">MyBundle:Blog:show</default>
+    <!-- </route> -->
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/nonvalid.yml b/lib/symfony/routing/Tests/Fixtures/nonvalid.yml
new file mode 100644
index 000000000..257cc5642
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/nonvalid.yml
@@ -0,0 +1 @@
+foo
diff --git a/lib/symfony/routing/Tests/Fixtures/nonvalid2.yml b/lib/symfony/routing/Tests/Fixtures/nonvalid2.yml
new file mode 100644
index 000000000..cfa9992bb
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/nonvalid2.yml
@@ -0,0 +1 @@
+route: string
diff --git a/lib/symfony/routing/Tests/Fixtures/nonvalidkeys.yml b/lib/symfony/routing/Tests/Fixtures/nonvalidkeys.yml
new file mode 100644
index 000000000..015e270fb
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/nonvalidkeys.yml
@@ -0,0 +1,3 @@
+someroute:
+  resource: path/to/some.yml
+  name_prefix: test_
diff --git a/lib/symfony/routing/Tests/Fixtures/nonvalidnode.xml b/lib/symfony/routing/Tests/Fixtures/nonvalidnode.xml
new file mode 100644
index 000000000..71093a4dd
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/nonvalidnode.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <foo>bar</foo>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/nonvalidroute.xml b/lib/symfony/routing/Tests/Fixtures/nonvalidroute.xml
new file mode 100644
index 000000000..f0b84496c
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/nonvalidroute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog_show" path="/blog/{slug}">
+        <default key="_controller">MyBundle:Blog:show</default>
+        <option key="compiler_class">RouteCompiler</option>
+        <foo key="bar">baz</foo>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/null_values.xml b/lib/symfony/routing/Tests/Fixtures/null_values.xml
new file mode 100644
index 000000000..078d49ae4
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/null_values.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog_show" path="/blog/{slug}">
+        <default key="foo" xsi:nil="true" />
+        <default key="bar" xsi:nil="1" />
+        <default key="foobar" xsi:nil="false">foo</default>
+        <default key="baz" xsi:nil="0">bar</default>
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/php_dsl.php b/lib/symfony/routing/Tests/Fixtures/php_dsl.php
new file mode 100644
index 000000000..73da01248
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/php_dsl.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    $routes
+        ->collection()
+        ->add('foo', '/foo')
+            ->condition('abc')
+            ->options(['utf8' => true])
+        ->add('buz', 'zub')
+            ->controller('foo:act');
+
+    $routes->import('php_dsl_sub.php')
+        ->prefix('/sub')
+        ->requirements(['id' => '\d+']);
+
+    $routes->add('ouf', '/ouf')
+        ->schemes(['https'])
+        ->methods(['GET'])
+        ->defaults(['id' => 0]);
+};
diff --git a/lib/symfony/routing/Tests/Fixtures/php_dsl_sub.php b/lib/symfony/routing/Tests/Fixtures/php_dsl_sub.php
new file mode 100644
index 000000000..9eb444ded
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/php_dsl_sub.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    $add = $routes->collection('c_')
+        ->prefix('pub');
+
+    $add('bar', '/bar');
+
+    $add->collection('pub_')
+        ->host('host')
+        ->add('buz', 'buz');
+};
diff --git a/lib/symfony/routing/Tests/Fixtures/scalar_defaults.xml b/lib/symfony/routing/Tests/Fixtures/scalar_defaults.xml
new file mode 100644
index 000000000..e3f81cc47
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/scalar_defaults.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog" path="/blog">
+        <default key="_controller">
+            <string>AcmeBlogBundle:Blog:index</string>
+        </default>
+        <default key="slug" xsi:nil="true" />
+        <default key="published">
+            <bool>true</bool>
+        </default>
+        <default key="page">
+            <int>1</int>
+        </default>
+        <default key="price">
+            <float>3.5</float>
+        </default>
+        <default key="archived">
+            <bool>false</bool>
+        </default>
+        <default key="free">
+            <bool>1</bool>
+        </default>
+        <default key="locked">
+            <bool>0</bool>
+        </default>
+        <default key="foo" xsi:nil="true" />
+        <default key="bar" xsi:nil="1" />
+    </route>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/special_route_name.yml b/lib/symfony/routing/Tests/Fixtures/special_route_name.yml
new file mode 100644
index 000000000..78be239aa
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/special_route_name.yml
@@ -0,0 +1,2 @@
+"#$péß^a|":
+    path: "true"
diff --git a/lib/symfony/routing/Tests/Fixtures/validpattern.php b/lib/symfony/routing/Tests/Fixtures/validpattern.php
new file mode 100644
index 000000000..3ef0e1486
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/validpattern.php
@@ -0,0 +1,18 @@
+<?php
+
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+$collection = new RouteCollection();
+$collection->add('blog_show', new Route(
+    '/blog/{slug}',
+    ['_controller' => 'MyBlogBundle:Blog:show'],
+    ['locale' => '\w+'],
+    ['compiler_class' => 'RouteCompiler'],
+    '{locale}.example.com',
+    ['https'],
+    ['GET', 'POST', 'put', 'OpTiOnS'],
+    'context.getMethod() == "GET"'
+));
+
+return $collection;
diff --git a/lib/symfony/routing/Tests/Fixtures/validpattern.xml b/lib/symfony/routing/Tests/Fixtures/validpattern.xml
new file mode 100644
index 000000000..93e59d62a
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/validpattern.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="blog_show" path="/blog/{slug}" host="{locale}.example.com" methods="GET|POST  put,OpTiOnS" schemes="hTTps">
+        <default key="_controller">MyBundle:Blog:show</default>
+        <requirement key="locale">\w+</requirement>
+        <option key="compiler_class">RouteCompiler</option>
+        <condition>context.getMethod() == "GET"</condition>
+    </route>
+
+    <route id="blog_show_inherited" path="/blog/{slug}" />
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/validpattern.yml b/lib/symfony/routing/Tests/Fixtures/validpattern.yml
new file mode 100644
index 000000000..565abaaa2
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/validpattern.yml
@@ -0,0 +1,13 @@
+blog_show:
+    path:         /blog/{slug}
+    defaults:     { _controller: "MyBundle:Blog:show" }
+    host:         "{locale}.example.com"
+    requirements: { 'locale': '\w+' }
+    methods:      ['GET','POST','put','OpTiOnS']
+    schemes:      ['https']
+    condition:    'context.getMethod() == "GET"'
+    options:
+        compiler_class: RouteCompiler
+
+blog_show_inherited:
+    path:      /blog/{slug}
diff --git a/lib/symfony/routing/Tests/Fixtures/validresource.php b/lib/symfony/routing/Tests/Fixtures/validresource.php
new file mode 100644
index 000000000..31d354a34
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/validresource.php
@@ -0,0 +1,18 @@
+<?php
+
+/** @var $loader \Symfony\Component\Routing\Loader\PhpFileLoader */
+/** @var \Symfony\Component\Routing\RouteCollection $collection */
+$collection = $loader->import('validpattern.php');
+$collection->addDefaults([
+    'foo' => 123,
+]);
+$collection->addRequirements([
+    'foo' => '\d+',
+]);
+$collection->addOptions([
+    'foo' => 'bar',
+]);
+$collection->setCondition('context.getMethod() == "POST"');
+$collection->addPrefix('/prefix');
+
+return $collection;
diff --git a/lib/symfony/routing/Tests/Fixtures/validresource.xml b/lib/symfony/routing/Tests/Fixtures/validresource.xml
new file mode 100644
index 000000000..02dfe6be8
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/validresource.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <import resource="validpattern.xml" prefix="/{foo}" host="">
+        <default key="foo">123</default>
+        <requirement key="foo">\d+</requirement>
+        <option key="foo">bar</option>
+        <condition>context.getMethod() == "POST"</condition>
+    </import>
+</routes>
diff --git a/lib/symfony/routing/Tests/Fixtures/validresource.yml b/lib/symfony/routing/Tests/Fixtures/validresource.yml
new file mode 100644
index 000000000..faf2263ae
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/validresource.yml
@@ -0,0 +1,8 @@
+_blog:
+    resource:     validpattern.yml
+    prefix:       /{foo}
+    defaults:     { 'foo': '123' }
+    requirements: { 'foo': '\d+' }
+    options:      { 'foo': 'bar' }
+    host:         ""
+    condition:    'context.getMethod() == "POST"'
diff --git a/lib/symfony/routing/Tests/Fixtures/with_define_path_variable.php b/lib/symfony/routing/Tests/Fixtures/with_define_path_variable.php
new file mode 100644
index 000000000..5871420b1
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/with_define_path_variable.php
@@ -0,0 +1,5 @@
+<?php
+
+$path = '/1/2/3';
+
+return new \Symfony\Component\Routing\RouteCollection();
diff --git a/lib/symfony/routing/Tests/Fixtures/withdoctype.xml b/lib/symfony/routing/Tests/Fixtures/withdoctype.xml
new file mode 100644
index 000000000..f217d5bca
--- /dev/null
+++ b/lib/symfony/routing/Tests/Fixtures/withdoctype.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!DOCTYPE foo>
+<foo></foo>
diff --git a/lib/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/lib/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
new file mode 100644
index 000000000..4e725fa8b
--- /dev/null
+++ b/lib/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -0,0 +1,177 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Generator\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class PhpGeneratorDumperTest extends TestCase
+{
+    /**
+     * @var RouteCollection
+     */
+    private $routeCollection;
+
+    /**
+     * @var PhpGeneratorDumper
+     */
+    private $generatorDumper;
+
+    /**
+     * @var string
+     */
+    private $testTmpFilepath;
+
+    /**
+     * @var string
+     */
+    private $largeTestTmpFilepath;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->routeCollection = new RouteCollection();
+        $this->generatorDumper = new PhpGeneratorDumper($this->routeCollection);
+        $this->testTmpFilepath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.php';
+        $this->largeTestTmpFilepath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.large.php';
+        @unlink($this->testTmpFilepath);
+        @unlink($this->largeTestTmpFilepath);
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        @unlink($this->testTmpFilepath);
+
+        $this->routeCollection = null;
+        $this->generatorDumper = null;
+        $this->testTmpFilepath = null;
+    }
+
+    public function testDumpWithRoutes()
+    {
+        $this->routeCollection->add('Test', new Route('/testing/{foo}'));
+        $this->routeCollection->add('Test2', new Route('/testing2'));
+
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump());
+        include $this->testTmpFilepath;
+
+        $projectUrlGenerator = new \ProjectUrlGenerator(new RequestContext('/app.php'));
+
+        $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
+        $absoluteUrlWithoutParameter = $projectUrlGenerator->generate('Test2', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
+        $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('http://localhost/app.php/testing/bar', $absoluteUrlWithParameter);
+        $this->assertEquals('http://localhost/app.php/testing2', $absoluteUrlWithoutParameter);
+        $this->assertEquals('/app.php/testing/bar', $relativeUrlWithParameter);
+        $this->assertEquals('/app.php/testing2', $relativeUrlWithoutParameter);
+    }
+
+    public function testDumpWithTooManyRoutes()
+    {
+        if (\defined('HHVM_VERSION_ID')) {
+            $this->markTestSkipped('HHVM consumes too much memory on this test.');
+        }
+
+        $this->routeCollection->add('Test', new Route('/testing/{foo}'));
+        for ($i = 0; $i < 32769; ++$i) {
+            $this->routeCollection->add('route_'.$i, new Route('/route_'.$i));
+        }
+        $this->routeCollection->add('Test2', new Route('/testing2'));
+
+        file_put_contents($this->largeTestTmpFilepath, $this->generatorDumper->dump([
+            'class' => 'ProjectLargeUrlGenerator',
+        ]));
+        $this->routeCollection = $this->generatorDumper = null;
+        include $this->largeTestTmpFilepath;
+
+        $projectUrlGenerator = new \ProjectLargeUrlGenerator(new RequestContext('/app.php'));
+
+        $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
+        $absoluteUrlWithoutParameter = $projectUrlGenerator->generate('Test2', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
+        $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('http://localhost/app.php/testing/bar', $absoluteUrlWithParameter);
+        $this->assertEquals('http://localhost/app.php/testing2', $absoluteUrlWithoutParameter);
+        $this->assertEquals('/app.php/testing/bar', $relativeUrlWithParameter);
+        $this->assertEquals('/app.php/testing2', $relativeUrlWithoutParameter);
+    }
+
+    public function testDumpWithoutRoutes()
+    {
+        $this->expectException('InvalidArgumentException');
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'WithoutRoutesUrlGenerator']));
+        include $this->testTmpFilepath;
+
+        $projectUrlGenerator = new \WithoutRoutesUrlGenerator(new RequestContext('/app.php'));
+
+        $projectUrlGenerator->generate('Test', []);
+    }
+
+    public function testGenerateNonExistingRoute()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\RouteNotFoundException');
+        $this->routeCollection->add('Test', new Route('/test'));
+
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'NonExistingRoutesUrlGenerator']));
+        include $this->testTmpFilepath;
+
+        $projectUrlGenerator = new \NonExistingRoutesUrlGenerator(new RequestContext());
+        $projectUrlGenerator->generate('NonExisting', []);
+    }
+
+    public function testDumpForRouteWithDefaults()
+    {
+        $this->routeCollection->add('Test', new Route('/testing/{foo}', ['foo' => 'bar']));
+
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'DefaultRoutesUrlGenerator']));
+        include $this->testTmpFilepath;
+
+        $projectUrlGenerator = new \DefaultRoutesUrlGenerator(new RequestContext());
+        $url = $projectUrlGenerator->generate('Test', []);
+
+        $this->assertEquals('/testing', $url);
+    }
+
+    public function testDumpWithSchemeRequirement()
+    {
+        $this->routeCollection->add('Test1', new Route('/testing', [], [], [], '', ['ftp', 'https']));
+
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'SchemeUrlGenerator']));
+        include $this->testTmpFilepath;
+
+        $projectUrlGenerator = new \SchemeUrlGenerator(new RequestContext('/app.php'));
+
+        $absoluteUrl = $projectUrlGenerator->generate('Test1', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrl = $projectUrlGenerator->generate('Test1', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('ftp://localhost/app.php/testing', $absoluteUrl);
+        $this->assertEquals('ftp://localhost/app.php/testing', $relativeUrl);
+
+        $projectUrlGenerator = new \SchemeUrlGenerator(new RequestContext('/app.php', 'GET', 'localhost', 'https'));
+
+        $absoluteUrl = $projectUrlGenerator->generate('Test1', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrl = $projectUrlGenerator->generate('Test1', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('https://localhost/app.php/testing', $absoluteUrl);
+        $this->assertEquals('/app.php/testing', $relativeUrl);
+    }
+}
diff --git a/lib/symfony/routing/Tests/Generator/UrlGeneratorTest.php b/lib/symfony/routing/Tests/Generator/UrlGeneratorTest.php
new file mode 100644
index 000000000..de7c4f5ed
--- /dev/null
+++ b/lib/symfony/routing/Tests/Generator/UrlGeneratorTest.php
@@ -0,0 +1,747 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Generator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Generator\UrlGenerator;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class UrlGeneratorTest extends TestCase
+{
+    public function testAbsoluteUrlWithPort80()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
+
+        $this->assertEquals('http://localhost/app.php/testing', $url);
+    }
+
+    public function testAbsoluteSecureUrlWithPort443()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes, ['scheme' => 'https'])->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
+
+        $this->assertEquals('https://localhost/app.php/testing', $url);
+    }
+
+    public function testAbsoluteUrlWithNonStandardPort()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes, ['httpPort' => 8080])->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
+
+        $this->assertEquals('http://localhost:8080/app.php/testing', $url);
+    }
+
+    public function testAbsoluteSecureUrlWithNonStandardPort()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes, ['httpsPort' => 8080, 'scheme' => 'https'])->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
+
+        $this->assertEquals('https://localhost:8080/app.php/testing', $url);
+    }
+
+    public function testRelativeUrlWithoutParameters()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('/app.php/testing', $url);
+    }
+
+    public function testRelativeUrlWithParameter()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}'));
+        $url = $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('/app.php/testing/bar', $url);
+    }
+
+    public function testRelativeUrlWithNullParameter()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing.{format}', ['format' => null]));
+        $url = $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('/app.php/testing', $url);
+    }
+
+    public function testRelativeUrlWithNullParameterButNotOptional()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', ['foo' => null]));
+        // This must raise an exception because the default requirement for "foo" is "[^/]+" which is not met with these params.
+        // Generating path "/testing//bar" would be wrong as matching this route would fail.
+        $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+    }
+
+    public function testRelativeUrlWithOptionalZeroParameter()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing/{page}'));
+        $url = $this->getGenerator($routes)->generate('test', ['page' => 0], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('/app.php/testing/0', $url);
+    }
+
+    public function testNotPassedOptionalParameterInBetween()
+    {
+        $routes = $this->getRoutes('test', new Route('/{slug}/{page}', ['slug' => 'index', 'page' => 0]));
+        $this->assertSame('/app.php/index/1', $this->getGenerator($routes)->generate('test', ['page' => 1]));
+        $this->assertSame('/app.php/', $this->getGenerator($routes)->generate('test'));
+    }
+
+    public function testRelativeUrlWithExtraParameters()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('/app.php/testing?foo=bar', $url);
+    }
+
+    public function testAbsoluteUrlWithExtraParameters()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
+
+        $this->assertEquals('http://localhost/app.php/testing?foo=bar', $url);
+    }
+
+    public function testUrlWithNullExtraParameters()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes)->generate('test', ['foo' => null], UrlGeneratorInterface::ABSOLUTE_URL);
+
+        $this->assertEquals('http://localhost/app.php/testing', $url);
+    }
+
+    public function testUrlWithExtraParametersFromGlobals()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $generator = $this->getGenerator($routes);
+        $context = new RequestContext('/app.php');
+        $context->setParameter('bar', 'bar');
+        $generator->setContext($context);
+        $url = $generator->generate('test', ['foo' => 'bar']);
+
+        $this->assertEquals('/app.php/testing?foo=bar', $url);
+    }
+
+    public function testUrlWithGlobalParameter()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}'));
+        $generator = $this->getGenerator($routes);
+        $context = new RequestContext('/app.php');
+        $context->setParameter('foo', 'bar');
+        $generator->setContext($context);
+        $url = $generator->generate('test', []);
+
+        $this->assertEquals('/app.php/testing/bar', $url);
+    }
+
+    public function testGlobalParameterHasHigherPriorityThanDefault()
+    {
+        $routes = $this->getRoutes('test', new Route('/{_locale}', ['_locale' => 'en']));
+        $generator = $this->getGenerator($routes);
+        $context = new RequestContext('/app.php');
+        $context->setParameter('_locale', 'de');
+        $generator->setContext($context);
+        $url = $generator->generate('test', []);
+
+        $this->assertSame('/app.php/de', $url);
+    }
+
+    public function testGenerateWithoutRoutes()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\RouteNotFoundException');
+        $routes = $this->getRoutes('foo', new Route('/testing/{foo}'));
+        $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
+    }
+
+    public function testGenerateForRouteWithoutMandatoryParameter()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\MissingMandatoryParametersException');
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}'));
+        $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
+    }
+
+    public function testGenerateForRouteWithInvalidOptionalParameter()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
+    }
+
+    public function testGenerateForRouteWithInvalidParameter()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => '1|2']));
+        $this->getGenerator($routes)->generate('test', ['foo' => '0'], UrlGeneratorInterface::ABSOLUTE_URL);
+    }
+
+    public function testGenerateForRouteWithInvalidOptionalParameterNonStrict()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
+        $generator = $this->getGenerator($routes);
+        $generator->setStrictRequirements(false);
+        $this->assertNull($generator->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL));
+    }
+
+    public function testGenerateForRouteWithInvalidOptionalParameterNonStrictWithLogger()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
+        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $logger->expects($this->once())
+            ->method('error');
+        $generator = $this->getGenerator($routes, [], $logger);
+        $generator->setStrictRequirements(false);
+        $this->assertNull($generator->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL));
+    }
+
+    public function testGenerateForRouteWithInvalidParameterButDisabledRequirementsCheck()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
+        $generator = $this->getGenerator($routes);
+        $generator->setStrictRequirements(null);
+        $this->assertSame('/app.php/testing/bar', $generator->generate('test', ['foo' => 'bar']));
+    }
+
+    public function testGenerateForRouteWithInvalidMandatoryParameter()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => 'd+']));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
+    }
+
+    public function testGenerateForRouteWithInvalidUtf8Parameter()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => '\pL+'], ['utf8' => true]));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'abc123'], UrlGeneratorInterface::ABSOLUTE_URL);
+    }
+
+    public function testRequiredParamAndEmptyPassed()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/{slug}', [], ['slug' => '.+']));
+        $this->getGenerator($routes)->generate('test', ['slug' => '']);
+    }
+
+    public function testSchemeRequirementDoesNothingIfSameCurrentScheme()
+    {
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['http']));
+        $this->assertEquals('/app.php/', $this->getGenerator($routes)->generate('test'));
+
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['https']));
+        $this->assertEquals('/app.php/', $this->getGenerator($routes, ['scheme' => 'https'])->generate('test'));
+    }
+
+    public function testSchemeRequirementForcesAbsoluteUrl()
+    {
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['https']));
+        $this->assertEquals('https://localhost/app.php/', $this->getGenerator($routes)->generate('test'));
+
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['http']));
+        $this->assertEquals('http://localhost/app.php/', $this->getGenerator($routes, ['scheme' => 'https'])->generate('test'));
+    }
+
+    public function testSchemeRequirementCreatesUrlForFirstRequiredScheme()
+    {
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['Ftp', 'https']));
+        $this->assertEquals('ftp://localhost/app.php/', $this->getGenerator($routes)->generate('test'));
+    }
+
+    public function testPathWithTwoStartingSlashes()
+    {
+        $routes = $this->getRoutes('test', new Route('//path-and-not-domain'));
+
+        // this must not generate '//path-and-not-domain' because that would be a network path
+        $this->assertSame('/path-and-not-domain', $this->getGenerator($routes, ['BaseUrl' => ''])->generate('test'));
+    }
+
+    public function testNoTrailingSlashForMultipleOptionalParameters()
+    {
+        $routes = $this->getRoutes('test', new Route('/category/{slug1}/{slug2}/{slug3}', ['slug2' => null, 'slug3' => null]));
+
+        $this->assertEquals('/app.php/category/foo', $this->getGenerator($routes)->generate('test', ['slug1' => 'foo']));
+    }
+
+    public function testWithAnIntegerAsADefaultValue()
+    {
+        $routes = $this->getRoutes('test', new Route('/{default}', ['default' => 0]));
+
+        $this->assertEquals('/app.php/foo', $this->getGenerator($routes)->generate('test', ['default' => 'foo']));
+    }
+
+    public function testNullForOptionalParameterIsIgnored()
+    {
+        $routes = $this->getRoutes('test', new Route('/test/{default}', ['default' => 0]));
+
+        $this->assertEquals('/app.php/test', $this->getGenerator($routes)->generate('test', ['default' => null]));
+    }
+
+    public function testQueryParamSameAsDefault()
+    {
+        $routes = $this->getRoutes('test', new Route('/test', ['page' => 1]));
+
+        $this->assertSame('/app.php/test?page=2', $this->getGenerator($routes)->generate('test', ['page' => 2]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', ['page' => 1]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', ['page' => '1']));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test'));
+    }
+
+    public function testArrayQueryParamSameAsDefault()
+    {
+        $routes = $this->getRoutes('test', new Route('/test', ['array' => ['foo', 'bar']]));
+
+        $this->assertSame('/app.php/test?array%5B0%5D=bar&array%5B1%5D=foo', $this->getGenerator($routes)->generate('test', ['array' => ['bar', 'foo']]));
+        $this->assertSame('/app.php/test?array%5Ba%5D=foo&array%5Bb%5D=bar', $this->getGenerator($routes)->generate('test', ['array' => ['a' => 'foo', 'b' => 'bar']]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', ['array' => ['foo', 'bar']]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', ['array' => [1 => 'bar', 0 => 'foo']]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test'));
+    }
+
+    public function testGenerateWithSpecialRouteName()
+    {
+        $routes = $this->getRoutes('$péß^a|', new Route('/bar'));
+
+        $this->assertSame('/app.php/bar', $this->getGenerator($routes)->generate('$péß^a|'));
+    }
+
+    public function testUrlEncoding()
+    {
+        $expectedPath = '/app.php/@:%5B%5D/%28%29*%27%22%20+,;-._~%26%24%3C%3E|%7B%7D%25%5C%5E%60!%3Ffoo=bar%23id'
+            .'/@:%5B%5D/%28%29*%27%22%20+,;-._~%26%24%3C%3E|%7B%7D%25%5C%5E%60!%3Ffoo=bar%23id'
+            .'?query=%40%3A%5B%5D/%28%29%2A%27%22%20%2B%2C%3B-._~%26%24%3C%3E%7C%7B%7D%25%5C%5E%60%21%3Ffoo%3Dbar%23id';
+
+        // This tests the encoding of reserved characters that are used for delimiting of URI components (defined in RFC 3986)
+        // and other special ASCII chars. These chars are tested as static text path, variable path and query param.
+        $chars = '@:[]/()*\'" +,;-._~&$<>|{}%\\^`!?foo=bar#id';
+        $routes = $this->getRoutes('test', new Route("/$chars/{varpath}", [], ['varpath' => '.+']));
+        $this->assertSame($expectedPath, $this->getGenerator($routes)->generate('test', [
+            'varpath' => $chars,
+            'query' => $chars,
+        ]));
+    }
+
+    public function testEncodingOfRelativePathSegments()
+    {
+        $routes = $this->getRoutes('test', new Route('/dir/../dir/..'));
+        $this->assertSame('/app.php/dir/%2E%2E/dir/%2E%2E', $this->getGenerator($routes)->generate('test'));
+        $routes = $this->getRoutes('test', new Route('/dir/./dir/.'));
+        $this->assertSame('/app.php/dir/%2E/dir/%2E', $this->getGenerator($routes)->generate('test'));
+        $routes = $this->getRoutes('test', new Route('/a./.a/a../..a/...'));
+        $this->assertSame('/app.php/a./.a/a../..a/...', $this->getGenerator($routes)->generate('test'));
+    }
+
+    public function testAdjacentVariables()
+    {
+        $routes = $this->getRoutes('test', new Route('/{x}{y}{z}.{_format}', ['z' => 'default-z', '_format' => 'html'], ['y' => '\d+']));
+        $generator = $this->getGenerator($routes);
+        $this->assertSame('/app.php/foo123', $generator->generate('test', ['x' => 'foo', 'y' => '123']));
+        $this->assertSame('/app.php/foo123bar.xml', $generator->generate('test', ['x' => 'foo', 'y' => '123', 'z' => 'bar', '_format' => 'xml']));
+
+        // The default requirement for 'x' should not allow the separator '.' in this case because it would otherwise match everything
+        // and following optional variables like _format could never match.
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $generator->generate('test', ['x' => 'do.t', 'y' => '123', 'z' => 'bar', '_format' => 'xml']);
+    }
+
+    public function testOptionalVariableWithNoRealSeparator()
+    {
+        $routes = $this->getRoutes('test', new Route('/get{what}', ['what' => 'All']));
+        $generator = $this->getGenerator($routes);
+
+        $this->assertSame('/app.php/get', $generator->generate('test'));
+        $this->assertSame('/app.php/getSites', $generator->generate('test', ['what' => 'Sites']));
+    }
+
+    public function testRequiredVariableWithNoRealSeparator()
+    {
+        $routes = $this->getRoutes('test', new Route('/get{what}Suffix'));
+        $generator = $this->getGenerator($routes);
+
+        $this->assertSame('/app.php/getSitesSuffix', $generator->generate('test', ['what' => 'Sites']));
+    }
+
+    public function testDefaultRequirementOfVariable()
+    {
+        $routes = $this->getRoutes('test', new Route('/{page}.{_format}'));
+        $generator = $this->getGenerator($routes);
+
+        $this->assertSame('/app.php/index.mobile.html', $generator->generate('test', ['page' => 'index', '_format' => 'mobile.html']));
+    }
+
+    public function testDefaultRequirementOfVariableDisallowsSlash()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/{page}.{_format}'));
+        $this->getGenerator($routes)->generate('test', ['page' => 'index', '_format' => 'sl/ash']);
+    }
+
+    public function testDefaultRequirementOfVariableDisallowsNextSeparator()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/{page}.{_format}'));
+        $this->getGenerator($routes)->generate('test', ['page' => 'do.t', '_format' => 'html']);
+    }
+
+    public function testWithHostDifferentFromContext()
+    {
+        $routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com'));
+
+        $this->assertEquals('//fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test', ['name' => 'Fabien', 'locale' => 'fr']));
+    }
+
+    public function testWithHostSameAsContext()
+    {
+        $routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com'));
+
+        $this->assertEquals('/app.php/Fabien', $this->getGenerator($routes, ['host' => 'fr.example.com'])->generate('test', ['name' => 'Fabien', 'locale' => 'fr']));
+    }
+
+    public function testWithHostSameAsContextAndAbsolute()
+    {
+        $routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com'));
+
+        $this->assertEquals('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, ['host' => 'fr.example.com'])->generate('test', ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::ABSOLUTE_URL));
+    }
+
+    public function testUrlWithInvalidParameterInHost()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/', [], ['foo' => 'bar'], [], '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
+    }
+
+    public function testUrlWithInvalidParameterInHostWhenParamHasADefaultValue()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/', ['foo' => 'bar'], ['foo' => 'bar'], [], '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
+    }
+
+    public function testUrlWithInvalidParameterEqualsDefaultValueInHost()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
+        $routes = $this->getRoutes('test', new Route('/', ['foo' => 'baz'], ['foo' => 'bar'], [], '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
+    }
+
+    public function testUrlWithInvalidParameterInHostInNonStrictMode()
+    {
+        $routes = $this->getRoutes('test', new Route('/', [], ['foo' => 'bar'], [], '{foo}.example.com'));
+        $generator = $this->getGenerator($routes);
+        $generator->setStrictRequirements(false);
+        $this->assertNull($generator->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH));
+    }
+
+    public function testHostIsCaseInsensitive()
+    {
+        $routes = $this->getRoutes('test', new Route('/', [], ['locale' => 'en|de|fr'], [], '{locale}.FooBar.com'));
+        $generator = $this->getGenerator($routes);
+        $this->assertSame('//EN.FooBar.com/app.php/', $generator->generate('test', ['locale' => 'EN'], UrlGeneratorInterface::NETWORK_PATH));
+    }
+
+    public function testDefaultHostIsUsedWhenContextHostIsEmpty()
+    {
+        $routes = $this->getRoutes('test', new Route('/path', ['domain' => 'my.fallback.host'], ['domain' => '.+'], [], '{domain}'));
+
+        $generator = $this->getGenerator($routes);
+        $generator->getContext()->setHost('');
+
+        $this->assertSame('http://my.fallback.host/app.php/path', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL));
+    }
+
+    public function testDefaultHostIsUsedWhenContextHostIsEmptyAndPathReferenceType()
+    {
+        $routes = $this->getRoutes('test', new Route('/path', ['domain' => 'my.fallback.host'], ['domain' => '.+'], [], '{domain}'));
+
+        $generator = $this->getGenerator($routes);
+        $generator->getContext()->setHost('');
+
+        $this->assertSame('//my.fallback.host/app.php/path', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH));
+    }
+
+    public function testAbsoluteUrlFallbackToPathIfHostIsEmptyAndSchemeIsHttp()
+    {
+        $routes = $this->getRoutes('test', new Route('/route'));
+
+        $generator = $this->getGenerator($routes);
+        $generator->getContext()->setHost('');
+        $generator->getContext()->setScheme('https');
+
+        $this->assertSame('/app.php/route', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL));
+    }
+
+    public function testAbsoluteUrlFallbackToNetworkIfSchemeIsEmptyAndHostIsNot()
+    {
+        $routes = $this->getRoutes('test', new Route('/path'));
+
+        $generator = $this->getGenerator($routes);
+        $generator->getContext()->setHost('example.com');
+        $generator->getContext()->setScheme('');
+
+        $this->assertSame('//example.com/app.php/path', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL));
+    }
+
+    public function testAbsoluteUrlFallbackToPathIfSchemeAndHostAreEmpty()
+    {
+        $routes = $this->getRoutes('test', new Route('/path'));
+
+        $generator = $this->getGenerator($routes);
+        $generator->getContext()->setHost('');
+        $generator->getContext()->setScheme('');
+
+        $this->assertSame('/app.php/path', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL));
+    }
+
+    public function testAbsoluteUrlWithNonHttpSchemeAndEmptyHost()
+    {
+        $routes = $this->getRoutes('test', new Route('/path', [], [], [], '', ['file']));
+
+        $generator = $this->getGenerator($routes);
+        $generator->getContext()->setBaseUrl('');
+        $generator->getContext()->setHost('');
+
+        $this->assertSame('file:///path', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL));
+    }
+
+    public function testGenerateNetworkPath()
+    {
+        $routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com', ['http']));
+
+        $this->assertSame('//fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test',
+            ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::NETWORK_PATH), 'network path with different host'
+        );
+        $this->assertSame('//fr.example.com/app.php/Fabien?query=string', $this->getGenerator($routes, ['host' => 'fr.example.com'])->generate('test',
+            ['name' => 'Fabien', 'locale' => 'fr', 'query' => 'string'], UrlGeneratorInterface::NETWORK_PATH), 'network path although host same as context'
+        );
+        $this->assertSame('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, ['scheme' => 'https'])->generate('test',
+            ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::NETWORK_PATH), 'absolute URL because scheme requirement does not match context'
+        );
+        $this->assertSame('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test',
+            ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::ABSOLUTE_URL), 'absolute URL with same scheme because it is requested'
+        );
+    }
+
+    public function testGenerateRelativePath()
+    {
+        $routes = new RouteCollection();
+        $routes->add('article', new Route('/{author}/{article}/'));
+        $routes->add('comments', new Route('/{author}/{article}/comments'));
+        $routes->add('host', new Route('/{article}', [], [], [], '{author}.example.com'));
+        $routes->add('scheme', new Route('/{author}/blog', [], [], [], '', ['https']));
+        $routes->add('unrelated', new Route('/about'));
+
+        $generator = $this->getGenerator($routes, ['host' => 'example.com', 'pathInfo' => '/fabien/symfony-is-great/']);
+
+        $this->assertSame('comments', $generator->generate('comments',
+            ['author' => 'fabien', 'article' => 'symfony-is-great'], UrlGeneratorInterface::RELATIVE_PATH)
+        );
+        $this->assertSame('comments?page=2', $generator->generate('comments',
+            ['author' => 'fabien', 'article' => 'symfony-is-great', 'page' => 2], UrlGeneratorInterface::RELATIVE_PATH)
+        );
+        $this->assertSame('../twig-is-great/', $generator->generate('article',
+            ['author' => 'fabien', 'article' => 'twig-is-great'], UrlGeneratorInterface::RELATIVE_PATH)
+        );
+        $this->assertSame('../../bernhard/forms-are-great/', $generator->generate('article',
+            ['author' => 'bernhard', 'article' => 'forms-are-great'], UrlGeneratorInterface::RELATIVE_PATH)
+        );
+        $this->assertSame('//bernhard.example.com/app.php/forms-are-great', $generator->generate('host',
+            ['author' => 'bernhard', 'article' => 'forms-are-great'], UrlGeneratorInterface::RELATIVE_PATH)
+        );
+        $this->assertSame('https://example.com/app.php/bernhard/blog', $generator->generate('scheme',
+                ['author' => 'bernhard'], UrlGeneratorInterface::RELATIVE_PATH)
+        );
+        $this->assertSame('../../about', $generator->generate('unrelated',
+            [], UrlGeneratorInterface::RELATIVE_PATH)
+        );
+    }
+
+    /**
+     * @dataProvider provideRelativePaths
+     */
+    public function testGetRelativePath($sourcePath, $targetPath, $expectedPath)
+    {
+        $this->assertSame($expectedPath, UrlGenerator::getRelativePath($sourcePath, $targetPath));
+    }
+
+    public function provideRelativePaths()
+    {
+        return [
+            [
+                '/same/dir/',
+                '/same/dir/',
+                '',
+            ],
+            [
+                '/same/file',
+                '/same/file',
+                '',
+            ],
+            [
+                '/',
+                '/file',
+                'file',
+            ],
+            [
+                '/',
+                '/dir/file',
+                'dir/file',
+            ],
+            [
+                '/dir/file.html',
+                '/dir/different-file.html',
+                'different-file.html',
+            ],
+            [
+                '/same/dir/extra-file',
+                '/same/dir/',
+                './',
+            ],
+            [
+                '/parent/dir/',
+                '/parent/',
+                '../',
+            ],
+            [
+                '/parent/dir/extra-file',
+                '/parent/',
+                '../',
+            ],
+            [
+                '/a/b/',
+                '/x/y/z/',
+                '../../x/y/z/',
+            ],
+            [
+                '/a/b/c/d/e',
+                '/a/c/d',
+                '../../../c/d',
+            ],
+            [
+                '/a/b/c//',
+                '/a/b/c/',
+                '../',
+            ],
+            [
+                '/a/b/c/',
+                '/a/b/c//',
+                './/',
+            ],
+            [
+                '/root/a/b/c/',
+                '/root/x/b/c/',
+                '../../../x/b/c/',
+            ],
+            [
+                '/a/b/c/d/',
+                '/a',
+                '../../../../a',
+            ],
+            [
+                '/special-chars/sp%20ce/1€/mäh/e=mc²',
+                '/special-chars/sp%20ce/1€/<µ>/e=mc²',
+                '../<µ>/e=mc²',
+            ],
+            [
+                'not-rooted',
+                'dir/file',
+                'dir/file',
+            ],
+            [
+                '//dir/',
+                '',
+                '../../',
+            ],
+            [
+                '/dir/',
+                '/dir/file:with-colon',
+                './file:with-colon',
+            ],
+            [
+                '/dir/',
+                '/dir/subdir/file:with-colon',
+                'subdir/file:with-colon',
+            ],
+            [
+                '/dir/',
+                '/dir/:subdir/',
+                './:subdir/',
+            ],
+        ];
+    }
+
+    public function testFragmentsCanBeAppendedToUrls()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+
+        $url = $this->getGenerator($routes)->generate('test', ['_fragment' => 'frag ment'], UrlGeneratorInterface::ABSOLUTE_PATH);
+        $this->assertEquals('/app.php/testing#frag%20ment', $url);
+
+        $url = $this->getGenerator($routes)->generate('test', ['_fragment' => '0'], UrlGeneratorInterface::ABSOLUTE_PATH);
+        $this->assertEquals('/app.php/testing#0', $url);
+    }
+
+    public function testFragmentsDoNotEscapeValidCharacters()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing'));
+        $url = $this->getGenerator($routes)->generate('test', ['_fragment' => '?/'], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('/app.php/testing#?/', $url);
+    }
+
+    public function testFragmentsCanBeDefinedAsDefaults()
+    {
+        $routes = $this->getRoutes('test', new Route('/testing', ['_fragment' => 'fragment']));
+        $url = $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals('/app.php/testing#fragment', $url);
+    }
+
+    /**
+     * @dataProvider provideLookAroundRequirementsInPath
+     */
+    public function testLookRoundRequirementsInPath($expected, $path, $requirement)
+    {
+        $routes = $this->getRoutes('test', new Route($path, [], ['foo' => $requirement, 'baz' => '.+?']));
+        $this->assertSame($expected, $this->getGenerator($routes)->generate('test', ['foo' => 'a/b', 'baz' => 'c/d/e']));
+    }
+
+    public function provideLookAroundRequirementsInPath()
+    {
+        yield ['/app.php/a/b/b%28ar/c/d/e', '/{foo}/b(ar/{baz}', '.+(?=/b\\(ar/)'];
+        yield ['/app.php/a/b/bar/c/d/e', '/{foo}/bar/{baz}', '.+(?!$)'];
+        yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<=/bar/).+'];
+        yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<!^).+'];
+    }
+
+    protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null)
+    {
+        $context = new RequestContext('/app.php');
+        foreach ($parameters as $key => $value) {
+            $method = 'set'.$key;
+            $context->$method($value);
+        }
+
+        return new UrlGenerator($routes, $context, $logger);
+    }
+
+    protected function getRoutes($name, Route $route)
+    {
+        $routes = new RouteCollection();
+        $routes->add($name, $route);
+
+        return $routes;
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/AbstractAnnotationLoaderTest.php b/lib/symfony/routing/Tests/Loader/AbstractAnnotationLoaderTest.php
new file mode 100644
index 000000000..0ce4a47ec
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/AbstractAnnotationLoaderTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+
+abstract class AbstractAnnotationLoaderTest extends TestCase
+{
+    public function getReader()
+    {
+        return $this->getMockBuilder('Doctrine\Common\Annotations\Reader')
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+    }
+
+    public function getClassLoader($reader)
+    {
+        return $this->getMockBuilder('Symfony\Component\Routing\Loader\AnnotationClassLoader')
+            ->setConstructorArgs([$reader])
+            ->getMockForAbstractClass()
+        ;
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php b/lib/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php
new file mode 100644
index 000000000..b13f23cf4
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -0,0 +1,348 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
+{
+    protected $loader;
+    private $reader;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->reader = $this->getReader();
+        $this->loader = $this->getClassLoader($this->reader);
+    }
+
+    public function testLoadMissingClass()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->loader->load('MissingClass');
+    }
+
+    public function testLoadAbstractClass()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\AbstractClass');
+    }
+
+    /**
+     * @dataProvider provideTestSupportsChecksResource
+     */
+    public function testSupportsChecksResource($resource, $expectedSupports)
+    {
+        $this->assertSame($expectedSupports, $this->loader->supports($resource), '->supports() returns true if the resource is loadable');
+    }
+
+    public function provideTestSupportsChecksResource()
+    {
+        return [
+            ['class', true],
+            ['\fully\qualified\class\name', true],
+            ['namespaced\class\without\leading\slash', true],
+            ['ÿClassWithLegalSpecialCharacters', true],
+            ['5', false],
+            ['foo.foo', false],
+            [null, false],
+        ];
+    }
+
+    public function testSupportsChecksTypeIfSpecified()
+    {
+        $this->assertTrue($this->loader->supports('class', 'annotation'), '->supports() checks the resource type if specified');
+        $this->assertFalse($this->loader->supports('class', 'foo'), '->supports() checks the resource type if specified');
+    }
+
+    public function getLoadTests()
+    {
+        return [
+            [
+                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
+                ['name' => 'route1', 'path' => '/path'],
+                ['arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'],
+            ],
+            [
+                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
+                ['defaults' => ['arg2' => 'foo'], 'requirements' => ['arg3' => '\w+']],
+                ['arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'],
+            ],
+            [
+                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
+                ['options' => ['foo' => 'bar']],
+                ['arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'],
+            ],
+            [
+                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
+                ['schemes' => ['https'], 'methods' => ['GET']],
+                ['arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'],
+            ],
+            [
+                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
+                ['condition' => 'context.getMethod() == "GET"'],
+                ['arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getLoadTests
+     */
+    public function testLoad($className, $routeData = [], $methodArgs = [])
+    {
+        $routeData = array_replace([
+            'name' => 'route',
+            'path' => '/',
+            'requirements' => [],
+            'options' => [],
+            'defaults' => [],
+            'schemes' => [],
+            'methods' => [],
+            'condition' => '',
+        ], $routeData);
+
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->willReturn([$this->getAnnotatedRoute($routeData)])
+        ;
+
+        $routeCollection = $this->loader->load($className);
+        $route = $routeCollection->get($routeData['name']);
+
+        $this->assertSame($routeData['path'], $route->getPath(), '->load preserves path annotation');
+        $this->assertCount(
+            \count($routeData['requirements']),
+            array_intersect_assoc($routeData['requirements'], $route->getRequirements()),
+            '->load preserves requirements annotation'
+        );
+        $this->assertCount(
+            \count($routeData['options']),
+            array_intersect_assoc($routeData['options'], $route->getOptions()),
+            '->load preserves options annotation'
+        );
+        $this->assertCount(
+            \count($routeData['defaults']),
+            $route->getDefaults(),
+            '->load preserves defaults annotation'
+        );
+        $this->assertEquals($routeData['schemes'], $route->getSchemes(), '->load preserves schemes annotation');
+        $this->assertEquals($routeData['methods'], $route->getMethods(), '->load preserves methods annotation');
+        $this->assertSame($routeData['condition'], $route->getCondition(), '->load preserves condition annotation');
+    }
+
+    public function testClassRouteLoad()
+    {
+        $classRouteData = [
+            'name' => 'prefix_',
+            'path' => '/prefix',
+            'schemes' => ['https'],
+            'methods' => ['GET'],
+        ];
+
+        $methodRouteData = [
+            'name' => 'route1',
+            'path' => '/path',
+            'schemes' => ['http'],
+            'methods' => ['POST', 'PUT'],
+        ];
+
+        $this->reader
+            ->expects($this->once())
+            ->method('getClassAnnotation')
+            ->willReturn($this->getAnnotatedRoute($classRouteData))
+        ;
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->willReturn([$this->getAnnotatedRoute($methodRouteData)])
+        ;
+
+        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass');
+        $route = $routeCollection->get($classRouteData['name'].$methodRouteData['name']);
+
+        $this->assertSame($classRouteData['path'].$methodRouteData['path'], $route->getPath(), '->load concatenates class and method route path');
+        $this->assertEquals(array_merge($classRouteData['schemes'], $methodRouteData['schemes']), $route->getSchemes(), '->load merges class and method route schemes');
+        $this->assertEquals(array_merge($classRouteData['methods'], $methodRouteData['methods']), $route->getMethods(), '->load merges class and method route methods');
+    }
+
+    public function testInvokableClassRouteLoadWithMethodAnnotation()
+    {
+        $classRouteData = [
+            'name' => 'route1',
+            'path' => '/',
+            'schemes' => ['https'],
+            'methods' => ['GET'],
+        ];
+
+        $this->reader
+            ->expects($this->exactly(1))
+            ->method('getClassAnnotations')
+            ->willReturn([$this->getAnnotatedRoute($classRouteData)])
+        ;
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->willReturn([])
+        ;
+
+        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
+        $route = $routeCollection->get($classRouteData['name']);
+
+        $this->assertSame($classRouteData['path'], $route->getPath(), '->load preserves class route path');
+        $this->assertEquals($classRouteData['schemes'], $route->getSchemes(), '->load preserves class route schemes');
+        $this->assertEquals($classRouteData['methods'], $route->getMethods(), '->load preserves class route methods');
+    }
+
+    public function testInvokableClassRouteLoadWithClassAnnotation()
+    {
+        $classRouteData = [
+            'name' => 'route1',
+            'path' => '/',
+            'schemes' => ['https'],
+            'methods' => ['GET'],
+        ];
+
+        $this->reader
+            ->expects($this->exactly(1))
+            ->method('getClassAnnotation')
+            ->willReturn($this->getAnnotatedRoute($classRouteData))
+        ;
+
+        $this->reader
+            ->expects($this->exactly(1))
+            ->method('getClassAnnotations')
+            ->willReturn([$this->getAnnotatedRoute($classRouteData)])
+        ;
+
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->willReturn([])
+        ;
+
+        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
+        $route = $routeCollection->get($classRouteData['name']);
+
+        $this->assertSame($classRouteData['path'], $route->getPath(), '->load preserves class route path');
+        $this->assertEquals($classRouteData['schemes'], $route->getSchemes(), '->load preserves class route schemes');
+        $this->assertEquals($classRouteData['methods'], $route->getMethods(), '->load preserves class route methods');
+    }
+
+    public function testInvokableClassMultipleRouteLoad()
+    {
+        $classRouteData1 = [
+            'name' => 'route1',
+            'path' => '/1',
+            'schemes' => ['https'],
+            'methods' => ['GET'],
+        ];
+
+        $classRouteData2 = [
+            'name' => 'route2',
+            'path' => '/2',
+            'schemes' => ['https'],
+            'methods' => ['GET'],
+        ];
+
+        $this->reader
+            ->expects($this->exactly(1))
+            ->method('getClassAnnotations')
+            ->willReturn([$this->getAnnotatedRoute($classRouteData1), $this->getAnnotatedRoute($classRouteData2)])
+        ;
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->willReturn([])
+        ;
+
+        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
+        $route = $routeCollection->get($classRouteData1['name']);
+
+        $this->assertSame($classRouteData1['path'], $route->getPath(), '->load preserves class route path');
+        $this->assertEquals($classRouteData1['schemes'], $route->getSchemes(), '->load preserves class route schemes');
+        $this->assertEquals($classRouteData1['methods'], $route->getMethods(), '->load preserves class route methods');
+
+        $route = $routeCollection->get($classRouteData2['name']);
+
+        $this->assertSame($classRouteData2['path'], $route->getPath(), '->load preserves class route path');
+        $this->assertEquals($classRouteData2['schemes'], $route->getSchemes(), '->load preserves class route schemes');
+        $this->assertEquals($classRouteData2['methods'], $route->getMethods(), '->load preserves class route methods');
+    }
+
+    public function testInvokableClassWithMethodRouteLoad()
+    {
+        $classRouteData = [
+            'name' => 'route1',
+            'path' => '/prefix',
+            'schemes' => ['https'],
+            'methods' => ['GET'],
+        ];
+
+        $methodRouteData = [
+            'name' => 'route2',
+            'path' => '/path',
+            'schemes' => ['http'],
+            'methods' => ['POST', 'PUT'],
+        ];
+
+        $this->reader
+            ->expects($this->once())
+            ->method('getClassAnnotation')
+            ->willReturn($this->getAnnotatedRoute($classRouteData))
+        ;
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->willReturn([$this->getAnnotatedRoute($methodRouteData)])
+        ;
+
+        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
+        $route = $routeCollection->get($classRouteData['name']);
+
+        $this->assertNull($route, '->load ignores class route');
+
+        $route = $routeCollection->get($classRouteData['name'].$methodRouteData['name']);
+
+        $this->assertSame($classRouteData['path'].$methodRouteData['path'], $route->getPath(), '->load concatenates class and method route path');
+        $this->assertEquals(array_merge($classRouteData['schemes'], $methodRouteData['schemes']), $route->getSchemes(), '->load merges class and method route schemes');
+        $this->assertEquals(array_merge($classRouteData['methods'], $methodRouteData['methods']), $route->getMethods(), '->load merges class and method route methods');
+    }
+
+    /**
+     * @requires function mb_strtolower
+     */
+    public function testDefaultRouteName()
+    {
+        $methodRouteData = [
+            'name' => null,
+        ];
+
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->willReturn([$this->getAnnotatedRoute($methodRouteData)])
+        ;
+
+        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\EncodingClass');
+        $defaultName = array_keys($routeCollection->all())[0];
+
+        $this->assertSame($defaultName, 'symfony_component_routing_tests_fixtures_annotatedclasses_encodingclass_routeàction');
+    }
+
+    private function getAnnotatedRoute($data)
+    {
+        return new Route($data);
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/lib/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
new file mode 100644
index 000000000..df96a679e
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
+
+class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest
+{
+    protected $loader;
+    protected $reader;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->reader = $this->getReader();
+        $this->loader = new AnnotationDirectoryLoader(new FileLocator(), $this->getClassLoader($this->reader));
+    }
+
+    public function testLoad()
+    {
+        $this->reader->expects($this->exactly(4))->method('getClassAnnotation');
+
+        $this->reader
+            ->expects($this->any())
+            ->method('getMethodAnnotations')
+            ->willReturn([])
+        ;
+
+        $this->reader
+            ->expects($this->any())
+            ->method('getClassAnnotations')
+            ->willReturn([])
+        ;
+
+        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses');
+    }
+
+    public function testLoadIgnoresHiddenDirectories()
+    {
+        $this->expectAnnotationsToBeReadFrom([
+            'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
+            'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass',
+            'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\FooClass',
+            'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\EncodingClass',
+        ]);
+
+        $this->reader
+            ->expects($this->any())
+            ->method('getMethodAnnotations')
+            ->willReturn([])
+        ;
+
+        $this->reader
+            ->expects($this->any())
+            ->method('getClassAnnotations')
+            ->willReturn([])
+        ;
+
+        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses');
+    }
+
+    public function testSupports()
+    {
+        $fixturesDir = __DIR__.'/../Fixtures';
+
+        $this->assertTrue($this->loader->supports($fixturesDir), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($this->loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
+
+        $this->assertTrue($this->loader->supports($fixturesDir, 'annotation'), '->supports() checks the resource type if specified');
+        $this->assertFalse($this->loader->supports($fixturesDir, 'foo'), '->supports() checks the resource type if specified');
+    }
+
+    public function testItSupportsAnyAnnotation()
+    {
+        $this->assertTrue($this->loader->supports(__DIR__.'/../Fixtures/even-with-not-existing-folder', 'annotation'));
+    }
+
+    public function testLoadFileIfLocatedResourceIsFile()
+    {
+        $this->reader->expects($this->exactly(1))->method('getClassAnnotation');
+
+        $this->reader
+            ->expects($this->any())
+            ->method('getMethodAnnotations')
+            ->willReturn([])
+        ;
+
+        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooClass.php');
+    }
+
+    private function expectAnnotationsToBeReadFrom(array $classes)
+    {
+        $this->reader->expects($this->exactly(\count($classes)))
+            ->method('getClassAnnotation')
+            ->with($this->callback(function (\ReflectionClass $class) use ($classes) {
+                return \in_array($class->getName(), $classes);
+            }));
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/AnnotationFileLoaderTest.php b/lib/symfony/routing/Tests/Loader/AnnotationFileLoaderTest.php
new file mode 100644
index 000000000..0b1175f60
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Loader\AnnotationFileLoader;
+
+class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
+{
+    protected $loader;
+    protected $reader;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->reader = $this->getReader();
+        $this->loader = new AnnotationFileLoader(new FileLocator(), $this->getClassLoader($this->reader));
+    }
+
+    public function testLoad()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooClass.php');
+    }
+
+    public function testLoadTraitWithClassConstant()
+    {
+        $this->reader->expects($this->never())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooTrait.php');
+    }
+
+    public function testLoadFileWithoutStartTag()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Did you forgot to add the "<?php" start tag at the beginning of the file?');
+        $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/NoStartTagClass.php');
+    }
+
+    /**
+     * @requires PHP 5.6
+     */
+    public function testLoadVariadic()
+    {
+        $route = new Route(['path' => '/path/to/{id}']);
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+        $this->reader->expects($this->once())->method('getMethodAnnotations')
+            ->willReturn([$route]);
+
+        $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/VariadicClass.php');
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testLoadAnonymousClass()
+    {
+        $this->reader->expects($this->never())->method('getClassAnnotation');
+        $this->reader->expects($this->never())->method('getMethodAnnotations');
+
+        $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/AnonymousClassInTrait.php');
+    }
+
+    public function testLoadAbstractClass()
+    {
+        $this->reader->expects($this->never())->method('getClassAnnotation');
+        $this->reader->expects($this->never())->method('getMethodAnnotations');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/AbstractClass.php');
+    }
+
+    public function testSupports()
+    {
+        $fixture = __DIR__.'/../Fixtures/annotated.php';
+
+        $this->assertTrue($this->loader->supports($fixture), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($this->loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
+
+        $this->assertTrue($this->loader->supports($fixture, 'annotation'), '->supports() checks the resource type if specified');
+        $this->assertFalse($this->loader->supports($fixture, 'foo'), '->supports() checks the resource type if specified');
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/ClosureLoaderTest.php b/lib/symfony/routing/Tests/Loader/ClosureLoaderTest.php
new file mode 100644
index 000000000..5d963f86f
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/ClosureLoaderTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Loader\ClosureLoader;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class ClosureLoaderTest extends TestCase
+{
+    public function testSupports()
+    {
+        $loader = new ClosureLoader();
+
+        $closure = function () {};
+
+        $this->assertTrue($loader->supports($closure), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
+
+        $this->assertTrue($loader->supports($closure, 'closure'), '->supports() checks the resource type if specified');
+        $this->assertFalse($loader->supports($closure, 'foo'), '->supports() checks the resource type if specified');
+    }
+
+    public function testLoad()
+    {
+        $loader = new ClosureLoader();
+
+        $route = new Route('/');
+        $routes = $loader->load(function () use ($route) {
+            $routes = new RouteCollection();
+
+            $routes->add('foo', $route);
+
+            return $routes;
+        });
+
+        $this->assertEquals($route, $routes->get('foo'), '->load() loads a \Closure resource');
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/DirectoryLoaderTest.php b/lib/symfony/routing/Tests/Loader/DirectoryLoaderTest.php
new file mode 100644
index 000000000..2657751b3
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/DirectoryLoaderTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\Routing\Loader\AnnotationFileLoader;
+use Symfony\Component\Routing\Loader\DirectoryLoader;
+use Symfony\Component\Routing\Loader\YamlFileLoader;
+use Symfony\Component\Routing\RouteCollection;
+
+class DirectoryLoaderTest extends AbstractAnnotationLoaderTest
+{
+    private $loader;
+    private $reader;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $locator = new FileLocator();
+        $this->reader = $this->getReader();
+        $this->loader = new DirectoryLoader($locator);
+        $resolver = new LoaderResolver([
+            new YamlFileLoader($locator),
+            new AnnotationFileLoader($locator, $this->getClassLoader($this->reader)),
+            $this->loader,
+        ]);
+        $this->loader->setResolver($resolver);
+    }
+
+    public function testLoadDirectory()
+    {
+        $collection = $this->loader->load(__DIR__.'/../Fixtures/directory', 'directory');
+        $this->verifyCollection($collection);
+    }
+
+    public function testImportDirectory()
+    {
+        $collection = $this->loader->load(__DIR__.'/../Fixtures/directory_import', 'directory');
+        $this->verifyCollection($collection);
+    }
+
+    private function verifyCollection(RouteCollection $collection)
+    {
+        $routes = $collection->all();
+
+        $this->assertCount(3, $routes, 'Three routes are loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        for ($i = 1; $i <= 3; ++$i) {
+            $this->assertSame('/route/'.$i, $routes['route'.$i]->getPath());
+        }
+    }
+
+    public function testSupports()
+    {
+        $fixturesDir = __DIR__.'/../Fixtures';
+
+        $this->assertFalse($this->loader->supports($fixturesDir), '->supports(*) returns false');
+
+        $this->assertTrue($this->loader->supports($fixturesDir, 'directory'), '->supports(*, "directory") returns true');
+        $this->assertFalse($this->loader->supports($fixturesDir, 'foo'), '->supports(*, "foo") returns false');
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/GlobFileLoaderTest.php b/lib/symfony/routing/Tests/Loader/GlobFileLoaderTest.php
new file mode 100644
index 000000000..e4e12b881
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/GlobFileLoaderTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\GlobResource;
+use Symfony\Component\Routing\Loader\GlobFileLoader;
+use Symfony\Component\Routing\RouteCollection;
+
+class GlobFileLoaderTest extends TestCase
+{
+    public function testSupports()
+    {
+        $loader = new GlobFileLoader(new FileLocator());
+
+        $this->assertTrue($loader->supports('any-path', 'glob'), '->supports() returns true if the resource has the glob type');
+        $this->assertFalse($loader->supports('any-path'), '->supports() returns false if the resource is not of glob type');
+    }
+
+    public function testLoadAddsTheGlobResourceToTheContainer()
+    {
+        $loader = new GlobFileLoaderWithoutImport(new FileLocator());
+        $collection = $loader->load(__DIR__.'/../Fixtures/directory/*.yml');
+
+        $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/directory', '/*.yml', false), $collection->getResources()[0]);
+    }
+}
+
+class GlobFileLoaderWithoutImport extends GlobFileLoader
+{
+    public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)
+    {
+        return new RouteCollection();
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/ObjectRouteLoaderTest.php b/lib/symfony/routing/Tests/Loader/ObjectRouteLoaderTest.php
new file mode 100644
index 000000000..64187744e
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/ObjectRouteLoaderTest.php
@@ -0,0 +1,117 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Loader\ObjectRouteLoader;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class ObjectRouteLoaderTest extends TestCase
+{
+    public function testLoadCallsServiceAndReturnsCollection()
+    {
+        $loader = new ObjectRouteLoaderForTest();
+
+        // create a basic collection that will be returned
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+
+        $loader->loaderMap = [
+            'my_route_provider_service' => new RouteService($collection),
+        ];
+
+        $actualRoutes = $loader->load(
+            'my_route_provider_service:loadRoutes',
+            'service'
+        );
+
+        $this->assertSame($collection, $actualRoutes);
+        // the service file should be listed as a resource
+        $this->assertNotEmpty($actualRoutes->getResources());
+    }
+
+    /**
+     * @dataProvider getBadResourceStrings
+     */
+    public function testExceptionWithoutSyntax($resourceString)
+    {
+        $this->expectException('InvalidArgumentException');
+        $loader = new ObjectRouteLoaderForTest();
+        $loader->load($resourceString);
+    }
+
+    public function getBadResourceStrings()
+    {
+        return [
+            ['Foo'],
+            ['Bar::baz'],
+            ['Foo:Bar:baz'],
+        ];
+    }
+
+    public function testExceptionOnNoObjectReturned()
+    {
+        $this->expectException('LogicException');
+        $loader = new ObjectRouteLoaderForTest();
+        $loader->loaderMap = ['my_service' => 'NOT_AN_OBJECT'];
+        $loader->load('my_service:method');
+    }
+
+    public function testExceptionOnBadMethod()
+    {
+        $this->expectException('BadMethodCallException');
+        $loader = new ObjectRouteLoaderForTest();
+        $loader->loaderMap = ['my_service' => new \stdClass()];
+        $loader->load('my_service:method');
+    }
+
+    public function testExceptionOnMethodNotReturningCollection()
+    {
+        $this->expectException('LogicException');
+        $service = $this->getMockBuilder('stdClass')
+            ->setMethods(['loadRoutes'])
+            ->getMock();
+        $service->expects($this->once())
+            ->method('loadRoutes')
+            ->willReturn('NOT_A_COLLECTION');
+
+        $loader = new ObjectRouteLoaderForTest();
+        $loader->loaderMap = ['my_service' => $service];
+        $loader->load('my_service:loadRoutes');
+    }
+}
+
+class ObjectRouteLoaderForTest extends ObjectRouteLoader
+{
+    public $loaderMap = [];
+
+    protected function getServiceObject($id)
+    {
+        return isset($this->loaderMap[$id]) ? $this->loaderMap[$id] : null;
+    }
+}
+
+class RouteService
+{
+    private $collection;
+
+    public function __construct($collection)
+    {
+        $this->collection = $collection;
+    }
+
+    public function loadRoutes()
+    {
+        return $this->collection;
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/PhpFileLoaderTest.php b/lib/symfony/routing/Tests/Loader/PhpFileLoaderTest.php
new file mode 100644
index 000000000..3e1f1ec2f
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/PhpFileLoaderTest.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Loader\PhpFileLoader;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class PhpFileLoaderTest extends TestCase
+{
+    public function testSupports()
+    {
+        $loader = new PhpFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
+
+        $this->assertTrue($loader->supports('foo.php'), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
+
+        $this->assertTrue($loader->supports('foo.php', 'php'), '->supports() checks the resource type if specified');
+        $this->assertFalse($loader->supports('foo.php', 'foo'), '->supports() checks the resource type if specified');
+    }
+
+    public function testLoadWithRoute()
+    {
+        $loader = new PhpFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('validpattern.php');
+        $routes = $routeCollection->all();
+
+        $this->assertCount(1, $routes, 'One route is loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        foreach ($routes as $route) {
+            $this->assertSame('/blog/{slug}', $route->getPath());
+            $this->assertSame('MyBlogBundle:Blog:show', $route->getDefault('_controller'));
+            $this->assertSame('{locale}.example.com', $route->getHost());
+            $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
+            $this->assertEquals(['GET', 'POST', 'PUT', 'OPTIONS'], $route->getMethods());
+            $this->assertEquals(['https'], $route->getSchemes());
+        }
+    }
+
+    public function testLoadWithImport()
+    {
+        $loader = new PhpFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('validresource.php');
+        $routes = $routeCollection->all();
+
+        $this->assertCount(1, $routes, 'One route is loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        foreach ($routes as $route) {
+            $this->assertSame('/prefix/blog/{slug}', $route->getPath());
+            $this->assertSame('MyBlogBundle:Blog:show', $route->getDefault('_controller'));
+            $this->assertSame('{locale}.example.com', $route->getHost());
+            $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
+            $this->assertEquals(['GET', 'POST', 'PUT', 'OPTIONS'], $route->getMethods());
+            $this->assertEquals(['https'], $route->getSchemes());
+        }
+    }
+
+    public function testThatDefiningVariableInConfigFileHasNoSideEffects()
+    {
+        $locator = new FileLocator([__DIR__.'/../Fixtures']);
+        $loader = new PhpFileLoader($locator);
+        $routeCollection = $loader->load('with_define_path_variable.php');
+        $resources = $routeCollection->getResources();
+        $this->assertCount(1, $resources);
+        $this->assertContainsOnly('Symfony\Component\Config\Resource\ResourceInterface', $resources);
+        $fileResource = reset($resources);
+        $this->assertSame(
+            realpath($locator->locate('with_define_path_variable.php')),
+            (string) $fileResource
+        );
+    }
+
+    public function testRoutingConfigurator()
+    {
+        $locator = new FileLocator([__DIR__.'/../Fixtures']);
+        $loader = new PhpFileLoader($locator);
+        $routeCollection = $loader->load('php_dsl.php');
+
+        $expectedCollection = new RouteCollection();
+
+        $expectedCollection->add('foo', (new Route('/foo'))
+            ->setOptions(['utf8' => true])
+            ->setCondition('abc')
+        );
+        $expectedCollection->add('buz', (new Route('/zub'))
+            ->setDefaults(['_controller' => 'foo:act'])
+        );
+        $expectedCollection->add('c_bar', (new Route('/sub/pub/bar'))
+            ->setRequirements(['id' => '\d+'])
+        );
+        $expectedCollection->add('c_pub_buz', (new Route('/sub/pub/buz'))
+            ->setHost('host')
+            ->setRequirements(['id' => '\d+'])
+        );
+        $expectedCollection->add('ouf', (new Route('/ouf'))
+            ->setSchemes(['https'])
+            ->setMethods(['GET'])
+            ->setDefaults(['id' => 0])
+        );
+
+        $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_sub.php')));
+        $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl.php')));
+
+        $this->assertEquals($expectedCollection, $routeCollection);
+    }
+
+    public function testRoutingConfiguratorCanImportGlobPatterns()
+    {
+        $locator = new FileLocator([__DIR__.'/../Fixtures/glob']);
+        $loader = new PhpFileLoader($locator);
+        $routeCollection = $loader->load('php_dsl.php');
+
+        $route = $routeCollection->get('bar_route');
+        $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller'));
+
+        $route = $routeCollection->get('baz_route');
+        $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller'));
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/XmlFileLoaderTest.php b/lib/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
new file mode 100644
index 000000000..128bb54fb
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
@@ -0,0 +1,399 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Routing\Loader\XmlFileLoader;
+use Symfony\Component\Routing\Tests\Fixtures\CustomXmlFileLoader;
+
+class XmlFileLoaderTest extends TestCase
+{
+    public function testSupports()
+    {
+        $loader = new XmlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
+
+        $this->assertTrue($loader->supports('foo.xml'), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
+
+        $this->assertTrue($loader->supports('foo.xml', 'xml'), '->supports() checks the resource type if specified');
+        $this->assertFalse($loader->supports('foo.xml', 'foo'), '->supports() checks the resource type if specified');
+    }
+
+    public function testLoadWithRoute()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('validpattern.xml');
+        $route = $routeCollection->get('blog_show');
+
+        $this->assertInstanceOf('Symfony\Component\Routing\Route', $route);
+        $this->assertSame('/blog/{slug}', $route->getPath());
+        $this->assertSame('{locale}.example.com', $route->getHost());
+        $this->assertSame('MyBundle:Blog:show', $route->getDefault('_controller'));
+        $this->assertSame('\w+', $route->getRequirement('locale'));
+        $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
+        $this->assertEquals(['GET', 'POST', 'PUT', 'OPTIONS'], $route->getMethods());
+        $this->assertEquals(['https'], $route->getSchemes());
+        $this->assertEquals('context.getMethod() == "GET"', $route->getCondition());
+    }
+
+    public function testLoadWithNamespacePrefix()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('namespaceprefix.xml');
+
+        $this->assertCount(1, $routeCollection->all(), 'One route is loaded');
+
+        $route = $routeCollection->get('blog_show');
+        $this->assertSame('/blog/{slug}', $route->getPath());
+        $this->assertSame('{_locale}.example.com', $route->getHost());
+        $this->assertSame('MyBundle:Blog:show', $route->getDefault('_controller'));
+        $this->assertSame('\w+', $route->getRequirement('slug'));
+        $this->assertSame('en|fr|de', $route->getRequirement('_locale'));
+        $this->assertNull($route->getDefault('slug'));
+        $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
+        $this->assertSame(1, $route->getDefault('page'));
+    }
+
+    public function testLoadWithImport()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('validresource.xml');
+        $routes = $routeCollection->all();
+
+        $this->assertCount(2, $routes, 'Two routes are loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        foreach ($routes as $route) {
+            $this->assertSame('/{foo}/blog/{slug}', $route->getPath());
+            $this->assertSame('123', $route->getDefault('foo'));
+            $this->assertSame('\d+', $route->getRequirement('foo'));
+            $this->assertSame('bar', $route->getOption('foo'));
+            $this->assertSame('', $route->getHost());
+            $this->assertSame('context.getMethod() == "POST"', $route->getCondition());
+        }
+    }
+
+    public function testUtf8Route()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/localized']));
+        $routeCollection = $loader->load('utf8.xml');
+        $routes = $routeCollection->all();
+
+        $this->assertCount(2, $routes, 'Two routes are loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        $utf8Route = $routeCollection->get('app_utf8');
+
+        $this->assertSame('/utf8', $utf8Route->getPath());
+        $this->assertTrue($utf8Route->getOption('utf8'), 'Must be utf8');
+
+        $noUtf8Route = $routeCollection->get('app_no_utf8');
+
+        $this->assertSame('/no-utf8', $noUtf8Route->getPath());
+        $this->assertFalse($noUtf8Route->getOption('utf8'), 'Must not be utf8');
+    }
+
+    /**
+     * @dataProvider getPathsToInvalidFiles
+     */
+    public function testLoadThrowsExceptionWithInvalidFile($filePath)
+    {
+        $this->expectException('InvalidArgumentException');
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $loader->load($filePath);
+    }
+
+    /**
+     * @dataProvider getPathsToInvalidFiles
+     */
+    public function testLoadThrowsExceptionWithInvalidFileEvenWithoutSchemaValidation($filePath)
+    {
+        $this->expectException('InvalidArgumentException');
+        $loader = new CustomXmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $loader->load($filePath);
+    }
+
+    public function getPathsToInvalidFiles()
+    {
+        return [['nonvalidnode.xml'], ['nonvalidroute.xml'], ['nonvalid.xml'], ['missing_id.xml'], ['missing_path.xml']];
+    }
+
+    public function testDocTypeIsNotAllowed()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Document types are not allowed.');
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $loader->load('withdoctype.xml');
+    }
+
+    public function testNullValues()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('null_values.xml');
+        $route = $routeCollection->get('blog_show');
+
+        $this->assertTrue($route->hasDefault('foo'));
+        $this->assertNull($route->getDefault('foo'));
+        $this->assertTrue($route->hasDefault('bar'));
+        $this->assertNull($route->getDefault('bar'));
+        $this->assertEquals('foo', $route->getDefault('foobar'));
+        $this->assertEquals('bar', $route->getDefault('baz'));
+    }
+
+    public function testScalarDataTypeDefaults()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('scalar_defaults.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame(
+            [
+                '_controller' => 'AcmeBlogBundle:Blog:index',
+                'slug' => null,
+                'published' => true,
+                'page' => 1,
+                'price' => 3.5,
+                'archived' => false,
+                'free' => true,
+                'locked' => false,
+                'foo' => null,
+                'bar' => null,
+            ],
+            $route->getDefaults()
+        );
+    }
+
+    public function testListDefaults()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('list_defaults.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame(
+            [
+                '_controller' => 'AcmeBlogBundle:Blog:index',
+                'values' => [true, 1, 3.5, 'foo'],
+            ],
+            $route->getDefaults()
+        );
+    }
+
+    public function testListInListDefaults()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('list_in_list_defaults.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame(
+            [
+                '_controller' => 'AcmeBlogBundle:Blog:index',
+                'values' => [[true, 1, 3.5, 'foo']],
+            ],
+            $route->getDefaults()
+        );
+    }
+
+    public function testListInMapDefaults()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('list_in_map_defaults.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame(
+            [
+                '_controller' => 'AcmeBlogBundle:Blog:index',
+                'values' => ['list' => [true, 1, 3.5, 'foo']],
+            ],
+            $route->getDefaults()
+        );
+    }
+
+    public function testMapDefaults()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('map_defaults.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame(
+            [
+                '_controller' => 'AcmeBlogBundle:Blog:index',
+                'values' => [
+                    'public' => true,
+                    'page' => 1,
+                    'price' => 3.5,
+                    'title' => 'foo',
+                ],
+            ],
+            $route->getDefaults()
+        );
+    }
+
+    public function testMapInListDefaults()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('map_in_list_defaults.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame(
+            [
+                '_controller' => 'AcmeBlogBundle:Blog:index',
+                'values' => [[
+                    'public' => true,
+                    'page' => 1,
+                    'price' => 3.5,
+                    'title' => 'foo',
+                ]],
+            ],
+            $route->getDefaults()
+        );
+    }
+
+    public function testMapInMapDefaults()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('map_in_map_defaults.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame(
+            [
+                '_controller' => 'AcmeBlogBundle:Blog:index',
+                'values' => ['map' => [
+                    'public' => true,
+                    'page' => 1,
+                    'price' => 3.5,
+                    'title' => 'foo',
+                ]],
+            ],
+            $route->getDefaults()
+        );
+    }
+
+    public function testNullValuesInList()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('list_null_values.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame([null, null, null, null, null, null], $route->getDefault('list'));
+    }
+
+    public function testNullValuesInMap()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('map_null_values.xml');
+        $route = $routeCollection->get('blog');
+
+        $this->assertSame(
+            [
+                'boolean' => null,
+                'integer' => null,
+                'float' => null,
+                'string' => null,
+                'list' => null,
+                'map' => null,
+            ],
+            $route->getDefault('map')
+        );
+    }
+
+    public function testLoadRouteWithControllerAttribute()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $routeCollection = $loader->load('routing.xml');
+
+        $route = $routeCollection->get('app_homepage');
+
+        $this->assertSame('AppBundle:Homepage:show', $route->getDefault('_controller'));
+    }
+
+    public function testLoadRouteWithoutControllerAttribute()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $routeCollection = $loader->load('routing.xml');
+
+        $route = $routeCollection->get('app_logout');
+
+        $this->assertNull($route->getDefault('_controller'));
+    }
+
+    public function testLoadRouteWithControllerSetInDefaults()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $routeCollection = $loader->load('routing.xml');
+
+        $route = $routeCollection->get('app_blog');
+
+        $this->assertSame('AppBundle:Blog:list', $route->getDefault('_controller'));
+    }
+
+    public function testOverrideControllerInDefaults()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $loader->load('override_defaults.xml');
+    }
+
+    /**
+     * @dataProvider provideFilesImportingRoutesWithControllers
+     */
+    public function testImportRouteWithController($file)
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $routeCollection = $loader->load($file);
+
+        $route = $routeCollection->get('app_homepage');
+        $this->assertSame('FrameworkBundle:Template:template', $route->getDefault('_controller'));
+
+        $route = $routeCollection->get('app_blog');
+        $this->assertSame('FrameworkBundle:Template:template', $route->getDefault('_controller'));
+
+        $route = $routeCollection->get('app_logout');
+        $this->assertSame('FrameworkBundle:Template:template', $route->getDefault('_controller'));
+    }
+
+    public function provideFilesImportingRoutesWithControllers()
+    {
+        yield ['import_controller.xml'];
+        yield ['import__controller.xml'];
+    }
+
+    public function testImportWithOverriddenController()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $loader->load('import_override_defaults.xml');
+    }
+
+    public function testImportRouteWithGlobMatchingSingleFile()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/glob']));
+        $routeCollection = $loader->load('import_single.xml');
+
+        $route = $routeCollection->get('bar_route');
+        $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller'));
+    }
+
+    public function testImportRouteWithGlobMatchingMultipleFiles()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/glob']));
+        $routeCollection = $loader->load('import_multiple.xml');
+
+        $route = $routeCollection->get('bar_route');
+        $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller'));
+
+        $route = $routeCollection->get('baz_route');
+        $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller'));
+    }
+}
diff --git a/lib/symfony/routing/Tests/Loader/YamlFileLoaderTest.php b/lib/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
new file mode 100644
index 000000000..2e3261a1c
--- /dev/null
+++ b/lib/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
@@ -0,0 +1,202 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Loader;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Loader\YamlFileLoader;
+
+class YamlFileLoaderTest extends TestCase
+{
+    public function testSupports()
+    {
+        $loader = new YamlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
+
+        $this->assertTrue($loader->supports('foo.yml'), '->supports() returns true if the resource is loadable');
+        $this->assertTrue($loader->supports('foo.yaml'), '->supports() returns true if the resource is loadable');
+        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
+
+        $this->assertTrue($loader->supports('foo.yml', 'yaml'), '->supports() checks the resource type if specified');
+        $this->assertTrue($loader->supports('foo.yaml', 'yaml'), '->supports() checks the resource type if specified');
+        $this->assertFalse($loader->supports('foo.yml', 'foo'), '->supports() checks the resource type if specified');
+    }
+
+    public function testLoadDoesNothingIfEmpty()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $collection = $loader->load('empty.yml');
+
+        $this->assertEquals([], $collection->all());
+        $this->assertEquals([new FileResource(realpath(__DIR__.'/../Fixtures/empty.yml'))], $collection->getResources());
+    }
+
+    /**
+     * @dataProvider getPathsToInvalidFiles
+     */
+    public function testLoadThrowsExceptionWithInvalidFile($filePath)
+    {
+        $this->expectException('InvalidArgumentException');
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $loader->load($filePath);
+    }
+
+    public function getPathsToInvalidFiles()
+    {
+        return [
+            ['nonvalid.yml'],
+            ['nonvalid2.yml'],
+            ['incomplete.yml'],
+            ['nonvalidkeys.yml'],
+            ['nonesense_resource_plus_path.yml'],
+            ['nonesense_type_without_resource.yml'],
+            ['bad_format.yml'],
+        ];
+    }
+
+    public function testLoadSpecialRouteName()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('special_route_name.yml');
+        $route = $routeCollection->get('#$péß^a|');
+
+        $this->assertInstanceOf('Symfony\Component\Routing\Route', $route);
+        $this->assertSame('/true', $route->getPath());
+    }
+
+    public function testLoadWithRoute()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('validpattern.yml');
+        $route = $routeCollection->get('blog_show');
+
+        $this->assertInstanceOf('Symfony\Component\Routing\Route', $route);
+        $this->assertSame('/blog/{slug}', $route->getPath());
+        $this->assertSame('{locale}.example.com', $route->getHost());
+        $this->assertSame('MyBundle:Blog:show', $route->getDefault('_controller'));
+        $this->assertSame('\w+', $route->getRequirement('locale'));
+        $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
+        $this->assertEquals(['GET', 'POST', 'PUT', 'OPTIONS'], $route->getMethods());
+        $this->assertEquals(['https'], $route->getSchemes());
+        $this->assertEquals('context.getMethod() == "GET"', $route->getCondition());
+    }
+
+    public function testLoadWithResource()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
+        $routeCollection = $loader->load('validresource.yml');
+        $routes = $routeCollection->all();
+
+        $this->assertCount(2, $routes, 'Two routes are loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        foreach ($routes as $route) {
+            $this->assertSame('/{foo}/blog/{slug}', $route->getPath());
+            $this->assertSame('123', $route->getDefault('foo'));
+            $this->assertSame('\d+', $route->getRequirement('foo'));
+            $this->assertSame('bar', $route->getOption('foo'));
+            $this->assertSame('', $route->getHost());
+            $this->assertSame('context.getMethod() == "POST"', $route->getCondition());
+        }
+    }
+
+    public function testLoadRouteWithControllerAttribute()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $routeCollection = $loader->load('routing.yml');
+
+        $route = $routeCollection->get('app_homepage');
+
+        $this->assertSame('AppBundle:Homepage:show', $route->getDefault('_controller'));
+    }
+
+    public function testLoadRouteWithoutControllerAttribute()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $routeCollection = $loader->load('routing.yml');
+
+        $route = $routeCollection->get('app_logout');
+
+        $this->assertNull($route->getDefault('_controller'));
+    }
+
+    public function testLoadRouteWithControllerSetInDefaults()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $routeCollection = $loader->load('routing.yml');
+
+        $route = $routeCollection->get('app_blog');
+
+        $this->assertSame('AppBundle:Blog:list', $route->getDefault('_controller'));
+    }
+
+    public function testOverrideControllerInDefaults()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $loader->load('override_defaults.yml');
+    }
+
+    /**
+     * @dataProvider provideFilesImportingRoutesWithControllers
+     */
+    public function testImportRouteWithController($file)
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $routeCollection = $loader->load($file);
+
+        $route = $routeCollection->get('app_homepage');
+        $this->assertSame('FrameworkBundle:Template:template', $route->getDefault('_controller'));
+
+        $route = $routeCollection->get('app_blog');
+        $this->assertSame('FrameworkBundle:Template:template', $route->getDefault('_controller'));
+
+        $route = $routeCollection->get('app_logout');
+        $this->assertSame('FrameworkBundle:Template:template', $route->getDefault('_controller'));
+    }
+
+    public function provideFilesImportingRoutesWithControllers()
+    {
+        yield ['import_controller.yml'];
+        yield ['import__controller.yml'];
+    }
+
+    public function testImportWithOverriddenController()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
+        $loader->load('import_override_defaults.yml');
+    }
+
+    public function testImportRouteWithGlobMatchingSingleFile()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/glob']));
+        $routeCollection = $loader->load('import_single.yml');
+
+        $route = $routeCollection->get('bar_route');
+        $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller'));
+    }
+
+    public function testImportRouteWithGlobMatchingMultipleFiles()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/glob']));
+        $routeCollection = $loader->load('import_multiple.yml');
+
+        $route = $routeCollection->get('bar_route');
+        $this->assertSame('AppBundle:Bar:view', $route->getDefault('_controller'));
+
+        $route = $routeCollection->get('baz_route');
+        $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller'));
+    }
+}
diff --git a/lib/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php b/lib/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
new file mode 100644
index 000000000..235e47768
--- /dev/null
+++ b/lib/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Matcher;
+
+use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
+use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
+
+class DumpedRedirectableUrlMatcherTest extends RedirectableUrlMatcherTest
+{
+    protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
+    {
+        static $i = 0;
+
+        $class = 'DumpedRedirectableUrlMatcher'.++$i;
+        $dumper = new PhpMatcherDumper($routes);
+        eval('?>'.$dumper->dump(['class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher']));
+
+        return $this->getMockBuilder($class)
+            ->setConstructorArgs([$context ?: new RequestContext()])
+            ->setMethods(['redirect'])
+            ->getMock();
+    }
+}
+
+class TestDumpedRedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatcherInterface
+{
+    public function redirect($path, $route, $scheme = null)
+    {
+        return [];
+    }
+}
diff --git a/lib/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php b/lib/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php
new file mode 100644
index 000000000..873b45a5a
--- /dev/null
+++ b/lib/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Matcher;
+
+use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
+
+class DumpedUrlMatcherTest extends UrlMatcherTest
+{
+    public function testSchemeRequirement()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.');
+        parent::testSchemeRequirement();
+    }
+
+    public function testSchemeAndMethodMismatch()
+    {
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.');
+        parent::testSchemeRequirement();
+    }
+
+    protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
+    {
+        static $i = 0;
+
+        $class = 'DumpedUrlMatcher'.++$i;
+        $dumper = new PhpMatcherDumper($routes);
+        eval('?>'.$dumper->dump(['class' => $class]));
+
+        return new $class($context ?: new RequestContext());
+    }
+}
diff --git a/lib/symfony/routing/Tests/Matcher/Dumper/DumperCollectionTest.php b/lib/symfony/routing/Tests/Matcher/Dumper/DumperCollectionTest.php
new file mode 100644
index 000000000..823efdb84
--- /dev/null
+++ b/lib/symfony/routing/Tests/Matcher/Dumper/DumperCollectionTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Matcher\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Matcher\Dumper\DumperCollection;
+
+class DumperCollectionTest extends TestCase
+{
+    public function testGetRoot()
+    {
+        $a = new DumperCollection();
+
+        $b = new DumperCollection();
+        $a->add($b);
+
+        $c = new DumperCollection();
+        $b->add($c);
+
+        $d = new DumperCollection();
+        $c->add($d);
+
+        $this->assertSame($a, $c->getRoot());
+    }
+}
diff --git a/lib/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/lib/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
new file mode 100644
index 000000000..728601015
--- /dev/null
+++ b/lib/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -0,0 +1,454 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Matcher\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
+use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class PhpMatcherDumperTest extends TestCase
+{
+    /**
+     * @var string
+     */
+    private $matcherClass;
+
+    /**
+     * @var string
+     */
+    private $dumpPath;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->matcherClass = uniqid('ProjectUrlMatcher');
+        $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        @unlink($this->dumpPath);
+    }
+
+    public function testDumpWhenSchemeIsUsedWithoutAProperDumper()
+    {
+        $this->expectException('LogicException');
+        $collection = new RouteCollection();
+        $collection->add('secure', new Route(
+            '/secure',
+            [],
+            [],
+            [],
+            '',
+            ['https']
+        ));
+        $dumper = new PhpMatcherDumper($collection);
+        $dumper->dump();
+    }
+
+    public function testRedirectPreservesUrlEncoding()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo:bar/'));
+
+        $class = $this->generateDumpedMatcher($collection, true);
+
+        $matcher = $this->getMockBuilder($class)
+                        ->setMethods(['redirect'])
+                        ->setConstructorArgs([new RequestContext()])
+                        ->getMock();
+
+        $matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/', 'foo')->willReturn([]);
+
+        $matcher->match('/foo%3Abar');
+    }
+
+    /**
+     * @dataProvider getRouteCollections
+     */
+    public function testDump(RouteCollection $collection, $fixture, $options = [])
+    {
+        $basePath = __DIR__.'/../../Fixtures/dumper/';
+
+        $dumper = new PhpMatcherDumper($collection);
+        $this->assertStringEqualsFile($basePath.$fixture, $dumper->dump($options), '->dump() correctly dumps routes as optimized PHP code.');
+    }
+
+    public function getRouteCollections()
+    {
+        /* test case 1 */
+
+        $collection = new RouteCollection();
+
+        $collection->add('overridden', new Route('/overridden'));
+
+        // defaults and requirements
+        $collection->add('foo', new Route(
+            '/foo/{bar}',
+            ['def' => 'test'],
+            ['bar' => 'baz|symfony']
+        ));
+        // method requirement
+        $collection->add('bar', new Route(
+            '/bar/{foo}',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['GET', 'head']
+        ));
+        // GET method requirement automatically adds HEAD as valid
+        $collection->add('barhead', new Route(
+            '/barhead/{foo}',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['GET']
+        ));
+        // simple
+        $collection->add('baz', new Route(
+            '/test/baz'
+        ));
+        // simple with extension
+        $collection->add('baz2', new Route(
+            '/test/baz.html'
+        ));
+        // trailing slash
+        $collection->add('baz3', new Route(
+            '/test/baz3/'
+        ));
+        // trailing slash with variable
+        $collection->add('baz4', new Route(
+            '/test/{foo}/'
+        ));
+        // trailing slash and method
+        $collection->add('baz5', new Route(
+            '/test/{foo}/',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['post']
+        ));
+        // complex name
+        $collection->add('baz.baz6', new Route(
+            '/test/{foo}/',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['put']
+        ));
+        // defaults without variable
+        $collection->add('foofoo', new Route(
+            '/foofoo',
+            ['def' => 'test']
+        ));
+        // pattern with quotes
+        $collection->add('quoter', new Route(
+            '/{quoter}',
+            [],
+            ['quoter' => '[\']+']
+        ));
+        // space in pattern
+        $collection->add('space', new Route(
+            '/spa ce'
+        ));
+
+        // prefixes
+        $collection1 = new RouteCollection();
+        $collection1->add('overridden', new Route('/overridden1'));
+        $collection1->add('foo1', new Route('/{foo}'));
+        $collection1->add('bar1', new Route('/{bar}'));
+        $collection1->addPrefix('/b\'b');
+        $collection2 = new RouteCollection();
+        $collection2->addCollection($collection1);
+        $collection2->add('overridden', new Route('/{var}', [], ['var' => '.*']));
+        $collection1 = new RouteCollection();
+        $collection1->add('foo2', new Route('/{foo1}'));
+        $collection1->add('bar2', new Route('/{bar1}'));
+        $collection1->addPrefix('/b\'b');
+        $collection2->addCollection($collection1);
+        $collection2->addPrefix('/a');
+        $collection->addCollection($collection2);
+
+        // overridden through addCollection() and multiple sub-collections with no own prefix
+        $collection1 = new RouteCollection();
+        $collection1->add('overridden2', new Route('/old'));
+        $collection1->add('helloWorld', new Route('/hello/{who}', ['who' => 'World!']));
+        $collection2 = new RouteCollection();
+        $collection3 = new RouteCollection();
+        $collection3->add('overridden2', new Route('/new'));
+        $collection3->add('hey', new Route('/hey/'));
+        $collection2->addCollection($collection3);
+        $collection1->addCollection($collection2);
+        $collection1->addPrefix('/multi');
+        $collection->addCollection($collection1);
+
+        // "dynamic" prefix
+        $collection1 = new RouteCollection();
+        $collection1->add('foo3', new Route('/{foo}'));
+        $collection1->add('bar3', new Route('/{bar}'));
+        $collection1->addPrefix('/b');
+        $collection1->addPrefix('{_locale}');
+        $collection->addCollection($collection1);
+
+        // route between collections
+        $collection->add('ababa', new Route('/ababa'));
+
+        // collection with static prefix but only one route
+        $collection1 = new RouteCollection();
+        $collection1->add('foo4', new Route('/{foo}'));
+        $collection1->addPrefix('/aba');
+        $collection->addCollection($collection1);
+
+        // prefix and host
+
+        $collection1 = new RouteCollection();
+
+        $route1 = new Route('/route1', [], [], [], 'a.example.com');
+        $collection1->add('route1', $route1);
+
+        $route2 = new Route('/c2/route2', [], [], [], 'a.example.com');
+        $collection1->add('route2', $route2);
+
+        $route3 = new Route('/c2/route3', [], [], [], 'b.example.com');
+        $collection1->add('route3', $route3);
+
+        $route4 = new Route('/route4', [], [], [], 'a.example.com');
+        $collection1->add('route4', $route4);
+
+        $route5 = new Route('/route5', [], [], [], 'c.example.com');
+        $collection1->add('route5', $route5);
+
+        $route6 = new Route('/route6', [], [], [], null);
+        $collection1->add('route6', $route6);
+
+        $collection->addCollection($collection1);
+
+        // host and variables
+
+        $collection1 = new RouteCollection();
+
+        $route11 = new Route('/route11', [], [], [], '{var1}.example.com');
+        $collection1->add('route11', $route11);
+
+        $route12 = new Route('/route12', ['var1' => 'val'], [], [], '{var1}.example.com');
+        $collection1->add('route12', $route12);
+
+        $route13 = new Route('/route13/{name}', [], [], [], '{var1}.example.com');
+        $collection1->add('route13', $route13);
+
+        $route14 = new Route('/route14/{name}', ['var1' => 'val'], [], [], '{var1}.example.com');
+        $collection1->add('route14', $route14);
+
+        $route15 = new Route('/route15/{name}', [], [], [], 'c.example.com');
+        $collection1->add('route15', $route15);
+
+        $route16 = new Route('/route16/{name}', ['var1' => 'val'], [], [], null);
+        $collection1->add('route16', $route16);
+
+        $route17 = new Route('/route17', [], [], [], null);
+        $collection1->add('route17', $route17);
+
+        $collection->addCollection($collection1);
+
+        // multiple sub-collections with a single route and a prefix each
+        $collection1 = new RouteCollection();
+        $collection1->add('a', new Route('/a...'));
+        $collection2 = new RouteCollection();
+        $collection2->add('b', new Route('/{var}'));
+        $collection3 = new RouteCollection();
+        $collection3->add('c', new Route('/{var}'));
+        $collection3->addPrefix('/c');
+        $collection2->addCollection($collection3);
+        $collection2->addPrefix('/b');
+        $collection1->addCollection($collection2);
+        $collection1->addPrefix('/a');
+        $collection->addCollection($collection1);
+
+        /* test case 2 */
+
+        $redirectCollection = clone $collection;
+
+        // force HTTPS redirection
+        $redirectCollection->add('secure', new Route(
+            '/secure',
+            [],
+            [],
+            [],
+            '',
+            ['https']
+        ));
+
+        // force HTTP redirection
+        $redirectCollection->add('nonsecure', new Route(
+            '/nonsecure',
+            [],
+            [],
+            [],
+            '',
+            ['http']
+        ));
+
+        /* test case 3 */
+
+        $rootprefixCollection = new RouteCollection();
+        $rootprefixCollection->add('static', new Route('/test'));
+        $rootprefixCollection->add('dynamic', new Route('/{var}'));
+        $rootprefixCollection->addPrefix('rootprefix');
+        $route = new Route('/with-condition');
+        $route->setCondition('context.getMethod() == "GET"');
+        $rootprefixCollection->add('with-condition', $route);
+
+        /* test case 4 */
+        $headMatchCasesCollection = new RouteCollection();
+        $headMatchCasesCollection->add('just_head', new Route(
+            '/just_head',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['HEAD']
+        ));
+        $headMatchCasesCollection->add('head_and_get', new Route(
+            '/head_and_get',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['HEAD', 'GET']
+        ));
+        $headMatchCasesCollection->add('get_and_head', new Route(
+            '/get_and_head',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['GET', 'HEAD']
+        ));
+        $headMatchCasesCollection->add('post_and_head', new Route(
+            '/post_and_head',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['POST', 'HEAD']
+        ));
+        $headMatchCasesCollection->add('put_and_post', new Route(
+            '/put_and_post',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['PUT', 'POST']
+        ));
+        $headMatchCasesCollection->add('put_and_get_and_head', new Route(
+            '/put_and_post',
+            [],
+            [],
+            [],
+            '',
+            [],
+            ['PUT', 'GET', 'HEAD']
+        ));
+
+        /* test case 5 */
+        $groupOptimisedCollection = new RouteCollection();
+        $groupOptimisedCollection->add('a_first', new Route('/a/11'));
+        $groupOptimisedCollection->add('a_second', new Route('/a/22'));
+        $groupOptimisedCollection->add('a_third', new Route('/a/333'));
+        $groupOptimisedCollection->add('a_wildcard', new Route('/{param}'));
+        $groupOptimisedCollection->add('a_fourth', new Route('/a/44/'));
+        $groupOptimisedCollection->add('a_fifth', new Route('/a/55/'));
+        $groupOptimisedCollection->add('a_sixth', new Route('/a/66/'));
+        $groupOptimisedCollection->add('nested_wildcard', new Route('/nested/{param}'));
+        $groupOptimisedCollection->add('nested_a', new Route('/nested/group/a/'));
+        $groupOptimisedCollection->add('nested_b', new Route('/nested/group/b/'));
+        $groupOptimisedCollection->add('nested_c', new Route('/nested/group/c/'));
+
+        $groupOptimisedCollection->add('slashed_a', new Route('/slashed/group/'));
+        $groupOptimisedCollection->add('slashed_b', new Route('/slashed/group/b/'));
+        $groupOptimisedCollection->add('slashed_c', new Route('/slashed/group/c/'));
+
+        $trailingSlashCollection = new RouteCollection();
+        $trailingSlashCollection->add('simple_trailing_slash_no_methods', new Route('/trailing/simple/no-methods/', [], [], [], '', [], []));
+        $trailingSlashCollection->add('simple_trailing_slash_GET_method', new Route('/trailing/simple/get-method/', [], [], [], '', [], ['GET']));
+        $trailingSlashCollection->add('simple_trailing_slash_HEAD_method', new Route('/trailing/simple/head-method/', [], [], [], '', [], ['HEAD']));
+        $trailingSlashCollection->add('simple_trailing_slash_POST_method', new Route('/trailing/simple/post-method/', [], [], [], '', [], ['POST']));
+        $trailingSlashCollection->add('regex_trailing_slash_no_methods', new Route('/trailing/regex/no-methods/{param}/', [], [], [], '', [], []));
+        $trailingSlashCollection->add('regex_trailing_slash_GET_method', new Route('/trailing/regex/get-method/{param}/', [], [], [], '', [], ['GET']));
+        $trailingSlashCollection->add('regex_trailing_slash_HEAD_method', new Route('/trailing/regex/head-method/{param}/', [], [], [], '', [], ['HEAD']));
+        $trailingSlashCollection->add('regex_trailing_slash_POST_method', new Route('/trailing/regex/post-method/{param}/', [], [], [], '', [], ['POST']));
+
+        $trailingSlashCollection->add('simple_not_trailing_slash_no_methods', new Route('/not-trailing/simple/no-methods', [], [], [], '', [], []));
+        $trailingSlashCollection->add('simple_not_trailing_slash_GET_method', new Route('/not-trailing/simple/get-method', [], [], [], '', [], ['GET']));
+        $trailingSlashCollection->add('simple_not_trailing_slash_HEAD_method', new Route('/not-trailing/simple/head-method', [], [], [], '', [], ['HEAD']));
+        $trailingSlashCollection->add('simple_not_trailing_slash_POST_method', new Route('/not-trailing/simple/post-method', [], [], [], '', [], ['POST']));
+        $trailingSlashCollection->add('regex_not_trailing_slash_no_methods', new Route('/not-trailing/regex/no-methods/{param}', [], [], [], '', [], []));
+        $trailingSlashCollection->add('regex_not_trailing_slash_GET_method', new Route('/not-trailing/regex/get-method/{param}', [], [], [], '', [], ['GET']));
+        $trailingSlashCollection->add('regex_not_trailing_slash_HEAD_method', new Route('/not-trailing/regex/head-method/{param}', [], [], [], '', [], ['HEAD']));
+        $trailingSlashCollection->add('regex_not_trailing_slash_POST_method', new Route('/not-trailing/regex/post-method/{param}', [], [], [], '', [], ['POST']));
+
+        return [
+           [new RouteCollection(), 'url_matcher0.php', []],
+           [$collection, 'url_matcher1.php', []],
+           [$redirectCollection, 'url_matcher2.php', ['base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher']],
+           [$rootprefixCollection, 'url_matcher3.php', []],
+           [$headMatchCasesCollection, 'url_matcher4.php', []],
+           [$groupOptimisedCollection, 'url_matcher5.php', ['base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher']],
+           [$trailingSlashCollection, 'url_matcher6.php', []],
+           [$trailingSlashCollection, 'url_matcher7.php', ['base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher']],
+        ];
+    }
+
+    private function generateDumpedMatcher(RouteCollection $collection, $redirectableStub = false)
+    {
+        $options = ['class' => $this->matcherClass];
+
+        if ($redirectableStub) {
+            $options['base_class'] = '\Symfony\Component\Routing\Tests\Matcher\Dumper\RedirectableUrlMatcherStub';
+        }
+
+        $dumper = new PhpMatcherDumper($collection);
+        $code = $dumper->dump($options);
+
+        file_put_contents($this->dumpPath, $code);
+        include $this->dumpPath;
+
+        return $this->matcherClass;
+    }
+}
+
+abstract class RedirectableUrlMatcherStub extends UrlMatcher implements RedirectableUrlMatcherInterface
+{
+    public function redirect($path, $route, $scheme = null)
+    {
+    }
+}
diff --git a/lib/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php b/lib/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
new file mode 100644
index 000000000..e0ee4e8ee
--- /dev/null
+++ b/lib/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Matcher\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Matcher\Dumper\StaticPrefixCollection;
+use Symfony\Component\Routing\Route;
+
+class StaticPrefixCollectionTest extends TestCase
+{
+    /**
+     * @dataProvider routeProvider
+     */
+    public function testGrouping(array $routes, $expected)
+    {
+        $collection = new StaticPrefixCollection('/');
+
+        foreach ($routes as $route) {
+            list($path, $name) = $route;
+            $staticPrefix = (new Route($path))->compile()->getStaticPrefix();
+            $collection->addRoute($staticPrefix, $name);
+        }
+
+        $collection->optimizeGroups();
+        $dumped = $this->dumpCollection($collection);
+        $this->assertEquals($expected, $dumped);
+    }
+
+    public function routeProvider()
+    {
+        return [
+            'Simple - not nested' => [
+                [
+                    ['/', 'root'],
+                    ['/prefix/segment/', 'prefix_segment'],
+                    ['/leading/segment/', 'leading_segment'],
+                ],
+                <<<EOF
+/ root
+/prefix/segment prefix_segment
+/leading/segment leading_segment
+EOF
+            ],
+            'Not nested - group too small' => [
+                [
+                    ['/', 'root'],
+                    ['/prefix/segment/aa', 'prefix_segment'],
+                    ['/prefix/segment/bb', 'leading_segment'],
+                ],
+                <<<EOF
+/ root
+/prefix/segment/aa prefix_segment
+/prefix/segment/bb leading_segment
+EOF
+            ],
+            'Nested - contains item at intersection' => [
+                [
+                    ['/', 'root'],
+                    ['/prefix/segment/', 'prefix_segment'],
+                    ['/prefix/segment/bb', 'leading_segment'],
+                ],
+                <<<EOF
+/ root
+/prefix/segment
+-> /prefix/segment prefix_segment
+-> /prefix/segment/bb leading_segment
+EOF
+            ],
+            'Simple one level nesting' => [
+                [
+                    ['/', 'root'],
+                    ['/group/segment/', 'nested_segment'],
+                    ['/group/thing/', 'some_segment'],
+                    ['/group/other/', 'other_segment'],
+                ],
+                <<<EOF
+/ root
+/group
+-> /group/segment nested_segment
+-> /group/thing some_segment
+-> /group/other other_segment
+EOF
+            ],
+            'Retain matching order with groups' => [
+                [
+                    ['/group/aa/', 'aa'],
+                    ['/group/bb/', 'bb'],
+                    ['/group/cc/', 'cc'],
+                    ['/', 'root'],
+                    ['/group/dd/', 'dd'],
+                    ['/group/ee/', 'ee'],
+                    ['/group/ff/', 'ff'],
+                ],
+                <<<EOF
+/group
+-> /group/aa aa
+-> /group/bb bb
+-> /group/cc cc
+/ root
+/group
+-> /group/dd dd
+-> /group/ee ee
+-> /group/ff ff
+EOF
+            ],
+            'Retain complex matching order with groups at base' => [
+                [
+                    ['/aaa/111/', 'first_aaa'],
+                    ['/prefixed/group/aa/', 'aa'],
+                    ['/prefixed/group/bb/', 'bb'],
+                    ['/prefixed/group/cc/', 'cc'],
+                    ['/prefixed/', 'root'],
+                    ['/prefixed/group/dd/', 'dd'],
+                    ['/prefixed/group/ee/', 'ee'],
+                    ['/prefixed/group/ff/', 'ff'],
+                    ['/aaa/222/', 'second_aaa'],
+                    ['/aaa/333/', 'third_aaa'],
+                ],
+                <<<EOF
+/aaa
+-> /aaa/111 first_aaa
+-> /aaa/222 second_aaa
+-> /aaa/333 third_aaa
+/prefixed
+-> /prefixed/group
+-> -> /prefixed/group/aa aa
+-> -> /prefixed/group/bb bb
+-> -> /prefixed/group/cc cc
+-> /prefixed root
+-> /prefixed/group
+-> -> /prefixed/group/dd dd
+-> -> /prefixed/group/ee ee
+-> -> /prefixed/group/ff ff
+EOF
+            ],
+
+            'Group regardless of segments' => [
+                [
+                    ['/aaa-111/', 'a1'],
+                    ['/aaa-222/', 'a2'],
+                    ['/aaa-333/', 'a3'],
+                    ['/group-aa/', 'g1'],
+                    ['/group-bb/', 'g2'],
+                    ['/group-cc/', 'g3'],
+                ],
+                <<<EOF
+/aaa-
+-> /aaa-111 a1
+-> /aaa-222 a2
+-> /aaa-333 a3
+/group-
+-> /group-aa g1
+-> /group-bb g2
+-> /group-cc g3
+EOF
+            ],
+        ];
+    }
+
+    private function dumpCollection(StaticPrefixCollection $collection, $prefix = '')
+    {
+        $lines = [];
+
+        foreach ($collection->getItems() as $item) {
+            if ($item instanceof StaticPrefixCollection) {
+                $lines[] = $prefix.$item->getPrefix();
+                $lines[] = $this->dumpCollection($item, $prefix.'-> ');
+            } else {
+                $lines[] = $prefix.implode(' ', $item);
+            }
+        }
+
+        return implode("\n", $lines);
+    }
+}
diff --git a/lib/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/lib/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php
new file mode 100644
index 000000000..66b199ab0
--- /dev/null
+++ b/lib/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -0,0 +1,150 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Matcher;
+
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class RedirectableUrlMatcherTest extends UrlMatcherTest
+{
+    public function testMissingTrailingSlash()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->expects($this->once())->method('redirect')->willReturn([]);
+        $matcher->match('/foo');
+    }
+
+    public function testRedirectWhenNoSlashForNonSafeMethod()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/'));
+
+        $context = new RequestContext();
+        $context->setMethod('POST');
+        $matcher = $this->getUrlMatcher($coll, $context);
+        $matcher->match('/foo');
+    }
+
+    public function testSchemeRedirectRedirectsToFirstScheme()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['FTP', 'HTTPS']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher
+            ->expects($this->once())
+            ->method('redirect')
+            ->with('/foo', 'foo', 'ftp')
+            ->willReturn(['_route' => 'foo'])
+        ;
+        $matcher->match('/foo');
+    }
+
+    public function testNoSchemaRedirectIfOneOfMultipleSchemesMatches()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['https', 'http']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher
+            ->expects($this->never())
+            ->method('redirect');
+        $matcher->match('/foo');
+    }
+
+    public function testSchemeRedirectWithParams()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/{bar}', [], [], [], '', ['https']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher
+            ->expects($this->once())
+            ->method('redirect')
+            ->with('/foo/baz', 'foo', 'https')
+            ->willReturn(['redirect' => 'value'])
+        ;
+        $this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'], $matcher->match('/foo/baz'));
+    }
+
+    public function testSlashRedirectWithParams()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/{bar}/'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher
+            ->expects($this->once())
+            ->method('redirect')
+            ->with('/foo/baz/', 'foo', null)
+            ->willReturn(['redirect' => 'value'])
+        ;
+        $this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'], $matcher->match('/foo/baz'));
+    }
+
+    public function testRedirectPreservesUrlEncoding()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo:bar/'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/')->willReturn([]);
+        $matcher->match('/foo%3Abar');
+    }
+
+    public function testSchemeRequirement()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
+        $matcher = $this->getUrlMatcher($coll, new RequestContext());
+        $matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn([]);
+        $this->assertSame(['_route' => 'foo'], $matcher->match('/foo'));
+    }
+
+    public function testFallbackPage()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/'));
+        $coll->add('bar', new Route('/{name}'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->expects($this->once())->method('redirect')->with('/foo/')->willReturn(['_route' => 'foo']);
+        $this->assertSame(['_route' => 'foo'], $matcher->match('/foo'));
+    }
+
+    public function testSlashAndVerbPrecedenceWithRedirection()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons', [], [], [], '', [], ['post']));
+        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons/', [], [], [], '', [], ['get']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $expected = [
+            '_route' => 'b',
+            'customerId' => '123',
+        ];
+        $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons/'));
+
+        $matcher->expects($this->once())->method('redirect')->with('/api/customers/123/contactpersons/')->willReturn([]);
+        $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
+    }
+
+    protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
+    {
+        return $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', [$routes, $context ?: new RequestContext()]);
+    }
+}
diff --git a/lib/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php b/lib/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php
new file mode 100644
index 000000000..b31f99e0c
--- /dev/null
+++ b/lib/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Matcher;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class TraceableUrlMatcherTest extends UrlMatcherTest
+{
+    public function test()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', [], [], [], '', [], ['POST']));
+        $coll->add('bar', new Route('/bar/{id}', [], ['id' => '\d+']));
+        $coll->add('bar1', new Route('/bar/{name}', [], ['id' => '\w+'], [], '', [], ['POST']));
+        $coll->add('bar2', new Route('/foo', [], [], [], 'baz'));
+        $coll->add('bar3', new Route('/foo1', [], [], [], 'baz'));
+        $coll->add('bar4', new Route('/foo2', [], [], [], 'baz', [], [], 'context.getMethod() == "GET"'));
+
+        $context = new RequestContext();
+        $context->setHost('baz');
+
+        $matcher = new TraceableUrlMatcher($coll, $context);
+        $traces = $matcher->getTraces('/babar');
+        $this->assertSame([0, 0, 0, 0, 0, 0], $this->getLevels($traces));
+
+        $traces = $matcher->getTraces('/foo');
+        $this->assertSame([1, 0, 0, 2], $this->getLevels($traces));
+
+        $traces = $matcher->getTraces('/bar/12');
+        $this->assertSame([0, 2], $this->getLevels($traces));
+
+        $traces = $matcher->getTraces('/bar/dd');
+        $this->assertSame([0, 1, 1, 0, 0, 0], $this->getLevels($traces));
+
+        $traces = $matcher->getTraces('/foo1');
+        $this->assertSame([0, 0, 0, 0, 2], $this->getLevels($traces));
+
+        $context->setMethod('POST');
+        $traces = $matcher->getTraces('/foo');
+        $this->assertSame([2], $this->getLevels($traces));
+
+        $traces = $matcher->getTraces('/bar/dd');
+        $this->assertSame([0, 1, 2], $this->getLevels($traces));
+
+        $traces = $matcher->getTraces('/foo2');
+        $this->assertSame([0, 0, 0, 0, 0, 1], $this->getLevels($traces));
+    }
+
+    public function testMatchRouteOnMultipleHosts()
+    {
+        $routes = new RouteCollection();
+        $routes->add('first', new Route(
+            '/mypath/',
+            ['_controller' => 'MainBundle:Info:first'],
+            [],
+            [],
+            'some.example.com'
+        ));
+
+        $routes->add('second', new Route(
+            '/mypath/',
+            ['_controller' => 'MainBundle:Info:second'],
+            [],
+            [],
+            'another.example.com'
+        ));
+
+        $context = new RequestContext();
+        $context->setHost('baz');
+
+        $matcher = new TraceableUrlMatcher($routes, $context);
+
+        $traces = $matcher->getTraces('/mypath/');
+        $this->assertSame(
+            [TraceableUrlMatcher::ROUTE_ALMOST_MATCHES, TraceableUrlMatcher::ROUTE_ALMOST_MATCHES],
+            $this->getLevels($traces)
+        );
+    }
+
+    public function getLevels($traces)
+    {
+        $levels = [];
+        foreach ($traces as $trace) {
+            $levels[] = $trace['level'];
+        }
+
+        return $levels;
+    }
+
+    public function testRoutesWithConditions()
+    {
+        $routes = new RouteCollection();
+        $routes->add('foo', new Route('/foo', [], [], [], 'baz', [], [], "request.headers.get('User-Agent') matches '/firefox/i'"));
+
+        $context = new RequestContext();
+        $context->setHost('baz');
+
+        $matcher = new TraceableUrlMatcher($routes, $context);
+
+        $notMatchingRequest = Request::create('/foo', 'GET');
+        $traces = $matcher->getTracesForRequest($notMatchingRequest);
+        $this->assertEquals("Condition \"request.headers.get('User-Agent') matches '/firefox/i'\" does not evaluate to \"true\"", $traces[0]['log']);
+
+        $matchingRequest = Request::create('/foo', 'GET', [], [], [], ['HTTP_USER_AGENT' => 'Firefox']);
+        $traces = $matcher->getTracesForRequest($matchingRequest);
+        $this->assertEquals('Route matches!', $traces[0]['log']);
+    }
+
+    protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
+    {
+        return new TraceableUrlMatcher($routes, $context ?: new RequestContext());
+    }
+}
diff --git a/lib/symfony/routing/Tests/Matcher/UrlMatcherTest.php b/lib/symfony/routing/Tests/Matcher/UrlMatcherTest.php
new file mode 100644
index 000000000..8a9731f98
--- /dev/null
+++ b/lib/symfony/routing/Tests/Matcher/UrlMatcherTest.php
@@ -0,0 +1,616 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Matcher;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class UrlMatcherTest extends TestCase
+{
+    public function testNoMethodSoAllowed()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertIsArray($matcher->match('/foo'));
+    }
+
+    public function testMethodNotAllowed()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', [], [], [], '', [], ['post']));
+
+        $matcher = $this->getUrlMatcher($coll);
+
+        try {
+            $matcher->match('/foo');
+            $this->fail();
+        } catch (MethodNotAllowedException $e) {
+            $this->assertEquals(['POST'], $e->getAllowedMethods());
+        }
+    }
+
+    public function testMethodNotAllowedOnRoot()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/', [], [], [], '', [], ['GET']));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
+
+        try {
+            $matcher->match('/');
+            $this->fail();
+        } catch (MethodNotAllowedException $e) {
+            $this->assertEquals(['GET'], $e->getAllowedMethods());
+        }
+    }
+
+    public function testHeadAllowedWhenRequirementContainsGet()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', [], [], [], '', [], ['get']));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'head'));
+        $this->assertIsArray($matcher->match('/foo'));
+    }
+
+    public function testMethodNotAllowedAggregatesAllowedMethods()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo1', new Route('/foo', [], [], [], '', [], ['post']));
+        $coll->add('foo2', new Route('/foo', [], [], [], '', [], ['put', 'delete']));
+
+        $matcher = $this->getUrlMatcher($coll);
+
+        try {
+            $matcher->match('/foo');
+            $this->fail();
+        } catch (MethodNotAllowedException $e) {
+            $this->assertEquals(['POST', 'PUT', 'DELETE'], $e->getAllowedMethods());
+        }
+    }
+
+    public function testMatch()
+    {
+        // test the patterns are matched and parameters are returned
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo/{bar}'));
+        $matcher = $this->getUrlMatcher($collection);
+        try {
+            $matcher->match('/no-match');
+            $this->fail();
+        } catch (ResourceNotFoundException $e) {
+        }
+        $this->assertEquals(['_route' => 'foo', 'bar' => 'baz'], $matcher->match('/foo/baz'));
+
+        // test that defaults are merged
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo/{bar}', ['def' => 'test']));
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'def' => 'test'], $matcher->match('/foo/baz'));
+
+        // test that route "method" is ignored if no method is given in the context
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo', [], [], [], '', [], ['get', 'head']));
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertIsArray($matcher->match('/foo'));
+
+        // route does not match with POST method context
+        $matcher = $this->getUrlMatcher($collection, new RequestContext('', 'post'));
+        try {
+            $matcher->match('/foo');
+            $this->fail();
+        } catch (MethodNotAllowedException $e) {
+        }
+
+        // route does match with GET or HEAD method context
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertIsArray($matcher->match('/foo'));
+        $matcher = $this->getUrlMatcher($collection, new RequestContext('', 'head'));
+        $this->assertIsArray($matcher->match('/foo'));
+
+        // route with an optional variable as the first segment
+        $collection = new RouteCollection();
+        $collection->add('bar', new Route('/{bar}/foo', ['bar' => 'bar'], ['bar' => 'foo|bar']));
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_route' => 'bar', 'bar' => 'bar'], $matcher->match('/bar/foo'));
+        $this->assertEquals(['_route' => 'bar', 'bar' => 'foo'], $matcher->match('/foo/foo'));
+
+        $collection = new RouteCollection();
+        $collection->add('bar', new Route('/{bar}', ['bar' => 'bar'], ['bar' => 'foo|bar']));
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_route' => 'bar', 'bar' => 'foo'], $matcher->match('/foo'));
+        $this->assertEquals(['_route' => 'bar', 'bar' => 'bar'], $matcher->match('/'));
+
+        // route with only optional variables
+        $collection = new RouteCollection();
+        $collection->add('bar', new Route('/{foo}/{bar}', ['foo' => 'foo', 'bar' => 'bar'], []));
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_route' => 'bar', 'foo' => 'foo', 'bar' => 'bar'], $matcher->match('/'));
+        $this->assertEquals(['_route' => 'bar', 'foo' => 'a', 'bar' => 'bar'], $matcher->match('/a'));
+        $this->assertEquals(['_route' => 'bar', 'foo' => 'a', 'bar' => 'b'], $matcher->match('/a/b'));
+    }
+
+    public function testMatchWithPrefixes()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/{foo}'));
+        $collection->addPrefix('/b');
+        $collection->addPrefix('/a');
+
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_route' => 'foo', 'foo' => 'foo'], $matcher->match('/a/b/foo'));
+    }
+
+    public function testMatchWithDynamicPrefix()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/{foo}'));
+        $collection->addPrefix('/b');
+        $collection->addPrefix('/{_locale}');
+
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_locale' => 'fr', '_route' => 'foo', 'foo' => 'foo'], $matcher->match('/fr/b/foo'));
+    }
+
+    public function testMatchSpecialRouteName()
+    {
+        $collection = new RouteCollection();
+        $collection->add('$péß^a|', new Route('/bar'));
+
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_route' => '$péß^a|'], $matcher->match('/bar'));
+    }
+
+    public function testTrailingEncodedNewlineIsNotOverlooked()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+
+        $matcher = $this->getUrlMatcher($collection);
+        $matcher->match('/foo%0a');
+    }
+
+    public function testMatchNonAlpha()
+    {
+        $collection = new RouteCollection();
+        $chars = '!"$%éà &\'()*+,./:;<=>@ABCDEFGHIJKLMNOPQRSTUVWXYZ\\[]^_`abcdefghijklmnopqrstuvwxyz{|}~-';
+        $collection->add('foo', new Route('/{foo}/bar', [], ['foo' => '['.preg_quote($chars).']+'], ['utf8' => true]));
+
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_route' => 'foo', 'foo' => $chars], $matcher->match('/'.rawurlencode($chars).'/bar'));
+        $this->assertEquals(['_route' => 'foo', 'foo' => $chars], $matcher->match('/'.strtr($chars, ['%' => '%25']).'/bar'));
+    }
+
+    public function testMatchWithDotMetacharacterInRequirements()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/{foo}/bar', [], ['foo' => '.+']));
+
+        $matcher = $this->getUrlMatcher($collection);
+        $this->assertEquals(['_route' => 'foo', 'foo' => "\n"], $matcher->match('/'.urlencode("\n").'/bar'), 'linefeed character is matched');
+    }
+
+    public function testMatchOverriddenRoute()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+
+        $collection1 = new RouteCollection();
+        $collection1->add('foo', new Route('/foo1'));
+
+        $collection->addCollection($collection1);
+
+        $matcher = $this->getUrlMatcher($collection);
+
+        $this->assertEquals(['_route' => 'foo'], $matcher->match('/foo1'));
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $this->assertEquals([], $matcher->match('/foo'));
+    }
+
+    public function testMatchRegression()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/{foo}'));
+        $coll->add('bar', new Route('/foo/bar/{foo}'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/foo/bar/bar'));
+
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/{bar}'));
+        $matcher = $this->getUrlMatcher($collection);
+        try {
+            $matcher->match('/');
+            $this->fail();
+        } catch (ResourceNotFoundException $e) {
+        }
+    }
+
+    public function testDefaultRequirementForOptionalVariables()
+    {
+        $coll = new RouteCollection();
+        $coll->add('test', new Route('/{page}.{_format}', ['page' => 'index', '_format' => 'html']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['page' => 'my-page', '_format' => 'xml', '_route' => 'test'], $matcher->match('/my-page.xml'));
+    }
+
+    public function testMatchingIsEager()
+    {
+        $coll = new RouteCollection();
+        $coll->add('test', new Route('/{foo}-{bar}-', [], ['foo' => '.+', 'bar' => '.+']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['foo' => 'text1-text2-text3', 'bar' => 'text4', '_route' => 'test'], $matcher->match('/text1-text2-text3-text4-'));
+    }
+
+    public function testAdjacentVariables()
+    {
+        $coll = new RouteCollection();
+        $coll->add('test', new Route('/{w}{x}{y}{z}.{_format}', ['z' => 'default-z', '_format' => 'html'], ['y' => 'y|Y']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        // 'w' eagerly matches as much as possible and the other variables match the remaining chars.
+        // This also shows that the variables w-z must all exclude the separating char (the dot '.' in this case) by default requirement.
+        // Otherwise they would also consume '.xml' and _format would never match as it's an optional variable.
+        $this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z', '_format' => 'xml', '_route' => 'test'], $matcher->match('/wwwwwxYZ.xml'));
+        // As 'y' has custom requirement and can only be of value 'y|Y', it will leave  'ZZZ' to variable z.
+        // So with carefully chosen requirements adjacent variables, can be useful.
+        $this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'ZZZ', '_format' => 'html', '_route' => 'test'], $matcher->match('/wwwwwxyZZZ'));
+        // z and _format are optional.
+        $this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z', '_format' => 'html', '_route' => 'test'], $matcher->match('/wwwwwxy'));
+
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $matcher->match('/wxy.html');
+    }
+
+    public function testOptionalVariableWithNoRealSeparator()
+    {
+        $coll = new RouteCollection();
+        $coll->add('test', new Route('/get{what}', ['what' => 'All']));
+        $matcher = $this->getUrlMatcher($coll);
+
+        $this->assertEquals(['what' => 'All', '_route' => 'test'], $matcher->match('/get'));
+        $this->assertEquals(['what' => 'Sites', '_route' => 'test'], $matcher->match('/getSites'));
+
+        // Usually the character in front of an optional parameter can be left out, e.g. with pattern '/get/{what}' just '/get' would match.
+        // But here the 't' in 'get' is not a separating character, so it makes no sense to match without it.
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $matcher->match('/ge');
+    }
+
+    public function testRequiredVariableWithNoRealSeparator()
+    {
+        $coll = new RouteCollection();
+        $coll->add('test', new Route('/get{what}Suffix'));
+        $matcher = $this->getUrlMatcher($coll);
+
+        $this->assertEquals(['what' => 'Sites', '_route' => 'test'], $matcher->match('/getSitesSuffix'));
+    }
+
+    public function testDefaultRequirementOfVariable()
+    {
+        $coll = new RouteCollection();
+        $coll->add('test', new Route('/{page}.{_format}'));
+        $matcher = $this->getUrlMatcher($coll);
+
+        $this->assertEquals(['page' => 'index', '_format' => 'mobile.html', '_route' => 'test'], $matcher->match('/index.mobile.html'));
+    }
+
+    public function testDefaultRequirementOfVariableDisallowsSlash()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $coll = new RouteCollection();
+        $coll->add('test', new Route('/{page}.{_format}'));
+        $matcher = $this->getUrlMatcher($coll);
+
+        $matcher->match('/index.sl/ash');
+    }
+
+    public function testDefaultRequirementOfVariableDisallowsNextSeparator()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $coll = new RouteCollection();
+        $coll->add('test', new Route('/{page}.{_format}', [], ['_format' => 'html|xml']));
+        $matcher = $this->getUrlMatcher($coll);
+
+        $matcher->match('/do.t.html');
+    }
+
+    public function testSchemeRequirement()
+    {
+        $this->getExpectedException() ?: $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->match('/foo');
+    }
+
+    public function testCondition()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $coll = new RouteCollection();
+        $route = new Route('/foo');
+        $route->setCondition('context.getMethod() == "POST"');
+        $coll->add('foo', $route);
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->match('/foo');
+    }
+
+    public function testRequestCondition()
+    {
+        $coll = new RouteCollection();
+        $route = new Route('/foo/{bar}');
+        $route->setCondition('request.getBaseUrl() == "/sub/front.php" and request.getPathInfo() == "/foo/bar"');
+        $coll->add('foo', $route);
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('/sub/front.php'));
+        $this->assertEquals(['bar' => 'bar', '_route' => 'foo'], $matcher->match('/foo/bar'));
+    }
+
+    public function testDecodeOnce()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/{foo}'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['foo' => 'bar%23', '_route' => 'foo'], $matcher->match('/foo/bar%2523'));
+    }
+
+    public function testCannotRelyOnPrefix()
+    {
+        $coll = new RouteCollection();
+
+        $subColl = new RouteCollection();
+        $subColl->add('bar', new Route('/bar'));
+        $subColl->addPrefix('/prefix');
+        // overwrite the pattern, so the prefix is not valid anymore for this route in the collection
+        $subColl->get('bar')->setPath('/new');
+
+        $coll->addCollection($subColl);
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['_route' => 'bar'], $matcher->match('/new'));
+    }
+
+    public function testWithHost()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/{foo}', [], [], [], '{locale}.example.com'));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
+        $this->assertEquals(['foo' => 'bar', '_route' => 'foo', 'locale' => 'en'], $matcher->match('/foo/bar'));
+    }
+
+    public function testWithHostOnRouteCollection()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/{foo}'));
+        $coll->add('bar', new Route('/bar/{foo}', [], [], [], '{locale}.example.net'));
+        $coll->setHost('{locale}.example.com');
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
+        $this->assertEquals(['foo' => 'bar', '_route' => 'foo', 'locale' => 'en'], $matcher->match('/foo/bar'));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
+        $this->assertEquals(['foo' => 'bar', '_route' => 'bar', 'locale' => 'en'], $matcher->match('/bar/bar'));
+    }
+
+    public function testWithOutHostHostDoesNotMatch()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/{foo}', [], [], [], '{locale}.example.com'));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'example.com'));
+        $matcher->match('/foo/bar');
+    }
+
+    public function testPathIsCaseSensitive()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/locale', [], ['locale' => 'EN|FR|DE']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->match('/en');
+    }
+
+    public function testHostIsCaseInsensitive()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/', [], ['locale' => 'EN|FR|DE'], [], '{locale}.example.com'));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
+        $this->assertEquals(['_route' => 'foo', 'locale' => 'en'], $matcher->match('/'));
+    }
+
+    public function testNoConfiguration()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\NoConfigurationException');
+        $coll = new RouteCollection();
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->match('/');
+    }
+
+    public function testNestedCollections()
+    {
+        $coll = new RouteCollection();
+
+        $subColl = new RouteCollection();
+        $subColl->add('a', new Route('/a'));
+        $subColl->add('b', new Route('/b'));
+        $subColl->add('c', new Route('/c'));
+        $subColl->addPrefix('/p');
+        $coll->addCollection($subColl);
+
+        $coll->add('baz', new Route('/{baz}'));
+
+        $subColl = new RouteCollection();
+        $subColl->add('buz', new Route('/buz'));
+        $subColl->addPrefix('/prefix');
+        $coll->addCollection($subColl);
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['_route' => 'a'], $matcher->match('/p/a'));
+        $this->assertEquals(['_route' => 'baz', 'baz' => 'p'], $matcher->match('/p'));
+        $this->assertEquals(['_route' => 'buz'], $matcher->match('/prefix/buz'));
+    }
+
+    public function testSchemeAndMethodMismatch()
+    {
+        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/', [], [], [], null, ['https'], ['POST']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->match('/');
+    }
+
+    public function testSiblingRoutes()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', (new Route('/a{a}'))->setMethods('POST'));
+        $coll->add('b', (new Route('/a{a}'))->setMethods('PUT'));
+        $coll->add('c', new Route('/a{a}'));
+        $coll->add('d', (new Route('/b{a}'))->setCondition('false'));
+        $coll->add('e', (new Route('/{b}{a}'))->setCondition('false'));
+        $coll->add('f', (new Route('/{b}{a}'))->setRequirements(['b' => 'b']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['_route' => 'c', 'a' => 'a'], $matcher->match('/aa'));
+        $this->assertEquals(['_route' => 'f', 'b' => 'b', 'a' => 'a'], $matcher->match('/ba'));
+    }
+
+    public function testRequirementWithCapturingGroup()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{a}/{b}', [], ['a' => '(a|b)']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['_route' => 'a', 'a' => 'a', 'b' => 'b'], $matcher->match('/a/b'));
+    }
+
+    public function testDotAllWithCatchAll()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{id}.html', [], ['id' => '.+']));
+        $coll->add('b', new Route('/{all}', [], ['all' => '.+']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(['_route' => 'a', 'id' => 'foo/bar'], $matcher->match('/foo/bar.html'));
+    }
+
+    public function testHostPattern()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{app}/{action}/{unused}', [], [], [], '{host}'));
+
+        $expected = [
+            '_route' => 'a',
+            'app' => 'an_app',
+            'action' => 'an_action',
+            'unused' => 'unused',
+            'host' => 'foo',
+        ];
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo'));
+        $this->assertEquals($expected, $matcher->match('/an_app/an_action/unused'));
+    }
+
+    public function testHostWithDot()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/foo', [], [], [], 'foo.example.com'));
+        $coll->add('b', new Route('/bar/{baz}'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals('b', $matcher->match('/bar/abc.123')['_route']);
+    }
+
+    public function testSlashVariant()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/foo/{bar}', [], ['bar' => '.*']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals('a', $matcher->match('/foo/')['_route']);
+    }
+
+    public function testSlashWithVerb()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{foo}', [], [], [], '', [], ['put', 'delete']));
+        $coll->add('b', new Route('/bar/'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertSame(['_route' => 'b'], $matcher->match('/bar/'));
+
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/dav/{foo}', [], ['foo' => '.*'], [], '', [], ['GET', 'OPTIONS']));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'OPTIONS'));
+        $expected = [
+            '_route' => 'a',
+            'foo' => 'files/bar/',
+        ];
+        $this->assertEquals($expected, $matcher->match('/dav/files/bar/'));
+    }
+
+    public function testSlashAndVerbPrecedence()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', [], [], [], '', [], ['post']));
+        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons', [], [], [], '', [], ['get']));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $expected = [
+            '_route' => 'b',
+            'customerId' => '123',
+        ];
+        $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
+
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', [], [], [], '', [], ['get']));
+        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons', [], [], [], '', [], ['post']));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
+        $expected = [
+            '_route' => 'b',
+            'customerId' => '123',
+        ];
+        $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
+    }
+
+    public function testGreedyTrailingRequirement()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{a}', [], ['a' => '.+']));
+
+        $matcher = $this->getUrlMatcher($coll);
+
+        $this->assertEquals(['_route' => 'a', 'a' => 'foo'], $matcher->match('/foo'));
+        $this->assertEquals(['_route' => 'a', 'a' => 'foo/'], $matcher->match('/foo/'));
+    }
+
+    protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
+    {
+        return new UrlMatcher($routes, $context ?: new RequestContext());
+    }
+}
diff --git a/lib/symfony/routing/Tests/RequestContextTest.php b/lib/symfony/routing/Tests/RequestContextTest.php
new file mode 100644
index 000000000..3d23b0e89
--- /dev/null
+++ b/lib/symfony/routing/Tests/RequestContextTest.php
@@ -0,0 +1,160 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\RequestContext;
+
+class RequestContextTest extends TestCase
+{
+    public function testConstruct()
+    {
+        $requestContext = new RequestContext(
+            'foo',
+            'post',
+            'foo.bar',
+            'HTTPS',
+            8080,
+            444,
+            '/baz',
+            'bar=foobar'
+        );
+
+        $this->assertEquals('foo', $requestContext->getBaseUrl());
+        $this->assertEquals('POST', $requestContext->getMethod());
+        $this->assertEquals('foo.bar', $requestContext->getHost());
+        $this->assertEquals('https', $requestContext->getScheme());
+        $this->assertSame(8080, $requestContext->getHttpPort());
+        $this->assertSame(444, $requestContext->getHttpsPort());
+        $this->assertEquals('/baz', $requestContext->getPathInfo());
+        $this->assertEquals('bar=foobar', $requestContext->getQueryString());
+    }
+
+    public function testFromRequest()
+    {
+        $request = Request::create('https://test.com:444/foo?bar=baz');
+        $requestContext = new RequestContext();
+        $requestContext->setHttpPort(123);
+        $requestContext->fromRequest($request);
+
+        $this->assertEquals('', $requestContext->getBaseUrl());
+        $this->assertEquals('GET', $requestContext->getMethod());
+        $this->assertEquals('test.com', $requestContext->getHost());
+        $this->assertEquals('https', $requestContext->getScheme());
+        $this->assertEquals('/foo', $requestContext->getPathInfo());
+        $this->assertEquals('bar=baz', $requestContext->getQueryString());
+        $this->assertSame(123, $requestContext->getHttpPort());
+        $this->assertSame(444, $requestContext->getHttpsPort());
+
+        $request = Request::create('http://test.com:8080/foo?bar=baz');
+        $requestContext = new RequestContext();
+        $requestContext->setHttpsPort(567);
+        $requestContext->fromRequest($request);
+
+        $this->assertSame(8080, $requestContext->getHttpPort());
+        $this->assertSame(567, $requestContext->getHttpsPort());
+    }
+
+    public function testGetParameters()
+    {
+        $requestContext = new RequestContext();
+        $this->assertEquals([], $requestContext->getParameters());
+
+        $requestContext->setParameters(['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $requestContext->getParameters());
+    }
+
+    public function testHasParameter()
+    {
+        $requestContext = new RequestContext();
+        $requestContext->setParameters(['foo' => 'bar']);
+
+        $this->assertTrue($requestContext->hasParameter('foo'));
+        $this->assertFalse($requestContext->hasParameter('baz'));
+    }
+
+    public function testGetParameter()
+    {
+        $requestContext = new RequestContext();
+        $requestContext->setParameters(['foo' => 'bar']);
+
+        $this->assertEquals('bar', $requestContext->getParameter('foo'));
+        $this->assertNull($requestContext->getParameter('baz'));
+    }
+
+    public function testSetParameter()
+    {
+        $requestContext = new RequestContext();
+        $requestContext->setParameter('foo', 'bar');
+
+        $this->assertEquals('bar', $requestContext->getParameter('foo'));
+    }
+
+    public function testMethod()
+    {
+        $requestContext = new RequestContext();
+        $requestContext->setMethod('post');
+
+        $this->assertSame('POST', $requestContext->getMethod());
+    }
+
+    public function testScheme()
+    {
+        $requestContext = new RequestContext();
+        $requestContext->setScheme('HTTPS');
+
+        $this->assertSame('https', $requestContext->getScheme());
+    }
+
+    public function testHost()
+    {
+        $requestContext = new RequestContext();
+        $requestContext->setHost('eXampLe.com');
+
+        $this->assertSame('example.com', $requestContext->getHost());
+    }
+
+    public function testQueryString()
+    {
+        $requestContext = new RequestContext();
+        $requestContext->setQueryString(null);
+
+        $this->assertSame('', $requestContext->getQueryString());
+    }
+
+    public function testPort()
+    {
+        $requestContext = new RequestContext();
+        $requestContext->setHttpPort('123');
+        $requestContext->setHttpsPort('456');
+
+        $this->assertSame(123, $requestContext->getHttpPort());
+        $this->assertSame(456, $requestContext->getHttpsPort());
+    }
+
+    public function testFluentInterface()
+    {
+        $requestContext = new RequestContext();
+
+        $this->assertSame($requestContext, $requestContext->setBaseUrl('/app.php'));
+        $this->assertSame($requestContext, $requestContext->setPathInfo('/index'));
+        $this->assertSame($requestContext, $requestContext->setMethod('POST'));
+        $this->assertSame($requestContext, $requestContext->setScheme('https'));
+        $this->assertSame($requestContext, $requestContext->setHost('example.com'));
+        $this->assertSame($requestContext, $requestContext->setQueryString('foo=bar'));
+        $this->assertSame($requestContext, $requestContext->setHttpPort(80));
+        $this->assertSame($requestContext, $requestContext->setHttpsPort(443));
+        $this->assertSame($requestContext, $requestContext->setParameters([]));
+        $this->assertSame($requestContext, $requestContext->setParameter('foo', 'bar'));
+    }
+}
diff --git a/lib/symfony/routing/Tests/RouteCollectionBuilderTest.php b/lib/symfony/routing/Tests/RouteCollectionBuilderTest.php
new file mode 100644
index 000000000..f5042749e
--- /dev/null
+++ b/lib/symfony/routing/Tests/RouteCollectionBuilderTest.php
@@ -0,0 +1,362 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Loader\YamlFileLoader;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouteCollectionBuilder;
+
+class RouteCollectionBuilderTest extends TestCase
+{
+    public function testImport()
+    {
+        $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
+        $resolver->expects($this->once())
+            ->method('resolve')
+            ->with('admin_routing.yml', 'yaml')
+            ->willReturn($resolvedLoader);
+
+        $originalRoute = new Route('/foo/path');
+        $expectedCollection = new RouteCollection();
+        $expectedCollection->add('one_test_route', $originalRoute);
+        $expectedCollection->addResource(new FileResource(__DIR__.'/Fixtures/file_resource.yml'));
+
+        $resolvedLoader
+            ->expects($this->once())
+            ->method('load')
+            ->with('admin_routing.yml', 'yaml')
+            ->willReturn($expectedCollection);
+
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $loader->expects($this->any())
+            ->method('getResolver')
+            ->willReturn($resolver);
+
+        // import the file!
+        $routes = new RouteCollectionBuilder($loader);
+        $importedRoutes = $routes->import('admin_routing.yml', '/', 'yaml');
+
+        // we should get back a RouteCollectionBuilder
+        $this->assertInstanceOf('Symfony\Component\Routing\RouteCollectionBuilder', $importedRoutes);
+
+        // get the collection back so we can look at it
+        $addedCollection = $importedRoutes->build();
+        $route = $addedCollection->get('one_test_route');
+        $this->assertSame($originalRoute, $route);
+        // should return file_resource.yml, which is in the original collection
+        $this->assertCount(1, $addedCollection->getResources());
+
+        // make sure the routes were imported into the top-level builder
+        $routeCollection = $routes->build();
+        $this->assertCount(1, $routes->build());
+        $this->assertCount(1, $routeCollection->getResources());
+    }
+
+    public function testImportAddResources()
+    {
+        $routeCollectionBuilder = new RouteCollectionBuilder(new YamlFileLoader(new FileLocator([__DIR__.'/Fixtures/'])));
+        $routeCollectionBuilder->import('file_resource.yml');
+        $routeCollection = $routeCollectionBuilder->build();
+
+        $this->assertCount(1, $routeCollection->getResources());
+    }
+
+    public function testImportWithoutLoaderThrowsException()
+    {
+        $this->expectException('BadMethodCallException');
+        $collectionBuilder = new RouteCollectionBuilder();
+        $collectionBuilder->import('routing.yml');
+    }
+
+    public function testAdd()
+    {
+        $collectionBuilder = new RouteCollectionBuilder();
+
+        $addedRoute = $collectionBuilder->add('/checkout', 'AppBundle:Order:checkout');
+        $addedRoute2 = $collectionBuilder->add('/blogs', 'AppBundle:Blog:list', 'blog_list');
+        $this->assertInstanceOf('Symfony\Component\Routing\Route', $addedRoute);
+        $this->assertEquals('AppBundle:Order:checkout', $addedRoute->getDefault('_controller'));
+
+        $finalCollection = $collectionBuilder->build();
+        $this->assertSame($addedRoute2, $finalCollection->get('blog_list'));
+    }
+
+    public function testFlushOrdering()
+    {
+        $importedCollection = new RouteCollection();
+        $importedCollection->add('imported_route1', new Route('/imported/foo1'));
+        $importedCollection->add('imported_route2', new Route('/imported/foo2'));
+
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        // make this loader able to do the import - keeps mocking simple
+        $loader->expects($this->any())
+            ->method('supports')
+            ->willReturn(true);
+        $loader
+            ->expects($this->once())
+            ->method('load')
+            ->willReturn($importedCollection);
+
+        $routes = new RouteCollectionBuilder($loader);
+
+        // 1) Add a route
+        $routes->add('/checkout', 'AppBundle:Order:checkout', 'checkout_route');
+        // 2) Import from a file
+        $routes->mount('/', $routes->import('admin_routing.yml'));
+        // 3) Add another route
+        $routes->add('/', 'AppBundle:Default:homepage', 'homepage');
+        // 4) Add another route
+        $routes->add('/admin', 'AppBundle:Admin:dashboard', 'admin_dashboard');
+
+        // set a default value
+        $routes->setDefault('_locale', 'fr');
+
+        $actualCollection = $routes->build();
+
+        $this->assertCount(5, $actualCollection);
+        $actualRouteNames = array_keys($actualCollection->all());
+        $this->assertEquals([
+            'checkout_route',
+            'imported_route1',
+            'imported_route2',
+            'homepage',
+            'admin_dashboard',
+        ], $actualRouteNames);
+
+        // make sure the defaults were set
+        $checkoutRoute = $actualCollection->get('checkout_route');
+        $defaults = $checkoutRoute->getDefaults();
+        $this->assertArrayHasKey('_locale', $defaults);
+        $this->assertEquals('fr', $defaults['_locale']);
+    }
+
+    public function testFlushSetsRouteNames()
+    {
+        $collectionBuilder = new RouteCollectionBuilder();
+
+        // add a "named" route
+        $collectionBuilder->add('/admin', 'AppBundle:Admin:dashboard', 'admin_dashboard');
+        // add an unnamed route
+        $collectionBuilder->add('/blogs', 'AppBundle:Blog:list')
+            ->setMethods(['GET']);
+
+        // integer route names are allowed - they don't confuse things
+        $collectionBuilder->add('/products', 'AppBundle:Product:list', 100);
+
+        $actualCollection = $collectionBuilder->build();
+        $actualRouteNames = array_keys($actualCollection->all());
+        $this->assertEquals([
+            'admin_dashboard',
+            'GET_blogs',
+            '100',
+        ], $actualRouteNames);
+    }
+
+    public function testFlushSetsDetailsOnChildrenRoutes()
+    {
+        $routes = new RouteCollectionBuilder();
+
+        $routes->add('/blogs/{page}', 'listAction', 'blog_list')
+            // unique things for the route
+            ->setDefault('page', 1)
+            ->setRequirement('id', '\d+')
+            ->setOption('expose', true)
+            // things that the collection will try to override (but won't)
+            ->setDefault('_format', 'html')
+            ->setRequirement('_format', 'json|xml')
+            ->setOption('fooBar', true)
+            ->setHost('example.com')
+            ->setCondition('request.isSecure()')
+            ->setSchemes(['https'])
+            ->setMethods(['POST']);
+
+        // a simple route, nothing added to it
+        $routes->add('/blogs/{id}', 'editAction', 'blog_edit');
+
+        // configure the collection itself
+        $routes
+            // things that will not override the child route
+            ->setDefault('_format', 'json')
+            ->setRequirement('_format', 'xml')
+            ->setOption('fooBar', false)
+            ->setHost('symfony.com')
+            ->setCondition('request.query.get("page")==1')
+            // some unique things that should be set on the child
+            ->setDefault('_locale', 'fr')
+            ->setRequirement('_locale', 'fr|en')
+            ->setOption('niceRoute', true)
+            ->setSchemes(['http'])
+            ->setMethods(['GET', 'POST']);
+
+        $collection = $routes->build();
+        $actualListRoute = $collection->get('blog_list');
+
+        $this->assertEquals(1, $actualListRoute->getDefault('page'));
+        $this->assertEquals('\d+', $actualListRoute->getRequirement('id'));
+        $this->assertTrue($actualListRoute->getOption('expose'));
+        // none of these should be overridden
+        $this->assertEquals('html', $actualListRoute->getDefault('_format'));
+        $this->assertEquals('json|xml', $actualListRoute->getRequirement('_format'));
+        $this->assertTrue($actualListRoute->getOption('fooBar'));
+        $this->assertEquals('example.com', $actualListRoute->getHost());
+        $this->assertEquals('request.isSecure()', $actualListRoute->getCondition());
+        $this->assertEquals(['https'], $actualListRoute->getSchemes());
+        $this->assertEquals(['POST'], $actualListRoute->getMethods());
+        // inherited from the main collection
+        $this->assertEquals('fr', $actualListRoute->getDefault('_locale'));
+        $this->assertEquals('fr|en', $actualListRoute->getRequirement('_locale'));
+        $this->assertTrue($actualListRoute->getOption('niceRoute'));
+
+        $actualEditRoute = $collection->get('blog_edit');
+        // inherited from the collection
+        $this->assertEquals('symfony.com', $actualEditRoute->getHost());
+        $this->assertEquals('request.query.get("page")==1', $actualEditRoute->getCondition());
+        $this->assertEquals(['http'], $actualEditRoute->getSchemes());
+        $this->assertEquals(['GET', 'POST'], $actualEditRoute->getMethods());
+    }
+
+    /**
+     * @dataProvider providePrefixTests
+     */
+    public function testFlushPrefixesPaths($collectionPrefix, $routePath, $expectedPath)
+    {
+        $routes = new RouteCollectionBuilder();
+
+        $routes->add($routePath, 'someController', 'test_route');
+
+        $outerRoutes = new RouteCollectionBuilder();
+        $outerRoutes->mount($collectionPrefix, $routes);
+
+        $collection = $outerRoutes->build();
+
+        $this->assertEquals($expectedPath, $collection->get('test_route')->getPath());
+    }
+
+    public function providePrefixTests()
+    {
+        $tests = [];
+        // empty prefix is of course ok
+        $tests[] = ['', '/foo', '/foo'];
+        // normal prefix - does not matter if it's a wildcard
+        $tests[] = ['/{admin}', '/foo', '/{admin}/foo'];
+        // shows that a prefix will always be given the starting slash
+        $tests[] = ['0', '/foo', '/0/foo'];
+
+        // spaces are ok, and double slahses at the end are cleaned
+        $tests[] = ['/ /', '/foo', '/ /foo'];
+
+        return $tests;
+    }
+
+    public function testFlushSetsPrefixedWithMultipleLevels()
+    {
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $routes = new RouteCollectionBuilder($loader);
+
+        $routes->add('homepage', 'MainController::homepageAction', 'homepage');
+
+        $adminRoutes = $routes->createBuilder();
+        $adminRoutes->add('/dashboard', 'AdminController::dashboardAction', 'admin_dashboard');
+
+        // embedded collection under /admin
+        $adminBlogRoutes = $routes->createBuilder();
+        $adminBlogRoutes->add('/new', 'BlogController::newAction', 'admin_blog_new');
+        // mount into admin, but before the parent collection has been mounted
+        $adminRoutes->mount('/blog', $adminBlogRoutes);
+
+        // now mount the /admin routes, above should all still be /blog/admin
+        $routes->mount('/admin', $adminRoutes);
+        // add a route after mounting
+        $adminRoutes->add('/users', 'AdminController::userAction', 'admin_users');
+
+        // add another sub-collection after the mount
+        $otherAdminRoutes = $routes->createBuilder();
+        $otherAdminRoutes->add('/sales', 'StatsController::indexAction', 'admin_stats_sales');
+        $adminRoutes->mount('/stats', $otherAdminRoutes);
+
+        // add a normal collection and see that it is also prefixed
+        $importedCollection = new RouteCollection();
+        $importedCollection->add('imported_route', new Route('/foo'));
+        // make this loader able to do the import - keeps mocking simple
+        $loader->expects($this->any())
+            ->method('supports')
+            ->willReturn(true);
+        $loader
+            ->expects($this->any())
+            ->method('load')
+            ->willReturn($importedCollection);
+        // import this from the /admin route builder
+        $adminRoutes->import('admin.yml', '/imported');
+
+        $collection = $routes->build();
+        $this->assertEquals('/admin/dashboard', $collection->get('admin_dashboard')->getPath(), 'Routes before mounting have the prefix');
+        $this->assertEquals('/admin/users', $collection->get('admin_users')->getPath(), 'Routes after mounting have the prefix');
+        $this->assertEquals('/admin/blog/new', $collection->get('admin_blog_new')->getPath(), 'Sub-collections receive prefix even if mounted before parent prefix');
+        $this->assertEquals('/admin/stats/sales', $collection->get('admin_stats_sales')->getPath(), 'Sub-collections receive prefix if mounted after parent prefix');
+        $this->assertEquals('/admin/imported/foo', $collection->get('imported_route')->getPath(), 'Normal RouteCollections are also prefixed properly');
+    }
+
+    public function testAutomaticRouteNamesDoNotConflict()
+    {
+        $routes = new RouteCollectionBuilder();
+
+        $adminRoutes = $routes->createBuilder();
+        // route 1
+        $adminRoutes->add('/dashboard', '');
+
+        $accountRoutes = $routes->createBuilder();
+        // route 2
+        $accountRoutes->add('/dashboard', '')
+            ->setMethods(['GET']);
+        // route 3
+        $accountRoutes->add('/dashboard', '')
+            ->setMethods(['POST']);
+
+        $routes->mount('/admin', $adminRoutes);
+        $routes->mount('/account', $accountRoutes);
+
+        $collection = $routes->build();
+        // there are 2 routes (i.e. with non-conflicting names)
+        $this->assertCount(3, $collection->all());
+    }
+
+    public function testAddsThePrefixOnlyOnceWhenLoadingMultipleCollections()
+    {
+        $firstCollection = new RouteCollection();
+        $firstCollection->add('a', new Route('/a'));
+
+        $secondCollection = new RouteCollection();
+        $secondCollection->add('b', new Route('/b'));
+
+        $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $loader->expects($this->any())
+            ->method('supports')
+            ->willReturn(true);
+        $loader
+            ->expects($this->any())
+            ->method('load')
+            ->willReturn([$firstCollection, $secondCollection]);
+
+        $routeCollectionBuilder = new RouteCollectionBuilder($loader);
+        $routeCollectionBuilder->import('/directory/recurse/*', '/other/', 'glob');
+        $routes = $routeCollectionBuilder->build()->all();
+
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/other/a', $routes['a']->getPath());
+        $this->assertEquals('/other/b', $routes['b']->getPath());
+    }
+}
diff --git a/lib/symfony/routing/Tests/RouteCollectionTest.php b/lib/symfony/routing/Tests/RouteCollectionTest.php
new file mode 100644
index 000000000..2d29d3296
--- /dev/null
+++ b/lib/symfony/routing/Tests/RouteCollectionTest.php
@@ -0,0 +1,305 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+class RouteCollectionTest extends TestCase
+{
+    public function testRoute()
+    {
+        $collection = new RouteCollection();
+        $route = new Route('/foo');
+        $collection->add('foo', $route);
+        $this->assertEquals(['foo' => $route], $collection->all(), '->add() adds a route');
+        $this->assertEquals($route, $collection->get('foo'), '->get() returns a route by name');
+        $this->assertNull($collection->get('bar'), '->get() returns null if a route does not exist');
+    }
+
+    public function testOverriddenRoute()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+        $collection->add('foo', new Route('/foo1'));
+
+        $this->assertEquals('/foo1', $collection->get('foo')->getPath());
+    }
+
+    public function testDeepOverriddenRoute()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+
+        $collection1 = new RouteCollection();
+        $collection1->add('foo', new Route('/foo1'));
+
+        $collection2 = new RouteCollection();
+        $collection2->add('foo', new Route('/foo2'));
+
+        $collection1->addCollection($collection2);
+        $collection->addCollection($collection1);
+
+        $this->assertEquals('/foo2', $collection1->get('foo')->getPath());
+        $this->assertEquals('/foo2', $collection->get('foo')->getPath());
+    }
+
+    public function testIterator()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+
+        $collection1 = new RouteCollection();
+        $collection1->add('bar', $bar = new Route('/bar'));
+        $collection1->add('foo', $foo = new Route('/foo-new'));
+        $collection->addCollection($collection1);
+        $collection->add('last', $last = new Route('/last'));
+
+        $this->assertInstanceOf('\ArrayIterator', $collection->getIterator());
+        $this->assertSame(['bar' => $bar, 'foo' => $foo, 'last' => $last], $collection->getIterator()->getArrayCopy());
+    }
+
+    public function testCount()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+
+        $collection1 = new RouteCollection();
+        $collection1->add('bar', new Route('/bar'));
+        $collection->addCollection($collection1);
+
+        $this->assertCount(2, $collection);
+    }
+
+    public function testAddCollection()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+
+        $collection1 = new RouteCollection();
+        $collection1->add('bar', $bar = new Route('/bar'));
+        $collection1->add('foo', $foo = new Route('/foo-new'));
+
+        $collection2 = new RouteCollection();
+        $collection2->add('grandchild', $grandchild = new Route('/grandchild'));
+
+        $collection1->addCollection($collection2);
+        $collection->addCollection($collection1);
+        $collection->add('last', $last = new Route('/last'));
+
+        $this->assertSame(['bar' => $bar, 'foo' => $foo, 'grandchild' => $grandchild, 'last' => $last], $collection->all(),
+            '->addCollection() imports routes of another collection, overrides if necessary and adds them at the end');
+    }
+
+    public function testAddCollectionWithResources()
+    {
+        $collection = new RouteCollection();
+        $collection->addResource($foo = new FileResource(__DIR__.'/Fixtures/foo.xml'));
+        $collection1 = new RouteCollection();
+        $collection1->addResource($foo1 = new FileResource(__DIR__.'/Fixtures/foo1.xml'));
+        $collection->addCollection($collection1);
+        $this->assertEquals([$foo, $foo1], $collection->getResources(), '->addCollection() merges resources');
+    }
+
+    public function testAddDefaultsAndRequirementsAndOptions()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/{placeholder}'));
+        $collection1 = new RouteCollection();
+        $collection1->add('bar', new Route('/{placeholder}',
+            ['_controller' => 'fixed', 'placeholder' => 'default'], ['placeholder' => '.+'], ['option' => 'value'])
+        );
+        $collection->addCollection($collection1);
+
+        $collection->addDefaults(['placeholder' => 'new-default']);
+        $this->assertEquals(['placeholder' => 'new-default'], $collection->get('foo')->getDefaults(), '->addDefaults() adds defaults to all routes');
+        $this->assertEquals(['_controller' => 'fixed', 'placeholder' => 'new-default'], $collection->get('bar')->getDefaults(),
+            '->addDefaults() adds defaults to all routes and overwrites existing ones');
+
+        $collection->addRequirements(['placeholder' => '\d+']);
+        $this->assertEquals(['placeholder' => '\d+'], $collection->get('foo')->getRequirements(), '->addRequirements() adds requirements to all routes');
+        $this->assertEquals(['placeholder' => '\d+'], $collection->get('bar')->getRequirements(),
+            '->addRequirements() adds requirements to all routes and overwrites existing ones');
+
+        $collection->addOptions(['option' => 'new-value']);
+        $this->assertEquals(
+            ['option' => 'new-value', 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler'],
+            $collection->get('bar')->getOptions(), '->addOptions() adds options to all routes and overwrites existing ones'
+        );
+    }
+
+    public function testAddPrefix()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', $foo = new Route('/foo'));
+        $collection2 = new RouteCollection();
+        $collection2->add('bar', $bar = new Route('/bar'));
+        $collection->addCollection($collection2);
+        $collection->addPrefix(' / ');
+        $this->assertSame('/foo', $collection->get('foo')->getPath(), '->addPrefix() trims the prefix and a single slash has no effect');
+        $collection->addPrefix('/{admin}', ['admin' => 'admin'], ['admin' => '\d+']);
+        $this->assertEquals('/{admin}/foo', $collection->get('foo')->getPath(), '->addPrefix() adds a prefix to all routes');
+        $this->assertEquals('/{admin}/bar', $collection->get('bar')->getPath(), '->addPrefix() adds a prefix to all routes');
+        $this->assertEquals(['admin' => 'admin'], $collection->get('foo')->getDefaults(), '->addPrefix() adds defaults to all routes');
+        $this->assertEquals(['admin' => 'admin'], $collection->get('bar')->getDefaults(), '->addPrefix() adds defaults to all routes');
+        $this->assertEquals(['admin' => '\d+'], $collection->get('foo')->getRequirements(), '->addPrefix() adds requirements to all routes');
+        $this->assertEquals(['admin' => '\d+'], $collection->get('bar')->getRequirements(), '->addPrefix() adds requirements to all routes');
+        $collection->addPrefix('0');
+        $this->assertEquals('/0/{admin}/foo', $collection->get('foo')->getPath(), '->addPrefix() ensures a prefix must start with a slash and must not end with a slash');
+        $collection->addPrefix('/ /');
+        $this->assertSame('/ /0/{admin}/foo', $collection->get('foo')->getPath(), '->addPrefix() can handle spaces if desired');
+        $this->assertSame('/ /0/{admin}/bar', $collection->get('bar')->getPath(), 'the route pattern of an added collection is in synch with the added prefix');
+    }
+
+    public function testAddPrefixOverridesDefaultsAndRequirements()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', $foo = new Route('/foo.{_format}'));
+        $collection->add('bar', $bar = new Route('/bar.{_format}', [], ['_format' => 'json']));
+        $collection->addPrefix('/admin', [], ['_format' => 'html']);
+
+        $this->assertEquals('html', $collection->get('foo')->getRequirement('_format'), '->addPrefix() overrides existing requirements');
+        $this->assertEquals('html', $collection->get('bar')->getRequirement('_format'), '->addPrefix() overrides existing requirements');
+    }
+
+    public function testResource()
+    {
+        $collection = new RouteCollection();
+        $collection->addResource($foo = new FileResource(__DIR__.'/Fixtures/foo.xml'));
+        $collection->addResource($bar = new FileResource(__DIR__.'/Fixtures/bar.xml'));
+        $collection->addResource(new FileResource(__DIR__.'/Fixtures/foo.xml'));
+
+        $this->assertEquals([$foo, $bar], $collection->getResources(),
+            '->addResource() adds a resource and getResources() only returns unique ones by comparing the string representation');
+    }
+
+    public function testUniqueRouteWithGivenName()
+    {
+        $collection1 = new RouteCollection();
+        $collection1->add('foo', new Route('/old'));
+        $collection2 = new RouteCollection();
+        $collection3 = new RouteCollection();
+        $collection3->add('foo', $new = new Route('/new'));
+
+        $collection2->addCollection($collection3);
+        $collection1->addCollection($collection2);
+
+        $this->assertSame($new, $collection1->get('foo'), '->get() returns new route that overrode previous one');
+        // size of 1 because collection1 contains /new but not /old anymore
+        $this->assertCount(1, $collection1->getIterator(), '->addCollection() removes previous routes when adding new routes with the same name');
+    }
+
+    public function testGet()
+    {
+        $collection1 = new RouteCollection();
+        $collection1->add('a', $a = new Route('/a'));
+        $collection2 = new RouteCollection();
+        $collection2->add('b', $b = new Route('/b'));
+        $collection1->addCollection($collection2);
+        $collection1->add('$péß^a|', $c = new Route('/special'));
+
+        $this->assertSame($b, $collection1->get('b'), '->get() returns correct route in child collection');
+        $this->assertSame($c, $collection1->get('$péß^a|'), '->get() can handle special characters');
+        $this->assertNull($collection2->get('a'), '->get() does not return the route defined in parent collection');
+        $this->assertNull($collection1->get('non-existent'), '->get() returns null when route does not exist');
+        $this->assertNull($collection1->get(0), '->get() does not disclose internal child RouteCollection');
+    }
+
+    public function testRemove()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', $foo = new Route('/foo'));
+
+        $collection1 = new RouteCollection();
+        $collection1->add('bar', $bar = new Route('/bar'));
+        $collection->addCollection($collection1);
+        $collection->add('last', $last = new Route('/last'));
+
+        $collection->remove('foo');
+        $this->assertSame(['bar' => $bar, 'last' => $last], $collection->all(), '->remove() can remove a single route');
+        $collection->remove(['bar', 'last']);
+        $this->assertSame([], $collection->all(), '->remove() accepts an array and can remove multiple routes at once');
+    }
+
+    public function testSetHost()
+    {
+        $collection = new RouteCollection();
+        $routea = new Route('/a');
+        $routeb = new Route('/b', [], [], [], '{locale}.example.net');
+        $collection->add('a', $routea);
+        $collection->add('b', $routeb);
+
+        $collection->setHost('{locale}.example.com');
+
+        $this->assertEquals('{locale}.example.com', $routea->getHost());
+        $this->assertEquals('{locale}.example.com', $routeb->getHost());
+    }
+
+    public function testSetCondition()
+    {
+        $collection = new RouteCollection();
+        $routea = new Route('/a');
+        $routeb = new Route('/b', [], [], [], '{locale}.example.net', [], [], 'context.getMethod() == "GET"');
+        $collection->add('a', $routea);
+        $collection->add('b', $routeb);
+
+        $collection->setCondition('context.getMethod() == "POST"');
+
+        $this->assertEquals('context.getMethod() == "POST"', $routea->getCondition());
+        $this->assertEquals('context.getMethod() == "POST"', $routeb->getCondition());
+    }
+
+    public function testClone()
+    {
+        $collection = new RouteCollection();
+        $collection->add('a', new Route('/a'));
+        $collection->add('b', new Route('/b', ['placeholder' => 'default'], ['placeholder' => '.+']));
+
+        $clonedCollection = clone $collection;
+
+        $this->assertCount(2, $clonedCollection);
+        $this->assertEquals($collection->get('a'), $clonedCollection->get('a'));
+        $this->assertNotSame($collection->get('a'), $clonedCollection->get('a'));
+        $this->assertEquals($collection->get('b'), $clonedCollection->get('b'));
+        $this->assertNotSame($collection->get('b'), $clonedCollection->get('b'));
+    }
+
+    public function testSetSchemes()
+    {
+        $collection = new RouteCollection();
+        $routea = new Route('/a', [], [], [], '', 'http');
+        $routeb = new Route('/b');
+        $collection->add('a', $routea);
+        $collection->add('b', $routeb);
+
+        $collection->setSchemes(['http', 'https']);
+
+        $this->assertEquals(['http', 'https'], $routea->getSchemes());
+        $this->assertEquals(['http', 'https'], $routeb->getSchemes());
+    }
+
+    public function testSetMethods()
+    {
+        $collection = new RouteCollection();
+        $routea = new Route('/a', [], [], [], '', [], ['GET', 'POST']);
+        $routeb = new Route('/b');
+        $collection->add('a', $routea);
+        $collection->add('b', $routeb);
+
+        $collection->setMethods('PUT');
+
+        $this->assertEquals(['PUT'], $routea->getMethods());
+        $this->assertEquals(['PUT'], $routeb->getMethods());
+    }
+}
diff --git a/lib/symfony/routing/Tests/RouteCompilerTest.php b/lib/symfony/routing/Tests/RouteCompilerTest.php
new file mode 100644
index 000000000..b398b2f35
--- /dev/null
+++ b/lib/symfony/routing/Tests/RouteCompilerTest.php
@@ -0,0 +1,379 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCompiler;
+
+class RouteCompilerTest extends TestCase
+{
+    /**
+     * @dataProvider provideCompileData
+     */
+    public function testCompile($name, $arguments, $prefix, $regex, $variables, $tokens)
+    {
+        $r = new \ReflectionClass('Symfony\\Component\\Routing\\Route');
+        $route = $r->newInstanceArgs($arguments);
+
+        $compiled = $route->compile();
+        $this->assertEquals($prefix, $compiled->getStaticPrefix(), $name.' (static prefix)');
+        $this->assertEquals($regex, $compiled->getRegex(), $name.' (regex)');
+        $this->assertEquals($variables, $compiled->getVariables(), $name.' (variables)');
+        $this->assertEquals($tokens, $compiled->getTokens(), $name.' (tokens)');
+    }
+
+    public function provideCompileData()
+    {
+        return [
+            [
+                'Static route',
+                ['/foo'],
+                '/foo', '#^/foo$#sD', [], [
+                    ['text', '/foo'],
+                ],
+            ],
+
+            [
+                'Route with a variable',
+                ['/foo/{bar}'],
+                '/foo', '#^/foo/(?P<bar>[^/]++)$#sD', ['bar'], [
+                    ['variable', '/', '[^/]++', 'bar'],
+                    ['text', '/foo'],
+                ],
+            ],
+
+            [
+                'Route with a variable that has a default value',
+                ['/foo/{bar}', ['bar' => 'bar']],
+                '/foo', '#^/foo(?:/(?P<bar>[^/]++))?$#sD', ['bar'], [
+                    ['variable', '/', '[^/]++', 'bar'],
+                    ['text', '/foo'],
+                ],
+            ],
+
+            [
+                'Route with several variables',
+                ['/foo/{bar}/{foobar}'],
+                '/foo', '#^/foo/(?P<bar>[^/]++)/(?P<foobar>[^/]++)$#sD', ['bar', 'foobar'], [
+                    ['variable', '/', '[^/]++', 'foobar'],
+                    ['variable', '/', '[^/]++', 'bar'],
+                    ['text', '/foo'],
+                ],
+            ],
+
+            [
+                'Route with several variables that have default values',
+                ['/foo/{bar}/{foobar}', ['bar' => 'bar', 'foobar' => '']],
+                '/foo', '#^/foo(?:/(?P<bar>[^/]++)(?:/(?P<foobar>[^/]++))?)?$#sD', ['bar', 'foobar'], [
+                    ['variable', '/', '[^/]++', 'foobar'],
+                    ['variable', '/', '[^/]++', 'bar'],
+                    ['text', '/foo'],
+                ],
+            ],
+
+            [
+                'Route with several variables but some of them have no default values',
+                ['/foo/{bar}/{foobar}', ['bar' => 'bar']],
+                '/foo', '#^/foo/(?P<bar>[^/]++)/(?P<foobar>[^/]++)$#sD', ['bar', 'foobar'], [
+                    ['variable', '/', '[^/]++', 'foobar'],
+                    ['variable', '/', '[^/]++', 'bar'],
+                    ['text', '/foo'],
+                ],
+            ],
+
+            [
+                'Route with an optional variable as the first segment',
+                ['/{bar}', ['bar' => 'bar']],
+                '', '#^/(?P<bar>[^/]++)?$#sD', ['bar'], [
+                    ['variable', '/', '[^/]++', 'bar'],
+                ],
+            ],
+
+            [
+                'Route with a requirement of 0',
+                ['/{bar}', ['bar' => null], ['bar' => '0']],
+                '', '#^/(?P<bar>0)?$#sD', ['bar'], [
+                    ['variable', '/', '0', 'bar'],
+                ],
+            ],
+
+            [
+                'Route with an optional variable as the first segment with requirements',
+                ['/{bar}', ['bar' => 'bar'], ['bar' => '(foo|bar)']],
+                '', '#^/(?P<bar>(foo|bar))?$#sD', ['bar'], [
+                    ['variable', '/', '(foo|bar)', 'bar'],
+                ],
+            ],
+
+            [
+                'Route with only optional variables',
+                ['/{foo}/{bar}', ['foo' => 'foo', 'bar' => 'bar']],
+                '', '#^/(?P<foo>[^/]++)?(?:/(?P<bar>[^/]++))?$#sD', ['foo', 'bar'], [
+                    ['variable', '/', '[^/]++', 'bar'],
+                    ['variable', '/', '[^/]++', 'foo'],
+                ],
+            ],
+
+            [
+                'Route with a variable in last position',
+                ['/foo-{bar}'],
+                '/foo-', '#^/foo\-(?P<bar>[^/]++)$#sD', ['bar'], [
+                    ['variable', '-', '[^/]++', 'bar'],
+                    ['text', '/foo'],
+                ],
+            ],
+
+            [
+                'Route with nested placeholders',
+                ['/{static{var}static}'],
+                '/{static', '#^/\{static(?P<var>[^/]+)static\}$#sD', ['var'], [
+                    ['text', 'static}'],
+                    ['variable', '', '[^/]+', 'var'],
+                    ['text', '/{static'],
+                ],
+            ],
+
+            [
+                'Route without separator between variables',
+                ['/{w}{x}{y}{z}.{_format}', ['z' => 'default-z', '_format' => 'html'], ['y' => '(y|Y)']],
+                '', '#^/(?P<w>[^/\.]+)(?P<x>[^/\.]+)(?P<y>(y|Y))(?:(?P<z>[^/\.]++)(?:\.(?P<_format>[^/]++))?)?$#sD', ['w', 'x', 'y', 'z', '_format'], [
+                    ['variable', '.', '[^/]++', '_format'],
+                    ['variable', '', '[^/\.]++', 'z'],
+                    ['variable', '', '(y|Y)', 'y'],
+                    ['variable', '', '[^/\.]+', 'x'],
+                    ['variable', '/', '[^/\.]+', 'w'],
+                ],
+            ],
+
+            [
+                'Route with a format',
+                ['/foo/{bar}.{_format}'],
+                '/foo', '#^/foo/(?P<bar>[^/\.]++)\.(?P<_format>[^/]++)$#sD', ['bar', '_format'], [
+                    ['variable', '.', '[^/]++', '_format'],
+                    ['variable', '/', '[^/\.]++', 'bar'],
+                    ['text', '/foo'],
+                ],
+            ],
+
+            [
+                'Static non UTF-8 route',
+                ["/fo\xE9"],
+                "/fo\xE9", "#^/fo\xE9$#sD", [], [
+                    ['text', "/fo\xE9"],
+                ],
+            ],
+
+            [
+                'Route with an explicit UTF-8 requirement',
+                ['/{bar}', ['bar' => null], ['bar' => '.'], ['utf8' => true]],
+                '', '#^/(?P<bar>.)?$#sDu', ['bar'], [
+                    ['variable', '/', '.', 'bar', true],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider provideCompileImplicitUtf8Data
+     * @expectedDeprecation Using UTF-8 route %s without setting the "utf8" option is deprecated %s.
+     */
+    public function testCompileImplicitUtf8Data($name, $arguments, $prefix, $regex, $variables, $tokens, $deprecationType)
+    {
+        $r = new \ReflectionClass('Symfony\\Component\\Routing\\Route');
+        $route = $r->newInstanceArgs($arguments);
+
+        $compiled = $route->compile();
+        $this->assertEquals($prefix, $compiled->getStaticPrefix(), $name.' (static prefix)');
+        $this->assertEquals($regex, $compiled->getRegex(), $name.' (regex)');
+        $this->assertEquals($variables, $compiled->getVariables(), $name.' (variables)');
+        $this->assertEquals($tokens, $compiled->getTokens(), $name.' (tokens)');
+    }
+
+    public function provideCompileImplicitUtf8Data()
+    {
+        return [
+            [
+                'Static UTF-8 route',
+                ['/foé'],
+                '/foé', '#^/foé$#sDu', [], [
+                    ['text', '/foé'],
+                ],
+                'patterns',
+            ],
+
+            [
+                'Route with an implicit UTF-8 requirement',
+                ['/{bar}', ['bar' => null], ['bar' => 'é']],
+                '', '#^/(?P<bar>é)?$#sDu', ['bar'], [
+                    ['variable', '/', 'é', 'bar', true],
+                ],
+                'requirements',
+            ],
+
+            [
+                'Route with a UTF-8 class requirement',
+                ['/{bar}', ['bar' => null], ['bar' => '\pM']],
+                '', '#^/(?P<bar>\pM)?$#sDu', ['bar'], [
+                    ['variable', '/', '\pM', 'bar', true],
+                ],
+                'requirements',
+            ],
+
+            [
+                'Route with a UTF-8 separator',
+                ['/foo/{bar}§{_format}', [], [], ['compiler_class' => Utf8RouteCompiler::class]],
+                '/foo', '#^/foo/(?P<bar>[^/§]++)§(?P<_format>[^/]++)$#sDu', ['bar', '_format'], [
+                    ['variable', '§', '[^/]++', '_format', true],
+                    ['variable', '/', '[^/§]++', 'bar', true],
+                    ['text', '/foo'],
+                ],
+                'patterns',
+            ],
+        ];
+    }
+
+    public function testRouteWithSameVariableTwice()
+    {
+        $this->expectException('LogicException');
+        $route = new Route('/{name}/{name}');
+
+        $route->compile();
+    }
+
+    public function testRouteCharsetMismatch()
+    {
+        $this->expectException('LogicException');
+        $route = new Route("/\xE9/{bar}", [], ['bar' => '.'], ['utf8' => true]);
+
+        $route->compile();
+    }
+
+    public function testRequirementCharsetMismatch()
+    {
+        $this->expectException('LogicException');
+        $route = new Route('/foo/{bar}', [], ['bar' => "\xE9"], ['utf8' => true]);
+
+        $route->compile();
+    }
+
+    public function testRouteWithFragmentAsPathParameter()
+    {
+        $this->expectException('InvalidArgumentException');
+        $route = new Route('/{_fragment}');
+
+        $route->compile();
+    }
+
+    /**
+     * @dataProvider getVariableNamesStartingWithADigit
+     */
+    public function testRouteWithVariableNameStartingWithADigit($name)
+    {
+        $this->expectException('DomainException');
+        $route = new Route('/{'.$name.'}');
+        $route->compile();
+    }
+
+    public function getVariableNamesStartingWithADigit()
+    {
+        return [
+           ['09'],
+           ['123'],
+           ['1e2'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideCompileWithHostData
+     */
+    public function testCompileWithHost($name, $arguments, $prefix, $regex, $variables, $pathVariables, $tokens, $hostRegex, $hostVariables, $hostTokens)
+    {
+        $r = new \ReflectionClass('Symfony\\Component\\Routing\\Route');
+        $route = $r->newInstanceArgs($arguments);
+
+        $compiled = $route->compile();
+        $this->assertEquals($prefix, $compiled->getStaticPrefix(), $name.' (static prefix)');
+        $this->assertEquals($regex, str_replace(["\n", ' '], '', $compiled->getRegex()), $name.' (regex)');
+        $this->assertEquals($variables, $compiled->getVariables(), $name.' (variables)');
+        $this->assertEquals($pathVariables, $compiled->getPathVariables(), $name.' (path variables)');
+        $this->assertEquals($tokens, $compiled->getTokens(), $name.' (tokens)');
+        $this->assertEquals($hostRegex, str_replace(["\n", ' '], '', $compiled->getHostRegex()), $name.' (host regex)');
+        $this->assertEquals($hostVariables, $compiled->getHostVariables(), $name.' (host variables)');
+        $this->assertEquals($hostTokens, $compiled->getHostTokens(), $name.' (host tokens)');
+    }
+
+    public function provideCompileWithHostData()
+    {
+        return [
+            [
+                'Route with host pattern',
+                ['/hello', [], [], [], 'www.example.com'],
+                '/hello', '#^/hello$#sD', [], [], [
+                    ['text', '/hello'],
+                ],
+                '#^www\.example\.com$#sDi', [], [
+                    ['text', 'www.example.com'],
+                ],
+            ],
+            [
+                'Route with host pattern and some variables',
+                ['/hello/{name}', [], [], [], 'www.example.{tld}'],
+                '/hello', '#^/hello/(?P<name>[^/]++)$#sD', ['tld', 'name'], ['name'], [
+                    ['variable', '/', '[^/]++', 'name'],
+                    ['text', '/hello'],
+                ],
+                '#^www\.example\.(?P<tld>[^\.]++)$#sDi', ['tld'], [
+                    ['variable', '.', '[^\.]++', 'tld'],
+                    ['text', 'www.example'],
+                ],
+            ],
+            [
+                'Route with variable at beginning of host',
+                ['/hello', [], [], [], '{locale}.example.{tld}'],
+                '/hello', '#^/hello$#sD', ['locale', 'tld'], [], [
+                    ['text', '/hello'],
+                ],
+                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#sDi', ['locale', 'tld'], [
+                    ['variable', '.', '[^\.]++', 'tld'],
+                    ['text', '.example'],
+                    ['variable', '', '[^\.]++', 'locale'],
+                ],
+            ],
+            [
+                'Route with host variables that has a default value',
+                ['/hello', ['locale' => 'a', 'tld' => 'b'], [], [], '{locale}.example.{tld}'],
+                '/hello', '#^/hello$#sD', ['locale', 'tld'], [], [
+                    ['text', '/hello'],
+                ],
+                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#sDi', ['locale', 'tld'], [
+                    ['variable', '.', '[^\.]++', 'tld'],
+                    ['text', '.example'],
+                    ['variable', '', '[^\.]++', 'locale'],
+                ],
+            ],
+        ];
+    }
+
+    public function testRouteWithTooLongVariableName()
+    {
+        $this->expectException('DomainException');
+        $route = new Route(sprintf('/{%s}', str_repeat('a', RouteCompiler::VARIABLE_MAXIMUM_LENGTH + 1)));
+        $route->compile();
+    }
+}
+
+class Utf8RouteCompiler extends RouteCompiler
+{
+    const SEPARATORS = '/§';
+}
diff --git a/lib/symfony/routing/Tests/RouteTest.php b/lib/symfony/routing/Tests/RouteTest.php
new file mode 100644
index 000000000..53ae859df
--- /dev/null
+++ b/lib/symfony/routing/Tests/RouteTest.php
@@ -0,0 +1,258 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Route;
+
+class RouteTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $route = new Route('/{foo}', ['foo' => 'bar'], ['foo' => '\d+'], ['foo' => 'bar'], '{locale}.example.com');
+        $this->assertEquals('/{foo}', $route->getPath(), '__construct() takes a path as its first argument');
+        $this->assertEquals(['foo' => 'bar'], $route->getDefaults(), '__construct() takes defaults as its second argument');
+        $this->assertEquals(['foo' => '\d+'], $route->getRequirements(), '__construct() takes requirements as its third argument');
+        $this->assertEquals('bar', $route->getOption('foo'), '__construct() takes options as its fourth argument');
+        $this->assertEquals('{locale}.example.com', $route->getHost(), '__construct() takes a host pattern as its fifth argument');
+
+        $route = new Route('/', [], [], [], '', ['Https'], ['POST', 'put'], 'context.getMethod() == "GET"');
+        $this->assertEquals(['https'], $route->getSchemes(), '__construct() takes schemes as its sixth argument and lowercases it');
+        $this->assertEquals(['POST', 'PUT'], $route->getMethods(), '__construct() takes methods as its seventh argument and uppercases it');
+        $this->assertEquals('context.getMethod() == "GET"', $route->getCondition(), '__construct() takes a condition as its eight argument');
+
+        $route = new Route('/', [], [], [], '', 'Https', 'Post');
+        $this->assertEquals(['https'], $route->getSchemes(), '__construct() takes a single scheme as its sixth argument');
+        $this->assertEquals(['POST'], $route->getMethods(), '__construct() takes a single method as its seventh argument');
+    }
+
+    public function testPath()
+    {
+        $route = new Route('/{foo}');
+        $route->setPath('/{bar}');
+        $this->assertEquals('/{bar}', $route->getPath(), '->setPath() sets the path');
+        $route->setPath('');
+        $this->assertEquals('/', $route->getPath(), '->setPath() adds a / at the beginning of the path if needed');
+        $route->setPath('bar');
+        $this->assertEquals('/bar', $route->getPath(), '->setPath() adds a / at the beginning of the path if needed');
+        $this->assertEquals($route, $route->setPath(''), '->setPath() implements a fluent interface');
+        $route->setPath('//path');
+        $this->assertEquals('/path', $route->getPath(), '->setPath() does not allow two slashes "//" at the beginning of the path as it would be confused with a network path when generating the path from the route');
+    }
+
+    public function testOptions()
+    {
+        $route = new Route('/{foo}');
+        $route->setOptions(['foo' => 'bar']);
+        $this->assertEquals(array_merge([
+        'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler',
+        ], ['foo' => 'bar']), $route->getOptions(), '->setOptions() sets the options');
+        $this->assertEquals($route, $route->setOptions([]), '->setOptions() implements a fluent interface');
+
+        $route->setOptions(['foo' => 'foo']);
+        $route->addOptions(['bar' => 'bar']);
+        $this->assertEquals($route, $route->addOptions([]), '->addOptions() implements a fluent interface');
+        $this->assertEquals(['foo' => 'foo', 'bar' => 'bar', 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler'], $route->getOptions(), '->addDefaults() keep previous defaults');
+    }
+
+    public function testOption()
+    {
+        $route = new Route('/{foo}');
+        $this->assertFalse($route->hasOption('foo'), '->hasOption() return false if option is not set');
+        $this->assertEquals($route, $route->setOption('foo', 'bar'), '->setOption() implements a fluent interface');
+        $this->assertEquals('bar', $route->getOption('foo'), '->setOption() sets the option');
+        $this->assertTrue($route->hasOption('foo'), '->hasOption() return true if option is set');
+    }
+
+    public function testDefaults()
+    {
+        $route = new Route('/{foo}');
+        $route->setDefaults(['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $route->getDefaults(), '->setDefaults() sets the defaults');
+        $this->assertEquals($route, $route->setDefaults([]), '->setDefaults() implements a fluent interface');
+
+        $route->setDefault('foo', 'bar');
+        $this->assertEquals('bar', $route->getDefault('foo'), '->setDefault() sets a default value');
+
+        $route->setDefault('foo2', 'bar2');
+        $this->assertEquals('bar2', $route->getDefault('foo2'), '->getDefault() return the default value');
+        $this->assertNull($route->getDefault('not_defined'), '->getDefault() return null if default value is not set');
+
+        $route->setDefault('_controller', $closure = function () { return 'Hello'; });
+        $this->assertEquals($closure, $route->getDefault('_controller'), '->setDefault() sets a default value');
+
+        $route->setDefaults(['foo' => 'foo']);
+        $route->addDefaults(['bar' => 'bar']);
+        $this->assertEquals($route, $route->addDefaults([]), '->addDefaults() implements a fluent interface');
+        $this->assertEquals(['foo' => 'foo', 'bar' => 'bar'], $route->getDefaults(), '->addDefaults() keep previous defaults');
+    }
+
+    public function testRequirements()
+    {
+        $route = new Route('/{foo}');
+        $route->setRequirements(['foo' => '\d+']);
+        $this->assertEquals(['foo' => '\d+'], $route->getRequirements(), '->setRequirements() sets the requirements');
+        $this->assertEquals('\d+', $route->getRequirement('foo'), '->getRequirement() returns a requirement');
+        $this->assertNull($route->getRequirement('bar'), '->getRequirement() returns null if a requirement is not defined');
+        $route->setRequirements(['foo' => '^\d+$']);
+        $this->assertEquals('\d+', $route->getRequirement('foo'), '->getRequirement() removes ^ and $ from the path');
+        $this->assertEquals($route, $route->setRequirements([]), '->setRequirements() implements a fluent interface');
+
+        $route->setRequirements(['foo' => '\d+']);
+        $route->addRequirements(['bar' => '\d+']);
+        $this->assertEquals($route, $route->addRequirements([]), '->addRequirements() implements a fluent interface');
+        $this->assertEquals(['foo' => '\d+', 'bar' => '\d+'], $route->getRequirements(), '->addRequirement() keep previous requirements');
+    }
+
+    public function testRequirement()
+    {
+        $route = new Route('/{foo}');
+        $this->assertFalse($route->hasRequirement('foo'), '->hasRequirement() return false if requirement is not set');
+        $route->setRequirement('foo', '^\d+$');
+        $this->assertEquals('\d+', $route->getRequirement('foo'), '->setRequirement() removes ^ and $ from the path');
+        $this->assertTrue($route->hasRequirement('foo'), '->hasRequirement() return true if requirement is set');
+    }
+
+    /**
+     * @dataProvider getInvalidRequirements
+     */
+    public function testSetInvalidRequirement($req)
+    {
+        $this->expectException('InvalidArgumentException');
+        $route = new Route('/{foo}');
+        $route->setRequirement('foo', $req);
+    }
+
+    public function getInvalidRequirements()
+    {
+        return [
+           [''],
+           [[]],
+           ['^$'],
+           ['^'],
+           ['$'],
+        ];
+    }
+
+    public function testHost()
+    {
+        $route = new Route('/');
+        $route->setHost('{locale}.example.net');
+        $this->assertEquals('{locale}.example.net', $route->getHost(), '->setHost() sets the host pattern');
+    }
+
+    public function testScheme()
+    {
+        $route = new Route('/');
+        $this->assertEquals([], $route->getSchemes(), 'schemes is initialized with []');
+        $this->assertFalse($route->hasScheme('http'));
+        $route->setSchemes('hTTp');
+        $this->assertEquals(['http'], $route->getSchemes(), '->setSchemes() accepts a single scheme string and lowercases it');
+        $this->assertTrue($route->hasScheme('htTp'));
+        $this->assertFalse($route->hasScheme('httpS'));
+        $route->setSchemes(['HttpS', 'hTTp']);
+        $this->assertEquals(['https', 'http'], $route->getSchemes(), '->setSchemes() accepts an array of schemes and lowercases them');
+        $this->assertTrue($route->hasScheme('htTp'));
+        $this->assertTrue($route->hasScheme('httpS'));
+    }
+
+    public function testMethod()
+    {
+        $route = new Route('/');
+        $this->assertEquals([], $route->getMethods(), 'methods is initialized with []');
+        $route->setMethods('gEt');
+        $this->assertEquals(['GET'], $route->getMethods(), '->setMethods() accepts a single method string and uppercases it');
+        $route->setMethods(['gEt', 'PosT']);
+        $this->assertEquals(['GET', 'POST'], $route->getMethods(), '->setMethods() accepts an array of methods and uppercases them');
+    }
+
+    public function testCondition()
+    {
+        $route = new Route('/');
+        $this->assertSame('', $route->getCondition());
+        $route->setCondition('context.getMethod() == "GET"');
+        $this->assertSame('context.getMethod() == "GET"', $route->getCondition());
+    }
+
+    public function testCompile()
+    {
+        $route = new Route('/{foo}');
+        $this->assertInstanceOf('Symfony\Component\Routing\CompiledRoute', $compiled = $route->compile(), '->compile() returns a compiled route');
+        $this->assertSame($compiled, $route->compile(), '->compile() only compiled the route once if unchanged');
+        $route->setRequirement('foo', '.*');
+        $this->assertNotSame($compiled, $route->compile(), '->compile() recompiles if the route was modified');
+    }
+
+    public function testSerialize()
+    {
+        $route = new Route('/prefix/{foo}', ['foo' => 'default'], ['foo' => '\d+']);
+
+        $serialized = serialize($route);
+        $unserialized = unserialize($serialized);
+
+        $this->assertEquals($route, $unserialized);
+        $this->assertNotSame($route, $unserialized);
+    }
+
+    /**
+     * Tests that the compiled version is also serialized to prevent the overhead
+     * of compiling it again after unserialize.
+     */
+    public function testSerializeWhenCompiled()
+    {
+        $route = new Route('/prefix/{foo}', ['foo' => 'default'], ['foo' => '\d+']);
+        $route->setHost('{locale}.example.net');
+        $route->compile();
+
+        $serialized = serialize($route);
+        $unserialized = unserialize($serialized);
+
+        $this->assertEquals($route, $unserialized);
+        $this->assertNotSame($route, $unserialized);
+    }
+
+    /**
+     * Tests that unserialization does not fail when the compiled Route is of a
+     * class other than CompiledRoute, such as a subclass of it.
+     */
+    public function testSerializeWhenCompiledWithClass()
+    {
+        $route = new Route('/', [], [], ['compiler_class' => '\Symfony\Component\Routing\Tests\Fixtures\CustomRouteCompiler']);
+        $this->assertInstanceOf('\Symfony\Component\Routing\Tests\Fixtures\CustomCompiledRoute', $route->compile(), '->compile() returned a proper route');
+
+        $serialized = serialize($route);
+        try {
+            $unserialized = unserialize($serialized);
+            $this->assertInstanceOf('\Symfony\Component\Routing\Tests\Fixtures\CustomCompiledRoute', $unserialized->compile(), 'the unserialized route compiled successfully');
+        } catch (\Exception $e) {
+            $this->fail('unserializing a route which uses a custom compiled route class');
+        }
+    }
+
+    /**
+     * Tests that the serialized representation of a route in one symfony version
+     * also works in later symfony versions, i.e. the unserialized route is in the
+     * same state as another, semantically equivalent, route.
+     */
+    public function testSerializedRepresentationKeepsWorking()
+    {
+        $serialized = 'C:31:"Symfony\Component\Routing\Route":936:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":571:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:31:"#^/prefix(?:/(?P<foo>\d+))?$#sD";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:40:"#^(?P<locale>[^\.]++)\.example\.net$#sDi";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}';
+        $unserialized = unserialize($serialized);
+
+        $route = new Route('/prefix/{foo}', ['foo' => 'default'], ['foo' => '\d+']);
+        $route->setHost('{locale}.example.net');
+        $route->compile();
+
+        $this->assertEquals($route, $unserialized);
+        $this->assertNotSame($route, $unserialized);
+    }
+}
diff --git a/lib/symfony/routing/Tests/RouterTest.php b/lib/symfony/routing/Tests/RouterTest.php
new file mode 100644
index 000000000..fc5e633b0
--- /dev/null
+++ b/lib/symfony/routing/Tests/RouterTest.php
@@ -0,0 +1,157 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\Router;
+
+class RouterTest extends TestCase
+{
+    private $router = null;
+
+    private $loader = null;
+
+    protected function setUp()
+    {
+        $this->loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+        $this->router = new Router($this->loader, 'routing.yml');
+    }
+
+    public function testSetOptionsWithSupportedOptions()
+    {
+        $this->router->setOptions([
+            'cache_dir' => './cache',
+            'debug' => true,
+            'resource_type' => 'ResourceType',
+        ]);
+
+        $this->assertSame('./cache', $this->router->getOption('cache_dir'));
+        $this->assertTrue($this->router->getOption('debug'));
+        $this->assertSame('ResourceType', $this->router->getOption('resource_type'));
+    }
+
+    public function testSetOptionsWithUnsupportedOptions()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The Router does not support the following options: "option_foo", "option_bar"');
+        $this->router->setOptions([
+            'cache_dir' => './cache',
+            'option_foo' => true,
+            'option_bar' => 'baz',
+            'resource_type' => 'ResourceType',
+        ]);
+    }
+
+    public function testSetOptionWithSupportedOption()
+    {
+        $this->router->setOption('cache_dir', './cache');
+
+        $this->assertSame('./cache', $this->router->getOption('cache_dir'));
+    }
+
+    public function testSetOptionWithUnsupportedOption()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The Router does not support the "option_foo" option');
+        $this->router->setOption('option_foo', true);
+    }
+
+    public function testGetOptionWithUnsupportedOption()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The Router does not support the "option_foo" option');
+        $this->router->getOption('option_foo', true);
+    }
+
+    public function testThatRouteCollectionIsLoaded()
+    {
+        $this->router->setOption('resource_type', 'ResourceType');
+
+        $routeCollection = new RouteCollection();
+
+        $this->loader->expects($this->once())
+            ->method('load')->with('routing.yml', 'ResourceType')
+            ->willReturn($routeCollection);
+
+        $this->assertSame($routeCollection, $this->router->getRouteCollection());
+    }
+
+    /**
+     * @dataProvider provideMatcherOptionsPreventingCaching
+     */
+    public function testMatcherIsCreatedIfCacheIsNotConfigured($option)
+    {
+        $this->router->setOption($option, null);
+
+        $this->loader->expects($this->once())
+            ->method('load')->with('routing.yml', null)
+            ->willReturn(new RouteCollection());
+
+        $this->assertInstanceOf('Symfony\\Component\\Routing\\Matcher\\UrlMatcher', $this->router->getMatcher());
+    }
+
+    public function provideMatcherOptionsPreventingCaching()
+    {
+        return [
+            ['cache_dir'],
+            ['matcher_cache_class'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideGeneratorOptionsPreventingCaching
+     */
+    public function testGeneratorIsCreatedIfCacheIsNotConfigured($option)
+    {
+        $this->router->setOption($option, null);
+
+        $this->loader->expects($this->once())
+            ->method('load')->with('routing.yml', null)
+            ->willReturn(new RouteCollection());
+
+        $this->assertInstanceOf('Symfony\\Component\\Routing\\Generator\\UrlGenerator', $this->router->getGenerator());
+    }
+
+    public function provideGeneratorOptionsPreventingCaching()
+    {
+        return [
+            ['cache_dir'],
+            ['generator_cache_class'],
+        ];
+    }
+
+    public function testMatchRequestWithUrlMatcherInterface()
+    {
+        $matcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')->getMock();
+        $matcher->expects($this->once())->method('match');
+
+        $p = new \ReflectionProperty($this->router, 'matcher');
+        $p->setAccessible(true);
+        $p->setValue($this->router, $matcher);
+
+        $this->router->matchRequest(Request::create('/'));
+    }
+
+    public function testMatchRequestWithRequestMatcherInterface()
+    {
+        $matcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
+        $matcher->expects($this->once())->method('matchRequest');
+
+        $p = new \ReflectionProperty($this->router, 'matcher');
+        $p->setAccessible(true);
+        $p->setValue($this->router, $matcher);
+
+        $this->router->matchRequest(Request::create('/'));
+    }
+}
diff --git a/lib/symfony/stopwatch/Tests/StopwatchEventTest.php b/lib/symfony/stopwatch/Tests/StopwatchEventTest.php
new file mode 100644
index 000000000..349334db7
--- /dev/null
+++ b/lib/symfony/stopwatch/Tests/StopwatchEventTest.php
@@ -0,0 +1,210 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Stopwatch\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Stopwatch\StopwatchEvent;
+
+/**
+ * StopwatchEventTest.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @group time-sensitive
+ */
+class StopwatchEventTest extends TestCase
+{
+    const DELTA = 37;
+
+    public function testGetOrigin()
+    {
+        $event = new StopwatchEvent(12);
+        $this->assertEquals(12, $event->getOrigin());
+    }
+
+    public function testGetCategory()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $this->assertEquals('default', $event->getCategory());
+
+        $event = new StopwatchEvent(microtime(true) * 1000, 'cat');
+        $this->assertEquals('cat', $event->getCategory());
+    }
+
+    public function testGetPeriods()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $this->assertEquals([], $event->getPeriods());
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        $event->stop();
+        $this->assertCount(1, $event->getPeriods());
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        $event->stop();
+        $event->start();
+        $event->stop();
+        $this->assertCount(2, $event->getPeriods());
+    }
+
+    public function testLap()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        $event->lap();
+        $event->stop();
+        $this->assertCount(2, $event->getPeriods());
+    }
+
+    public function testDuration()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(200000);
+        $event->stop();
+        $this->assertEqualsWithDelta(200, $event->getDuration(), self::DELTA);
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(100000);
+        $event->stop();
+        usleep(50000);
+        $event->start();
+        usleep(100000);
+        $event->stop();
+        $this->assertEqualsWithDelta(200, $event->getDuration(), self::DELTA);
+    }
+
+    public function testDurationBeforeStop()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(200000);
+        $this->assertEqualsWithDelta(200, $event->getDuration(), self::DELTA);
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(100000);
+        $event->stop();
+        usleep(50000);
+        $event->start();
+        $this->assertEqualsWithDelta(100, $event->getDuration(), self::DELTA);
+        usleep(100000);
+        $this->assertEqualsWithDelta(200, $event->getDuration(), self::DELTA);
+    }
+
+    public function testDurationWithMultipleStarts()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(100000);
+        $event->start();
+        usleep(100000);
+        $this->assertEqualsWithDelta(300, $event->getDuration(), self::DELTA);
+        $event->stop();
+        $this->assertEqualsWithDelta(300, $event->getDuration(), self::DELTA);
+        usleep(100000);
+        $this->assertEqualsWithDelta(400, $event->getDuration(), self::DELTA);
+        $event->stop();
+        $this->assertEqualsWithDelta(400, $event->getDuration(), self::DELTA);
+    }
+
+    public function testStopWithoutStart()
+    {
+        $this->expectException('LogicException');
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->stop();
+    }
+
+    public function testIsStarted()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        $this->assertTrue($event->isStarted());
+    }
+
+    public function testIsNotStarted()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $this->assertFalse($event->isStarted());
+    }
+
+    public function testEnsureStopped()
+    {
+        // this also test overlap between two periods
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(100000);
+        $event->start();
+        usleep(100000);
+        $event->ensureStopped();
+        $this->assertEqualsWithDelta(300, $event->getDuration(), self::DELTA);
+    }
+
+    public function testStartTime()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $this->assertLessThanOrEqual(0.5, $event->getStartTime());
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        $event->stop();
+        $this->assertLessThanOrEqual(1, $event->getStartTime());
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(100000);
+        $event->stop();
+        $this->assertEqualsWithDelta(0, $event->getStartTime(), self::DELTA);
+    }
+
+    public function testStartTimeWhenStartedLater()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        usleep(100000);
+        $this->assertLessThanOrEqual(0.5, $event->getStartTime());
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        usleep(100000);
+        $event->start();
+        $event->stop();
+        $this->assertLessThanOrEqual(101, $event->getStartTime());
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        usleep(100000);
+        $event->start();
+        usleep(100000);
+        $this->assertEqualsWithDelta(100, $event->getStartTime(), self::DELTA);
+        $event->stop();
+        $this->assertEqualsWithDelta(100, $event->getStartTime(), self::DELTA);
+    }
+
+    public function testInvalidOriginThrowsAnException()
+    {
+        $this->expectException('InvalidArgumentException');
+        new StopwatchEvent('abc');
+    }
+
+    public function testHumanRepresentation()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $this->assertEquals('default: 0.00 MiB - 0 ms', (string) $event);
+        $event->start();
+        $event->stop();
+        $this->assertEquals(1, preg_match('/default: [0-9\.]+ MiB - [0-9]+ ms/', (string) $event));
+
+        $event = new StopwatchEvent(microtime(true) * 1000, 'foo');
+        $this->assertEquals('foo: 0.00 MiB - 0 ms', (string) $event);
+    }
+}
diff --git a/lib/symfony/stopwatch/Tests/StopwatchPeriodTest.php b/lib/symfony/stopwatch/Tests/StopwatchPeriodTest.php
new file mode 100644
index 000000000..717ff9d56
--- /dev/null
+++ b/lib/symfony/stopwatch/Tests/StopwatchPeriodTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Stopwatch\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Stopwatch\StopwatchPeriod;
+
+class StopwatchPeriodTest extends TestCase
+{
+    /**
+     * @dataProvider provideTimeValues
+     */
+    public function testGetStartTime($start, $useMorePrecision, $expected)
+    {
+        $period = new StopwatchPeriod($start, $start, $useMorePrecision);
+        $this->assertSame($expected, $period->getStartTime());
+    }
+
+    /**
+     * @dataProvider provideTimeValues
+     */
+    public function testGetEndTime($end, $useMorePrecision, $expected)
+    {
+        $period = new StopwatchPeriod($end, $end, $useMorePrecision);
+        $this->assertSame($expected, $period->getEndTime());
+    }
+
+    /**
+     * @dataProvider provideDurationValues
+     */
+    public function testGetDuration($start, $end, $useMorePrecision, $duration)
+    {
+        $period = new StopwatchPeriod($start, $end, $useMorePrecision);
+        $this->assertSame($duration, $period->getDuration());
+    }
+
+    public function provideTimeValues()
+    {
+        yield [0, false, 0];
+        yield [0, true, 0.0];
+        yield [0.0, false, 0];
+        yield [0.0, true, 0.0];
+        yield [2.71, false, 2];
+        yield [2.71, true, 2.71];
+    }
+
+    public function provideDurationValues()
+    {
+        yield [0, 0, false, 0];
+        yield [0, 0, true, 0.0];
+        yield [0.0, 0.0, false, 0];
+        yield [0.0, 0.0, true, 0.0];
+        yield [2, 3.14, false, 1];
+        yield [2, 3.14, true, 1.14];
+        yield [2.71, 3.14, false, 1];
+        yield [2.71, 3.14, true, 0.43];
+    }
+}
diff --git a/lib/symfony/stopwatch/Tests/StopwatchTest.php b/lib/symfony/stopwatch/Tests/StopwatchTest.php
new file mode 100644
index 000000000..b8efa373b
--- /dev/null
+++ b/lib/symfony/stopwatch/Tests/StopwatchTest.php
@@ -0,0 +1,182 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Stopwatch\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+/**
+ * StopwatchTest.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @group time-sensitive
+ */
+class StopwatchTest extends TestCase
+{
+    const DELTA = 20;
+
+    public function testStart()
+    {
+        $stopwatch = new Stopwatch();
+        $event = $stopwatch->start('foo', 'cat');
+
+        $this->assertInstanceOf('Symfony\Component\Stopwatch\StopwatchEvent', $event);
+        $this->assertEquals('cat', $event->getCategory());
+        $this->assertSame($event, $stopwatch->getEvent('foo'));
+    }
+
+    public function testStartWithoutCategory()
+    {
+        $stopwatch = new Stopwatch();
+        $stopwatchEvent = $stopwatch->start('bar');
+        $this->assertSame('default', $stopwatchEvent->getCategory());
+        $this->assertSame($stopwatchEvent, $stopwatch->getEvent('bar'));
+    }
+
+    public function testIsStarted()
+    {
+        $stopwatch = new Stopwatch();
+        $stopwatch->start('foo', 'cat');
+
+        $this->assertTrue($stopwatch->isStarted('foo'));
+    }
+
+    public function testIsNotStarted()
+    {
+        $stopwatch = new Stopwatch();
+
+        $this->assertFalse($stopwatch->isStarted('foo'));
+    }
+
+    public function testIsNotStartedEvent()
+    {
+        $stopwatch = new Stopwatch();
+
+        $sections = new \ReflectionProperty('Symfony\Component\Stopwatch\Stopwatch', 'sections');
+        $sections->setAccessible(true);
+        $section = $sections->getValue($stopwatch);
+
+        $events = new \ReflectionProperty('Symfony\Component\Stopwatch\Section', 'events');
+        $events->setAccessible(true);
+
+        $stopwatchMockEvent = $this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
+            ->setConstructorArgs([microtime(true) * 1000])
+            ->getMock()
+        ;
+
+        $events->setValue(end($section), ['foo' => $stopwatchMockEvent]);
+
+        $this->assertFalse($stopwatch->isStarted('foo'));
+    }
+
+    public function testStop()
+    {
+        $stopwatch = new Stopwatch();
+        $stopwatch->start('foo', 'cat');
+        usleep(200000);
+        $event = $stopwatch->stop('foo');
+
+        $this->assertInstanceOf('Symfony\Component\Stopwatch\StopwatchEvent', $event);
+        $this->assertEqualsWithDelta(200, $event->getDuration(), self::DELTA);
+    }
+
+    public function testUnknownEvent()
+    {
+        $this->expectException('LogicException');
+        $stopwatch = new Stopwatch();
+        $stopwatch->getEvent('foo');
+    }
+
+    public function testStopWithoutStart()
+    {
+        $this->expectException('LogicException');
+        $stopwatch = new Stopwatch();
+        $stopwatch->stop('foo');
+    }
+
+    public function testMorePrecision()
+    {
+        $stopwatch = new Stopwatch(true);
+
+        $stopwatch->start('foo');
+        $event = $stopwatch->stop('foo');
+
+        $this->assertIsFloat($event->getStartTime());
+        $this->assertIsFloat($event->getEndTime());
+        $this->assertIsFloat($event->getDuration());
+    }
+
+    public function testSection()
+    {
+        $stopwatch = new Stopwatch();
+
+        $stopwatch->openSection();
+        $stopwatch->start('foo', 'cat');
+        $stopwatch->stop('foo');
+        $stopwatch->start('bar', 'cat');
+        $stopwatch->stop('bar');
+        $stopwatch->stopSection('1');
+
+        $stopwatch->openSection();
+        $stopwatch->start('foobar', 'cat');
+        $stopwatch->stop('foobar');
+        $stopwatch->stopSection('2');
+
+        $stopwatch->openSection();
+        $stopwatch->start('foobar', 'cat');
+        $stopwatch->stop('foobar');
+        $stopwatch->stopSection('0');
+
+        // the section is an event by itself
+        $this->assertCount(3, $stopwatch->getSectionEvents('1'));
+        $this->assertCount(2, $stopwatch->getSectionEvents('2'));
+        $this->assertCount(2, $stopwatch->getSectionEvents('0'));
+    }
+
+    public function testReopenASection()
+    {
+        $stopwatch = new Stopwatch();
+
+        $stopwatch->openSection();
+        $stopwatch->start('foo', 'cat');
+        $stopwatch->stopSection('section');
+
+        $stopwatch->openSection('section');
+        $stopwatch->start('bar', 'cat');
+        $stopwatch->stopSection('section');
+
+        $events = $stopwatch->getSectionEvents('section');
+
+        $this->assertCount(3, $events);
+        $this->assertCount(2, $events['__section__']->getPeriods());
+    }
+
+    public function testReopenANewSectionShouldThrowAnException()
+    {
+        $this->expectException('LogicException');
+        $stopwatch = new Stopwatch();
+        $stopwatch->openSection('section');
+    }
+
+    public function testReset()
+    {
+        $stopwatch = new Stopwatch();
+
+        $stopwatch->openSection();
+        $stopwatch->start('foo', 'cat');
+
+        $stopwatch->reset();
+
+        $this->assertEquals(new Stopwatch(), $stopwatch);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/AppVariableTest.php b/lib/symfony/twig-bridge/Tests/AppVariableTest.php
new file mode 100644
index 000000000..eb132e720
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/AppVariableTest.php
@@ -0,0 +1,264 @@
+<?php
+
+namespace Symfony\Bridge\Twig\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\AppVariable;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Session;
+
+class AppVariableTest extends TestCase
+{
+    /**
+     * @var AppVariable
+     */
+    protected $appVariable;
+
+    protected function setUp()
+    {
+        $this->appVariable = new AppVariable();
+    }
+
+    /**
+     * @dataProvider debugDataProvider
+     */
+    public function testDebug($debugFlag)
+    {
+        $this->appVariable->setDebug($debugFlag);
+
+        $this->assertEquals($debugFlag, $this->appVariable->getDebug());
+    }
+
+    public function debugDataProvider()
+    {
+        return [
+            'debug on' => [true],
+            'debug off' => [false],
+        ];
+    }
+
+    public function testEnvironment()
+    {
+        $this->appVariable->setEnvironment('dev');
+
+        $this->assertEquals('dev', $this->appVariable->getEnvironment());
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testGetSession()
+    {
+        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+        $request->method('getSession')->willReturn($session);
+
+        $this->setRequestStack($request);
+
+        $this->assertEquals($session, $this->appVariable->getSession());
+    }
+
+    public function testGetSessionWithNoRequest()
+    {
+        $this->setRequestStack(null);
+
+        $this->assertNull($this->appVariable->getSession());
+    }
+
+    public function testGetRequest()
+    {
+        $this->setRequestStack($request = new Request());
+
+        $this->assertEquals($request, $this->appVariable->getRequest());
+    }
+
+    public function testGetToken()
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+        $this->appVariable->setTokenStorage($tokenStorage);
+
+        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+        $tokenStorage->method('getToken')->willReturn($token);
+
+        $this->assertEquals($token, $this->appVariable->getToken());
+    }
+
+    public function testGetUser()
+    {
+        $this->setTokenStorage($user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
+
+        $this->assertEquals($user, $this->appVariable->getUser());
+    }
+
+    public function testGetUserWithUsernameAsTokenUser()
+    {
+        $this->setTokenStorage($user = 'username');
+
+        $this->assertNull($this->appVariable->getUser());
+    }
+
+    public function testGetTokenWithNoToken()
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+        $this->appVariable->setTokenStorage($tokenStorage);
+
+        $this->assertNull($this->appVariable->getToken());
+    }
+
+    public function testGetUserWithNoToken()
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+        $this->appVariable->setTokenStorage($tokenStorage);
+
+        $this->assertNull($this->appVariable->getUser());
+    }
+
+    public function testEnvironmentNotSet()
+    {
+        $this->expectException('RuntimeException');
+        $this->appVariable->getEnvironment();
+    }
+
+    public function testDebugNotSet()
+    {
+        $this->expectException('RuntimeException');
+        $this->appVariable->getDebug();
+    }
+
+    public function testGetTokenWithTokenStorageNotSet()
+    {
+        $this->expectException('RuntimeException');
+        $this->appVariable->getToken();
+    }
+
+    public function testGetUserWithTokenStorageNotSet()
+    {
+        $this->expectException('RuntimeException');
+        $this->appVariable->getUser();
+    }
+
+    public function testGetRequestWithRequestStackNotSet()
+    {
+        $this->expectException('RuntimeException');
+        $this->appVariable->getRequest();
+    }
+
+    public function testGetSessionWithRequestStackNotSet()
+    {
+        $this->expectException('RuntimeException');
+        $this->appVariable->getSession();
+    }
+
+    public function testGetFlashesWithNoRequest()
+    {
+        $this->setRequestStack(null);
+
+        $this->assertEquals([], $this->appVariable->getFlashes());
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testGetFlashesWithNoSessionStarted()
+    {
+        $flashMessages = $this->setFlashMessages(false);
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes());
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testGetFlashes()
+    {
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes(null));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes(''));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes([]));
+
+        $this->setFlashMessages();
+        $this->assertEquals([], $this->appVariable->getFlashes('this-does-not-exist'));
+
+        $this->setFlashMessages();
+        $this->assertEquals(
+            ['this-does-not-exist' => []],
+            $this->appVariable->getFlashes(['this-does-not-exist'])
+        );
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals($flashMessages['notice'], $this->appVariable->getFlashes('notice'));
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals(
+            ['notice' => $flashMessages['notice']],
+            $this->appVariable->getFlashes(['notice'])
+        );
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals(
+            ['notice' => $flashMessages['notice'], 'this-does-not-exist' => []],
+            $this->appVariable->getFlashes(['notice', 'this-does-not-exist'])
+        );
+
+        $flashMessages = $this->setFlashMessages();
+        $this->assertEquals(
+            ['notice' => $flashMessages['notice'], 'error' => $flashMessages['error']],
+            $this->appVariable->getFlashes(['notice', 'error'])
+        );
+
+        $this->assertEquals(
+            ['warning' => $flashMessages['warning']],
+            $this->appVariable->getFlashes(['warning']),
+            'After getting some flash types (e.g. "notice" and "error"), the rest of flash messages must remain (e.g. "warning").'
+        );
+
+        $this->assertEquals(
+            ['this-does-not-exist' => []],
+            $this->appVariable->getFlashes(['this-does-not-exist'])
+        );
+    }
+
+    protected function setRequestStack($request)
+    {
+        $requestStackMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
+        $requestStackMock->method('getCurrentRequest')->willReturn($request);
+
+        $this->appVariable->setRequestStack($requestStackMock);
+    }
+
+    protected function setTokenStorage($user)
+    {
+        $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+        $this->appVariable->setTokenStorage($tokenStorage);
+
+        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+        $tokenStorage->method('getToken')->willReturn($token);
+
+        $token->method('getUser')->willReturn($user);
+    }
+
+    private function setFlashMessages($sessionHasStarted = true)
+    {
+        $flashMessages = [
+            'notice' => ['Notice #1 message'],
+            'warning' => ['Warning #1 message'],
+            'error' => ['Error #1 message', 'Error #2 message'],
+        ];
+        $flashBag = new FlashBag();
+        $flashBag->initialize($flashMessages);
+
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
+        $session->method('isStarted')->willReturn($sessionHasStarted);
+        $session->method('getFlashBag')->willReturn($flashBag);
+
+        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+        $request->method('getSession')->willReturn($session);
+        $this->setRequestStack($request);
+
+        return $flashMessages;
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Command/DebugCommandTest.php b/lib/symfony/twig-bridge/Tests/Command/DebugCommandTest.php
new file mode 100644
index 000000000..7eb96018a
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Command/DebugCommandTest.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Command\DebugCommand;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
+
+class DebugCommandTest extends TestCase
+{
+    public function testDebugCommand()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute([], ['decorated' => false]);
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('Functions', trim($tester->getDisplay()));
+    }
+
+    public function testLineSeparatorInLoaderPaths()
+    {
+        // these paths aren't realistic,
+        // they're configured to force the line separator
+        $tester = $this->createCommandTester([
+            'Acme' => ['extractor', 'extractor'],
+            '!Acme' => ['extractor', 'extractor'],
+            FilesystemLoader::MAIN_NAMESPACE => ['extractor', 'extractor'],
+        ]);
+        $ret = $tester->execute([], ['decorated' => false]);
+        $ds = \DIRECTORY_SEPARATOR;
+        $loaderPaths = <<<TXT
+Loader Paths
+------------
+
+ ----------- ------------ 
+  Namespace   Paths       
+ ----------- ------------ 
+  @Acme       extractor$ds  
+              extractor$ds  
+                          
+  @!Acme      extractor$ds  
+              extractor$ds  
+                          
+  (None)      extractor$ds  
+              extractor$ds  
+ ----------- ------------
+TXT;
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString($loaderPaths, trim($tester->getDisplay(true)));
+    }
+
+    public function testWithGlobals()
+    {
+        $message = '<error>foo</error>';
+        $tester = $this->createCommandTester([], ['message' => $message]);
+        $tester->execute([], ['decorated' => true]);
+
+        $display = $tester->getDisplay();
+
+        $this->assertStringContainsString(json_encode($message), $display);
+    }
+
+    public function testWithGlobalsJson()
+    {
+        $globals = ['message' => '<error>foo</error>'];
+
+        $tester = $this->createCommandTester([], $globals);
+        $tester->execute(['--format' => 'json'], ['decorated' => true]);
+
+        $display = $tester->getDisplay();
+        $display = json_decode($display, true);
+
+        $this->assertSame($globals, $display['globals']);
+    }
+
+    public function testWithFilter()
+    {
+        $tester = $this->createCommandTester([]);
+        $tester->execute(['--format' => 'json'], ['decorated' => false]);
+        $display = $tester->getDisplay();
+        $display1 = json_decode($display, true);
+
+        $tester->execute(['filter' => 'date', '--format' => 'json'], ['decorated' => false]);
+        $display = $tester->getDisplay();
+        $display2 = json_decode($display, true);
+
+        $this->assertNotSame($display1, $display2);
+    }
+
+    private function createCommandTester(array $paths = [], array $globals = [])
+    {
+        $filesystemLoader = new FilesystemLoader([], \dirname(__DIR__).'/Fixtures');
+        foreach ($paths as $namespace => $relDirs) {
+            foreach ($relDirs as $relDir) {
+                $filesystemLoader->addPath($relDir, $namespace);
+            }
+        }
+
+        $environment = new Environment($filesystemLoader);
+        foreach ($globals as $name => $value) {
+            $environment->addGlobal($name, $value);
+        }
+
+        $command = new DebugCommand($environment);
+
+        $application = new Application();
+        $application->add($command);
+        $command = $application->find('debug:twig');
+
+        return new CommandTester($command);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Command/LintCommandTest.php b/lib/symfony/twig-bridge/Tests/Command/LintCommandTest.php
new file mode 100644
index 000000000..84154512b
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Command/LintCommandTest.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Command\LintCommand;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\CommandTester;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
+
+class LintCommandTest extends TestCase
+{
+    private $files;
+
+    public function testLintCorrectFile()
+    {
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile('{{ foo }}');
+
+        $ret = $tester->execute(['filename' => [$filename]], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('OK in', trim($tester->getDisplay()));
+    }
+
+    public function testLintIncorrectFile()
+    {
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile('{{ foo');
+
+        $ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
+
+        $this->assertEquals(1, $ret, 'Returns 1 in case of error');
+        $this->assertRegExp('/ERROR  in \S+ \(line /', trim($tester->getDisplay()));
+    }
+
+    public function testLintFileNotReadable()
+    {
+        $this->expectException('RuntimeException');
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile('');
+        unlink($filename);
+
+        $tester->execute(['filename' => [$filename]], ['decorated' => false]);
+    }
+
+    public function testLintFileCompileTimeException()
+    {
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile("{{ 2|number_format(2, decimal_point='.', ',') }}");
+
+        $ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
+
+        $this->assertEquals(1, $ret, 'Returns 1 in case of error');
+        $this->assertRegExp('/ERROR  in \S+ \(line /', trim($tester->getDisplay()));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bridge\Twig\Command\LintCommand::__construct()" is deprecated since Symfony 3.4 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.
+     */
+    public function testLegacyLintCommand()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('The Twig environment needs to be set.');
+        $command = new LintCommand();
+
+        $application = new Application();
+        $application->add($command);
+        $command = $application->find('lint:twig');
+
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+    }
+
+    /**
+     * @return CommandTester
+     */
+    private function createCommandTester()
+    {
+        $command = new LintCommand(new Environment(new FilesystemLoader()));
+
+        $application = new Application();
+        $application->add($command);
+        $command = $application->find('lint:twig');
+
+        return new CommandTester($command);
+    }
+
+    /**
+     * @return string Path to the new file
+     */
+    private function createFile($content)
+    {
+        $filename = tempnam(sys_get_temp_dir(), 'sf-');
+        file_put_contents($filename, $content);
+
+        $this->files[] = $filename;
+
+        return $filename;
+    }
+
+    protected function setUp()
+    {
+        $this->files = [];
+    }
+
+    protected function tearDown()
+    {
+        foreach ($this->files as $file) {
+            if (file_exists($file)) {
+                unlink($file);
+            }
+        }
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
new file mode 100644
index 000000000..913121618
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
@@ -0,0 +1,166 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+abstract class AbstractBootstrap3HorizontalLayoutTest extends AbstractBootstrap3LayoutTest
+{
+    public function testLabelOnForm()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
+        $view = $form->createView();
+        $this->renderWidget($view, ['label' => 'foo']);
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@class="col-sm-2 control-label required"]
+    [.="[trans]Name[/trans]"]
+'
+        );
+    }
+
+    public function testLabelDoesNotRenderFieldAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="col-sm-2 control-label required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-sm-2 control-label required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-sm-2 control-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
+            'label' => 'Custom label',
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-sm-2 control-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testStartTag()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => 'http://example.com/directory',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="form-horizontal">', $html);
+    }
+
+    public function testStartTagWithOverriddenVars()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'put',
+            'action' => 'http://example.com/directory',
+        ]);
+
+        $html = $this->renderStart($form->createView(), [
+            'method' => 'post',
+            'action' => 'http://foo.com/directory',
+        ]);
+
+        $this->assertSame('<form name="form" method="post" action="http://foo.com/directory" class="form-horizontal">', $html);
+    }
+
+    public function testStartTagForMultipartForm()
+    {
+        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+                'method' => 'get',
+                'action' => 'http://example.com/directory',
+            ])
+            ->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType')
+            ->getForm();
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="form-horizontal" enctype="multipart/form-data">', $html);
+    }
+
+    public function testStartTagWithExtraAttributes()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => 'http://example.com/directory',
+        ]);
+
+        $html = $this->renderStart($form->createView(), [
+            'attr' => ['class' => 'foobar'],
+        ]);
+
+        $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="foobar form-horizontal">', $html);
+    }
+
+    public function testCheckboxRow()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
+        $view = $form->createView();
+        $html = $this->renderRow($view, ['label' => 'foo']);
+
+        $this->assertMatchesXpath($html, '/div[@class="form-group"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3LayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3LayoutTest.php
new file mode 100644
index 000000000..f04372c54
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -0,0 +1,2546 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Tests\AbstractLayoutTest;
+
+abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
+{
+    protected static $supportedFeatureSetVersion = 304;
+
+    public function testLabelOnForm()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
+        $view = $form->createView();
+        $this->renderWidget($view, ['label' => 'foo']);
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@class="control-label required"]
+    [.="[trans]Name[/trans]"]
+'
+        );
+    }
+
+    public function testLabelDoesNotRenderFieldAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="control-label required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class control-label required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class control-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
+            'label' => 'Custom label',
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class control-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testErrors()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $form->addError(new FormError('[trans]Error 1[/trans]'));
+        $form->addError(new FormError('[trans]Error 2[/trans]'));
+        $view = $form->createView();
+        $html = $this->renderErrors($view);
+
+        $this->assertMatchesXpath($html,
+'/div
+    [@class="alert alert-danger"]
+    [
+        ./ul
+            [@class="list-unstyled"]
+            [
+                ./li
+                    [.=" [trans]Error 1[/trans]"]
+                    [
+                        ./span[@class="glyphicon glyphicon-exclamation-sign"]
+                    ]
+                /following-sibling::li
+                    [.=" [trans]Error 2[/trans]"]
+                    [
+                        ./span[@class="glyphicon glyphicon-exclamation-sign"]
+                    ]
+            ]
+            [count(./li)=2]
+    ]
+'
+        );
+    }
+
+    public function testOverrideWidgetBlock()
+    {
+        // see custom_widgets.html.twig
+        $form = $this->factory->createNamed('text_id', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderWidget($form->createView());
+
+        $this->assertMatchesXpath($html,
+'/div
+    [
+        ./input
+        [@type="text"]
+        [@id="text_id"]
+        [@class="form-control"]
+    ]
+    [@id="container"]
+'
+        );
+    }
+
+    public function testCheckedCheckbox()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', true);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="checkbox"]
+    [
+        ./label
+            [.=" [trans]Name[/trans]"]
+            [
+                ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][@checked="checked"][@value="1"]
+            ]
+    ]
+'
+        );
+    }
+
+    public function testUncheckedCheckbox()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="checkbox"]
+    [
+        ./label
+            [.=" [trans]Name[/trans]"]
+            [
+                ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][not(@checked)]
+            ]
+    ]
+'
+        );
+    }
+
+    public function testCheckboxWithValue()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false, [
+            'value' => 'foo&bar',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="checkbox"]
+    [
+        ./label
+            [.=" [trans]Name[/trans]"]
+            [
+                ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][@value="foo&bar"]
+            ]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoice()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceAttributesWithMainAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'attr' => ['class' => 'bar&baz'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
+'/select
+    [@name="name"]
+    [@class="bar&baz form-control"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleExpandedChoiceAttributesWithMainAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+            'attr' => ['class' => 'bar&baz'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
+'/div
+    [@class="bar&baz"]
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&A[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&B[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSelectWithSizeBiggerThanOneCanBeRequired()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, [
+            'choices' => ['a', 'b'],
+            'multiple' => false,
+            'expanded' => false,
+            'attr' => ['size' => 2],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => '']],
+'/select
+    [@name="name"]
+    [@required="required"]
+    [@size="2"]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'choice_translation_domain' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="Choice&A"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPlaceholderWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'required' => false,
+            'translation_domain' => false,
+            'placeholder' => 'Placeholder&Not&Translated',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value=""][not(@selected)][not(@disabled)][.="Placeholder&Not&Translated"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="Choice&A"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][@class="foo&bar"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPreferred()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => '-- sep --', 'attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.="-- sep --"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPreferredAndNoSeparator()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => null, 'attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPreferredAndBlankSeparator()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => '', 'attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.=""]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+    ]
+'
+        );
+    }
+
+    public function testChoiceWithOnlyPreferred()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&a', '&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@class="my&class form-control"]
+'
+        );
+    }
+
+    public function testSingleChoiceNonRequired()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => false,
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value=""][.=""]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceNonRequiredNoneSelected()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => false,
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value=""][.=""]
+        /following-sibling::option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceNonRequiredWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'required' => false,
+            'placeholder' => 'Select&Anything&Not&Me',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [
+        ./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Anything&Not&Me[/trans]"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceRequiredWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => true,
+            'multiple' => false,
+            'expanded' => false,
+            'placeholder' => 'Test&Me',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@required="required"]
+    [
+        ./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Test&Me[/trans]"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceRequiredWithPlaceholderViaView()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => true,
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['placeholder' => '', 'attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@required="required"]
+    [
+        ./option[@value=""][not(@selected)][not(@disabled)][.=""]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceGrouped()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => [
+                'Group&1' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+                'Group&2' => ['Choice&C' => '&c'],
+            ],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [./optgroup[@label="[trans]Group&1[/trans]"]
+        [
+            ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+            /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+        ]
+        [count(./option)=2]
+    ]
+    [./optgroup[@label="[trans]Group&2[/trans]"]
+        [./option[@value="&c"][not(@selected)][.="[trans]Choice&C[/trans]"]]
+        [count(./option)=1]
+    ]
+    [count(./optgroup)=2]
+'
+        );
+    }
+
+    public function testMultipleChoice()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => true,
+            'multiple' => true,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name[]"]
+    [@class="my&class form-control"]
+    [@required="required"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testMultipleChoiceAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
+            'required' => true,
+            'multiple' => true,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name[]"]
+    [@class="my&class form-control"]
+    [@required="required"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][@class="foo&bar"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testMultipleChoiceSkipsPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => true,
+            'expanded' => false,
+            'placeholder' => 'Test&Me',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name[]"]
+    [@class="my&class form-control"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testMultipleChoiceNonRequired()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => false,
+            'multiple' => true,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name[]"]
+    [@class="my&class form-control"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceExpanded()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&A[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&B[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithLabelsAsFalse()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_label' => false,
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithLabelsSetByCallable()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_label' => function ($choice, $label, $value) {
+                if ('&b' === $choice) {
+                    return false;
+                }
+
+                return 'label.'.$value;
+            },
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]label.&a[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]label.&c[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_2"][@value="&c"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_label' => function () {
+                return false;
+            },
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+            'choice_translation_domain' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" Choice&A"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" Choice&B"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&A[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&B[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)][@class="foo&bar"]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+            'placeholder' => 'Test&Me',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Test&Me[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&A[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&B[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+            'required' => false,
+            'choice_translation_domain' => false,
+            'placeholder' => 'Placeholder&Not&Translated',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" Placeholder&Not&Translated"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" Choice&A"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" Choice&B"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithBooleanValue()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', true, [
+            'choices' => ['Choice&A' => '1', 'Choice&B' => '0'],
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&A[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_0"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="radio"]
+            [
+                ./label
+                    [.=" [trans]Choice&B[/trans]"]
+                    [
+                        ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpanded()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'multiple' => true,
+            'expanded' => true,
+            'required' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" [trans]Choice&A[/trans]"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" [trans]Choice&B[/trans]"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" [trans]Choice&C[/trans]"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedWithLabelsAsFalse()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_label' => false,
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="checkbox"]
+            [
+                ./label
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedWithLabelsSetByCallable()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_label' => function ($choice, $label, $value) {
+                if ('&b' === $choice) {
+                    return false;
+                }
+
+                return 'label.'.$value;
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+            '/div
+    [
+        ./div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" [trans]label.&a[/trans]"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" [trans]label.&c[/trans]"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@value="&c"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_label' => function () {
+                return false;
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="checkbox"]
+            [
+                ./label
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'multiple' => true,
+            'expanded' => true,
+            'required' => true,
+            'choice_translation_domain' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" Choice&A"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" Choice&B"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" Choice&C"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
+            'multiple' => true,
+            'expanded' => true,
+            'required' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" [trans]Choice&A[/trans]"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" [trans]Choice&B[/trans]"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)][@class="foo&bar"]
+                    ]
+            ]
+        /following-sibling::div
+            [@class="checkbox"]
+            [
+                ./label
+                    [.=" [trans]Choice&C[/trans]"]
+                    [
+                        ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
+                    ]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testCountry()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CountryType', 'AT');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [./option[@value="AT"][@selected="selected"][.="Austria"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testCountryWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CountryType', 'AT', [
+            'placeholder' => 'Select&Country',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Country[/trans]"]]
+    [./option[@value="AT"][@selected="selected"][.="Austria"]]
+    [count(./option)>201]
+'
+        );
+    }
+
+    public function testDateTime()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
+            'input' => 'string',
+            'with_seconds' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [
+        ./select
+            [@id="name_date_month"]
+            [@class="form-control"]
+            [./option[@value="2"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_date_day"]
+            [@class="form-control"]
+            [./option[@value="3"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_date_year"]
+            [@class="form-control"]
+            [./option[@value="'.date('Y').'"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_time_hour"]
+            [@class="form-control"]
+            [./option[@value="4"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_time_minute"]
+            [@class="form-control"]
+            [./option[@value="5"][@selected="selected"]]
+    ]
+    [count(.//select)=5]
+'
+        );
+    }
+
+    public function testDateTimeWithPlaceholderGlobal()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', null, [
+            'input' => 'string',
+            'placeholder' => 'Change&Me',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_date_month"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+        /following-sibling::select
+            [@id="name_date_day"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+        /following-sibling::select
+            [@id="name_date_year"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+        /following-sibling::select
+            [@id="name_time_hour"]
+            [@class="form-control"]
+            [./option[@value=""][.="[trans]Change&Me[/trans]"]]
+        /following-sibling::select
+            [@id="name_time_minute"]
+            [@class="form-control"]
+            [./option[@value=""][.="[trans]Change&Me[/trans]"]]
+    ]
+    [count(.//select)=5]
+'
+        );
+    }
+
+    public function testDateTimeWithHourAndMinute()
+    {
+        $data = ['year' => date('Y'), 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5'];
+
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, [
+            'input' => 'array',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_date_month"]
+            [@class="form-control"]
+            [./option[@value="2"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_date_day"]
+            [@class="form-control"]
+            [./option[@value="3"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_date_year"]
+            [@class="form-control"]
+            [./option[@value="'.date('Y').'"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_time_hour"]
+            [@class="form-control"]
+            [./option[@value="4"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_time_minute"]
+            [@class="form-control"]
+            [./option[@value="5"][@selected="selected"]]
+    ]
+    [count(.//select)=5]
+'
+        );
+    }
+
+    public function testDateTimeWithSeconds()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
+            'input' => 'string',
+            'with_seconds' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_date_month"]
+            [@class="form-control"]
+            [./option[@value="2"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_date_day"]
+            [@class="form-control"]
+            [./option[@value="3"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_date_year"]
+            [@class="form-control"]
+            [./option[@value="'.date('Y').'"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_time_hour"]
+            [@class="form-control"]
+            [./option[@value="4"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_time_minute"]
+            [@class="form-control"]
+            [./option[@value="5"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_time_second"]
+            [@class="form-control"]
+            [./option[@value="6"][@selected="selected"]]
+    ]
+    [count(.//select)=6]
+'
+        );
+    }
+
+    public function testDateTimeSingleText()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
+            'input' => 'string',
+            'date_widget' => 'single_text',
+            'time_widget' => 'single_text',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./input
+            [@type="date"]
+            [@id="name_date"]
+            [@name="name[date]"]
+            [@class="form-control"]
+            [@value="2011-02-03"]
+        /following-sibling::input
+            [@type="time"]
+            [@id="name_time"]
+            [@name="name[time]"]
+            [@class="form-control"]
+            [@value="04:05"]
+    ]
+'
+        );
+    }
+
+    public function testDateTimeWithWidgetSingleText()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
+            'input' => 'string',
+            'widget' => 'single_text',
+            'model_timezone' => 'UTC',
+            'view_timezone' => 'UTC',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="datetime-local"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="2011-02-03T04:05:06"]
+'
+        );
+    }
+
+    public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
+            'input' => 'string',
+            'date_widget' => 'choice',
+            'time_widget' => 'choice',
+            'widget' => 'single_text',
+            'model_timezone' => 'UTC',
+            'view_timezone' => 'UTC',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="datetime-local"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="2011-02-03T04:05:06"]
+'
+        );
+    }
+
+    public function testDateChoice()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', date('Y').'-02-03', [
+            'input' => 'string',
+            'widget' => 'choice',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_month"]
+            [@class="form-control"]
+            [./option[@value="2"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_day"]
+            [@class="form-control"]
+            [./option[@value="3"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_year"]
+            [@class="form-control"]
+            [./option[@value="'.date('Y').'"][@selected="selected"]]
+    ]
+    [count(./select)=3]
+'
+        );
+    }
+
+    public function testDateChoiceWithPlaceholderGlobal()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, [
+            'input' => 'string',
+            'widget' => 'choice',
+            'placeholder' => 'Change&Me',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_month"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+        /following-sibling::select
+            [@id="name_day"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+        /following-sibling::select
+            [@id="name_year"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+    ]
+    [count(./select)=3]
+'
+        );
+    }
+
+    public function testDateChoiceWithPlaceholderOnYear()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, [
+            'input' => 'string',
+            'widget' => 'choice',
+            'required' => false,
+            'placeholder' => ['year' => 'Change&Me'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_month"]
+            [@class="form-control"]
+            [./option[@value="1"]]
+        /following-sibling::select
+            [@id="name_day"]
+            [@class="form-control"]
+            [./option[@value="1"]]
+        /following-sibling::select
+            [@id="name_year"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+    ]
+    [count(./select)=3]
+'
+        );
+    }
+
+    public function testDateText()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', [
+            'input' => 'string',
+            'widget' => 'text',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./input
+            [@id="name_month"]
+            [@type="text"]
+            [@class="form-control"]
+            [@value="2"]
+        /following-sibling::input
+            [@id="name_day"]
+            [@type="text"]
+            [@class="form-control"]
+            [@value="3"]
+        /following-sibling::input
+            [@id="name_year"]
+            [@type="text"]
+            [@class="form-control"]
+            [@value="2011"]
+    ]
+    [count(./input)=3]
+'
+        );
+    }
+
+    public function testDateSingleText()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', [
+            'input' => 'string',
+            'widget' => 'single_text',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="date"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="2011-02-03"]
+'
+        );
+    }
+
+    public function testBirthDay()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '2000-02-03', [
+            'input' => 'string',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_month"]
+            [@class="form-control"]
+            [./option[@value="2"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_day"]
+            [@class="form-control"]
+            [./option[@value="3"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_year"]
+            [@class="form-control"]
+            [./option[@value="2000"][@selected="selected"]]
+    ]
+    [count(./select)=3]
+'
+        );
+    }
+
+    public function testBirthDayWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '1950-01-01', [
+            'input' => 'string',
+            'placeholder' => '',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_month"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
+            [./option[@value="1"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_day"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
+            [./option[@value="1"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_year"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
+            [./option[@value="1950"][@selected="selected"]]
+    ]
+    [count(./select)=3]
+'
+        );
+    }
+
+    public function testEmail()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType', 'foo&bar');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="email"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="foo&bar"]
+    [not(@maxlength)]
+'
+        );
+    }
+
+    public function testEmailWithMaxLength()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="email"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="foo&bar"]
+    [@maxlength="123"]
+'
+        );
+    }
+
+    public function testHidden()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\HiddenType', 'foo&bar');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="hidden"]
+    [@name="name"]
+    [@class="my&class"]
+    [@value="foo&bar"]
+'
+        );
+    }
+
+    public function testDisabled()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
+            'disabled' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="text"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@disabled="disabled"]
+'
+        );
+    }
+
+    public function testInteger()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', 123);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="number"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="123"]
+'
+        );
+    }
+
+    public function testIntegerTypeWithGroupingRendersAsTextInput()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', 123, [
+            'grouping' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="text"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="123"]
+'
+        );
+    }
+
+    public function testLanguage()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\LanguageType', 'de');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [./option[@value="de"][@selected="selected"][.="German"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testLocale()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\LocaleType', 'de_AT');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [./option[@value="de_AT"][@selected="selected"][.="German (Austria)"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testMoney()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, [
+            'currency' => 'EUR',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="input-group"]
+    [
+        ./span
+            [@class="input-group-addon"]
+            [contains(.., "€")]
+        /following-sibling::input
+            [@id="my&id"]
+            [@type="text"]
+            [@name="name"]
+            [@class="my&class form-control"]
+            [@value="1234.56"]
+    ]
+'
+        );
+    }
+
+    public function testMoneyWithoutCurrency()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, [
+            'currency' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/input
+    [@id="my&id"]
+    [@type="text"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="1234.56"]
+    [not(preceding-sibling::*)]
+    [not(following-sibling::*)]
+'
+        );
+    }
+
+    public function testNumber()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\NumberType', 1234.56);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="text"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="1234.56"]
+'
+        );
+    }
+
+    public function testPassword()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', 'foo&bar');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="password"]
+    [@name="name"]
+    [@class="my&class form-control"]
+'
+        );
+    }
+
+    public function testPasswordSubmittedWithNotAlwaysEmpty()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', null, [
+            'always_empty' => false,
+        ]);
+        $form->submit('foo&bar');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="password"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="foo&bar"]
+'
+        );
+    }
+
+    public function testPasswordWithMaxLength()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="password"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@maxlength="123"]
+'
+        );
+    }
+
+    public function testPercent()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PercentType', 0.1);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="input-group"]
+    [
+        ./input
+            [@id="my&id"]
+            [@type="text"]
+            [@name="name"]
+            [@class="my&class form-control"]
+            [@value="10"]
+        /following-sibling::span
+            [@class="input-group-addon"]
+            [contains(.., "%")]
+    ]
+'
+        );
+    }
+
+    public function testCheckedRadio()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', true);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="radio"]
+    [
+        ./label
+            [@class="required"]
+            [
+                ./input
+                    [@id="my&id"]
+                    [@type="radio"]
+                    [@name="name"]
+                    [@class="my&class"]
+                    [@checked="checked"]
+                    [@value="1"]
+            ]
+    ]
+'
+        );
+    }
+
+    public function testUncheckedRadio()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="radio"]
+    [
+        ./label
+            [@class="required"]
+            [
+                ./input
+                    [@id="my&id"]
+                    [@type="radio"]
+                    [@name="name"]
+                    [@class="my&class"]
+                    [not(@checked)]
+            ]
+    ]
+'
+        );
+    }
+
+    public function testRadioWithValue()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false, [
+            'value' => 'foo&bar',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="radio"]
+    [
+        ./label
+            [@class="required"]
+            [
+                ./input
+                    [@id="my&id"]
+                    [@type="radio"]
+                    [@name="name"]
+                    [@class="my&class"]
+                    [@value="foo&bar"]
+            ]
+    ]
+'
+        );
+    }
+
+    public function testRange()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, ['attr' => ['min' => 5]]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="range"]
+    [@name="name"]
+    [@value="42"]
+    [@min="5"]
+    [@class="my&class form-control"]
+'
+        );
+    }
+
+    public function testRangeWithMinMaxValues()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, ['attr' => ['min' => 5, 'max' => 57]]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="range"]
+    [@name="name"]
+    [@value="42"]
+    [@min="5"]
+    [@max="57"]
+    [@class="my&class form-control"]
+'
+        );
+    }
+
+    public function testTextarea()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', 'foo&bar', [
+            'attr' => ['pattern' => 'foo'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/textarea
+    [@name="name"]
+    [@pattern="foo"]
+    [@class="my&class form-control"]
+    [.="foo&bar"]
+'
+        );
+    }
+
+    public function testText()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'foo&bar');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="text"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="foo&bar"]
+    [not(@maxlength)]
+'
+        );
+    }
+
+    public function testTextWithMaxLength()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="text"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="foo&bar"]
+    [@maxlength="123"]
+'
+        );
+    }
+
+    public function testSearch()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\SearchType', 'foo&bar');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="search"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="foo&bar"]
+    [not(@maxlength)]
+'
+        );
+    }
+
+    public function testTime()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
+            'input' => 'string',
+            'with_seconds' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_hour"]
+            [@class="form-control"]
+            [not(@size)]
+            [./option[@value="4"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_minute"]
+            [@class="form-control"]
+            [not(@size)]
+            [./option[@value="5"][@selected="selected"]]
+    ]
+    [count(./select)=2]
+'
+        );
+    }
+
+    public function testTimeWithSeconds()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
+            'input' => 'string',
+            'with_seconds' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_hour"]
+            [@class="form-control"]
+            [not(@size)]
+            [./option[@value="4"][@selected="selected"]]
+            [count(./option)>23]
+        /following-sibling::select
+            [@id="name_minute"]
+            [@class="form-control"]
+            [not(@size)]
+            [./option[@value="5"][@selected="selected"]]
+            [count(./option)>59]
+        /following-sibling::select
+            [@id="name_second"]
+            [@class="form-control"]
+            [not(@size)]
+            [./option[@value="6"][@selected="selected"]]
+            [count(./option)>59]
+    ]
+    [count(./select)=3]
+'
+        );
+    }
+
+    public function testTimeText()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
+            'input' => 'string',
+            'widget' => 'text',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./input
+            [@type="text"]
+            [@id="name_hour"]
+            [@name="name[hour]"]
+            [@class="form-control"]
+            [@value="04"]
+            [@required="required"]
+            [not(@size)]
+        /following-sibling::input
+            [@type="text"]
+            [@id="name_minute"]
+            [@name="name[minute]"]
+            [@class="form-control"]
+            [@value="05"]
+            [@required="required"]
+            [not(@size)]
+    ]
+    [count(./input)=2]
+'
+        );
+    }
+
+    public function testTimeSingleText()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
+            'input' => 'string',
+            'widget' => 'single_text',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="time"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="04:05"]
+    [not(@size)]
+'
+        );
+    }
+
+    public function testTimeWithPlaceholderGlobal()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, [
+            'input' => 'string',
+            'placeholder' => 'Change&Me',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_hour"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+            [count(./option)>24]
+        /following-sibling::select
+            [@id="name_minute"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+            [count(./option)>60]
+    ]
+    [count(./select)=2]
+'
+        );
+    }
+
+    public function testTimeWithPlaceholderOnYear()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, [
+            'input' => 'string',
+            'required' => false,
+            'placeholder' => ['hour' => 'Change&Me'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/div
+    [@class="my&class form-inline"]
+    [
+        ./select
+            [@id="name_hour"]
+            [@class="form-control"]
+            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+            [count(./option)>24]
+        /following-sibling::select
+            [@id="name_minute"]
+            [./option[@value="1"]]
+            [count(./option)>59]
+    ]
+    [count(./select)=2]
+'
+        );
+    }
+
+    public function testTimezone()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimezoneType', 'Europe/Vienna');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@name="name"]
+    [@class="my&class form-control"]
+    [not(@required)]
+    [.//option[@value="Europe/Vienna"][@selected="selected"]]
+    [count(.//option)>200]
+'
+        );
+    }
+
+    public function testTimezoneWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimezoneType', null, [
+            'placeholder' => 'Select&Timezone',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/select
+    [@class="my&class form-control"]
+    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
+    [count(.//option)>201]
+'
+        );
+    }
+
+    public function testUrlWithDefaultProtocol()
+    {
+        $url = 'http://www.example.com?foo1=bar1&foo2=bar2';
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url, ['default_protocol' => 'http']);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+'/input
+    [@type="text"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="http://www.example.com?foo1=bar1&foo2=bar2"]
+    [@inputmode="url"]
+'
+        );
+    }
+
+    public function testUrlWithoutDefaultProtocol()
+    {
+        $url = 'http://www.example.com?foo1=bar1&foo2=bar2';
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url, ['default_protocol' => null]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/input
+    [@type="url"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="http://www.example.com?foo1=bar1&foo2=bar2"]
+'
+        );
+    }
+
+    public function testButton()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ButtonType');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/button[@type="button"][@name="name"][.="[trans]Name[/trans]"][@class="my&class btn"]'
+        );
+    }
+
+    public function testButtonlabelWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
+            'translation_domain' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/button[@type="button"][@name="name"][.="Name"][@class="my&class btn"]'
+        );
+    }
+
+    public function testSubmit()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\SubmitType');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/button[@type="submit"][@name="name"][@class="my&class btn"]'
+        );
+    }
+
+    public function testReset()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ResetType');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/button[@type="reset"][@name="name"][@class="my&class btn"]'
+        );
+    }
+
+    public function testWidgetAttributes()
+    {
+        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', [
+            'required' => true,
+            'disabled' => true,
+            'attr' => ['readonly' => true, 'maxlength' => 10, 'pattern' => '\d+', 'class' => 'foobar', 'data-foo' => 'bar'],
+        ]);
+
+        $html = $this->renderWidget($form->createView());
+
+        // compare plain HTML to check the whitespace
+        $this->assertSame('<input type="text" id="text" name="text" disabled="disabled" required="required" readonly="readonly" maxlength="10" pattern="\d+" class="foobar form-control" data-foo="bar" value="value" />', $html);
+    }
+
+    public function testWidgetAttributeNameRepeatedIfTrue()
+    {
+        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', [
+            'attr' => ['foo' => true],
+        ]);
+
+        $html = $this->renderWidget($form->createView());
+
+        // foo="foo"
+        $this->assertSame('<input type="text" id="text" name="text" required="required" foo="foo" class="form-control" value="value" />', $html);
+    }
+
+    public function testButtonAttributes()
+    {
+        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
+            'disabled' => true,
+            'attr' => ['class' => 'foobar', 'data-foo' => 'bar'],
+        ]);
+
+        $html = $this->renderWidget($form->createView());
+
+        // compare plain HTML to check the whitespace
+        $this->assertSame('<button type="button" id="button" name="button" disabled="disabled" class="foobar btn" data-foo="bar">[trans]Button[/trans]</button>', $html);
+    }
+
+    public function testButtonAttributeNameRepeatedIfTrue()
+    {
+        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
+            'attr' => ['foo' => true],
+        ]);
+
+        $html = $this->renderWidget($form->createView());
+
+        // foo="foo"
+        $this->assertSame('<button type="button" id="button" name="button" foo="foo" class="btn-default btn">[trans]Button[/trans]</button>', $html);
+    }
+
+    public function testTel()
+    {
+        $tel = '0102030405';
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/input
+    [@type="tel"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="0102030405"]
+'
+        );
+    }
+
+    public function testColor()
+    {
+        $color = '#0000ff';
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ColorType', $color);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/input
+    [@type="color"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="#0000ff"]
+'
+        );
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
new file mode 100644
index 000000000..51a1360f6
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
@@ -0,0 +1,217 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Tests\Extension;
+
+use Symfony\Component\Form\FormError;
+
+/**
+ * Abstract class providing test cases for the Bootstrap 4 horizontal Twig form theme.
+ *
+ * @author Hidde Wieringa <hidde@hiddewieringa.nl>
+ */
+abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4LayoutTest
+{
+    public function testRow()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $form->addError(new FormError('[trans]Error![/trans]'));
+        $view = $form->createView();
+        $html = $this->renderRow($view);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [
+        ./label[@for="name"]
+        [
+            ./span[@class="alert alert-danger d-block"]
+                [./span[@class="d-block"]
+                    [./span[.="[trans]Error[/trans]"]]
+                    [./span[.="[trans]Error![/trans]"]]
+                ]
+                [count(./span)=1]
+        ]
+        /following-sibling::div[./input[@id="name"]]
+    ]
+'
+        );
+    }
+
+    public function testLabelOnForm()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
+        $view = $form->createView();
+        $this->renderWidget($view, ['label' => 'foo']);
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html,
+'/legend
+    [@class="col-form-label col-sm-2 col-form-label required"]
+    [.="[trans]Name[/trans]"]
+'
+        );
+    }
+
+    public function testLabelDoesNotRenderFieldAttributes()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="col-form-label col-sm-2 required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-form-label col-sm-2 required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-form-label col-sm-2 required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
+            'label' => 'Custom label',
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-form-label col-sm-2 required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLegendOnExpandedType()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, [
+            'label' => 'Custom label',
+            'expanded' => true,
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+        ]);
+        $view = $form->createView();
+        $this->renderWidget($view);
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html,
+'/legend
+    [@class="col-sm-2 col-form-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testStartTag()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => 'http://example.com/directory',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="http://example.com/directory">', $html);
+    }
+
+    public function testStartTagWithOverriddenVars()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'put',
+            'action' => 'http://example.com/directory',
+        ]);
+
+        $html = $this->renderStart($form->createView(), [
+            'method' => 'post',
+            'action' => 'http://foo.com/directory',
+        ]);
+
+        $this->assertSame('<form name="form" method="post" action="http://foo.com/directory">', $html);
+    }
+
+    public function testStartTagForMultipartForm()
+    {
+        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+                'method' => 'get',
+                'action' => 'http://example.com/directory',
+            ])
+            ->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType')
+            ->getForm();
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="http://example.com/directory" enctype="multipart/form-data">', $html);
+    }
+
+    public function testStartTagWithExtraAttributes()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => 'http://example.com/directory',
+        ]);
+
+        $html = $this->renderStart($form->createView(), [
+            'attr' => ['class' => 'foobar'],
+        ]);
+
+        $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="foobar">', $html);
+    }
+
+    public function testCheckboxRow()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
+        $view = $form->createView();
+        $html = $this->renderRow($view, ['label' => 'foo']);
+
+        $this->assertMatchesXpath($html, '/div[@class="form-group row"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap4LayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap4LayoutTest.php
new file mode 100644
index 000000000..30b5ea10e
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/AbstractBootstrap4LayoutTest.php
@@ -0,0 +1,986 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Component\Form\Extension\Core\Type\ButtonType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\MoneyType;
+use Symfony\Component\Form\Extension\Core\Type\PercentType;
+use Symfony\Component\Form\Extension\Core\Type\RadioType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormError;
+
+/**
+ * Abstract class providing test cases for the Bootstrap 4 Twig form theme.
+ *
+ * @author Hidde Wieringa <hidde@hiddewieringa.nl>
+ */
+abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
+{
+    public function testRow()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $form->addError(new FormError('[trans]Error![/trans]'));
+        $view = $form->createView();
+        $html = $this->renderRow($view);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [
+        ./label[@for="name"]
+        [
+            ./span[@class="alert alert-danger d-block"]
+                [./span[@class="d-block"]
+                    [./span[.="[trans]Error[/trans]"]]
+                    [./span[.="[trans]Error![/trans]"]]
+                ]
+                [count(./span)=1]
+        ]
+        /following-sibling::input[@id="name"]
+    ]
+'
+        );
+    }
+
+    public function testLabelOnForm()
+    {
+        $form = $this->factory->createNamed('name', DateType::class);
+        $view = $form->createView();
+        $this->renderWidget($view, ['label' => 'foo']);
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html,
+'/legend
+    [@class="col-form-label required"]
+    [.="[trans]Name[/trans]"]
+'
+        );
+    }
+
+    public function testLabelDoesNotRenderFieldAttributes()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'label' => 'Custom label',
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLegendOnExpandedType()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, null, [
+            'label' => 'Custom label',
+            'expanded' => true,
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+        ]);
+        $view = $form->createView();
+        $this->renderWidget($view);
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html,
+'/legend
+    [@class="col-form-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testErrors()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $form->addError(new FormError('[trans]Error 1[/trans]'));
+        $form->addError(new FormError('[trans]Error 2[/trans]'));
+        $view = $form->createView();
+        $html = $this->renderErrors($view);
+
+        $this->assertMatchesXpath($html,
+'/span
+    [@class="alert alert-danger d-block"]
+    [
+        ./span[@class="d-block"]
+            [./span[.="[trans]Error[/trans]"]]
+            [./span[.="[trans]Error 1[/trans]"]]
+
+        /following-sibling::span[@class="d-block"]
+            [./span[.="[trans]Error[/trans]"]]
+            [./span[.="[trans]Error 2[/trans]"]]
+    ]
+    [count(./span)=2]
+'
+        );
+    }
+
+    public function testErrorWithNoLabel()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, ['label' => false]);
+        $form->addError(new FormError('[trans]Error 1[/trans]'));
+        $view = $form->createView();
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html, '//span[.="[trans]Error[/trans]"]');
+    }
+
+    public function testCheckedCheckbox()
+    {
+        $form = $this->factory->createNamed('name', CheckboxType::class, true);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="form-check"]
+    [
+        ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class form-check-input"][@checked="checked"][@value="1"]
+        /following-sibling::label
+            [.="[trans]Name[/trans]"]
+            [@class="form-check-label required"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceAttributesWithMainAttributes()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'attr' => ['class' => 'bar&baz'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
+'/select
+    [@name="name"]
+    [@class="bar&baz form-control"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleExpandedChoiceAttributesWithMainAttributes()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+            'attr' => ['class' => 'bar&baz'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
+'/div
+    [@class="bar&baz"]
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+                    [.="[trans]Choice&A[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+                    [.="[trans]Choice&B[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testUncheckedCheckbox()
+    {
+        $form = $this->factory->createNamed('name', CheckboxType::class, false);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="form-check"]
+    [
+        ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class form-check-input"][not(@checked)]
+        /following-sibling::label
+            [.="[trans]Name[/trans]"]
+    ]
+'
+        );
+    }
+
+    public function testCheckboxWithValue()
+    {
+        $form = $this->factory->createNamed('name', CheckboxType::class, false, [
+            'value' => 'foo&bar',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="form-check"]
+    [
+        ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class form-check-input"][@value="foo&bar"]
+        /following-sibling::label
+            [.="[trans]Name[/trans]"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpanded()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+                    [.="[trans]Choice&A[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+                    [.="[trans]Choice&B[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithLabelsAsFalse()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_label' => false,
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithLabelsSetByCallable()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_label' => function ($choice, $label, $value) {
+                if ('&b' === $choice) {
+                    return false;
+                }
+
+                return 'label.'.$value;
+            },
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+                    [.="[trans]label.&a[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_2"][@value="&c"][not(@checked)]
+                /following-sibling::label
+                    [.="[trans]label.&c[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_label' => function () {
+                return false;
+            },
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+            'choice_translation_domain' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+                    [.="Choice&A"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+                    [.="Choice&B"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedAttributes()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+                    [.="[trans]Choice&A[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)][@class="foo&bar form-check-input"]
+                /following-sibling::label
+                    [.="[trans]Choice&B[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+            'placeholder' => 'Test&Me',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)]
+                /following-sibling::label
+                    [.="[trans]Test&Me[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@checked]
+                /following-sibling::label
+                    [.="[trans]Choice&A[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
+                /following-sibling::label
+                    [.="[trans]Choice&B[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => true,
+            'required' => false,
+            'choice_translation_domain' => false,
+            'placeholder' => 'Placeholder&Not&Translated',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)]
+                /following-sibling::label
+                    [.="Placeholder&Not&Translated"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@checked]
+                /following-sibling::label
+                    [.="Choice&A"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
+                /following-sibling::label
+                    [.="Choice&B"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testSingleChoiceExpandedWithBooleanValue()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, true, [
+            'choices' => ['Choice&A' => '1', 'Choice&B' => '0'],
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_0"][@checked]
+                /following-sibling::label
+                    [.="[trans]Choice&A[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
+                /following-sibling::label
+                    [.="[trans]Choice&B[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpanded()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'multiple' => true,
+            'expanded' => true,
+            'required' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
+                /following-sibling::label
+                    [.="[trans]Choice&A[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]
+                /following-sibling::label
+                    [.="[trans]Choice&B[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
+                /following-sibling::label
+                    [.="[trans]Choice&C[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedWithLabelsAsFalse()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_label' => false,
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedWithLabelsSetByCallable()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_label' => function ($choice, $label, $value) {
+                if ('&b' === $choice) {
+                    return false;
+                }
+
+                return 'label.'.$value;
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+            '/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+                    [.="[trans]label.&a[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@value="&c"][not(@checked)]
+                /following-sibling::label
+                    [.="[trans]label.&c[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_label' => function () {
+                return false;
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
+                /following-sibling::label
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]
+                /following-sibling::label
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'multiple' => true,
+            'expanded' => true,
+            'required' => true,
+            'choice_translation_domain' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
+                /following-sibling::label
+                    [.="Choice&A"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]
+                /following-sibling::label
+                    [.="Choice&B"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
+                /following-sibling::label
+                    [.="Choice&C"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceExpandedAttributes()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
+            'multiple' => true,
+            'expanded' => true,
+            'required' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/div
+    [
+        ./div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
+                /following-sibling::label
+                    [.="[trans]Choice&A[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)][@class="foo&bar form-check-input"]
+                /following-sibling::label
+                    [.="[trans]Choice&B[/trans]"]
+            ]
+        /following-sibling::div
+            [@class="form-check"]
+            [
+                ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
+                /following-sibling::label
+                    [.="[trans]Choice&C[/trans]"]
+            ]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
+    ]
+'
+        );
+    }
+
+    public function testCheckedRadio()
+    {
+        $form = $this->factory->createNamed('name', RadioType::class, true);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="form-check"]
+    [
+        ./input
+            [@id="my&id"]
+            [@type="radio"]
+            [@name="name"]
+            [@class="my&class form-check-input"]
+            [@checked="checked"]
+            [@value="1"]
+        /following-sibling::label
+            [@class="form-check-label required"]
+    ]
+'
+        );
+    }
+
+    public function testUncheckedRadio()
+    {
+        $form = $this->factory->createNamed('name', RadioType::class, false);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="form-check"]
+    [
+        ./input
+            [@id="my&id"]
+            [@type="radio"]
+            [@name="name"]
+            [@class="my&class form-check-input"]
+            [not(@checked)]
+        /following-sibling::label
+            [@class="form-check-label required"]
+    ]
+'
+        );
+    }
+
+    public function testRadioWithValue()
+    {
+        $form = $this->factory->createNamed('name', RadioType::class, false, [
+            'value' => 'foo&bar',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+'/div
+    [@class="form-check"]
+    [
+        ./input
+            [@id="my&id"]
+            [@type="radio"]
+            [@name="name"]
+            [@class="my&class form-check-input"]
+            [@value="foo&bar"]
+        /following-sibling::label
+            [@class="form-check-label required"]
+            [@for="my&id"]
+    ]
+'
+        );
+    }
+
+    public function testButtonAttributeNameRepeatedIfTrue()
+    {
+        $form = $this->factory->createNamed('button', ButtonType::class, null, [
+            'attr' => ['foo' => true],
+        ]);
+
+        $html = $this->renderWidget($form->createView());
+
+        // foo="foo"
+        $this->assertSame('<button type="button" id="button" name="button" foo="foo" class="btn-secondary btn">[trans]Button[/trans]</button>', $html);
+    }
+
+    public function testFile()
+    {
+        $form = $this->factory->createNamed('name', FileType::class);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class form-control-file']],
+'/input
+    [@type="file"]
+'
+        );
+    }
+
+    public function testMoney()
+    {
+        $form = $this->factory->createNamed('name', MoneyType::class, 1234.56, [
+            'currency' => 'EUR',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+            '/div
+    [@class="input-group"]
+    [
+        ./div
+            [@class="input-group-prepend"]
+            [
+                ./span
+                    [@class="input-group-text"]
+                    [contains(.., "€")]
+            ]
+        /following-sibling::input
+            [@id="my&id"]
+            [@type="text"]
+            [@name="name"]
+            [@class="my&class form-control"]
+            [@value="1234.56"]
+    ]
+'
+        );
+    }
+
+    public function testPercent()
+    {
+        $form = $this->factory->createNamed('name', PercentType::class, 0.1);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+            '/div
+    [@class="input-group"]
+    [
+        ./input
+            [@id="my&id"]
+            [@type="text"]
+            [@name="name"]
+            [@class="my&class form-control"]
+            [@value="10"]
+            /following-sibling::div
+                [@class="input-group-append"]
+                [
+                    ./span
+                    [@class="input-group-text"]
+                    [contains(.., "%")]
+                ]
+    ]
+'
+        );
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/CodeExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/CodeExtensionTest.php
new file mode 100644
index 000000000..a637117f0
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/CodeExtensionTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\CodeExtension;
+use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
+
+class CodeExtensionTest extends TestCase
+{
+    public function testFormatFile()
+    {
+        $expected = sprintf('<a href="proto://foobar%s#&amp;line=25" title="Click to open this file" class="file_link">%s at line 25</a>', substr(__FILE__, 5), __FILE__);
+        $this->assertEquals($expected, $this->getExtension()->formatFile(__FILE__, 25));
+    }
+
+    /**
+     * @dataProvider getClassNameProvider
+     */
+    public function testGettingClassAbbreviation($class, $abbr)
+    {
+        $this->assertEquals($this->getExtension()->abbrClass($class), $abbr);
+    }
+
+    /**
+     * @dataProvider getMethodNameProvider
+     */
+    public function testGettingMethodAbbreviation($method, $abbr)
+    {
+        $this->assertEquals($this->getExtension()->abbrMethod($method), $abbr);
+    }
+
+    public function getClassNameProvider()
+    {
+        return [
+            ['F\Q\N\Foo', '<abbr title="F\Q\N\Foo">Foo</abbr>'],
+            ['Bare', '<abbr title="Bare">Bare</abbr>'],
+        ];
+    }
+
+    public function getMethodNameProvider()
+    {
+        return [
+            ['F\Q\N\Foo::Method', '<abbr title="F\Q\N\Foo">Foo</abbr>::Method()'],
+            ['Bare::Method', '<abbr title="Bare">Bare</abbr>::Method()'],
+            ['Closure', '<abbr title="Closure">Closure</abbr>'],
+            ['Method', '<abbr title="Method">Method</abbr>()'],
+        ];
+    }
+
+    public function testGetName()
+    {
+        $this->assertEquals('code', $this->getExtension()->getName());
+    }
+
+    protected function getExtension()
+    {
+        return new CodeExtension(new FileLinkFormatter('proto://%f#&line=%l&'.substr(__FILE__, 0, 5).'>foobar'), '/root', 'UTF-8');
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/DumpExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/DumpExtensionTest.php
new file mode 100644
index 000000000..273ca922d
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/DumpExtensionTest.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\DumpExtension;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\VarDumper;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+
+class DumpExtensionTest extends TestCase
+{
+    /**
+     * @dataProvider getDumpTags
+     */
+    public function testDumpTag($template, $debug, $expectedOutput, $expectedDumped)
+    {
+        $extension = new DumpExtension(new VarCloner());
+        $twig = new Environment(new ArrayLoader(['template' => $template]), [
+            'debug' => $debug,
+            'cache' => false,
+            'optimizations' => 0,
+        ]);
+        $twig->addExtension($extension);
+
+        $dumped = null;
+        $exception = null;
+        $prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) { $dumped = $var; });
+
+        try {
+            $this->assertEquals($expectedOutput, $twig->render('template'));
+        } catch (\Exception $exception) {
+        }
+
+        VarDumper::setHandler($prevDumper);
+
+        if (null !== $exception) {
+            throw $exception;
+        }
+
+        $this->assertSame($expectedDumped, $dumped);
+    }
+
+    public function getDumpTags()
+    {
+        return [
+            ['A{% dump %}B', true, 'AB', []],
+            ['A{% set foo="bar"%}B{% dump %}C', true, 'ABC', ['foo' => 'bar']],
+            ['A{% dump %}B', false, 'AB', null],
+        ];
+    }
+
+    /**
+     * @dataProvider getDumpArgs
+     */
+    public function testDump($context, $args, $expectedOutput, $debug = true)
+    {
+        $extension = new DumpExtension(new VarCloner());
+        $twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), [
+            'debug' => $debug,
+            'cache' => false,
+            'optimizations' => 0,
+        ]);
+
+        array_unshift($args, $context);
+        array_unshift($args, $twig);
+
+        $dump = \call_user_func_array([$extension, 'dump'], $args);
+
+        if ($debug) {
+            $this->assertStringStartsWith('<script>', $dump);
+            $dump = preg_replace('/^.*?<pre/', '<pre', $dump);
+            $dump = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump);
+        }
+        $this->assertEquals($expectedOutput, $dump);
+    }
+
+    public function getDumpArgs()
+    {
+        return [
+            [[], [], '', false],
+            [[], [], "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \">[]\n</pre><script>Sfdump(\"sf-dump\")</script>\n"],
+            [
+                [],
+                [123, 456],
+                "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-num>123</span>\n</pre><script>Sfdump(\"sf-dump\")</script>\n"
+                ."<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-num>456</span>\n</pre><script>Sfdump(\"sf-dump\")</script>\n",
+            ],
+            [
+                ['foo' => 'bar'],
+                [],
+                "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-note>array:1</span> [<samp>\n"
+                ."  \"<span class=sf-dump-key>foo</span>\" => \"<span class=sf-dump-str title=\"3 characters\">bar</span>\"\n"
+                ."</samp>]\n"
+                ."</pre><script>Sfdump(\"sf-dump\")</script>\n",
+            ],
+        ];
+    }
+
+    public function testCustomDumper()
+    {
+        $output = '';
+        $lineDumper = function ($line) use (&$output) {
+            $output .= $line;
+        };
+
+        $dumper = new HtmlDumper($lineDumper);
+
+        $dumper->setDumpHeader('');
+        $dumper->setDumpBoundaries(
+            '<pre class=sf-dump-test id=%s data-indent-pad="%s">',
+            '</pre><script>Sfdump("%s")</script>'
+        );
+        $extension = new DumpExtension(new VarCloner(), $dumper);
+        $twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), [
+            'debug' => true,
+            'cache' => false,
+            'optimizations' => 0,
+        ]);
+
+        $dump = $extension->dump($twig, [], 'foo');
+        $dump = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump);
+
+        $this->assertEquals(
+            '<pre class=sf-dump-test id=sf-dump data-indent-pad="  ">"'.
+            "<span class=sf-dump-str title=\"3 characters\">foo</span>\"\n".
+            "</pre><script>Sfdump(\"sf-dump\")</script>\n",
+            $dump,
+            'Custom dumper should be used to dump data.'
+        );
+
+        $this->assertEmpty($output, 'Dumper output should be ignored.');
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/ExpressionExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/ExpressionExtensionTest.php
new file mode 100644
index 000000000..bfb9c578b
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/ExpressionExtensionTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\ExpressionExtension;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+
+class ExpressionExtensionTest extends TestCase
+{
+    public function testExpressionCreation()
+    {
+        $template = "{{ expression('1 == 1') }}";
+        $twig = new Environment(new ArrayLoader(['template' => $template]), ['debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0]);
+        $twig->addExtension(new ExpressionExtension());
+
+        $output = $twig->render('template');
+        $this->assertEquals('1 == 1', $output);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/StubFilesystemLoader.php b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/StubFilesystemLoader.php
new file mode 100644
index 000000000..4cbc55b46
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/StubFilesystemLoader.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension\Fixtures;
+
+use Twig\Loader\FilesystemLoader;
+
+class StubFilesystemLoader extends FilesystemLoader
+{
+    protected function findTemplate($name, $throw = true)
+    {
+        // strip away bundle name
+        $parts = explode(':', $name);
+
+        return parent::findTemplate(end($parts), $throw);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/StubTranslator.php b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/StubTranslator.php
new file mode 100644
index 000000000..5ef9e61b6
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/StubTranslator.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension\Fixtures;
+
+use Symfony\Component\Translation\TranslatorInterface;
+
+class StubTranslator implements TranslatorInterface
+{
+    public function trans($id, array $parameters = [], $domain = null, $locale = null)
+    {
+        return '[trans]'.$id.'[/trans]';
+    }
+
+    public function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null)
+    {
+        return '[trans]'.$id.'[/trans]';
+    }
+
+    public function setLocale($locale)
+    {
+    }
+
+    public function getLocale()
+    {
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/child_label.html.twig b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/child_label.html.twig
new file mode 100644
index 000000000..8c7c24899
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/child_label.html.twig
@@ -0,0 +1,3 @@
+{% block form_label %}
+    <label>{{ global }}child</label>
+{% endblock form_label %}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig
new file mode 100644
index 000000000..36e9c702a
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig
@@ -0,0 +1,19 @@
+{% block _text_id_widget -%}
+    <div id="container">
+        {{- form_widget(form) -}}
+    </div>
+{%- endblock _text_id_widget %}
+
+{% block _names_entry_label -%}
+    {% if label is empty %}
+        {%- set label = name|humanize -%}
+    {% endif -%}
+    <label>Custom label: {{ label|trans({}, translation_domain) }}</label>
+{%- endblock _names_entry_label %}
+
+{% block _name_c_entry_label -%}
+    {% if label is empty %}
+        {%- set label = name|humanize -%}
+    {% endif -%}
+    <label>Custom name label: {{ label|trans({}, translation_domain) }}</label>
+{%- endblock _name_c_entry_label %}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig
new file mode 100644
index 000000000..ac166b7b6
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig
@@ -0,0 +1 @@
+{% extends dynamic_template_name ~ '.html.twig' %}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/parent_label.html.twig b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/parent_label.html.twig
new file mode 100644
index 000000000..e96278b8f
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/parent_label.html.twig
@@ -0,0 +1,3 @@
+{% block form_label %}
+    <label>parent</label>
+{% endblock form_label %}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme.html.twig b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme.html.twig
new file mode 100644
index 000000000..e8816be96
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme.html.twig
@@ -0,0 +1,4 @@
+{% block form_widget_simple %}
+    {%- set type = type|default('text') -%}
+    <input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
+{%- endblock form_widget_simple %}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig
new file mode 100644
index 000000000..501b555ef
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig
@@ -0,0 +1,6 @@
+{% extends 'form_div_layout.html.twig' %}
+
+{% block form_widget_simple %}
+    {%- set type = type|default('text') -%}
+    <input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
+{%- endblock form_widget_simple %}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme_use.html.twig b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme_use.html.twig
new file mode 100644
index 000000000..37150734a
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/Fixtures/templates/form/theme_use.html.twig
@@ -0,0 +1,6 @@
+{% use 'form_div_layout.html.twig' %}
+
+{% block form_widget_simple %}
+    {%- set type = type|default('text') -%}
+    <input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
+{%- endblock form_widget_simple %}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
new file mode 100644
index 000000000..b11d1720b
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormView;
+use Twig\Environment;
+
+class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTest
+{
+    use RuntimeLoaderProvider;
+
+    protected $testableFeatures = [
+        'choice_attr',
+    ];
+
+    /**
+     * @var FormRenderer
+     */
+    private $renderer;
+
+    /**
+     * @before
+     */
+    public function doSetUp()
+    {
+        $loader = new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]);
+
+        $environment = new Environment($loader, ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_3_horizontal_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+    }
+
+    protected function renderForm(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    {
+        if (null !== $label) {
+            $vars += ['label' => $label];
+        }
+
+        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    {
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
new file mode 100644
index 000000000..0bb5a7b6c
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -0,0 +1,156 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormView;
+use Twig\Environment;
+
+class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
+{
+    use RuntimeLoaderProvider;
+
+    /**
+     * @var FormRenderer
+     */
+    private $renderer;
+
+    /**
+     * @before
+     */
+    public function doSetUp()
+    {
+        $loader = new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]);
+
+        $environment = new Environment($loader, ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_3_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+    }
+
+    public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get">', $html);
+    }
+
+    public function testStartTagHasActionAttributeWhenActionIsZero()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '0',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="0">', $html);
+    }
+
+    public function testMoneyWidgetInIso()
+    {
+        $environment = new Environment(new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]), ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+        $environment->setCharset('ISO-8859-1');
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_3_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+
+        $view = $this->factory
+            ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType')
+            ->createView()
+        ;
+
+        $this->assertSame(<<<'HTML'
+<div class="input-group">
+                            <span class="input-group-addon">&euro; </span>
+            <input type="text" id="name" name="name" required="required" class="form-control" />        </div>
+HTML
+        , trim($this->renderWidget($view)));
+    }
+
+    protected function renderForm(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    {
+        if (null !== $label) {
+            $vars += ['label' => $label];
+        }
+
+        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    {
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
new file mode 100644
index 000000000..02ab01fc5
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormView;
+use Twig\Environment;
+
+/**
+ * Class providing test cases for the Bootstrap 4 Twig form theme.
+ *
+ * @author Hidde Wieringa <hidde@hiddewieringa.nl>
+ */
+class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4HorizontalLayoutTest
+{
+    use RuntimeLoaderProvider;
+
+    protected $testableFeatures = [
+        'choice_attr',
+    ];
+
+    private $renderer;
+
+    /**
+     * @before
+     */
+    public function doSetUp()
+    {
+        $loader = new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]);
+
+        $environment = new Environment($loader, ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_4_horizontal_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+    }
+
+    protected function renderForm(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    {
+        if (null !== $label) {
+            $vars += ['label' => $label];
+        }
+
+        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    {
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
new file mode 100644
index 000000000..cb2328b51
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -0,0 +1,160 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormView;
+use Twig\Environment;
+
+/**
+ * Class providing test cases for the Bootstrap 4 horizontal Twig form theme.
+ *
+ * @author Hidde Wieringa <hidde@hiddewieringa.nl>
+ */
+class FormExtensionBootstrap4LayoutTest extends AbstractBootstrap4LayoutTest
+{
+    use RuntimeLoaderProvider;
+    /**
+     * @var FormRenderer
+     */
+    private $renderer;
+
+    /**
+     * @before
+     */
+    public function doSetUp()
+    {
+        $loader = new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]);
+
+        $environment = new Environment($loader, ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_4_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+    }
+
+    public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get">', $html);
+    }
+
+    public function testStartTagHasActionAttributeWhenActionIsZero()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '0',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="0">', $html);
+    }
+
+    public function testMoneyWidgetInIso()
+    {
+        $environment = new Environment(new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]), ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+        $environment->setCharset('ISO-8859-1');
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_4_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+
+        $view = $this->factory
+            ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType')
+            ->createView()
+        ;
+
+        $this->assertSame(<<<'HTML'
+<div class="input-group"><div class="input-group-prepend">
+                    <span class="input-group-text">&euro; </span>
+                </div><input type="text" id="name" name="name" required="required" class="form-control" /></div>
+HTML
+        , trim($this->renderWidget($view)));
+    }
+
+    protected function renderForm(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    {
+        if (null !== $label) {
+            $vars += ['label' => $label];
+        }
+
+        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    {
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionDivLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionDivLayoutTest.php
new file mode 100644
index 000000000..51e587411
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -0,0 +1,258 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Tests\AbstractDivLayoutTest;
+use Twig\Environment;
+
+class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
+{
+    use RuntimeLoaderProvider;
+
+    /**
+     * @var FormRenderer
+     */
+    private $renderer;
+
+    protected static $supportedFeatureSetVersion = 304;
+
+    /**
+     * @before
+     */
+    public function doSetUp()
+    {
+        $loader = new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]);
+
+        $environment = new Environment($loader, ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addGlobal('global', '');
+        // the value can be any template that exists
+        $environment->addGlobal('dynamic_template_name', 'child_label');
+        $environment->addExtension(new FormExtension());
+
+        $rendererEngine = new TwigRendererEngine([
+            'form_div_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+    }
+
+    public function testThemeBlockInheritanceUsingUse()
+    {
+        $view = $this->factory
+            ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType')
+            ->createView()
+        ;
+
+        $this->setTheme($view, ['theme_use.html.twig']);
+
+        $this->assertMatchesXpath(
+            $this->renderWidget($view),
+            '/input[@type="email"][@rel="theme"]'
+        );
+    }
+
+    public function testThemeBlockInheritanceUsingExtend()
+    {
+        $view = $this->factory
+            ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType')
+            ->createView()
+        ;
+
+        $this->setTheme($view, ['theme_extends.html.twig']);
+
+        $this->assertMatchesXpath(
+            $this->renderWidget($view),
+            '/input[@type="email"][@rel="theme"]'
+        );
+    }
+
+    public function testThemeBlockInheritanceUsingDynamicExtend()
+    {
+        $view = $this->factory
+            ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType')
+            ->createView()
+        ;
+
+        $this->renderer->setTheme($view, ['page_dynamic_extends.html.twig']);
+        $this->assertMatchesXpath(
+            $this->renderer->searchAndRenderBlock($view, 'row'),
+            '/div/label[text()="child"]'
+        );
+    }
+
+    public function isSelectedChoiceProvider()
+    {
+        return [
+            [true, '0', '0'],
+            [true, '1', '1'],
+            [true, '', ''],
+            [true, '1.23', '1.23'],
+            [true, 'foo', 'foo'],
+            [true, 'foo10', 'foo10'],
+            [true, 'foo', [1, 'foo', 'foo10']],
+
+            [false, 10, [1, 'foo', 'foo10']],
+            [false, 0, [1, 'foo', 'foo10']],
+        ];
+    }
+
+    /**
+     * @dataProvider isSelectedChoiceProvider
+     */
+    public function testIsChoiceSelected($expected, $choice, $value)
+    {
+        $choice = new ChoiceView($choice, $choice, $choice.' label');
+
+        $this->assertSame($expected, \Symfony\Bridge\Twig\Extension\twig_is_selected_choice($choice, $value));
+    }
+
+    public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get">', $html);
+    }
+
+    public function testStartTagHasActionAttributeWhenActionIsZero()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '0',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="0">', $html);
+    }
+
+    public function isRootFormProvider()
+    {
+        return [
+            [true, new FormView()],
+            [false, new FormView(new FormView())],
+        ];
+    }
+
+    /**
+     * @dataProvider isRootFormProvider
+     */
+    public function testIsRootForm($expected, FormView $formView)
+    {
+        $this->assertSame($expected, \Symfony\Bridge\Twig\Extension\twig_is_root_form($formView));
+    }
+
+    public function testMoneyWidgetInIso()
+    {
+        $environment = new Environment(new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]), ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+        $environment->setCharset('ISO-8859-1');
+
+        $rendererEngine = new TwigRendererEngine([
+            'form_div_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+
+        $view = $this->factory
+            ->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType')
+            ->createView()
+        ;
+
+        $this->assertSame('&euro; <input type="text" id="name" name="name" required="required" />', $this->renderWidget($view));
+    }
+
+    protected function renderForm(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    {
+        if (null !== $label) {
+            $vars += ['label' => $label];
+        }
+
+        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    {
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
+    }
+
+    public static function themeBlockInheritanceProvider()
+    {
+        return [
+            [['theme.html.twig']],
+        ];
+    }
+
+    public static function themeInheritanceProvider()
+    {
+        return [
+            [['parent_label.html.twig'], ['child_label.html.twig']],
+        ];
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTableLayoutTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTableLayoutTest.php
new file mode 100644
index 000000000..0676dffd5
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -0,0 +1,130 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
+use Twig\Environment;
+
+class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
+{
+    use RuntimeLoaderProvider;
+
+    /**
+     * @var FormRenderer
+     */
+    private $renderer;
+
+    protected static $supportedFeatureSetVersion = 304;
+
+    /**
+     * @before
+     */
+    public function doSetUp()
+    {
+        $loader = new StubFilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]);
+
+        $environment = new Environment($loader, ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addGlobal('global', '');
+        $environment->addExtension(new FormExtension());
+
+        $rendererEngine = new TwigRendererEngine([
+            'form_table_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+    }
+
+    public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get">', $html);
+    }
+
+    public function testStartTagHasActionAttributeWhenActionIsZero()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'method' => 'get',
+            'action' => '0',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        $this->assertSame('<form name="form" method="get" action="0">', $html);
+    }
+
+    protected function renderForm(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    {
+        if (null !== $label) {
+            $vars += ['label' => $label];
+        }
+
+        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = [])
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    {
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTest.php
new file mode 100644
index 000000000..4bdf78775
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/FormExtensionTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Form\FormRendererInterface;
+use Twig\Environment;
+
+/**
+ * @group legacy
+ */
+class FormExtensionTest extends TestCase
+{
+    /**
+     * @dataProvider rendererDataProvider
+     */
+    public function testInitRuntimeAndAccessRenderer($rendererConstructor, $expectedAccessedRenderer)
+    {
+        $extension = new FormExtension($rendererConstructor);
+        $extension->initRuntime($this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock());
+        $this->assertSame($expectedAccessedRenderer, $extension->renderer);
+    }
+
+    /**
+     * @dataProvider rendererDataProvider
+     */
+    public function testAccessRendererAndInitRuntime($rendererConstructor, $expectedAccessedRenderer)
+    {
+        $extension = new FormExtension($rendererConstructor);
+        $this->assertSame($expectedAccessedRenderer, $extension->renderer);
+        $extension->initRuntime($this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock());
+    }
+
+    public function rendererDataProvider()
+    {
+        $twigRenderer = $this->getMockBuilder(TwigRendererInterface::class)->getMock();
+        $twigRenderer->expects($this->once())
+            ->method('setEnvironment');
+
+        yield [$twigRenderer, $twigRenderer];
+
+        $twigRenderer = $this->getMockBuilder(TwigRendererInterface::class)->getMock();
+        $twigRenderer->expects($this->once())
+            ->method('setEnvironment');
+
+        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+        $container->expects($this->once())
+            ->method('get')
+            ->with('service_id')
+            ->willReturn($twigRenderer);
+
+        yield [[$container, 'service_id'], $twigRenderer];
+
+        $formRenderer = $this->getMockBuilder(FormRendererInterface::class)->getMock();
+
+        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+        $container->expects($this->once())
+            ->method('get')
+            ->with('service_id')
+            ->willReturn($formRenderer);
+
+        yield [[$container, 'service_id'], $formRenderer];
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/HttpFoundationExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/HttpFoundationExtensionTest.php
new file mode 100644
index 000000000..38ee375b9
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/HttpFoundationExtensionTest.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\HttpFoundationExtension;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\RequestContext;
+
+class HttpFoundationExtensionTest extends TestCase
+{
+    /**
+     * @dataProvider getGenerateAbsoluteUrlData()
+     */
+    public function testGenerateAbsoluteUrl($expected, $path, $pathinfo)
+    {
+        $stack = new RequestStack();
+        $stack->push(Request::create($pathinfo));
+        $extension = new HttpFoundationExtension($stack);
+
+        $this->assertEquals($expected, $extension->generateAbsoluteUrl($path));
+    }
+
+    public function getGenerateAbsoluteUrlData()
+    {
+        return [
+            ['http://localhost/foo.png', '/foo.png', '/foo/bar.html'],
+            ['http://localhost/foo/foo.png', 'foo.png', '/foo/bar.html'],
+            ['http://localhost/foo/foo.png', 'foo.png', '/foo/bar'],
+            ['http://localhost/foo/bar/foo.png', 'foo.png', '/foo/bar/'],
+
+            ['http://example.com/baz', 'http://example.com/baz', '/'],
+            ['https://example.com/baz', 'https://example.com/baz', '/'],
+            ['//example.com/baz', '//example.com/baz', '/'],
+
+            ['http://localhost/foo/bar?baz', '?baz', '/foo/bar'],
+            ['http://localhost/foo/bar?baz=1', '?baz=1', '/foo/bar?foo=1'],
+            ['http://localhost/foo/baz?baz=1', 'baz?baz=1', '/foo/bar?foo=1'],
+
+            ['http://localhost/foo/bar#baz', '#baz', '/foo/bar'],
+            ['http://localhost/foo/bar?0#baz', '#baz', '/foo/bar?0'],
+            ['http://localhost/foo/bar?baz=1#baz', '?baz=1#baz', '/foo/bar?foo=1'],
+            ['http://localhost/foo/baz?baz=1#baz', 'baz?baz=1#baz', '/foo/bar?foo=1'],
+        ];
+    }
+
+    /**
+     * @dataProvider getGenerateAbsoluteUrlRequestContextData
+     */
+    public function testGenerateAbsoluteUrlWithRequestContext($path, $baseUrl, $host, $scheme, $httpPort, $httpsPort, $expected)
+    {
+        if (!class_exists('Symfony\Component\Routing\RequestContext')) {
+            $this->markTestSkipped('The Routing component is needed to run tests that depend on its request context.');
+        }
+
+        $requestContext = new RequestContext($baseUrl, 'GET', $host, $scheme, $httpPort, $httpsPort, $path);
+        $extension = new HttpFoundationExtension(new RequestStack(), $requestContext);
+
+        $this->assertEquals($expected, $extension->generateAbsoluteUrl($path));
+    }
+
+    /**
+     * @dataProvider getGenerateAbsoluteUrlRequestContextData
+     */
+    public function testGenerateAbsoluteUrlWithoutRequestAndRequestContext($path)
+    {
+        if (!class_exists('Symfony\Component\Routing\RequestContext')) {
+            $this->markTestSkipped('The Routing component is needed to run tests that depend on its request context.');
+        }
+
+        $extension = new HttpFoundationExtension(new RequestStack());
+
+        $this->assertEquals($path, $extension->generateAbsoluteUrl($path));
+    }
+
+    public function getGenerateAbsoluteUrlRequestContextData()
+    {
+        return [
+            ['/foo.png', '/foo', 'localhost', 'http', 80, 443, 'http://localhost/foo.png'],
+            ['foo.png', '/foo', 'localhost', 'http', 80, 443, 'http://localhost/foo/foo.png'],
+            ['foo.png', '/foo/bar/', 'localhost', 'http', 80, 443, 'http://localhost/foo/bar/foo.png'],
+            ['/foo.png', '/foo', 'localhost', 'https', 80, 443, 'https://localhost/foo.png'],
+            ['foo.png', '/foo', 'localhost', 'https', 80, 443, 'https://localhost/foo/foo.png'],
+            ['foo.png', '/foo/bar/', 'localhost', 'https', 80, 443, 'https://localhost/foo/bar/foo.png'],
+            ['/foo.png', '/foo', 'localhost', 'http', 443, 80, 'http://localhost:443/foo.png'],
+            ['/foo.png', '/foo', 'localhost', 'https', 443, 80, 'https://localhost:80/foo.png'],
+        ];
+    }
+
+    public function testGenerateAbsoluteUrlWithScriptFileName()
+    {
+        $request = Request::create('http://localhost/app/web/app_dev.php');
+        $request->server->set('SCRIPT_FILENAME', '/var/www/app/web/app_dev.php');
+
+        $stack = new RequestStack();
+        $stack->push($request);
+        $extension = new HttpFoundationExtension($stack);
+
+        $this->assertEquals(
+            'http://localhost/app/web/bundles/framework/css/structure.css',
+            $extension->generateAbsoluteUrl('/app/web/bundles/framework/css/structure.css')
+        );
+    }
+
+    /**
+     * @dataProvider getGenerateRelativePathData()
+     */
+    public function testGenerateRelativePath($expected, $path, $pathinfo)
+    {
+        if (!method_exists('Symfony\Component\HttpFoundation\Request', 'getRelativeUriForPath')) {
+            $this->markTestSkipped('Your version of Symfony HttpFoundation is too old.');
+        }
+
+        $stack = new RequestStack();
+        $stack->push(Request::create($pathinfo));
+        $extension = new HttpFoundationExtension($stack);
+
+        $this->assertEquals($expected, $extension->generateRelativePath($path));
+    }
+
+    public function getGenerateRelativePathData()
+    {
+        return [
+            ['../foo.png', '/foo.png', '/foo/bar.html'],
+            ['../baz/foo.png', '/baz/foo.png', '/foo/bar.html'],
+            ['baz/foo.png', 'baz/foo.png', '/foo/bar.html'],
+
+            ['http://example.com/baz', 'http://example.com/baz', '/'],
+            ['https://example.com/baz', 'https://example.com/baz', '/'],
+            ['//example.com/baz', '//example.com/baz', '/'],
+        ];
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/HttpKernelExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/HttpKernelExtensionTest.php
new file mode 100644
index 000000000..c635935f3
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/HttpKernelExtensionTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
+use Symfony\Bridge\Twig\Extension\HttpKernelRuntime;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+
+class HttpKernelExtensionTest extends TestCase
+{
+    public function testFragmentWithError()
+    {
+        $this->expectException('Twig\Error\RuntimeError');
+        $renderer = $this->getFragmentHandler($this->throwException(new \Exception('foo')));
+
+        $this->renderTemplate($renderer);
+    }
+
+    public function testRenderFragment()
+    {
+        $renderer = $this->getFragmentHandler($this->returnValue(new Response('html')));
+
+        $response = $this->renderTemplate($renderer);
+
+        $this->assertEquals('html', $response);
+    }
+
+    public function testUnknownFragmentRenderer()
+    {
+        $context = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+        $renderer = new FragmentHandler($context);
+
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The "inline" renderer does not exist.');
+
+        $renderer->render('/foo');
+    }
+
+    protected function getFragmentHandler($return)
+    {
+        $strategy = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Fragment\\FragmentRendererInterface')->getMock();
+        $strategy->expects($this->once())->method('getName')->willReturn('inline');
+        $strategy->expects($this->once())->method('render')->will($return);
+
+        $context = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+
+        $context->expects($this->any())->method('getCurrentRequest')->willReturn(Request::create('/'));
+
+        return new FragmentHandler($context, [$strategy], false);
+    }
+
+    protected function renderTemplate(FragmentHandler $renderer, $template = '{{ render("foo") }}')
+    {
+        $loader = new ArrayLoader(['index' => $template]);
+        $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
+        $twig->addExtension(new HttpKernelExtension());
+
+        $loader = $this->getMockBuilder('Twig\RuntimeLoader\RuntimeLoaderInterface')->getMock();
+        $loader->expects($this->any())->method('load')->willReturnMap([
+            ['Symfony\Bridge\Twig\Extension\HttpKernelRuntime', new HttpKernelRuntime($renderer)],
+        ]);
+        $twig->addRuntimeLoader($loader);
+
+        return $twig->render('index');
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/RoutingExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/RoutingExtensionTest.php
new file mode 100644
index 000000000..05f7ad741
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/RoutingExtensionTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\RoutingExtension;
+use Twig\Environment;
+use Twig\Node\Expression\FilterExpression;
+use Twig\Source;
+
+class RoutingExtensionTest extends TestCase
+{
+    /**
+     * @dataProvider getEscapingTemplates
+     */
+    public function testEscaping($template, $mustBeEscaped)
+    {
+        $twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0]);
+        $twig->addExtension(new RoutingExtension($this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock()));
+
+        $nodes = $twig->parse($twig->tokenize(new Source($template, '')));
+
+        $this->assertSame($mustBeEscaped, $nodes->getNode('body')->getNode(0)->getNode('expr') instanceof FilterExpression);
+    }
+
+    public function getEscapingTemplates()
+    {
+        return [
+            ['{{ path("foo") }}', false],
+            ['{{ path("foo", {}) }}', false],
+            ['{{ path("foo", { foo: "foo" }) }}', false],
+            ['{{ path("foo", foo) }}', true],
+            ['{{ path("foo", { foo: foo }) }}', true],
+            ['{{ path("foo", { foo: ["foo", "bar"] }) }}', true],
+            ['{{ path("foo", { foo: "foo", bar: "bar" }) }}', true],
+
+            ['{{ path(name = "foo", parameters = {}) }}', false],
+            ['{{ path(name = "foo", parameters = { foo: "foo" }) }}', false],
+            ['{{ path(name = "foo", parameters = foo) }}', true],
+            ['{{ path(name = "foo", parameters = { foo: ["foo", "bar"] }) }}', true],
+            ['{{ path(name = "foo", parameters = { foo: foo }) }}', true],
+            ['{{ path(name = "foo", parameters = { foo: "foo", bar: "bar" }) }}', true],
+        ];
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/RuntimeLoaderProvider.php b/lib/symfony/twig-bridge/Tests/Extension/RuntimeLoaderProvider.php
new file mode 100644
index 000000000..0bec8ec6f
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/RuntimeLoaderProvider.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Symfony\Component\Form\FormRenderer;
+use Twig\Environment;
+
+trait RuntimeLoaderProvider
+{
+    protected function registerTwigRuntimeLoader(Environment $environment, FormRenderer $renderer)
+    {
+        $loader = $this->getMockBuilder('Twig\RuntimeLoader\RuntimeLoaderInterface')->getMock();
+        $loader->expects($this->any())->method('load')->will($this->returnValueMap([
+            ['Symfony\Component\Form\FormRenderer', $renderer],
+        ]));
+        $environment->addRuntimeLoader($loader);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/StopwatchExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/StopwatchExtensionTest.php
new file mode 100644
index 000000000..35f3baa1b
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/StopwatchExtensionTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\StopwatchExtension;
+use Twig\Environment;
+use Twig\Error\RuntimeError;
+use Twig\Loader\ArrayLoader;
+
+class StopwatchExtensionTest extends TestCase
+{
+    public function testFailIfStoppingWrongEvent()
+    {
+        $this->expectException('Twig\Error\SyntaxError');
+        $this->testTiming('{% stopwatch "foo" %}{% endstopwatch "bar" %}', []);
+    }
+
+    /**
+     * @dataProvider getTimingTemplates
+     */
+    public function testTiming($template, $events)
+    {
+        $twig = new Environment(new ArrayLoader(['template' => $template]), ['debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0]);
+        $twig->addExtension(new StopwatchExtension($this->getStopwatch($events)));
+
+        try {
+            $twig->render('template');
+        } catch (RuntimeError $e) {
+            throw $e->getPrevious();
+        }
+    }
+
+    public function getTimingTemplates()
+    {
+        return [
+            ['{% stopwatch "foo" %}something{% endstopwatch %}', 'foo'],
+            ['{% stopwatch "foo" %}symfony is fun{% endstopwatch %}{% stopwatch "bar" %}something{% endstopwatch %}', ['foo', 'bar']],
+            ['{% set foo = "foo" %}{% stopwatch foo %}something{% endstopwatch %}', 'foo'],
+            ['{% set foo = "foo" %}{% stopwatch foo %}something {% set foo = "bar" %}{% endstopwatch %}', 'foo'],
+            ['{% stopwatch "foo.bar" %}something{% endstopwatch %}', 'foo.bar'],
+            ['{% stopwatch "foo" %}something{% endstopwatch %}{% stopwatch "foo" %}something else{% endstopwatch %}', ['foo', 'foo']],
+        ];
+    }
+
+    protected function getStopwatch($events = [])
+    {
+        $events = \is_array($events) ? $events : [$events];
+        $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
+
+        $i = -1;
+        foreach ($events as $eventName) {
+            $stopwatch->expects($this->at(++$i))
+                ->method('start')
+                ->with($this->equalTo($eventName), 'template')
+            ;
+            $stopwatch->expects($this->at(++$i))
+                ->method('stop')
+                ->with($this->equalTo($eventName))
+            ;
+        }
+
+        return $stopwatch;
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/TranslationExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/TranslationExtensionTest.php
new file mode 100644
index 000000000..206cda678
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/TranslationExtensionTest.php
@@ -0,0 +1,213 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Component\Translation\Loader\ArrayLoader;
+use Symfony\Component\Translation\Translator;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader as TwigArrayLoader;
+
+class TranslationExtensionTest extends TestCase
+{
+    public function testEscaping()
+    {
+        $output = $this->getTemplate('{% trans %}Percent: %value%%% (%msg%){% endtrans %}')->render(['value' => 12, 'msg' => 'approx.']);
+
+        $this->assertEquals('Percent: 12% (approx.)', $output);
+    }
+
+    /**
+     * @dataProvider getTransTests
+     */
+    public function testTrans($template, $expected, array $variables = [])
+    {
+        if ($expected != $this->getTemplate($template)->render($variables)) {
+            echo $template."\n";
+            $loader = new TwigArrayLoader(['index' => $template]);
+            $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
+            $twig->addExtension(new TranslationExtension(new Translator('en')));
+
+            echo $twig->compile($twig->parse($twig->tokenize($twig->getLoader()->getSourceContext('index'))))."\n\n";
+            $this->assertEquals($expected, $this->getTemplate($template)->render($variables));
+        }
+
+        $this->assertEquals($expected, $this->getTemplate($template)->render($variables));
+    }
+
+    public function testTransUnknownKeyword()
+    {
+        $this->expectException('Twig\Error\SyntaxError');
+        $this->expectExceptionMessage('Unexpected token. Twig was looking for the "with", "from", or "into" keyword in "index" at line 3.');
+        $this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
+    }
+
+    public function testTransComplexBody()
+    {
+        $this->expectException('Twig\Error\SyntaxError');
+        $this->expectExceptionMessage('A message inside a trans tag must be a simple text in "index" at line 2.');
+        $this->getTemplate("{% trans %}\n{{ 1 + 2 }}{% endtrans %}")->render();
+    }
+
+    public function testTransChoiceComplexBody()
+    {
+        $this->expectException('Twig\Error\SyntaxError');
+        $this->expectExceptionMessage('A message inside a transchoice tag must be a simple text in "index" at line 2.');
+        $this->getTemplate("{% transchoice count %}\n{{ 1 + 2 }}{% endtranschoice %}")->render();
+    }
+
+    public function getTransTests()
+    {
+        return [
+            // trans tag
+            ['{% trans %}Hello{% endtrans %}', 'Hello'],
+            ['{% trans %}%name%{% endtrans %}', 'Symfony', ['name' => 'Symfony']],
+
+            ['{% trans from elsewhere %}Hello{% endtrans %}', 'Hello'],
+
+            ['{% trans %}Hello %name%{% endtrans %}', 'Hello Symfony', ['name' => 'Symfony']],
+            ['{% trans with { \'%name%\': \'Symfony\' } %}Hello %name%{% endtrans %}', 'Hello Symfony'],
+            ['{% set vars = { \'%name%\': \'Symfony\' } %}{% trans with vars %}Hello %name%{% endtrans %}', 'Hello Symfony'],
+
+            ['{% trans into "fr"%}Hello{% endtrans %}', 'Hello'],
+
+            // transchoice
+            [
+                '{% transchoice count from "messages" %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
+                'There is no apples',
+                ['count' => 0],
+            ],
+            [
+                '{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
+                'There is 5 apples',
+                ['count' => 5],
+            ],
+            [
+                '{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
+                'There is 5 apples (Symfony)',
+                ['count' => 5, 'name' => 'Symfony'],
+            ],
+            [
+                '{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
+                'There is 5 apples (Symfony)',
+                ['count' => 5],
+            ],
+            [
+                '{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
+                'There is no apples',
+                ['count' => 0],
+            ],
+            [
+                '{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
+                'There is 5 apples',
+            ],
+
+            // trans filter
+            ['{{ "Hello"|trans }}', 'Hello'],
+            ['{{ name|trans }}', 'Symfony', ['name' => 'Symfony']],
+            ['{{ hello|trans({ \'%name%\': \'Symfony\' }) }}', 'Hello Symfony', ['hello' => 'Hello %name%']],
+            ['{% set vars = { \'%name%\': \'Symfony\' } %}{{ hello|trans(vars) }}', 'Hello Symfony', ['hello' => 'Hello %name%']],
+            ['{{ "Hello"|trans({}, "messages", "fr") }}', 'Hello'],
+
+            // transchoice filter
+            ['{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count) }}', 'There is 5 apples', ['count' => 5]],
+            ['{{ text|transchoice(5, {\'%name%\': \'Symfony\'}) }}', 'There is 5 apples (Symfony)', ['text' => '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%)']],
+            ['{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count, {}, "messages", "fr") }}', 'There is 5 apples', ['count' => 5]],
+        ];
+    }
+
+    public function testDefaultTranslationDomain()
+    {
+        $templates = [
+            'index' => '
+                {%- extends "base" %}
+
+                {%- trans_default_domain "foo" %}
+
+                {%- block content %}
+                    {%- trans %}foo{% endtrans %}
+                    {%- trans from "custom" %}foo{% endtrans %}
+                    {{- "foo"|trans }}
+                    {{- "foo"|trans({}, "custom") }}
+                    {{- "foo"|transchoice(1) }}
+                    {{- "foo"|transchoice(1, {}, "custom") }}
+                {% endblock %}
+            ',
+
+            'base' => '
+                {%- block content "" %}
+            ',
+        ];
+
+        $translator = new Translator('en');
+        $translator->addLoader('array', new ArrayLoader());
+        $translator->addResource('array', ['foo' => 'foo (messages)'], 'en');
+        $translator->addResource('array', ['foo' => 'foo (custom)'], 'en', 'custom');
+        $translator->addResource('array', ['foo' => 'foo (foo)'], 'en', 'foo');
+
+        $template = $this->getTemplate($templates, $translator);
+
+        $this->assertEquals('foo (foo)foo (custom)foo (foo)foo (custom)foo (foo)foo (custom)', trim($template->render([])));
+    }
+
+    public function testDefaultTranslationDomainWithNamedArguments()
+    {
+        $templates = [
+            'index' => '
+                {%- trans_default_domain "foo" %}
+
+                {%- block content %}
+                    {{- "foo"|trans(arguments = {}, domain = "custom") }}
+                    {{- "foo"|transchoice(count = 1) }}
+                    {{- "foo"|transchoice(count = 1, arguments = {}, domain = "custom") }}
+                    {{- "foo"|trans({}, domain = "custom") }}
+                    {{- "foo"|trans({}, "custom", locale = "fr") }}
+                    {{- "foo"|transchoice(1, arguments = {}, domain = "custom") }}
+                    {{- "foo"|transchoice(1, {}, "custom", locale = "fr") }}
+                {% endblock %}
+            ',
+
+            'base' => '
+                {%- block content "" %}
+            ',
+        ];
+
+        $translator = new Translator('en');
+        $translator->addLoader('array', new ArrayLoader());
+        $translator->addResource('array', ['foo' => 'foo (messages)'], 'en');
+        $translator->addResource('array', ['foo' => 'foo (custom)'], 'en', 'custom');
+        $translator->addResource('array', ['foo' => 'foo (foo)'], 'en', 'foo');
+        $translator->addResource('array', ['foo' => 'foo (fr)'], 'fr', 'custom');
+
+        $template = $this->getTemplate($templates, $translator);
+
+        $this->assertEquals('foo (custom)foo (foo)foo (custom)foo (custom)foo (fr)foo (custom)foo (fr)', trim($template->render([])));
+    }
+
+    protected function getTemplate($template, $translator = null)
+    {
+        if (null === $translator) {
+            $translator = new Translator('en');
+        }
+
+        if (\is_array($template)) {
+            $loader = new TwigArrayLoader($template);
+        } else {
+            $loader = new TwigArrayLoader(['index' => $template]);
+        }
+        $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
+        $twig->addExtension(new TranslationExtension($translator));
+
+        return $twig->loadTemplate('index');
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/WebLinkExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/WebLinkExtensionTest.php
new file mode 100644
index 000000000..f49eea396
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/WebLinkExtensionTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use Fig\Link\Link;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\WebLinkExtension;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class WebLinkExtensionTest extends TestCase
+{
+    /**
+     * @var Request
+     */
+    private $request;
+
+    /**
+     * @var WebLinkExtension
+     */
+    private $extension;
+
+    protected function setUp()
+    {
+        $this->request = new Request();
+
+        $requestStack = new RequestStack();
+        $requestStack->push($this->request);
+
+        $this->extension = new WebLinkExtension($requestStack);
+    }
+
+    public function testLink()
+    {
+        $this->assertEquals('/foo.css', $this->extension->link('/foo.css', 'preload', ['as' => 'style', 'nopush' => true]));
+
+        $link = (new Link('preload', '/foo.css'))->withAttribute('as', 'style')->withAttribute('nopush', true);
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
+    }
+
+    public function testPreload()
+    {
+        $this->assertEquals('/foo.css', $this->extension->preload('/foo.css', ['as' => 'style', 'crossorigin' => true]));
+
+        $link = (new Link('preload', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
+    }
+
+    public function testDnsPrefetch()
+    {
+        $this->assertEquals('/foo.css', $this->extension->dnsPrefetch('/foo.css', ['as' => 'style', 'crossorigin' => true]));
+
+        $link = (new Link('dns-prefetch', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
+    }
+
+    public function testPreconnect()
+    {
+        $this->assertEquals('/foo.css', $this->extension->preconnect('/foo.css', ['as' => 'style', 'crossorigin' => true]));
+
+        $link = (new Link('preconnect', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
+    }
+
+    public function testPrefetch()
+    {
+        $this->assertEquals('/foo.css', $this->extension->prefetch('/foo.css', ['as' => 'style', 'crossorigin' => true]));
+
+        $link = (new Link('prefetch', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
+    }
+
+    public function testPrerender()
+    {
+        $this->assertEquals('/foo.css', $this->extension->prerender('/foo.css', ['as' => 'style', 'crossorigin' => true]));
+
+        $link = (new Link('prerender', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Extension/WorkflowExtensionTest.php b/lib/symfony/twig-bridge/Tests/Extension/WorkflowExtensionTest.php
new file mode 100644
index 000000000..20d78bfe3
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Extension/WorkflowExtensionTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\WorkflowExtension;
+use Symfony\Component\Workflow\Definition;
+use Symfony\Component\Workflow\Registry;
+use Symfony\Component\Workflow\SupportStrategy\ClassInstanceSupportStrategy;
+use Symfony\Component\Workflow\Transition;
+use Symfony\Component\Workflow\Workflow;
+
+class WorkflowExtensionTest extends TestCase
+{
+    private $extension;
+
+    protected function setUp()
+    {
+        $places = ['ordered', 'waiting_for_payment', 'processed'];
+        $transitions = [
+            new Transition('t1', 'ordered', 'waiting_for_payment'),
+            new Transition('t2', 'waiting_for_payment', 'processed'),
+        ];
+        $definition = new Definition($places, $transitions);
+        $workflow = new Workflow($definition);
+
+        $registry = new Registry();
+        $registry->add($workflow, new ClassInstanceSupportStrategy(\stdClass::class));
+
+        $this->extension = new WorkflowExtension($registry);
+    }
+
+    public function testCanTransition()
+    {
+        $subject = new \stdClass();
+        $subject->marking = [];
+
+        $this->assertTrue($this->extension->canTransition($subject, 't1'));
+        $this->assertFalse($this->extension->canTransition($subject, 't2'));
+    }
+
+    public function testGetEnabledTransitions()
+    {
+        $subject = new \stdClass();
+        $subject->marking = [];
+
+        $transitions = $this->extension->getEnabledTransitions($subject);
+
+        $this->assertCount(1, $transitions);
+        $this->assertInstanceOf(Transition::class, $transitions[0]);
+        $this->assertSame('t1', $transitions[0]->getName());
+    }
+
+    public function testHasMarkedPlace()
+    {
+        $subject = new \stdClass();
+        $subject->marking = [];
+        $subject->marking = ['ordered' => 1, 'waiting_for_payment' => 1];
+
+        $this->assertTrue($this->extension->hasMarkedPlace($subject, 'ordered'));
+        $this->assertTrue($this->extension->hasMarkedPlace($subject, 'waiting_for_payment'));
+        $this->assertFalse($this->extension->hasMarkedPlace($subject, 'processed'));
+    }
+
+    public function testGetMarkedPlaces()
+    {
+        $subject = new \stdClass();
+        $subject->marking = [];
+        $subject->marking = ['ordered' => 1, 'waiting_for_payment' => 1];
+
+        $this->assertSame(['ordered', 'waiting_for_payment'], $this->extension->getMarkedPlaces($subject));
+        $this->assertSame($subject->marking, $this->extension->getMarkedPlaces($subject, false));
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Fixtures/extractor/syntax_error.twig b/lib/symfony/twig-bridge/Tests/Fixtures/extractor/syntax_error.twig
new file mode 100644
index 000000000..b3e069870
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Fixtures/extractor/syntax_error.twig
@@ -0,0 +1 @@
+{% syntax error
diff --git a/lib/symfony/twig-bridge/Tests/Fixtures/extractor/with_translations.html.twig b/lib/symfony/twig-bridge/Tests/Fixtures/extractor/with_translations.html.twig
new file mode 100644
index 000000000..8cdb42d29
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Fixtures/extractor/with_translations.html.twig
@@ -0,0 +1 @@
+<h1>{{ 'Hi!'|trans }}</h1>
diff --git a/lib/symfony/twig-bridge/Tests/Node/DumpNodeTest.php b/lib/symfony/twig-bridge/Tests/Node/DumpNodeTest.php
new file mode 100644
index 000000000..befc8341d
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Node/DumpNodeTest.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Node;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Node\DumpNode;
+use Twig\Compiler;
+use Twig\Environment;
+use Twig\Node\Expression\NameExpression;
+use Twig\Node\Node;
+
+class DumpNodeTest extends TestCase
+{
+    public function testNoVar()
+    {
+        $node = new DumpNode('bar', null, 7);
+
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
+        $compiler = new Compiler($env);
+
+        $expected = <<<'EOTXT'
+if ($this->env->isDebug()) {
+    $barvars = [];
+    foreach ($context as $barkey => $barval) {
+        if (!$barval instanceof \Twig\Template) {
+            $barvars[$barkey] = $barval;
+        }
+    }
+    // line 7
+    \Symfony\Component\VarDumper\VarDumper::dump($barvars);
+}
+
+EOTXT;
+
+        $this->assertSame($expected, $compiler->compile($node)->getSource());
+    }
+
+    public function testIndented()
+    {
+        $node = new DumpNode('bar', null, 7);
+
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
+        $compiler = new Compiler($env);
+
+        $expected = <<<'EOTXT'
+    if ($this->env->isDebug()) {
+        $barvars = [];
+        foreach ($context as $barkey => $barval) {
+            if (!$barval instanceof \Twig\Template) {
+                $barvars[$barkey] = $barval;
+            }
+        }
+        // line 7
+        \Symfony\Component\VarDumper\VarDumper::dump($barvars);
+    }
+
+EOTXT;
+
+        $this->assertSame($expected, $compiler->compile($node, 1)->getSource());
+    }
+
+    public function testOneVar()
+    {
+        $vars = new Node([
+            new NameExpression('foo', 7),
+        ]);
+        $node = new DumpNode('bar', $vars, 7);
+
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
+        $compiler = new Compiler($env);
+
+        $expected = <<<'EOTXT'
+if ($this->env->isDebug()) {
+    // line 7
+    \Symfony\Component\VarDumper\VarDumper::dump(%foo%);
+}
+
+EOTXT;
+
+        if (\PHP_VERSION_ID >= 70000) {
+            $expected = preg_replace('/%(.*?)%/', '($context["$1"] ?? null)', $expected);
+        } else {
+            $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);
+        }
+
+        $this->assertSame($expected, $compiler->compile($node)->getSource());
+    }
+
+    public function testMultiVars()
+    {
+        $vars = new Node([
+            new NameExpression('foo', 7),
+            new NameExpression('bar', 7),
+        ]);
+        $node = new DumpNode('bar', $vars, 7);
+
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
+        $compiler = new Compiler($env);
+
+        $expected = <<<'EOTXT'
+if ($this->env->isDebug()) {
+    // line 7
+    \Symfony\Component\VarDumper\VarDumper::dump([
+        "foo" => %foo%,
+        "bar" => %bar%,
+    ]);
+}
+
+EOTXT;
+
+        if (\PHP_VERSION_ID >= 70000) {
+            $expected = preg_replace('/%(.*?)%/', '($context["$1"] ?? null)', $expected);
+        } else {
+            $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);
+        }
+
+        $this->assertSame($expected, $compiler->compile($node)->getSource());
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Node/FormThemeTest.php b/lib/symfony/twig-bridge/Tests/Node/FormThemeTest.php
new file mode 100644
index 000000000..39d9f44be
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Node/FormThemeTest.php
@@ -0,0 +1,111 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Node;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Node\FormThemeNode;
+use Symfony\Bridge\Twig\Tests\Extension\RuntimeLoaderProvider;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormRendererEngineInterface;
+use Twig\Compiler;
+use Twig\Environment;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Expression\NameExpression;
+use Twig\Node\Node;
+
+class FormThemeTest extends TestCase
+{
+    use RuntimeLoaderProvider;
+
+    public function testConstructor()
+    {
+        $form = new NameExpression('form', 0);
+        $resources = new Node([
+            new ConstantExpression('tpl1', 0),
+            new ConstantExpression('tpl2', 0),
+        ]);
+
+        $node = new FormThemeNode($form, $resources, 0);
+
+        $this->assertEquals($form, $node->getNode('form'));
+        $this->assertEquals($resources, $node->getNode('resources'));
+        $this->assertFalse($node->getAttribute('only'));
+    }
+
+    public function testCompile()
+    {
+        $form = new NameExpression('form', 0);
+        $resources = new ArrayExpression([
+            new ConstantExpression(0, 0),
+            new ConstantExpression('tpl1', 0),
+            new ConstantExpression(1, 0),
+            new ConstantExpression('tpl2', 0),
+        ], 0);
+
+        $node = new FormThemeNode($form, $resources, 0);
+
+        $environment = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
+        $formRenderer = new FormRenderer($this->getMockBuilder(FormRendererEngineInterface::class)->getMock());
+        $this->registerTwigRuntimeLoader($environment, $formRenderer);
+        $compiler = new Compiler($environment);
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, [0 => "tpl1", 1 => "tpl2"], true);',
+                $this->getVariableGetter('form')
+             ),
+            trim($compiler->compile($node)->getSource())
+        );
+
+        $node = new FormThemeNode($form, $resources, 0, null, true);
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, [0 => "tpl1", 1 => "tpl2"], false);',
+                $this->getVariableGetter('form')
+             ),
+            trim($compiler->compile($node)->getSource())
+        );
+
+        $resources = new ConstantExpression('tpl1', 0);
+
+        $node = new FormThemeNode($form, $resources, 0);
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, "tpl1", true);',
+                $this->getVariableGetter('form')
+             ),
+            trim($compiler->compile($node)->getSource())
+        );
+
+        $node = new FormThemeNode($form, $resources, 0, null, true);
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, "tpl1", false);',
+                $this->getVariableGetter('form')
+             ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    protected function getVariableGetter($name)
+    {
+        if (\PHP_VERSION_ID >= 70000) {
+            return sprintf('($context["%s"] ?? null)', $name);
+        }
+
+        return sprintf('(isset($context["%s"]) ? $context["%1$s"] : null)', $name);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Node/SearchAndRenderBlockNodeTest.php b/lib/symfony/twig-bridge/Tests/Node/SearchAndRenderBlockNodeTest.php
new file mode 100644
index 000000000..db160b7c8
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Node/SearchAndRenderBlockNodeTest.php
@@ -0,0 +1,280 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Node;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode;
+use Twig\Compiler;
+use Twig\Environment;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\ConditionalExpression;
+use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Expression\NameExpression;
+use Twig\Node\Node;
+
+class SearchAndRenderBlockNodeTest extends TestCase
+{
+    public function testCompileWidget()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_widget', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'widget\')',
+                $this->getVariableGetter('form')
+             ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileWidgetWithVariables()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+            new ArrayExpression([
+                new ConstantExpression('foo', 0),
+                new ConstantExpression('bar', 0),
+            ], 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_widget', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'widget\', ["foo" => "bar"])',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileLabelWithLabel()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+            new ConstantExpression('my label', 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'label\', ["label" => "my label"])',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileLabelWithNullLabel()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+            new ConstantExpression(null, 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        // "label" => null must not be included in the output!
+        // Otherwise the default label is overwritten with null.
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'label\')',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileLabelWithEmptyStringLabel()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+            new ConstantExpression('', 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        // "label" => null must not be included in the output!
+        // Otherwise the default label is overwritten with null.
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'label\')',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileLabelWithDefaultLabel()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'label\')',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileLabelWithAttributes()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+            new ConstantExpression(null, 0),
+            new ArrayExpression([
+                new ConstantExpression('foo', 0),
+                new ConstantExpression('bar', 0),
+            ], 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        // "label" => null must not be included in the output!
+        // Otherwise the default label is overwritten with null.
+        // https://github.com/symfony/symfony/issues/5029
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'label\', ["foo" => "bar"])',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileLabelWithLabelAndAttributes()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+            new ConstantExpression('value in argument', 0),
+            new ArrayExpression([
+                new ConstantExpression('foo', 0),
+                new ConstantExpression('bar', 0),
+                new ConstantExpression('label', 0),
+                new ConstantExpression('value in attributes', 0),
+            ], 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'label\', ["foo" => "bar", "label" => "value in argument"])',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileLabelWithLabelThatEvaluatesToNull()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+            new ConditionalExpression(
+                // if
+                new ConstantExpression(true, 0),
+                // then
+                new ConstantExpression(null, 0),
+                // else
+                new ConstantExpression(null, 0),
+                0
+            ),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        // "label" => null must not be included in the output!
+        // Otherwise the default label is overwritten with null.
+        // https://github.com/symfony/symfony/issues/5029
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'label\', (twig_test_empty($_label_ = ((true) ? (null) : (null))) ? [] : ["label" => $_label_]))',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
+    {
+        $arguments = new Node([
+            new NameExpression('form', 0),
+            new ConditionalExpression(
+                // if
+                new ConstantExpression(true, 0),
+                // then
+                new ConstantExpression(null, 0),
+                // else
+                new ConstantExpression(null, 0),
+                0
+            ),
+            new ArrayExpression([
+                new ConstantExpression('foo', 0),
+                new ConstantExpression('bar', 0),
+                new ConstantExpression('label', 0),
+                new ConstantExpression('value in attributes', 0),
+            ], 0),
+        ]);
+
+        $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
+
+        $compiler = new Compiler(new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock()));
+
+        // "label" => null must not be included in the output!
+        // Otherwise the default label is overwritten with null.
+        // https://github.com/symfony/symfony/issues/5029
+        $this->assertEquals(
+            sprintf(
+                '$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(%s, \'label\', ["foo" => "bar", "label" => "value in attributes"] + (twig_test_empty($_label_ = ((true) ? (null) : (null))) ? [] : ["label" => $_label_]))',
+                $this->getVariableGetter('form')
+            ),
+            trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    protected function getVariableGetter($name)
+    {
+        if (\PHP_VERSION_ID >= 70000) {
+            return sprintf('($context["%s"] ?? null)', $name);
+        }
+
+        return sprintf('(isset($context["%s"]) ? $context["%1$s"] : null)', $name);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Node/TransNodeTest.php b/lib/symfony/twig-bridge/Tests/Node/TransNodeTest.php
new file mode 100644
index 000000000..3008f43f6
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Node/TransNodeTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Node;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Node\TransNode;
+use Twig\Compiler;
+use Twig\Environment;
+use Twig\Node\Expression\NameExpression;
+use Twig\Node\TextNode;
+
+/**
+ * @author Asmir Mustafic <goetas@gmail.com>
+ */
+class TransNodeTest extends TestCase
+{
+    public function testCompileStrict()
+    {
+        $body = new TextNode('trans %var%', 0);
+        $vars = new NameExpression('foo', 0);
+        $node = new TransNode($body, null, null, $vars);
+
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['strict_variables' => true]);
+        $compiler = new Compiler($env);
+
+        $this->assertEquals(
+            sprintf(
+                'echo $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->getTranslator()->trans("trans %%var%%", array_merge(["%%var%%" => %s], %s), "messages");',
+                $this->getVariableGetterWithoutStrictCheck('var'),
+                $this->getVariableGetterWithStrictCheck('foo')
+             ),
+             trim($compiler->compile($node)->getSource())
+        );
+    }
+
+    protected function getVariableGetterWithoutStrictCheck($name)
+    {
+        if (\PHP_VERSION_ID >= 70000) {
+            return sprintf('($context["%s"] ?? null)', $name);
+        }
+
+        return sprintf('(isset($context["%s"]) ? $context["%1$s"] : null)', $name);
+    }
+
+    protected function getVariableGetterWithStrictCheck($name)
+    {
+        if (Environment::MAJOR_VERSION >= 2) {
+            return sprintf('(isset($context["%1$s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new %2$s(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name, Environment::VERSION_ID >= 20700 ? 'RuntimeError' : 'Twig_Error_Runtime');
+        }
+
+        if (\PHP_VERSION_ID >= 70000) {
+            return sprintf('($context["%s"] ?? $this->getContext($context, "%1$s"))', $name);
+        }
+
+        return sprintf('(isset($context["%s"]) ? $context["%1$s"] : $this->getContext($context, "%1$s"))', $name);
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/NodeVisitor/ScopeTest.php b/lib/symfony/twig-bridge/Tests/NodeVisitor/ScopeTest.php
new file mode 100644
index 000000000..fad0e1f82
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/NodeVisitor/ScopeTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\NodeVisitor;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\NodeVisitor\Scope;
+
+class ScopeTest extends TestCase
+{
+    public function testScopeInitiation()
+    {
+        $scope = new Scope();
+        $scope->enter();
+        $this->assertNull($scope->get('test'));
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php b/lib/symfony/twig-bridge/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
new file mode 100644
index 000000000..5abfe1e92
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\NodeVisitor;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\NodeVisitor\TranslationDefaultDomainNodeVisitor;
+use Symfony\Bridge\Twig\NodeVisitor\TranslationNodeVisitor;
+use Twig\Environment;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Node;
+
+class TranslationDefaultDomainNodeVisitorTest extends TestCase
+{
+    private static $message = 'message';
+    private static $domain = 'domain';
+
+    /** @dataProvider getDefaultDomainAssignmentTestData */
+    public function testDefaultDomainAssignment(Node $node)
+    {
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
+        $visitor = new TranslationDefaultDomainNodeVisitor();
+
+        // visit trans_default_domain tag
+        $defaultDomain = TwigNodeProvider::getTransDefaultDomainTag(self::$domain);
+        $visitor->enterNode($defaultDomain, $env);
+        $visitor->leaveNode($defaultDomain, $env);
+
+        // visit tested node
+        $enteredNode = $visitor->enterNode($node, $env);
+        $leavedNode = $visitor->leaveNode($node, $env);
+        $this->assertSame($node, $enteredNode);
+        $this->assertSame($node, $leavedNode);
+
+        // extracting tested node messages
+        $visitor = new TranslationNodeVisitor();
+        $visitor->enable();
+        $visitor->enterNode($node, $env);
+        $visitor->leaveNode($node, $env);
+
+        $this->assertEquals([[self::$message, self::$domain]], $visitor->getMessages());
+    }
+
+    /** @dataProvider getDefaultDomainAssignmentTestData */
+    public function testNewModuleWithoutDefaultDomainTag(Node $node)
+    {
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
+        $visitor = new TranslationDefaultDomainNodeVisitor();
+
+        // visit trans_default_domain tag
+        $newModule = TwigNodeProvider::getModule('test');
+        $visitor->enterNode($newModule, $env);
+        $visitor->leaveNode($newModule, $env);
+
+        // visit tested node
+        $enteredNode = $visitor->enterNode($node, $env);
+        $leavedNode = $visitor->leaveNode($node, $env);
+        $this->assertSame($node, $enteredNode);
+        $this->assertSame($node, $leavedNode);
+
+        // extracting tested node messages
+        $visitor = new TranslationNodeVisitor();
+        $visitor->enable();
+        $visitor->enterNode($node, $env);
+        $visitor->leaveNode($node, $env);
+
+        $this->assertEquals([[self::$message, null]], $visitor->getMessages());
+    }
+
+    public function getDefaultDomainAssignmentTestData()
+    {
+        return [
+            [TwigNodeProvider::getTransFilter(self::$message)],
+            [TwigNodeProvider::getTransChoiceFilter(self::$message)],
+            [TwigNodeProvider::getTransTag(self::$message)],
+            // with named arguments
+            [TwigNodeProvider::getTransFilter(self::$message, null, [
+                'arguments' => new ArrayExpression([], 0),
+            ])],
+            [TwigNodeProvider::getTransChoiceFilter(self::$message), null, [
+                'arguments' => new ArrayExpression([], 0),
+            ]],
+        ];
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/NodeVisitor/TranslationNodeVisitorTest.php b/lib/symfony/twig-bridge/Tests/NodeVisitor/TranslationNodeVisitorTest.php
new file mode 100644
index 000000000..11d16e4cd
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/NodeVisitor/TranslationNodeVisitorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\NodeVisitor;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\NodeVisitor\TranslationNodeVisitor;
+use Twig\Environment;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Expression\FilterExpression;
+use Twig\Node\Expression\NameExpression;
+use Twig\Node\Node;
+
+class TranslationNodeVisitorTest extends TestCase
+{
+    /** @dataProvider getMessagesExtractionTestData */
+    public function testMessagesExtraction(Node $node, array $expectedMessages)
+    {
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
+        $visitor = new TranslationNodeVisitor();
+        $visitor->enable();
+        $visitor->enterNode($node, $env);
+        $visitor->leaveNode($node, $env);
+        $this->assertEquals($expectedMessages, $visitor->getMessages());
+    }
+
+    public function testMessageExtractionWithInvalidDomainNode()
+    {
+        $message = 'new key';
+
+        $node = new FilterExpression(
+            new ConstantExpression($message, 0),
+            new ConstantExpression('trans', 0),
+            new Node([
+                new ArrayExpression([], 0),
+                new NameExpression('variable', 0),
+            ]),
+            0
+        );
+
+        $this->testMessagesExtraction($node, [[$message, TranslationNodeVisitor::UNDEFINED_DOMAIN]]);
+    }
+
+    public function getMessagesExtractionTestData()
+    {
+        $message = 'new key';
+        $domain = 'domain';
+
+        return [
+            [TwigNodeProvider::getTransFilter($message), [[$message, null]]],
+            [TwigNodeProvider::getTransChoiceFilter($message), [[$message, null]]],
+            [TwigNodeProvider::getTransTag($message), [[$message, null]]],
+            [TwigNodeProvider::getTransFilter($message, $domain), [[$message, $domain]]],
+            [TwigNodeProvider::getTransChoiceFilter($message, $domain), [[$message, $domain]]],
+            [TwigNodeProvider::getTransTag($message, $domain), [[$message, $domain]]],
+        ];
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/NodeVisitor/TwigNodeProvider.php b/lib/symfony/twig-bridge/Tests/NodeVisitor/TwigNodeProvider.php
new file mode 100644
index 000000000..514772467
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/NodeVisitor/TwigNodeProvider.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\NodeVisitor;
+
+use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;
+use Symfony\Bridge\Twig\Node\TransNode;
+use Twig\Node\BodyNode;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Expression\FilterExpression;
+use Twig\Node\ModuleNode;
+use Twig\Node\Node;
+use Twig\Source;
+
+class TwigNodeProvider
+{
+    public static function getModule($content)
+    {
+        return new ModuleNode(
+            new ConstantExpression($content, 0),
+            null,
+            new ArrayExpression([], 0),
+            new ArrayExpression([], 0),
+            new ArrayExpression([], 0),
+            null,
+            new Source('', '')
+        );
+    }
+
+    public static function getTransFilter($message, $domain = null, $arguments = null)
+    {
+        if (!$arguments) {
+            $arguments = $domain ? [
+                new ArrayExpression([], 0),
+                new ConstantExpression($domain, 0),
+            ] : [];
+        }
+
+        return new FilterExpression(
+            new ConstantExpression($message, 0),
+            new ConstantExpression('trans', 0),
+            new Node($arguments),
+            0
+        );
+    }
+
+    public static function getTransChoiceFilter($message, $domain = null, $arguments = null)
+    {
+        if (!$arguments) {
+            $arguments = $domain ? [
+                new ConstantExpression(0, 0),
+                new ArrayExpression([], 0),
+                new ConstantExpression($domain, 0),
+            ] : [];
+        }
+
+        return new FilterExpression(
+            new ConstantExpression($message, 0),
+            new ConstantExpression('transchoice', 0),
+            new Node($arguments),
+            0
+        );
+    }
+
+    public static function getTransTag($message, $domain = null)
+    {
+        return new TransNode(
+            new BodyNode([], ['data' => $message]),
+            $domain ? new ConstantExpression($domain, 0) : null
+        );
+    }
+
+    public static function getTransDefaultDomainTag($domain)
+    {
+        return new TransDefaultDomainNode(
+            new ConstantExpression($domain, 0)
+        );
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/TokenParser/FormThemeTokenParserTest.php b/lib/symfony/twig-bridge/Tests/TokenParser/FormThemeTokenParserTest.php
new file mode 100644
index 000000000..ce1980eb1
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/TokenParser/FormThemeTokenParserTest.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\TokenParser;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Node\FormThemeNode;
+use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
+use Twig\Environment;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Expression\NameExpression;
+use Twig\Parser;
+use Twig\Source;
+
+class FormThemeTokenParserTest extends TestCase
+{
+    /**
+     * @dataProvider getTestsForFormTheme
+     */
+    public function testCompile($source, $expected)
+    {
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
+        $env->addTokenParser(new FormThemeTokenParser());
+        $source = new Source($source, '');
+        $stream = $env->tokenize($source);
+        $parser = new Parser($env);
+
+        $expected->setSourceContext($source);
+
+        $this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));
+    }
+
+    public function getTestsForFormTheme()
+    {
+        return [
+            [
+                '{% form_theme form "tpl1" %}',
+                new FormThemeNode(
+                    new NameExpression('form', 1),
+                    new ArrayExpression([
+                        new ConstantExpression(0, 1),
+                        new ConstantExpression('tpl1', 1),
+                    ], 1),
+                    1,
+                    'form_theme'
+                ),
+            ],
+            [
+                '{% form_theme form "tpl1" "tpl2" %}',
+                new FormThemeNode(
+                    new NameExpression('form', 1),
+                    new ArrayExpression([
+                        new ConstantExpression(0, 1),
+                        new ConstantExpression('tpl1', 1),
+                        new ConstantExpression(1, 1),
+                        new ConstantExpression('tpl2', 1),
+                    ], 1),
+                    1,
+                    'form_theme'
+                ),
+            ],
+            [
+                '{% form_theme form with "tpl1" %}',
+                new FormThemeNode(
+                    new NameExpression('form', 1),
+                    new ConstantExpression('tpl1', 1),
+                    1,
+                    'form_theme'
+                ),
+            ],
+            [
+                '{% form_theme form with ["tpl1"] %}',
+                new FormThemeNode(
+                    new NameExpression('form', 1),
+                    new ArrayExpression([
+                        new ConstantExpression(0, 1),
+                        new ConstantExpression('tpl1', 1),
+                    ], 1),
+                    1,
+                    'form_theme'
+                ),
+            ],
+            [
+                '{% form_theme form with ["tpl1", "tpl2"] %}',
+                new FormThemeNode(
+                    new NameExpression('form', 1),
+                    new ArrayExpression([
+                        new ConstantExpression(0, 1),
+                        new ConstantExpression('tpl1', 1),
+                        new ConstantExpression(1, 1),
+                        new ConstantExpression('tpl2', 1),
+                    ], 1),
+                    1,
+                    'form_theme'
+                ),
+            ],
+            [
+                '{% form_theme form with ["tpl1", "tpl2"] only %}',
+                new FormThemeNode(
+                    new NameExpression('form', 1),
+                    new ArrayExpression([
+                        new ConstantExpression(0, 1),
+                        new ConstantExpression('tpl1', 1),
+                        new ConstantExpression(1, 1),
+                        new ConstantExpression('tpl2', 1),
+                    ], 1),
+                    1,
+                    'form_theme',
+                    true
+                ),
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/Translation/TwigExtractorTest.php b/lib/symfony/twig-bridge/Tests/Translation/TwigExtractorTest.php
new file mode 100644
index 000000000..28932d944
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/Translation/TwigExtractorTest.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests\Translation;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Translation\TwigExtractor;
+use Symfony\Component\Translation\MessageCatalogue;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+
+class TwigExtractorTest extends TestCase
+{
+    /**
+     * @dataProvider getExtractData
+     */
+    public function testExtract($template, $messages)
+    {
+        $loader = $this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock();
+        $twig = new Environment($loader, [
+            'strict_variables' => true,
+            'debug' => true,
+            'cache' => false,
+            'autoescape' => false,
+        ]);
+        $twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
+
+        $extractor = new TwigExtractor($twig);
+        $extractor->setPrefix('prefix');
+        $catalogue = new MessageCatalogue('en');
+
+        $m = new \ReflectionMethod($extractor, 'extractTemplate');
+        $m->setAccessible(true);
+        $m->invoke($extractor, $template, $catalogue);
+
+        foreach ($messages as $key => $domain) {
+            $this->assertTrue($catalogue->has($key, $domain));
+            $this->assertEquals('prefix'.$key, $catalogue->get($key, $domain));
+        }
+    }
+
+    public function getExtractData()
+    {
+        return [
+            ['{{ "new key" | trans() }}', ['new key' => 'messages']],
+            ['{{ "new key" | trans() | upper }}', ['new key' => 'messages']],
+            ['{{ "new key" | trans({}, "domain") }}', ['new key' => 'domain']],
+            ['{{ "new key" | transchoice(1) }}', ['new key' => 'messages']],
+            ['{{ "new key" | transchoice(1) | upper }}', ['new key' => 'messages']],
+            ['{{ "new key" | transchoice(1, {}, "domain") }}', ['new key' => 'domain']],
+            ['{% trans %}new key{% endtrans %}', ['new key' => 'messages']],
+            ['{% trans %}  new key  {% endtrans %}', ['new key' => 'messages']],
+            ['{% trans from "domain" %}new key{% endtrans %}', ['new key' => 'domain']],
+            ['{% set foo = "new key" | trans %}', ['new key' => 'messages']],
+            ['{{ 1 ? "new key" | trans : "another key" | trans }}', ['new key' => 'messages', 'another key' => 'messages']],
+
+            // make sure 'trans_default_domain' tag is supported
+            ['{% trans_default_domain "domain" %}{{ "new key"|trans }}', ['new key' => 'domain']],
+            ['{% trans_default_domain "domain" %}{{ "new key"|transchoice }}', ['new key' => 'domain']],
+            ['{% trans_default_domain "domain" %}{% trans %}new key{% endtrans %}', ['new key' => 'domain']],
+
+            // make sure this works with twig's named arguments
+            ['{{ "new key" | trans(domain="domain") }}', ['new key' => 'domain']],
+            ['{{ "new key" | transchoice(domain="domain", count=1) }}', ['new key' => 'domain']],
+        ];
+    }
+
+    /**
+     * @dataProvider resourcesWithSyntaxErrorsProvider
+     */
+    public function testExtractSyntaxError($resources, array $messages)
+    {
+        $twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
+        $twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
+
+        $extractor = new TwigExtractor($twig);
+        $catalogue = new MessageCatalogue('en');
+        $extractor->extract($resources, $catalogue);
+        $this->assertSame($messages, $catalogue->all());
+    }
+
+    /**
+     * @return array
+     */
+    public function resourcesWithSyntaxErrorsProvider()
+    {
+        return [
+            [__DIR__.'/../Fixtures', ['messages' => ['Hi!' => 'Hi!']]],
+            [__DIR__.'/../Fixtures/extractor/syntax_error.twig', []],
+            [new \SplFileInfo(__DIR__.'/../Fixtures/extractor/syntax_error.twig'), []],
+        ];
+    }
+
+    /**
+     * @dataProvider resourceProvider
+     */
+    public function testExtractWithFiles($resource)
+    {
+        $loader = new ArrayLoader([]);
+        $twig = new Environment($loader, [
+            'strict_variables' => true,
+            'debug' => true,
+            'cache' => false,
+            'autoescape' => false,
+        ]);
+        $twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
+
+        $extractor = new TwigExtractor($twig);
+        $catalogue = new MessageCatalogue('en');
+        $extractor->extract($resource, $catalogue);
+
+        $this->assertTrue($catalogue->has('Hi!', 'messages'));
+        $this->assertEquals('Hi!', $catalogue->get('Hi!', 'messages'));
+    }
+
+    /**
+     * @return array
+     */
+    public function resourceProvider()
+    {
+        $directory = __DIR__.'/../Fixtures/extractor/';
+
+        return [
+            [$directory.'with_translations.html.twig'],
+            [[$directory.'with_translations.html.twig']],
+            [[new \SplFileInfo($directory.'with_translations.html.twig')]],
+            [new \ArrayObject([$directory.'with_translations.html.twig'])],
+            [new \ArrayObject([new \SplFileInfo($directory.'with_translations.html.twig')])],
+        ];
+    }
+}
diff --git a/lib/symfony/twig-bridge/Tests/TwigEngineTest.php b/lib/symfony/twig-bridge/Tests/TwigEngineTest.php
new file mode 100644
index 000000000..e136d0c76
--- /dev/null
+++ b/lib/symfony/twig-bridge/Tests/TwigEngineTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <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\Twig\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\TwigEngine;
+use Symfony\Component\Templating\TemplateReference;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+
+class TwigEngineTest extends TestCase
+{
+    public function testExistsWithTemplateInstances()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists($this->getMockForAbstractClass('Twig\Template', [], '', false)));
+    }
+
+    public function testExistsWithNonExistentTemplates()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertFalse($engine->exists('foobar'));
+        $this->assertFalse($engine->exists(new TemplateReference('foorbar')));
+    }
+
+    public function testExistsWithTemplateWithSyntaxErrors()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists('error'));
+        $this->assertTrue($engine->exists(new TemplateReference('error')));
+    }
+
+    public function testExists()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists('index'));
+        $this->assertTrue($engine->exists(new TemplateReference('index')));
+    }
+
+    public function testRender()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertSame('foo', $engine->render('index'));
+        $this->assertSame('foo', $engine->render(new TemplateReference('index')));
+    }
+
+    public function testRenderWithError()
+    {
+        $this->expectException('Twig\Error\SyntaxError');
+        $engine = $this->getTwig();
+
+        $engine->render(new TemplateReference('error'));
+    }
+
+    protected function getTwig()
+    {
+        $twig = new Environment(new ArrayLoader([
+            'index' => 'foo',
+            'error' => '{{ foo }',
+        ]));
+        $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+
+        return new TwigEngine($twig, $parser);
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/ContainerAwareRuntimeLoaderTest.php b/lib/symfony/twig-bundle/Tests/ContainerAwareRuntimeLoaderTest.php
new file mode 100644
index 000000000..88f8fb21e
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/ContainerAwareRuntimeLoaderTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\TwigBundle\ContainerAwareRuntimeLoader;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * @group legacy
+ */
+class ContainerAwareRuntimeLoaderTest extends TestCase
+{
+    public function testLoad()
+    {
+        $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
+        $container->expects($this->once())->method('get')->with('foo');
+
+        $loader = new ContainerAwareRuntimeLoader($container, [
+            'FooClass' => 'foo',
+        ]);
+        $loader->load('FooClass');
+    }
+
+    public function testLoadWithoutAMatch()
+    {
+        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+        $logger->expects($this->once())->method('warning')->with('Class "BarClass" is not configured as a Twig runtime. Add the "twig.runtime" tag to the related service in the container.');
+        $loader = new ContainerAwareRuntimeLoader($this->getMockBuilder(ContainerInterface::class)->getMock(), [], $logger);
+        $this->assertNull($loader->load('BarClass'));
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/Controller/ExceptionControllerTest.php b/lib/symfony/twig-bundle/Tests/Controller/ExceptionControllerTest.php
new file mode 100644
index 000000000..800da68c9
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Controller/ExceptionControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\Controller;
+
+use Symfony\Bundle\TwigBundle\Controller\ExceptionController;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
+use Symfony\Component\Debug\Exception\FlattenException;
+use Symfony\Component\HttpFoundation\Request;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+
+class ExceptionControllerTest extends TestCase
+{
+    public function testShowActionCanBeForcedToShowErrorPage()
+    {
+        $twig = $this->createTwigEnv(['@Twig/Exception/error404.html.twig' => '<html>not found</html>']);
+
+        $request = $this->createRequest('html');
+        $request->attributes->set('showException', false);
+        $exception = FlattenException::create(new \Exception(), 404);
+        $controller = new ExceptionController($twig, /* "showException" defaults to --> */ true);
+
+        $response = $controller->showAction($request, $exception, null);
+
+        $this->assertEquals(200, $response->getStatusCode()); // successful request
+        $this->assertEquals('<html>not found</html>', $response->getContent());
+    }
+
+    public function testFallbackToHtmlIfNoTemplateForRequestedFormat()
+    {
+        $twig = $this->createTwigEnv(['@Twig/Exception/error.html.twig' => '<html></html>']);
+
+        $request = $this->createRequest('txt');
+        $exception = FlattenException::create(new \Exception());
+        $controller = new ExceptionController($twig, false);
+
+        $controller->showAction($request, $exception);
+
+        $this->assertEquals('html', $request->getRequestFormat());
+    }
+
+    public function testFallbackToHtmlWithFullExceptionIfNoTemplateForRequestedFormatAndExceptionsShouldBeShown()
+    {
+        $twig = $this->createTwigEnv(['@Twig/Exception/exception_full.html.twig' => '<html></html>']);
+
+        $request = $this->createRequest('txt');
+        $request->attributes->set('showException', true);
+        $exception = FlattenException::create(new \Exception());
+        $controller = new ExceptionController($twig, false);
+
+        $controller->showAction($request, $exception);
+
+        $this->assertEquals('html', $request->getRequestFormat());
+    }
+
+    public function testResponseHasRequestedMimeType()
+    {
+        $twig = $this->createTwigEnv(['@Twig/Exception/error.json.twig' => '{}']);
+
+        $request = $this->createRequest('json');
+        $exception = FlattenException::create(new \Exception());
+        $controller = new ExceptionController($twig, false);
+
+        $response = $controller->showAction($request, $exception);
+
+        $this->assertEquals('json', $request->getRequestFormat());
+        $this->assertEquals($request->getMimeType('json'), $response->headers->get('Content-Type'));
+    }
+
+    private function createRequest($requestFormat)
+    {
+        $request = Request::create('whatever');
+        $request->headers->set('X-Php-Ob-Level', 1);
+        $request->setRequestFormat($requestFormat);
+
+        return $request;
+    }
+
+    private function createTwigEnv(array $templates)
+    {
+        return new Environment(new ArrayLoader($templates));
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/Controller/PreviewErrorControllerTest.php b/lib/symfony/twig-bundle/Tests/Controller/PreviewErrorControllerTest.php
new file mode 100644
index 000000000..ae740e1ab
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Controller/PreviewErrorControllerTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\Controller;
+
+use Symfony\Bundle\TwigBundle\Controller\PreviewErrorController;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
+use Symfony\Component\Debug\Exception\FlattenException;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class PreviewErrorControllerTest extends TestCase
+{
+    public function testForwardRequestToConfiguredController()
+    {
+        $request = Request::create('whatever');
+        $response = new Response('');
+        $code = 123;
+        $logicalControllerName = 'foo:bar:baz';
+
+        $kernel = $this->getMockBuilder('\Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $kernel
+            ->expects($this->once())
+            ->method('handle')
+            ->with(
+                $this->callback(function (Request $request) use ($logicalControllerName, $code) {
+                    $this->assertEquals($logicalControllerName, $request->attributes->get('_controller'));
+
+                    $exception = $request->attributes->get('exception');
+                    $this->assertInstanceOf(FlattenException::class, $exception);
+                    $this->assertEquals($code, $exception->getStatusCode());
+                    $this->assertFalse($request->attributes->get('showException'));
+
+                    return true;
+                }),
+                $this->equalTo(HttpKernelInterface::SUB_REQUEST)
+            )
+            ->willReturn($response);
+
+        $controller = new PreviewErrorController($kernel, $logicalControllerName);
+
+        $this->assertSame($response, $controller->previewErrorPageAction($request, $code));
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php
new file mode 100644
index 000000000..539a952a6
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\ExtensionPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+class ExtensionPassTest extends TestCase
+{
+    public function testProcessDoesNotDropExistingFileLoaderMethodCalls()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+
+        $container->register('twig.app_variable', '\Symfony\Bridge\Twig\AppVariable');
+        $container->register('templating', '\Symfony\Bundle\TwigBundle\TwigEngine');
+        $container->register('twig.extension.yaml');
+        $container->register('twig.extension.debug.stopwatch');
+        $container->register('twig.extension.expression');
+
+        $nativeTwigLoader = new Definition('\Twig\Loader\FilesystemLoader');
+        $nativeTwigLoader->addMethodCall('addPath', []);
+        $container->setDefinition('twig.loader.native_filesystem', $nativeTwigLoader);
+
+        $filesystemLoader = new Definition('\Symfony\Bundle\TwigBundle\Loader\FilesystemLoader');
+        $filesystemLoader->setArguments([null, null, null]);
+        $filesystemLoader->addMethodCall('addPath', []);
+        $container->setDefinition('twig.loader.filesystem', $filesystemLoader);
+
+        $extensionPass = new ExtensionPass();
+        $extensionPass->process($container);
+
+        $this->assertCount(2, $filesystemLoader->getMethodCalls());
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigEnvironmentPassTest.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigEnvironmentPassTest.php
new file mode 100644
index 000000000..0af3fe4b3
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigEnvironmentPassTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\TwigEnvironmentPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class TwigEnvironmentPassTest extends TestCase
+{
+    public function testTwigBridgeExtensionsAreRegisteredFirst()
+    {
+        $container = new ContainerBuilder();
+        $twigDefinition = $container->register('twig');
+        $container->register('other_extension', 'Foo\Bar')
+            ->addTag('twig.extension');
+        $container->register('twig_bridge_extension', FormExtension::class)
+            ->addTag('twig.extension');
+
+        $twigEnvironmentPass = new TwigEnvironmentPass();
+        $twigEnvironmentPass->process($container);
+
+        $methodCalls = $twigDefinition->getMethodCalls();
+        $this->assertCount(2, $methodCalls);
+
+        $twigBridgeExtensionReference = $methodCalls[0][1][0];
+        $this->assertInstanceOf(Reference::class, $twigBridgeExtensionReference);
+        $this->assertSame('twig_bridge_extension', (string) $twigBridgeExtensionReference);
+
+        $otherExtensionReference = $methodCalls[1][1][0];
+        $this->assertInstanceOf(Reference::class, $otherExtensionReference);
+        $this->assertSame('other_extension', (string) $otherExtensionReference);
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
new file mode 100644
index 000000000..a112b64b5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\TwigLoaderPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+class TwigLoaderPassTest extends TestCase
+{
+    /**
+     * @var ContainerBuilder
+     */
+    private $builder;
+    /**
+     * @var Definition
+     */
+    private $chainLoader;
+    /**
+     * @var TwigLoaderPass
+     */
+    private $pass;
+
+    protected function setUp()
+    {
+        $this->builder = new ContainerBuilder();
+        $this->builder->register('twig');
+        $this->chainLoader = new Definition('loader');
+        $this->pass = new TwigLoaderPass();
+    }
+
+    public function testMapperPassWithOneTaggedLoader()
+    {
+        $this->builder->register('test_loader_1')
+            ->addTag('twig.loader');
+
+        $this->pass->process($this->builder);
+
+        $this->assertSame('test_loader_1', (string) $this->builder->getAlias('twig.loader'));
+    }
+
+    public function testMapperPassWithTwoTaggedLoaders()
+    {
+        $this->builder->setDefinition('twig.loader.chain', $this->chainLoader);
+        $this->builder->register('test_loader_1')
+            ->addTag('twig.loader');
+        $this->builder->register('test_loader_2')
+            ->addTag('twig.loader');
+
+        $this->pass->process($this->builder);
+
+        $this->assertSame('twig.loader.chain', (string) $this->builder->getAlias('twig.loader'));
+        $calls = $this->chainLoader->getMethodCalls();
+        $this->assertCount(2, $calls);
+        $this->assertEquals('addLoader', $calls[0][0]);
+        $this->assertEquals('addLoader', $calls[1][0]);
+        $this->assertEquals('test_loader_1', (string) $calls[0][1][0]);
+        $this->assertEquals('test_loader_2', (string) $calls[1][1][0]);
+    }
+
+    public function testMapperPassWithTwoTaggedLoadersWithPriority()
+    {
+        $this->builder->setDefinition('twig.loader.chain', $this->chainLoader);
+        $this->builder->register('test_loader_1')
+            ->addTag('twig.loader', ['priority' => 100]);
+        $this->builder->register('test_loader_2')
+            ->addTag('twig.loader', ['priority' => 200]);
+
+        $this->pass->process($this->builder);
+
+        $this->assertSame('twig.loader.chain', (string) $this->builder->getAlias('twig.loader'));
+        $calls = $this->chainLoader->getMethodCalls();
+        $this->assertCount(2, $calls);
+        $this->assertEquals('addLoader', $calls[0][0]);
+        $this->assertEquals('addLoader', $calls[1][0]);
+        $this->assertEquals('test_loader_2', (string) $calls[0][1][0]);
+        $this->assertEquals('test_loader_1', (string) $calls[1][1][0]);
+    }
+
+    public function testMapperPassWithZeroTaggedLoaders()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+        $this->pass->process($this->builder);
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/ConfigurationTest.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/ConfigurationTest.php
new file mode 100644
index 000000000..049d05b5c
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\TwigBundle\DependencyInjection\Configuration;
+use Symfony\Component\Config\Definition\Processor;
+
+class ConfigurationTest extends TestCase
+{
+    public function testDoNoDuplicateDefaultFormResources()
+    {
+        $input = [
+            'form_themes' => ['form_div_layout.html.twig'],
+        ];
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(), [$input]);
+
+        $this->assertEquals(['form_div_layout.html.twig'], $config['form_themes']);
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Resources/TwigBundle/views/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Resources/TwigBundle/views/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Resources/TwigBundle/views/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Resources/views/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Resources/views/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/Resources/views/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/customTemplateEscapingGuesser.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/customTemplateEscapingGuesser.php
new file mode 100644
index 000000000..c9acb3c25
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/customTemplateEscapingGuesser.php
@@ -0,0 +1,6 @@
+<?php
+
+$container->loadFromExtension('twig', [
+    'autoescape_service' => 'my_project.some_bundle.template_escaping_guesser',
+    'autoescape_service_method' => 'guess',
+]);
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/empty.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/empty.php
new file mode 100644
index 000000000..d107fd90d
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/empty.php
@@ -0,0 +1,3 @@
+<?php
+
+$container->loadFromExtension('twig', []);
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/extra.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/extra.php
new file mode 100644
index 000000000..49acc87a8
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/extra.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('twig', [
+     'paths' => [
+         'namespaced_path3' => 'namespace3',
+      ],
+]);
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/formats.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/formats.php
new file mode 100644
index 000000000..7e8573880
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/formats.php
@@ -0,0 +1,14 @@
+<?php
+
+$container->loadFromExtension('twig', [
+    'date' => [
+        'format' => 'Y-m-d',
+        'interval_format' => '%d',
+        'timezone' => 'Europe/Berlin',
+    ],
+    'number_format' => [
+        'decimals' => 2,
+        'decimal_point' => ',',
+        'thousands_separator' => '.',
+    ],
+]);
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/full.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/full.php
new file mode 100644
index 000000000..8dd2be409
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -0,0 +1,27 @@
+<?php
+
+$container->loadFromExtension('twig', [
+    'form_themes' => [
+        'MyBundle::form.html.twig',
+    ],
+    'globals' => [
+        'foo' => '@bar',
+        'baz' => '@@qux',
+        'pi' => 3.14,
+        'bad' => ['key' => 'foo'],
+    ],
+    'auto_reload' => true,
+    'autoescape' => true,
+    'base_template_class' => 'stdClass',
+    'cache' => '/tmp',
+    'charset' => 'ISO-8859-1',
+    'debug' => true,
+    'strict_variables' => true,
+    'default_path' => '%kernel.project_dir%/Fixtures/templates',
+    'paths' => [
+        'path1',
+        'path2',
+        'namespaced_path1' => 'namespace1',
+        'namespaced_path2' => 'namespace2',
+    ],
+]);
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/bundles/BarBundle/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/bundles/BarBundle/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/bundles/BarBundle/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/bundles/TwigBundle/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/bundles/TwigBundle/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/bundles/TwigBundle/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/layout.html.twig b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/layout.html.twig
new file mode 100644
index 000000000..bb07ecfe5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/templates/layout.html.twig
@@ -0,0 +1 @@
+This is a layout
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/customTemplateEscapingGuesser.xml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/customTemplateEscapingGuesser.xml
new file mode 100644
index 000000000..f72bed9d1
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/customTemplateEscapingGuesser.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:twig="http://symfony.com/schema/dic/twig"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config autoescape-service="my_project.some_bundle.template_escaping_guesser" autoescape-service-method="guess" />
+</container>
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/empty.xml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/empty.xml
new file mode 100644
index 000000000..f3b51fa24
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/empty.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:twig="http://symfony.com/schema/dic/twig"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config />
+</container>
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/extra.xml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/extra.xml
new file mode 100644
index 000000000..17bcf0acd
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/extra.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:twig="http://symfony.com/schema/dic/twig"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true">
+        <twig:path namespace="namespace3">namespaced_path3</twig:path>
+    </twig:config>
+</container>
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/formats.xml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/formats.xml
new file mode 100644
index 000000000..fa888b30a
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/formats.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:twig="http://symfony.com/schema/dic/twig"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config>
+        <twig:date format="Y-m-d" interval-format="%d" timezone="Europe/Berlin" />
+        <twig:number-format decimals="2" decimal-point="," thousands-separator="." />
+    </twig:config>
+</container>
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/full.xml
new file mode 100644
index 000000000..8ece3b80b
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:twig="http://symfony.com/schema/dic/twig"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true" default-path="%kernel.project_dir%/Fixtures/templates">
+        <twig:form-theme>MyBundle::form.html.twig</twig:form-theme>
+        <twig:global key="foo" id="bar" type="service" />
+        <twig:global key="baz">@@qux</twig:global>
+        <twig:global key="pi">3.14</twig:global>
+        <twig:path>path1</twig:path>
+        <twig:path>path2</twig:path>
+        <twig:path namespace="namespace1">namespaced_path1</twig:path>
+        <twig:path namespace="namespace2">namespaced_path2</twig:path>
+    </twig:config>
+</container>
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/customTemplateEscapingGuesser.yml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/customTemplateEscapingGuesser.yml
new file mode 100644
index 000000000..eb26e7165
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/customTemplateEscapingGuesser.yml
@@ -0,0 +1,3 @@
+twig:
+    autoescape_service: my_project.some_bundle.template_escaping_guesser
+    autoescape_service_method: guess
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/empty.yml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/empty.yml
new file mode 100644
index 000000000..a472b2698
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/empty.yml
@@ -0,0 +1 @@
+twig:
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/extra.yml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/extra.yml
new file mode 100644
index 000000000..3c5e6a3b5
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/extra.yml
@@ -0,0 +1,3 @@
+twig:
+    paths:
+        namespaced_path3: namespace3
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/formats.yml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/formats.yml
new file mode 100644
index 000000000..290921630
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/formats.yml
@@ -0,0 +1,9 @@
+twig:
+    date:
+        format: Y-m-d
+        interval_format: '%d'
+        timezone: Europe/Berlin
+    number_format:
+        decimals: 2
+        decimal_point: ','
+        thousands_separator: .
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/full.yml
new file mode 100644
index 000000000..24c10c23f
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -0,0 +1,21 @@
+twig:
+    form_themes:
+        - MyBundle::form.html.twig
+    globals:
+        foo: "@bar"
+        baz: "@@qux"
+        pi:  3.14
+        bad: {key: foo}
+    auto_reload:         true
+    autoescape:          true
+    base_template_class: stdClass
+    cache:               /tmp
+    charset:             ISO-8859-1
+    debug:               true
+    strict_variables:    true
+    default_path: '%kernel.project_dir%/Fixtures/templates'
+    paths:
+        path1: ''
+        path2: ''
+        namespaced_path1: namespace1
+        namespaced_path2: namespace2
diff --git a/lib/symfony/twig-bundle/Tests/DependencyInjection/TwigExtensionTest.php b/lib/symfony/twig-bundle/Tests/DependencyInjection/TwigExtensionTest.php
new file mode 100644
index 000000000..000cad7f9
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -0,0 +1,355 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection;
+
+use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\RuntimeLoaderPass;
+use Symfony\Bundle\TwigBundle\DependencyInjection\TwigExtension;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\Reference;
+
+class TwigExtensionTest extends TestCase
+{
+    public function testLoadEmptyConfiguration()
+    {
+        $container = $this->createContainer();
+        $container->registerExtension(new TwigExtension());
+        $container->loadFromExtension('twig', []);
+        $this->compileContainer($container);
+
+        $this->assertEquals('Twig\Environment', $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
+
+        $this->assertContains('form_div_layout.html.twig', $container->getParameter('twig.form.resources'), '->load() includes default template for form resources');
+
+        // Twig options
+        $options = $container->getDefinition('twig')->getArgument(1);
+        $this->assertEquals('%kernel.cache_dir%/twig', $options['cache'], '->load() sets default value for cache option');
+        $this->assertEquals('%kernel.charset%', $options['charset'], '->load() sets default value for charset option');
+        $this->assertEquals('%kernel.debug%', $options['debug'], '->load() sets default value for debug option');
+    }
+
+    /**
+     * @dataProvider getFormats
+     */
+    public function testLoadFullConfiguration($format)
+    {
+        $container = $this->createContainer();
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'full', $format);
+        $this->compileContainer($container);
+
+        $this->assertEquals('Twig\Environment', $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
+
+        // Form resources
+        $resources = $container->getParameter('twig.form.resources');
+        $this->assertContains('form_div_layout.html.twig', $resources, '->load() includes default template for form resources');
+        $this->assertContains('MyBundle::form.html.twig', $resources, '->load() merges new templates into form resources');
+
+        // Globals
+        $calls = $container->getDefinition('twig')->getMethodCalls();
+        $this->assertEquals('app', $calls[0][1][0], '->load() registers services as Twig globals');
+        $this->assertEquals(new Reference('twig.app_variable'), $calls[0][1][1]);
+        $this->assertEquals('foo', $calls[2][1][0], '->load() registers services as Twig globals');
+        $this->assertEquals(new Reference('bar'), $calls[2][1][1], '->load() registers services as Twig globals');
+        $this->assertEquals('baz', $calls[3][1][0], '->load() registers variables as Twig globals');
+        $this->assertEquals('@qux', $calls[3][1][1], '->load() allows escaping of service identifiers');
+        $this->assertEquals('pi', $calls[4][1][0], '->load() registers variables as Twig globals');
+        $this->assertEquals(3.14, $calls[4][1][1], '->load() registers variables as Twig globals');
+
+        // Yaml and Php specific configs
+        if (\in_array($format, ['yml', 'php'])) {
+            $this->assertEquals('bad', $calls[5][1][0], '->load() registers variables as Twig globals');
+            $this->assertEquals(['key' => 'foo'], $calls[5][1][1], '->load() registers variables as Twig globals');
+        }
+
+        // Twig options
+        $options = $container->getDefinition('twig')->getArgument(1);
+        $this->assertTrue($options['auto_reload'], '->load() sets the auto_reload option');
+        $this->assertTrue($options['autoescape'], '->load() sets the autoescape option');
+        $this->assertEquals('stdClass', $options['base_template_class'], '->load() sets the base_template_class option');
+        $this->assertEquals('/tmp', $options['cache'], '->load() sets the cache option');
+        $this->assertEquals('ISO-8859-1', $options['charset'], '->load() sets the charset option');
+        $this->assertTrue($options['debug'], '->load() sets the debug option');
+        $this->assertTrue($options['strict_variables'], '->load() sets the strict_variables option');
+    }
+
+    /**
+     * @dataProvider getFormats
+     */
+    public function testLoadCustomTemplateEscapingGuesserConfiguration($format)
+    {
+        $container = $this->createContainer();
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'customTemplateEscapingGuesser', $format);
+        $this->compileContainer($container);
+
+        $options = $container->getDefinition('twig')->getArgument(1);
+        $this->assertEquals([new Reference('my_project.some_bundle.template_escaping_guesser'), 'guess'], $options['autoescape']);
+    }
+
+    /**
+     * @dataProvider getFormats
+     */
+    public function testLoadDefaultTemplateEscapingGuesserConfiguration($format)
+    {
+        $container = $this->createContainer();
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'empty', $format);
+        $this->compileContainer($container);
+
+        $options = $container->getDefinition('twig')->getArgument(1);
+        $this->assertEquals('name', $options['autoescape']);
+    }
+
+    /**
+     * @dataProvider getFormats
+     */
+    public function testLoadCustomDateFormats($fileFormat)
+    {
+        $container = $this->createContainer();
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'formats', $fileFormat);
+        $this->compileContainer($container);
+
+        $environmentConfigurator = $container->getDefinition('twig.configurator.environment');
+
+        $this->assertSame('Y-m-d', $environmentConfigurator->getArgument(0));
+        $this->assertSame('%d', $environmentConfigurator->getArgument(1));
+        $this->assertSame('Europe/Berlin', $environmentConfigurator->getArgument(2));
+        $this->assertSame(2, $environmentConfigurator->getArgument(3));
+        $this->assertSame(',', $environmentConfigurator->getArgument(4));
+        $this->assertSame('.', $environmentConfigurator->getArgument(5));
+    }
+
+    public function testGlobalsWithDifferentTypesAndValues()
+    {
+        $globals = [
+            'array' => [],
+            'false' => false,
+            'float' => 2.0,
+            'integer' => 3,
+            'null' => null,
+            'object' => new \stdClass(),
+            'string' => 'foo',
+            'true' => true,
+        ];
+
+        $container = $this->createContainer();
+        $container->registerExtension(new TwigExtension());
+        $container->loadFromExtension('twig', ['globals' => $globals]);
+        $this->compileContainer($container);
+
+        $calls = $container->getDefinition('twig')->getMethodCalls();
+        foreach (\array_slice($calls, 2) as $call) {
+            $this->assertEquals(key($globals), $call[1][0]);
+            $this->assertSame(current($globals), $call[1][1]);
+
+            next($globals);
+        }
+    }
+
+    /**
+     * @dataProvider getFormats
+     */
+    public function testTwigLoaderPaths($format)
+    {
+        $container = $this->createContainer();
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'full', $format);
+        $this->loadFromFile($container, 'extra', $format);
+        $this->compileContainer($container);
+
+        $def = $container->getDefinition('twig.loader.native_filesystem');
+        $paths = [];
+        foreach ($def->getMethodCalls() as $call) {
+            if ('addPath' === $call[0] && false === strpos($call[1][0], 'Form')) {
+                $paths[] = $call[1];
+            }
+        }
+
+        $this->assertEquals([
+            ['path1'],
+            ['path2'],
+            ['namespaced_path1', 'namespace1'],
+            ['namespaced_path2', 'namespace2'],
+            ['namespaced_path3', 'namespace3'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildChildChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildChildChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'Twig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'Twig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'Twig'],
+            [__DIR__.'/Fixtures/Bundle/ChildTwigBundle/Resources/views', 'Twig'],
+            [__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'],
+            [__DIR__.'/Fixtures/templates/bundles/TwigBundle', 'Twig'],
+            [realpath(__DIR__.'/../..').'/Resources/views', 'Twig'],
+            [realpath(__DIR__.'/../..').'/Resources/views', '!Twig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildTwigBundle/Resources/views', 'ChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildChildTwig'],
+            [__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildChildTwig'],
+            [__DIR__.'/Fixtures/Resources/views'],
+            [__DIR__.'/Fixtures/templates'],
+        ], $paths);
+    }
+
+    public function getFormats()
+    {
+        return [
+            ['php'],
+            ['yml'],
+            ['xml'],
+        ];
+    }
+
+    /**
+     * @dataProvider stopwatchExtensionAvailabilityProvider
+     */
+    public function testStopwatchExtensionAvailability($debug, $stopwatchEnabled, $expected)
+    {
+        $container = $this->createContainer();
+        $container->setParameter('kernel.debug', $debug);
+        if ($stopwatchEnabled) {
+            $container->register('debug.stopwatch', 'Symfony\Component\Stopwatch\Stopwatch');
+        }
+        $container->registerExtension(new TwigExtension());
+        $container->loadFromExtension('twig', []);
+        $container->setAlias('test.twig.extension.debug.stopwatch', 'twig.extension.debug.stopwatch')->setPublic(true);
+        $this->compileContainer($container);
+
+        $tokenParsers = $container->get('test.twig.extension.debug.stopwatch')->getTokenParsers();
+        $stopwatchIsAvailable = new \ReflectionProperty($tokenParsers[0], 'stopwatchIsAvailable');
+        $stopwatchIsAvailable->setAccessible(true);
+
+        $this->assertSame($expected, $stopwatchIsAvailable->getValue($tokenParsers[0]));
+    }
+
+    public function stopwatchExtensionAvailabilityProvider()
+    {
+        return [
+            'debug-and-stopwatch-enabled' => [true, true, true],
+            'only-stopwatch-enabled' => [false, true, false],
+            'only-debug-enabled' => [true, false, false],
+            'debug-and-stopwatch-disabled' => [false, false, false],
+        ];
+    }
+
+    public function testRuntimeLoader()
+    {
+        $container = $this->createContainer();
+        $container->registerExtension(new TwigExtension());
+        $container->loadFromExtension('twig', []);
+        $container->setParameter('kernel.environment', 'test');
+        $container->setParameter('debug.file_link_format', 'test');
+        $container->setParameter('foo', 'FooClass');
+        $container->register('http_kernel', 'FooClass');
+        $container->register('templating.locator', 'FooClass');
+        $container->register('templating.name_parser', 'FooClass');
+        $container->register('foo', '%foo%')->addTag('twig.runtime');
+        $container->addCompilerPass(new RuntimeLoaderPass(), PassConfig::TYPE_BEFORE_REMOVING);
+        $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
+        $container->compile();
+
+        $loader = $container->getDefinition('twig.runtime_loader');
+        $args = $container->getDefinition((string) $loader->getArgument(0))->getArgument(0);
+        $this->assertArrayHasKey('Symfony\Component\Form\FormRenderer', $args);
+        $this->assertArrayHasKey('FooClass', $args);
+        $this->assertEquals('twig.form.renderer', $args['Symfony\Component\Form\FormRenderer']->getValues()[0]);
+        $this->assertEquals('foo', $args['FooClass']->getValues()[0]);
+    }
+
+    private function createContainer()
+    {
+        $container = new ContainerBuilder(new ParameterBag([
+            'kernel.cache_dir' => __DIR__,
+            'kernel.root_dir' => __DIR__.'/Fixtures',
+            'kernel.project_dir' => __DIR__,
+            'kernel.charset' => 'UTF-8',
+            'kernel.debug' => false,
+            'kernel.bundles' => [
+                'TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle',
+                'ChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildTwigBundle\\ChildTwigBundle',
+                'ChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildTwigBundle\\ChildChildTwigBundle',
+                'ChildChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildTwigBundle\\ChildChildChildTwigBundle',
+                'ChildChildChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildChildTwigBundle\\ChildChildChildChildTwigBundle',
+            ],
+            'kernel.bundles_metadata' => [
+                'ChildChildChildChildTwigBundle' => [
+                    'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildChildTwigBundle\\ChildChildChildChildTwigBundle',
+                    'parent' => 'ChildChildChildTwigBundle',
+                    'path' => __DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle',
+                ],
+                'TwigBundle' => [
+                    'namespace' => 'Symfony\\Bundle\\TwigBundle',
+                    'parent' => null,
+                    'path' => realpath(__DIR__.'/../..'),
+                ],
+                'ChildTwigBundle' => [
+                    'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildTwigBundle\\ChildTwigBundle',
+                    'parent' => 'TwigBundle',
+                    'path' => __DIR__.'/Fixtures/Bundle/ChildTwigBundle',
+                ],
+                'ChildChildChildTwigBundle' => [
+                    'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildTwigBundle\\ChildChildChildTwigBundle',
+                    'parent' => 'ChildChildTwigBundle',
+                    'path' => __DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle',
+                ],
+                'ChildChildTwigBundle' => [
+                    'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildTwigBundle\\ChildChildTwigBundle',
+                    'parent' => 'ChildTwigBundle',
+                    'path' => __DIR__.'/Fixtures/Bundle/ChildChildTwigBundle',
+                ],
+            ],
+        ]));
+
+        return $container;
+    }
+
+    private function compileContainer(ContainerBuilder $container)
+    {
+        $container->getCompilerPassConfig()->setOptimizationPasses([]);
+        $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
+        $container->compile();
+    }
+
+    private function loadFromFile(ContainerBuilder $container, $file, $format)
+    {
+        $locator = new FileLocator(__DIR__.'/Fixtures/'.$format);
+
+        switch ($format) {
+            case 'php':
+                $loader = new PhpFileLoader($container, $locator);
+                break;
+            case 'xml':
+                $loader = new XmlFileLoader($container, $locator);
+                break;
+            case 'yml':
+                $loader = new YamlFileLoader($container, $locator);
+                break;
+            default:
+                throw new \InvalidArgumentException(sprintf('Unsupported format: %s', $format));
+        }
+
+        $loader->load($file.'.'.$format);
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/Fixtures/templates/BarBundle/Resources/views/index.html.twig b/lib/symfony/twig-bundle/Tests/Fixtures/templates/BarBundle/Resources/views/index.html.twig
new file mode 100644
index 000000000..1975b0e15
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Fixtures/templates/BarBundle/Resources/views/index.html.twig
@@ -0,0 +1 @@
+{# Twig template #}
diff --git a/lib/symfony/twig-bundle/Tests/Fixtures/templates/Foo/index.html.twig b/lib/symfony/twig-bundle/Tests/Fixtures/templates/Foo/index.html.twig
new file mode 100644
index 000000000..1975b0e15
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Fixtures/templates/Foo/index.html.twig
@@ -0,0 +1 @@
+{# Twig template #}
diff --git a/lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/BarBundle/views/base.html.twig b/lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/BarBundle/views/base.html.twig
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/views/layout.html.twig b/lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/views/layout.html.twig
new file mode 100644
index 000000000..1975b0e15
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/views/layout.html.twig
@@ -0,0 +1 @@
+{# Twig template #}
diff --git a/lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/views/sub/sub.html.twig b/lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/views/sub/sub.html.twig
new file mode 100644
index 000000000..1975b0e15
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Fixtures/templates/Resources/views/sub/sub.html.twig
@@ -0,0 +1 @@
+{# Twig template #}
diff --git a/lib/symfony/twig-bundle/Tests/Functional/CacheWarmingTest.php b/lib/symfony/twig-bundle/Tests/Functional/CacheWarmingTest.php
new file mode 100644
index 000000000..63710a8e1
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Functional/CacheWarmingTest.php
@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel\Kernel;
+
+class CacheWarmingTest extends TestCase
+{
+    public function testCacheIsProperlyWarmedWhenTemplatingIsAvailable()
+    {
+        $kernel = new CacheWarmingKernel(true);
+        $kernel->boot();
+
+        $warmer = $kernel->getContainer()->get('cache_warmer');
+        $warmer->enableOptionalWarmers();
+        $warmer->warmUp($kernel->getCacheDir());
+
+        $this->assertFileExists($kernel->getCacheDir().'/twig');
+    }
+
+    public function testCacheIsProperlyWarmedWhenTemplatingIsDisabled()
+    {
+        $kernel = new CacheWarmingKernel(false);
+        $kernel->boot();
+
+        $warmer = $kernel->getContainer()->get('cache_warmer');
+        $warmer->enableOptionalWarmers();
+        $warmer->warmUp($kernel->getCacheDir());
+
+        $this->assertFileExists($kernel->getCacheDir().'/twig');
+    }
+
+    protected function setUp()
+    {
+        $this->deleteTempDir();
+    }
+
+    protected function tearDown()
+    {
+        $this->deleteTempDir();
+    }
+
+    private function deleteTempDir()
+    {
+        if (!file_exists($dir = sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel')) {
+            return;
+        }
+
+        $fs = new Filesystem();
+        $fs->remove($dir);
+    }
+}
+
+class CacheWarmingKernel extends Kernel
+{
+    private $withTemplating;
+
+    public function __construct($withTemplating)
+    {
+        $this->withTemplating = $withTemplating;
+
+        parent::__construct(($withTemplating ? 'with' : 'without').'_templating', true);
+    }
+
+    public function getName()
+    {
+        return 'CacheWarming';
+    }
+
+    public function registerBundles()
+    {
+        return [new FrameworkBundle(), new TwigBundle()];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load(function ($container) {
+            $container->loadFromExtension('framework', [
+                'secret' => '$ecret',
+                'form' => ['enabled' => false],
+            ]);
+        });
+
+        if ($this->withTemplating) {
+            $loader->load(function ($container) {
+                $container->loadFromExtension('framework', [
+                    'secret' => '$ecret',
+                    'templating' => ['engines' => ['twig']],
+                    'router' => ['resource' => '%kernel.project_dir%/Resources/config/empty_routing.yml'],
+                    'form' => ['enabled' => false],
+                ]);
+            });
+        }
+    }
+
+    public function getProjectDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel/cache/'.$this->environment;
+    }
+
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel/logs';
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/Functional/EmptyAppTest.php b/lib/symfony/twig-bundle/Tests/Functional/EmptyAppTest.php
new file mode 100644
index 000000000..86d933b55
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Functional/EmptyAppTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\Functional;
+
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
+
+class EmptyAppTest extends TestCase
+{
+    public function testBootEmptyApp()
+    {
+        $kernel = new EmptyAppKernel('test', true);
+        $kernel->boot();
+
+        $this->assertTrue($kernel->getContainer()->hasParameter('twig.default_path'));
+        $this->assertNotEmpty($kernel->getContainer()->getParameter('twig.default_path'));
+    }
+}
+
+class EmptyAppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        return [new TwigBundle()];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/EmptyAppKernel/cache/'.$this->environment;
+    }
+
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/EmptyAppKernel/logs';
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/Functional/NoTemplatingEntryTest.php b/lib/symfony/twig-bundle/Tests/Functional/NoTemplatingEntryTest.php
new file mode 100644
index 000000000..3d509c44e
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Functional/NoTemplatingEntryTest.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel\Kernel;
+
+class NoTemplatingEntryTest extends TestCase
+{
+    public function test()
+    {
+        $kernel = new NoTemplatingEntryKernel('dev', true);
+        $kernel->boot();
+
+        $container = $kernel->getContainer();
+        $content = $container->get('twig')->render('index.html.twig');
+        $this->assertStringContainsString('{ a: b }', $content);
+    }
+
+    protected function setUp()
+    {
+        $this->deleteTempDir();
+    }
+
+    protected function tearDown()
+    {
+        $this->deleteTempDir();
+    }
+
+    protected function deleteTempDir()
+    {
+        if (!file_exists($dir = sys_get_temp_dir().'/'.Kernel::VERSION.'/NoTemplatingEntryKernel')) {
+            return;
+        }
+
+        $fs = new Filesystem();
+        $fs->remove($dir);
+    }
+}
+
+class NoTemplatingEntryKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        return [new FrameworkBundle(), new TwigBundle()];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load(function ($container) {
+            $container->loadFromExtension('framework', [
+                'secret' => '$ecret',
+                'form' => ['enabled' => false],
+            ]);
+        });
+    }
+
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/NoTemplatingEntryKernel/cache/'.$this->environment;
+    }
+
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/NoTemplatingEntryKernel/logs';
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/Functional/Resources/config/empty_routing.yml b/lib/symfony/twig-bundle/Tests/Functional/Resources/config/empty_routing.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/symfony/twig-bundle/Tests/Functional/Resources/views/index.html.twig b/lib/symfony/twig-bundle/Tests/Functional/Resources/views/index.html.twig
new file mode 100644
index 000000000..ddc4eb440
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Functional/Resources/views/index.html.twig
@@ -0,0 +1 @@
+{{ {a: 'b'}|yaml_encode }}
diff --git a/lib/symfony/twig-bundle/Tests/Loader/FilesystemLoaderTest.php b/lib/symfony/twig-bundle/Tests/Loader/FilesystemLoaderTest.php
new file mode 100644
index 000000000..7fa8dd2b4
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/Loader/FilesystemLoaderTest.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\Loader;
+
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use Symfony\Bundle\TwigBundle\Loader\FilesystemLoader;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
+
+class FilesystemLoaderTest extends TestCase
+{
+    public function testGetSourceContext()
+    {
+        $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+        $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $locator
+            ->expects($this->once())
+            ->method('locate')
+            ->willReturn(__DIR__.'/../DependencyInjection/Fixtures/Resources/views/layout.html.twig')
+        ;
+        $loader = new FilesystemLoader($locator, $parser);
+        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views', 'namespace');
+
+        // Twig-style
+        $this->assertEquals("This is a layout\n", $loader->getSourceContext('@namespace/layout.html.twig')->getCode());
+
+        // Symfony-style
+        $this->assertEquals("This is a layout\n", $loader->getSourceContext('TwigBundle::layout.html.twig')->getCode());
+    }
+
+    public function testExists()
+    {
+        // should return true for templates that Twig does not find, but Symfony does
+        $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+        $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $locator
+            ->expects($this->once())
+            ->method('locate')
+            ->willReturn($template = __DIR__.'/../DependencyInjection/Fixtures/Resources/views/layout.html.twig')
+        ;
+        $loader = new FilesystemLoader($locator, $parser);
+
+        $this->assertTrue($loader->exists($template));
+    }
+
+    public function testTwigErrorIfLocatorThrowsInvalid()
+    {
+        $this->expectException('Twig\Error\LoaderError');
+        $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+        $parser
+            ->expects($this->once())
+            ->method('parse')
+            ->with('name.format.engine')
+            ->willReturn(new TemplateReference('', '', 'name', 'format', 'engine'))
+        ;
+
+        $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $locator
+            ->expects($this->once())
+            ->method('locate')
+            ->willThrowException(new \InvalidArgumentException('Unable to find template "NonExistent".'))
+        ;
+
+        $loader = new FilesystemLoader($locator, $parser);
+        $loader->getCacheKey('name.format.engine');
+    }
+
+    public function testTwigErrorIfLocatorReturnsFalse()
+    {
+        $this->expectException('Twig\Error\LoaderError');
+        $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+        $parser
+            ->expects($this->once())
+            ->method('parse')
+            ->with('name.format.engine')
+            ->willReturn(new TemplateReference('', '', 'name', 'format', 'engine'))
+        ;
+
+        $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $locator
+            ->expects($this->once())
+            ->method('locate')
+            ->willReturn(false)
+        ;
+
+        $loader = new FilesystemLoader($locator, $parser);
+        $loader->getCacheKey('name.format.engine');
+    }
+
+    public function testTwigErrorIfTemplateDoesNotExist()
+    {
+        $this->expectException('Twig\Error\LoaderError');
+        $this->expectExceptionMessageRegExp('/Unable to find template "name\.format\.engine" \(looked into: .*Tests.Loader.\.\..DependencyInjection.Fixtures.Resources.views\)/');
+        $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+        $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+
+        $loader = new FilesystemLoader($locator, $parser);
+        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views');
+
+        $method = new \ReflectionMethod('Symfony\Bundle\TwigBundle\Loader\FilesystemLoader', 'findTemplate');
+        $method->setAccessible(true);
+        $method->invoke($loader, 'name.format.engine');
+    }
+
+    public function testTwigSoftErrorIfTemplateDoesNotExist()
+    {
+        $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+        $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+
+        $loader = new FilesystemLoader($locator, $parser);
+        $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views');
+
+        $method = new \ReflectionMethod('Symfony\Bundle\TwigBundle\Loader\FilesystemLoader', 'findTemplate');
+        $method->setAccessible(true);
+        $this->assertFalse($method->invoke($loader, 'name.format.engine', false));
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/TemplateIteratorTest.php b/lib/symfony/twig-bundle/Tests/TemplateIteratorTest.php
new file mode 100644
index 000000000..b9092af3e
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/TemplateIteratorTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests;
+
+use Symfony\Bundle\TwigBundle\TemplateIterator;
+
+class TemplateIteratorTest extends TestCase
+{
+    public function testGetIterator()
+    {
+        $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
+        $bundle->expects($this->any())->method('getName')->willReturn('BarBundle');
+        $bundle->expects($this->any())->method('getPath')->willReturn(__DIR__.'/Fixtures/templates/BarBundle');
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Kernel')->disableOriginalConstructor()->getMock();
+        $kernel->expects($this->any())->method('getBundles')->willReturn([
+            $bundle,
+        ]);
+        $iterator = new TemplateIterator($kernel, __DIR__.'/Fixtures/templates', [__DIR__.'/Fixtures/templates/Foo' => 'Foo'], __DIR__.'/DependencyInjection/Fixtures/templates');
+
+        $sorted = iterator_to_array($iterator);
+        sort($sorted);
+        $this->assertEquals(
+            [
+                '@Bar/base.html.twig',
+                '@Bar/index.html.twig',
+                '@Bar/layout.html.twig',
+                '@Foo/index.html.twig',
+                'layout.html.twig',
+                'sub/sub.html.twig',
+            ],
+            $sorted
+        );
+    }
+}
diff --git a/lib/symfony/twig-bundle/Tests/TestCase.php b/lib/symfony/twig-bundle/Tests/TestCase.php
new file mode 100644
index 000000000..800be3008
--- /dev/null
+++ b/lib/symfony/twig-bundle/Tests/TestCase.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests;
+
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+
+class TestCase extends PHPUnitTestCase
+{
+}
diff --git a/lib/symfony/var-dumper/Test/VarDumperTestTrait.php b/lib/symfony/var-dumper/Test/VarDumperTestTrait.php
new file mode 100644
index 000000000..84c36f49c
--- /dev/null
+++ b/lib/symfony/var-dumper/Test/VarDumperTestTrait.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Test;
+
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+trait VarDumperTestTrait
+{
+    public function assertDumpEquals($dump, $data, $filter = 0, $message = '')
+    {
+        if (\is_string($filter)) {
+            @trigger_error(sprintf('The $message argument of the "%s()" method at the 3rd position is deprecated since Symfony 3.4 and will be moved at the 4th position in 4.0.', __METHOD__), E_USER_DEPRECATED);
+            $message = $filter;
+            $filter = 0;
+        }
+
+        $this->assertSame(rtrim($dump), $this->getDump($data, null, $filter), $message);
+    }
+
+    public function assertDumpMatchesFormat($dump, $data, $filter = 0, $message = '')
+    {
+        if (\is_string($filter)) {
+            @trigger_error(sprintf('The $message argument of the "%s()" method at the 3rd position is deprecated since Symfony 3.4 and will be moved at the 4th position in 4.0.', __METHOD__), E_USER_DEPRECATED);
+            $message = $filter;
+            $filter = 0;
+        }
+
+        $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data, null, $filter), $message);
+    }
+
+    /**
+     * @return string|null
+     */
+    protected function getDump($data, $key = null, $filter = 0)
+    {
+        $flags = getenv('DUMP_LIGHT_ARRAY') ? CliDumper::DUMP_LIGHT_ARRAY : 0;
+        $flags |= getenv('DUMP_STRING_LENGTH') ? CliDumper::DUMP_STRING_LENGTH : 0;
+
+        $cloner = new VarCloner();
+        $cloner->setMaxItems(-1);
+        $dumper = new CliDumper(null, null, $flags);
+        $dumper->setColors(false);
+        $data = $cloner->cloneVar($data, $filter)->withRefHandles(false);
+        if (null !== $key && null === $data = $data->seek($key)) {
+            return null;
+        }
+
+        return rtrim($dumper->dump($data, true));
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/CasterTest.php b/lib/symfony/var-dumper/Tests/Caster/CasterTest.php
new file mode 100644
index 000000000..728697b41
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/CasterTest.php
@@ -0,0 +1,181 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    private $referenceArray = [
+        'null' => null,
+        'empty' => false,
+        'public' => 'pub',
+        "\0~\0virtual" => 'virt',
+        "\0+\0dynamic" => 'dyn',
+        "\0*\0protected" => 'prot',
+        "\0Foo\0private" => 'priv',
+    ];
+
+    /**
+     * @dataProvider provideFilter
+     */
+    public function testFilter($filter, $expectedDiff, $listedProperties = null)
+    {
+        if (null === $listedProperties) {
+            $filteredArray = Caster::filter($this->referenceArray, $filter);
+        } else {
+            $filteredArray = Caster::filter($this->referenceArray, $filter, $listedProperties);
+        }
+
+        $this->assertSame($expectedDiff, array_diff_assoc($this->referenceArray, $filteredArray));
+    }
+
+    public function provideFilter()
+    {
+        return [
+            [
+                0,
+                [],
+            ],
+            [
+                Caster::EXCLUDE_PUBLIC,
+                [
+                    'null' => null,
+                    'empty' => false,
+                    'public' => 'pub',
+                ],
+            ],
+            [
+                Caster::EXCLUDE_NULL,
+                [
+                    'null' => null,
+                ],
+            ],
+            [
+                Caster::EXCLUDE_EMPTY,
+                [
+                    'null' => null,
+                    'empty' => false,
+                ],
+            ],
+            [
+                Caster::EXCLUDE_VIRTUAL,
+                [
+                    "\0~\0virtual" => 'virt',
+                ],
+            ],
+            [
+                Caster::EXCLUDE_DYNAMIC,
+                [
+                    "\0+\0dynamic" => 'dyn',
+                ],
+            ],
+            [
+                Caster::EXCLUDE_PROTECTED,
+                [
+                    "\0*\0protected" => 'prot',
+                ],
+            ],
+            [
+                Caster::EXCLUDE_PRIVATE,
+                [
+                    "\0Foo\0private" => 'priv',
+                ],
+            ],
+            [
+                Caster::EXCLUDE_VERBOSE,
+                [
+                    'public' => 'pub',
+                    "\0*\0protected" => 'prot',
+                ],
+                ['public', "\0*\0protected"],
+            ],
+            [
+                Caster::EXCLUDE_NOT_IMPORTANT,
+                [
+                    'null' => null,
+                    'empty' => false,
+                    "\0~\0virtual" => 'virt',
+                    "\0+\0dynamic" => 'dyn',
+                    "\0Foo\0private" => 'priv',
+                ],
+                ['public', "\0*\0protected"],
+            ],
+            [
+                Caster::EXCLUDE_VIRTUAL | Caster::EXCLUDE_DYNAMIC,
+                [
+                    "\0~\0virtual" => 'virt',
+                    "\0+\0dynamic" => 'dyn',
+                ],
+            ],
+            [
+                Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_VERBOSE,
+                $this->referenceArray,
+                ['public', "\0*\0protected"],
+            ],
+            [
+                Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_EMPTY,
+                [
+                    'null' => null,
+                    'empty' => false,
+                    "\0~\0virtual" => 'virt',
+                    "\0+\0dynamic" => 'dyn',
+                    "\0*\0protected" => 'prot',
+                    "\0Foo\0private" => 'priv',
+                ],
+                ['public', 'empty'],
+            ],
+            [
+                Caster::EXCLUDE_VERBOSE | Caster::EXCLUDE_EMPTY | Caster::EXCLUDE_STRICT,
+                [
+                    'empty' => false,
+                ],
+                ['public', 'empty'],
+            ],
+        ];
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testAnonymousClass()
+    {
+        $c = eval('return new class extends stdClass { private $foo = "foo"; };');
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+stdClass@anonymous {
+  -foo: "foo"
+}
+EOTXT
+            , $c
+        );
+
+        $c = eval('return new class { private $foo = "foo"; };');
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+@anonymous {
+  -foo: "foo"
+}
+EOTXT
+            , $c
+        );
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/DateCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/DateCasterTest.php
new file mode 100644
index 000000000..da8b4d0fa
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/DateCasterTest.php
@@ -0,0 +1,426 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Caster\DateCaster;
+use Symfony\Component\VarDumper\Cloner\Stub;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Dany Maillard <danymaillard93b@gmail.com>
+ */
+class DateCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    /**
+     * @dataProvider provideDateTimes
+     */
+    public function testDumpDateTime($time, $timezone, $xDate, $xTimestamp)
+    {
+        if ((\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID <= 50509) && preg_match('/[-+]\d{2}:\d{2}/', $timezone)) {
+            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
+        }
+
+        $date = new \DateTime($time, new \DateTimeZone($timezone));
+
+        $xDump = <<<EODUMP
+DateTime @$xTimestamp {
+  date: $xDate
+}
+EODUMP;
+
+        $this->assertDumpEquals($xDump, $date);
+    }
+
+    /**
+     * @dataProvider provideDateTimes
+     */
+    public function testCastDateTime($time, $timezone, $xDate, $xTimestamp, $xInfos)
+    {
+        if ((\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID <= 50509) && preg_match('/[-+]\d{2}:\d{2}/', $timezone)) {
+            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
+        }
+
+        $stub = new Stub();
+        $date = new \DateTime($time, new \DateTimeZone($timezone));
+        $cast = DateCaster::castDateTime($date, ['foo' => 'bar'], $stub, false, 0);
+
+        $xDump = <<<EODUMP
+array:1 [
+  "\\x00~\\x00date" => $xDate
+]
+EODUMP;
+
+        $this->assertDumpEquals($xDump, $cast);
+
+        $xDump = <<<EODUMP
+Symfony\Component\VarDumper\Caster\ConstStub {
+  +type: 1
+  +class: "$xDate"
+  +value: "%A$xInfos%A"
+  +cut: 0
+  +handle: 0
+  +refCount: 0
+  +position: 0
+  +attr: []
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $cast["\0~\0date"]);
+    }
+
+    public function provideDateTimes()
+    {
+        return [
+            ['2017-04-30 00:00:00.000000', 'Europe/Zurich', '2017-04-30 00:00:00.0 Europe/Zurich (+02:00)', 1493503200, 'Sunday, April 30, 2017%Afrom now%ADST On'],
+            ['2017-12-31 00:00:00.000000', 'Europe/Zurich', '2017-12-31 00:00:00.0 Europe/Zurich (+01:00)', 1514674800, 'Sunday, December 31, 2017%Afrom now%ADST Off'],
+            ['2017-04-30 00:00:00.000000', '+02:00', '2017-04-30 00:00:00.0 +02:00', 1493503200, 'Sunday, April 30, 2017%Afrom now'],
+
+            ['2017-04-30 00:00:00.100000', '+00:00', '2017-04-30 00:00:00.100 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.120000', '+00:00', '2017-04-30 00:00:00.120 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.123000', '+00:00', '2017-04-30 00:00:00.123 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.123400', '+00:00', '2017-04-30 00:00:00.123400 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.123450', '+00:00', '2017-04-30 00:00:00.123450 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.123456', '+00:00', '2017-04-30 00:00:00.123456 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideIntervals
+     */
+    public function testDumpInterval($intervalSpec, $ms, $invert, $expected)
+    {
+        if ($ms && \PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+            $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
+        }
+
+        $interval = $this->createInterval($intervalSpec, $ms, $invert);
+
+        $xDump = <<<EODUMP
+DateInterval {
+  interval: $expected
+%A}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $interval);
+    }
+
+    /**
+     * @dataProvider provideIntervals
+     */
+    public function testDumpIntervalExcludingVerbosity($intervalSpec, $ms, $invert, $expected)
+    {
+        if ($ms && \PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+            $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
+        }
+
+        $interval = $this->createInterval($intervalSpec, $ms, $invert);
+
+        $xDump = <<<EODUMP
+DateInterval {
+  interval: $expected
+}
+EODUMP;
+
+        $this->assertDumpEquals($xDump, $interval, Caster::EXCLUDE_VERBOSE);
+    }
+
+    /**
+     * @dataProvider provideIntervals
+     */
+    public function testCastInterval($intervalSpec, $ms, $invert, $xInterval, $xSeconds)
+    {
+        if ($ms && \PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+            $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
+        }
+
+        $interval = $this->createInterval($intervalSpec, $ms, $invert);
+        $stub = new Stub();
+
+        $cast = DateCaster::castInterval($interval, ['foo' => 'bar'], $stub, false, Caster::EXCLUDE_VERBOSE);
+
+        $xDump = <<<EODUMP
+array:1 [
+  "\\x00~\\x00interval" => $xInterval
+]
+EODUMP;
+
+        $this->assertDumpEquals($xDump, $cast);
+
+        if (null === $xSeconds) {
+            return;
+        }
+
+        $xDump = <<<EODUMP
+Symfony\Component\VarDumper\Caster\ConstStub {
+  +type: 1
+  +class: "$xInterval"
+  +value: "$xSeconds"
+  +cut: 0
+  +handle: 0
+  +refCount: 0
+  +position: 0
+  +attr: []
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $cast["\0~\0interval"]);
+    }
+
+    public function provideIntervals()
+    {
+        $i = new \DateInterval('PT0S');
+        $ms = ($withMs = \PHP_VERSION_ID >= 70100 && isset($i->f)) ? '.0' : '';
+
+        return [
+            ['PT0S', 0, 0, '0s', '0s'],
+            ['PT0S', 0.1, 0, $withMs ? '+ 00:00:00.100' : '0s', '%is'],
+            ['PT1S', 0, 0, '+ 00:00:01'.$ms, '%is'],
+            ['PT2M', 0, 0, '+ 00:02:00'.$ms, '%is'],
+            ['PT3H', 0, 0, '+ 03:00:00'.$ms, '%ss'],
+            ['P4D', 0, 0, '+ 4d', '%ss'],
+            ['P5M', 0, 0, '+ 5m', null],
+            ['P6Y', 0, 0, '+ 6y', null],
+            ['P1Y2M3DT4H5M6S', 0, 0, '+ 1y 2m 3d 04:05:06'.$ms, null],
+            ['PT1M60S', 0, 0, '+ 00:02:00'.$ms, null],
+            ['PT1H60M', 0, 0, '+ 02:00:00'.$ms, null],
+            ['P1DT24H', 0, 0, '+ 2d', null],
+            ['P1M32D', 0, 0, '+ 1m 32d', null],
+
+            ['PT0S', 0, 1, '0s', '0s'],
+            ['PT0S', 0.1, 1, $withMs ? '- 00:00:00.100' : '0s', '%is'],
+            ['PT1S', 0, 1, '- 00:00:01'.$ms, '%is'],
+            ['PT2M', 0, 1, '- 00:02:00'.$ms, '%is'],
+            ['PT3H', 0, 1, '- 03:00:00'.$ms, '%ss'],
+            ['P4D', 0, 1, '- 4d', '%ss'],
+            ['P5M', 0, 1, '- 5m', null],
+            ['P6Y', 0, 1, '- 6y', null],
+            ['P1Y2M3DT4H5M6S', 0, 1, '- 1y 2m 3d 04:05:06'.$ms, null],
+            ['PT1M60S', 0, 1, '- 00:02:00'.$ms, null],
+            ['PT1H60M', 0, 1, '- 02:00:00'.$ms, null],
+            ['P1DT24H', 0, 1, '- 2d', null],
+            ['P1M32D', 0, 1, '- 1m 32d', null],
+        ];
+    }
+
+    /**
+     * @dataProvider provideTimeZones
+     */
+    public function testDumpTimeZone($timezone, $expected)
+    {
+        if ((\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID <= 50509) && !preg_match('/\w+\/\w+/', $timezone)) {
+            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
+        }
+
+        $timezone = new \DateTimeZone($timezone);
+
+        $xDump = <<<EODUMP
+DateTimeZone {
+  timezone: $expected
+%A}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $timezone);
+    }
+
+    /**
+     * @dataProvider provideTimeZones
+     */
+    public function testDumpTimeZoneExcludingVerbosity($timezone, $expected)
+    {
+        if ((\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID <= 50509) && !preg_match('/\w+\/\w+/', $timezone)) {
+            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
+        }
+
+        $timezone = new \DateTimeZone($timezone);
+
+        $xDump = <<<EODUMP
+DateTimeZone {
+  timezone: $expected
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $timezone, Caster::EXCLUDE_VERBOSE);
+    }
+
+    /**
+     * @dataProvider provideTimeZones
+     */
+    public function testCastTimeZone($timezone, $xTimezone, $xRegion)
+    {
+        if ((\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID <= 50509) && !preg_match('/\w+\/\w+/', $timezone)) {
+            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
+        }
+
+        $timezone = new \DateTimeZone($timezone);
+        $stub = new Stub();
+
+        $cast = DateCaster::castTimeZone($timezone, ['foo' => 'bar'], $stub, false, Caster::EXCLUDE_VERBOSE);
+
+        $xDump = <<<EODUMP
+array:1 [
+  "\\x00~\\x00timezone" => $xTimezone
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $cast);
+
+        $xDump = <<<EODUMP
+Symfony\Component\VarDumper\Caster\ConstStub {
+  +type: 1
+  +class: "$xTimezone"
+  +value: "$xRegion"
+  +cut: 0
+  +handle: 0
+  +refCount: 0
+  +position: 0
+  +attr: []
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $cast["\0~\0timezone"]);
+    }
+
+    public function provideTimeZones()
+    {
+        $xRegion = \extension_loaded('intl') ? '%s' : '';
+
+        return [
+            // type 1 (UTC offset)
+            ['-12:00', '-12:00', ''],
+            ['+00:00', '+00:00', ''],
+            ['+14:00', '+14:00', ''],
+
+            // type 2 (timezone abbreviation)
+            ['GMT', '+00:00', ''],
+            ['a', '+01:00', ''],
+            ['b', '+02:00', ''],
+            ['z', '+00:00', ''],
+
+            // type 3 (timezone identifier)
+            ['Africa/Tunis', 'Africa/Tunis (%s:00)', $xRegion],
+            ['America/Panama', 'America/Panama (%s:00)', $xRegion],
+            ['Asia/Jerusalem', 'Asia/Jerusalem (%s:00)', $xRegion],
+            ['Atlantic/Canary', 'Atlantic/Canary (%s:00)', $xRegion],
+            ['Australia/Perth', 'Australia/Perth (%s:00)', $xRegion],
+            ['Europe/Zurich', 'Europe/Zurich (%s:00)', $xRegion],
+            ['Pacific/Tahiti', 'Pacific/Tahiti (%s:00)', $xRegion],
+        ];
+    }
+
+    /**
+     * @dataProvider providePeriods
+     */
+    public function testDumpPeriod($start, $interval, $end, $options, $expected)
+    {
+        if (\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID < 50620 || (\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70005)) {
+            $this->markTestSkipped();
+        }
+
+        $p = new \DatePeriod(new \DateTime($start), new \DateInterval($interval), \is_int($end) ? $end : new \DateTime($end), $options);
+
+        $xDump = <<<EODUMP
+DatePeriod {
+  period: $expected
+%A}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $p);
+    }
+
+    /**
+     * @dataProvider providePeriods
+     */
+    public function testCastPeriod($start, $interval, $end, $options, $xPeriod, $xDates)
+    {
+        if (\defined('HHVM_VERSION_ID') || \PHP_VERSION_ID < 50620 || (\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70005)) {
+            $this->markTestSkipped();
+        }
+
+        $p = new \DatePeriod(new \DateTime($start), new \DateInterval($interval), \is_int($end) ? $end : new \DateTime($end), $options);
+        $stub = new Stub();
+
+        $cast = DateCaster::castPeriod($p, [], $stub, false, 0);
+
+        $xDump = <<<EODUMP
+array:1 [
+  "\\x00~\\x00period" => $xPeriod
+]
+EODUMP;
+
+        $this->assertDumpEquals($xDump, $cast);
+
+        $xDump = <<<EODUMP
+Symfony\Component\VarDumper\Caster\ConstStub {
+  +type: 1
+  +class: "$xPeriod"
+  +value: "%A$xDates%A"
+  +cut: 0
+  +handle: 0
+  +refCount: 0
+  +position: 0
+  +attr: []
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $cast["\0~\0period"]);
+    }
+
+    public function providePeriods()
+    {
+        $i = new \DateInterval('PT0S');
+        $ms = \PHP_VERSION_ID >= 70100 && isset($i->f) ? '.0' : '';
+
+        $periods = [
+            ['2017-01-01', 'P1D', '2017-01-03', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02'],
+            ['2017-01-01', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01%a2) 2017-01-02'],
+
+            ['2017-01-01', 'P1D', '2017-01-04', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-04 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'],
+            ['2017-01-01', 'P1D', 2, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 3 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'],
+
+            ['2017-01-01', 'P1D', '2017-01-05', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-05 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02%a1 more'],
+            ['2017-01-01', 'P1D', 3, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 4 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03%a1 more'],
+
+            ['2017-01-01', 'P1D', '2017-01-21', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-21 00:00:00.0', '1) 2017-01-01%a17 more'],
+            ['2017-01-01', 'P1D', 19, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 20 time/s', '1) 2017-01-01%a17 more'],
+
+            ['2017-01-01 01:00:00', 'P1D', '2017-01-03 01:00:00', 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) to 2017-01-03 01:00:00.0', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'],
+            ['2017-01-01 01:00:00', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'],
+
+            ['2017-01-01', 'P1DT1H', '2017-01-03', 0, "every + 1d 01:00:00$ms, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0", '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'],
+            ['2017-01-01', 'P1DT1H', 1, 0, "every + 1d 01:00:00$ms, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s", '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'],
+
+            ['2017-01-01', 'P1D', '2017-01-04', \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) to 2017-01-04 00:00:00.0', '1) 2017-01-02%a2) 2017-01-03'],
+            ['2017-01-01', 'P1D', 2, \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) recurring 2 time/s', '1) 2017-01-02%a2) 2017-01-03'],
+        ];
+
+        if (\PHP_VERSION_ID < 70107) {
+            array_walk($periods, function (&$i) { $i[5] = ''; });
+        }
+
+        return $periods;
+    }
+
+    private function createInterval($intervalSpec, $ms, $invert)
+    {
+        $interval = new \DateInterval($intervalSpec);
+        if (\PHP_VERSION_ID >= 70100 && isset($interval->f)) {
+            $interval->f = $ms;
+        }
+        $interval->invert = $invert;
+
+        return $interval;
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
new file mode 100644
index 000000000..738180f5b
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
@@ -0,0 +1,227 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Caster\ExceptionCaster;
+use Symfony\Component\VarDumper\Caster\FrameStub;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+class ExceptionCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    private function getTestException($msg, &$ref = null)
+    {
+        return new \Exception(''.$msg);
+    }
+
+    protected function tearDown()
+    {
+        ExceptionCaster::$srcContext = 1;
+        ExceptionCaster::$traceArgs = true;
+    }
+
+    public function testDefaultSettings()
+    {
+        $ref = ['foo'];
+        $e = $this->getTestException('foo', $ref);
+
+        $expectedDump = <<<'EODUMP'
+Exception {
+  #message: "foo"
+  #code: 0
+  #file: "%sExceptionCasterTest.php"
+  #line: 28
+  trace: {
+    %s%eTests%eCaster%eExceptionCasterTest.php:28 {
+      › {
+      ›     return new \Exception(''.$msg);
+      › }
+    }
+    %s%eTests%eCaster%eExceptionCasterTest.php:40 { …}
+%A
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $e);
+        $this->assertSame(['foo'], $ref);
+    }
+
+    public function testSeek()
+    {
+        $e = $this->getTestException(2);
+
+        $expectedDump = <<<'EODUMP'
+{
+  %s%eTests%eCaster%eExceptionCasterTest.php:28 {
+    › {
+    ›     return new \Exception(''.$msg);
+    › }
+  }
+  %s%eTests%eCaster%eExceptionCasterTest.php:64 { …}
+%A
+EODUMP;
+
+        $this->assertStringMatchesFormat($expectedDump, $this->getDump($e, 'trace'));
+    }
+
+    public function testNoArgs()
+    {
+        $e = $this->getTestException(1);
+        ExceptionCaster::$traceArgs = false;
+
+        $expectedDump = <<<'EODUMP'
+Exception {
+  #message: "1"
+  #code: 0
+  #file: "%sExceptionCasterTest.php"
+  #line: 28
+  trace: {
+    %sExceptionCasterTest.php:28 {
+      › {
+      ›     return new \Exception(''.$msg);
+      › }
+    }
+    %s%eTests%eCaster%eExceptionCasterTest.php:82 { …}
+%A
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $e);
+    }
+
+    public function testNoSrcContext()
+    {
+        $e = $this->getTestException(1);
+        ExceptionCaster::$srcContext = -1;
+
+        $expectedDump = <<<'EODUMP'
+Exception {
+  #message: "1"
+  #code: 0
+  #file: "%sExceptionCasterTest.php"
+  #line: 28
+  trace: {
+    %s%eTests%eCaster%eExceptionCasterTest.php:28
+    %s%eTests%eCaster%eExceptionCasterTest.php:%d
+%A
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $e);
+    }
+
+    public function testHtmlDump()
+    {
+        if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
+            $this->markTestSkipped('A custom file_link_format is defined.');
+        }
+
+        $e = $this->getTestException(1);
+        ExceptionCaster::$srcContext = -1;
+
+        $cloner = new VarCloner();
+        $cloner->setMaxItems(1);
+        $dumper = new HtmlDumper();
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $dump = $dumper->dump($cloner->cloneVar($e)->withRefHandles(false), true);
+
+        $expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>Exception</span> {<samp>
+  #<span class=sf-dump-protected title="Protected property">message</span>: "<span class=sf-dump-str>1</span>"
+  #<span class=sf-dump-protected title="Protected property">code</span>: <span class=sf-dump-num>0</span>
+  #<span class=sf-dump-protected title="Protected property">file</span>: "<span class=sf-dump-str title="%sExceptionCasterTest.php
+%d characters"><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%s%eVarDumper</span><span class=sf-dump-ellipsis>%e</span>Tests%eCaster%eExceptionCasterTest.php</span>"
+  #<span class=sf-dump-protected title="Protected property">line</span>: <span class=sf-dump-num>28</span>
+  <span class=sf-dump-meta>trace</span>: {<samp>
+    <span class=sf-dump-meta title="%sExceptionCasterTest.php
+Stack level %d."><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%s%eVarDumper</span><span class=sf-dump-ellipsis>%e</span>Tests%eCaster%eExceptionCasterTest.php</span>:<span class=sf-dump-num>28</span>
+     &hellip;%d
+  </samp>}
+</samp>}
+</bar>
+EODUMP;
+
+        $this->assertStringMatchesFormat($expectedDump, $dump);
+    }
+
+    /**
+     * @requires function Twig\Template::getSourceContext
+     */
+    public function testFrameWithTwig()
+    {
+        require_once \dirname(__DIR__).'/Fixtures/Twig.php';
+
+        $f = [
+            new FrameStub([
+                'file' => \dirname(__DIR__).'/Fixtures/Twig.php',
+                'line' => 20,
+                'class' => '__TwigTemplate_VarDumperFixture_u75a09',
+            ]),
+            new FrameStub([
+                'file' => \dirname(__DIR__).'/Fixtures/Twig.php',
+                'line' => 21,
+                'class' => '__TwigTemplate_VarDumperFixture_u75a09',
+                'object' => new \__TwigTemplate_VarDumperFixture_u75a09(null, __FILE__),
+            ]),
+        ];
+
+        $expectedDump = <<<'EODUMP'
+array:2 [
+  0 => {
+    class: "__TwigTemplate_VarDumperFixture_u75a09"
+    src: {
+      %sTwig.php:1 {
+        › 
+        › foo bar
+        ›   twig source
+      }
+    }
+  }
+  1 => {
+    class: "__TwigTemplate_VarDumperFixture_u75a09"
+    object: __TwigTemplate_VarDumperFixture_u75a09 {
+    %A
+    }
+    src: {
+      %sExceptionCasterTest.php:2 {
+        › foo bar
+        ›   twig source
+        › 
+      }
+    }
+  }
+]
+
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $f);
+    }
+
+    public function testExcludeVerbosity()
+    {
+        $e = $this->getTestException('foo');
+
+        $expectedDump = <<<'EODUMP'
+Exception {
+  #message: "foo"
+  #code: 0
+  #file: "%sExceptionCasterTest.php"
+  #line: 28
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $e, Caster::EXCLUDE_VERBOSE);
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/PdoCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/PdoCasterTest.php
new file mode 100644
index 000000000..19bbe0f80
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/PdoCasterTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\PdoCaster;
+use Symfony\Component\VarDumper\Cloner\Stub;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class PdoCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    /**
+     * @requires extension pdo_sqlite
+     */
+    public function testCastPdo()
+    {
+        $pdo = new \PDO('sqlite::memory:');
+        $pdo->setAttribute(\PDO::ATTR_STATEMENT_CLASS, ['PDOStatement', [$pdo]]);
+
+        $cast = PdoCaster::castPdo($pdo, [], new Stub(), false);
+
+        $this->assertInstanceOf('Symfony\Component\VarDumper\Caster\EnumStub', $cast["\0~\0attributes"]);
+
+        $attr = $cast["\0~\0attributes"] = $cast["\0~\0attributes"]->value;
+        $this->assertInstanceOf('Symfony\Component\VarDumper\Caster\ConstStub', $attr['CASE']);
+        $this->assertSame('NATURAL', $attr['CASE']->class);
+        $this->assertSame('BOTH', $attr['DEFAULT_FETCH_MODE']->class);
+
+        $xDump = <<<'EODUMP'
+array:2 [
+  "\x00~\x00inTransaction" => false
+  "\x00~\x00attributes" => array:9 [
+    "CASE" => NATURAL
+    "ERRMODE" => SILENT
+    "PERSISTENT" => false
+    "DRIVER_NAME" => "sqlite"
+    "ORACLE_NULLS" => NATURAL
+    "CLIENT_VERSION" => "%s"
+    "SERVER_VERSION" => "%s"
+    "STATEMENT_CLASS" => array:%d [
+      0 => "PDOStatement"%A
+    ]
+    "DEFAULT_FETCH_MODE" => BOTH
+  ]
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $cast);
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/RedisCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
new file mode 100644
index 000000000..ed14494ec
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @requires extension redis
+ */
+class RedisCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testNotConnected()
+    {
+        $redis = new \Redis();
+
+        if (\defined('HHVM_VERSION_ID')) {
+            $xCast = <<<'EODUMP'
+Redis {
+  #host: ""
+%A
+}
+EODUMP;
+        } else {
+            $xCast = <<<'EODUMP'
+Redis {
+  isConnected: false
+}
+EODUMP;
+        }
+
+        $this->assertDumpMatchesFormat($xCast, $redis);
+    }
+
+    public function testConnected()
+    {
+        $redis = new \Redis();
+        if (!@$redis->connect('127.0.0.1')) {
+            $e = error_get_last();
+            self::markTestSkipped($e['message']);
+        }
+
+        if (\defined('HHVM_VERSION_ID')) {
+            $xCast = <<<'EODUMP'
+Redis {
+  #host: "127.0.0.1"
+%A
+}
+EODUMP;
+        } else {
+            $xCast = <<<'EODUMP'
+Redis {%A
+  isConnected: true
+  host: "127.0.0.1"
+  port: 6379
+  auth: null
+  dbNum: 0
+  timeout: 0.0
+  persistentId: null
+  options: {
+    READ_TIMEOUT: 0.0
+    SERIALIZER: NONE
+    PREFIX: null
+    SCAN: NORETRY
+  }
+}
+EODUMP;
+        }
+
+        $this->assertDumpMatchesFormat($xCast, $redis);
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
new file mode 100644
index 000000000..37e14966f
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
@@ -0,0 +1,270 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo;
+use Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ReflectionCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testReflectionCaster()
+    {
+        $var = new \ReflectionClass('ReflectionClass');
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionClass {
+  +name: "ReflectionClass"
+%Aimplements: array:%d [
+    0 => "Reflector"
+%A]
+  constants: array:3 [
+    "IS_IMPLICIT_ABSTRACT" => 16
+    "IS_EXPLICIT_ABSTRACT" => %d
+    "IS_FINAL" => %d
+  ]
+  properties: array:%d [
+    "name" => ReflectionProperty {
+%A    +name: "name"
+      +class: "ReflectionClass"
+%A    modifiers: "public"
+    }
+%A]
+  methods: array:%d [
+%A
+    "export" => ReflectionMethod {
+      +name: "export"
+      +class: "ReflectionClass"
+%A    parameters: {
+        $%s: ReflectionParameter {
+%A         position: 0
+%A
+}
+EOTXT
+            , $var
+        );
+    }
+
+    public function testClosureCaster()
+    {
+        $a = $b = 123;
+        $var = function ($x) use ($a, &$b) {};
+
+        $this->assertDumpMatchesFormat(
+            <<<EOTXT
+Closure {
+%Aparameters: {
+    \$x: {}
+  }
+  use: {
+    \$a: 123
+    \$b: & 123
+  }
+  file: "%sReflectionCasterTest.php"
+  line: "68 to 68"
+}
+EOTXT
+            , $var
+        );
+    }
+
+    public function testFromCallableClosureCaster()
+    {
+        if (\defined('HHVM_VERSION_ID')) {
+            $this->markTestSkipped('Not for HHVM.');
+        }
+        $var = [
+            (new \ReflectionMethod($this, __FUNCTION__))->getClosure($this),
+            (new \ReflectionMethod(__CLASS__, 'tearDownAfterClass'))->getClosure(),
+        ];
+
+        $this->assertDumpMatchesFormat(
+            <<<EOTXT
+array:2 [
+  0 => Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest::testFromCallableClosureCaster {
+    this: Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest { …}
+    file: "%sReflectionCasterTest.php"
+    line: "%d to %d"
+  }
+  1 => %sTestCase::tearDownAfterClass {
+    file: "%sTestCase.php"
+    line: "%d to %d"
+  }
+]
+EOTXT
+            , $var
+        );
+    }
+
+    public function testClosureCasterExcludingVerbosity()
+    {
+        $var = function () {};
+
+        $expectedDump = <<<EOTXT
+Closure {
+  class: "Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest"
+  this: Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest { …}
+}
+EOTXT;
+
+        $this->assertDumpEquals($expectedDump, $var, Caster::EXCLUDE_VERBOSE);
+    }
+
+    public function testReflectionParameter()
+    {
+        $var = new \ReflectionParameter(__NAMESPACE__.'\reflectionParameterFixture', 0);
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionParameter {
+  +name: "arg1"
+  position: 0
+  typeHint: "Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass"
+  default: null
+}
+EOTXT
+            , $var
+        );
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testReflectionParameterScalar()
+    {
+        $f = eval('return function (int $a) {};');
+        $var = new \ReflectionParameter($f, 0);
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionParameter {
+  +name: "a"
+  position: 0
+  typeHint: "int"
+}
+EOTXT
+            , $var
+        );
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testReturnType()
+    {
+        $f = eval('return function ():int {};');
+        $line = __LINE__ - 1;
+
+        $this->assertDumpMatchesFormat(
+            <<<EOTXT
+Closure {
+  returnType: "int"
+  class: "Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest"
+  this: Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest { …}
+  file: "%sReflectionCasterTest.php($line) : eval()'d code"
+  line: "1 to 1"
+}
+EOTXT
+            , $f
+        );
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testGenerator()
+    {
+        if (\extension_loaded('xdebug')) {
+            $this->markTestSkipped('xdebug is active');
+        }
+
+        $generator = new GeneratorDemo();
+        $generator = $generator->baz();
+
+        $expectedDump = <<<'EODUMP'
+Generator {
+  this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
+  executing: {
+    Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() {
+      %sGeneratorDemo.php:14 {
+        › {
+        ›     yield from bar();
+        › }
+      }
+    }
+  }
+  closed: false
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $generator);
+
+        foreach ($generator as $v) {
+            break;
+        }
+
+        $expectedDump = <<<'EODUMP'
+array:2 [
+  0 => ReflectionGenerator {
+    this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
+    trace: {
+      %s%eTests%eFixtures%eGeneratorDemo.php:9 {
+        › {
+        ›     yield 1;
+        › }
+      }
+      %s%eTests%eFixtures%eGeneratorDemo.php:20 { …}
+      %s%eTests%eFixtures%eGeneratorDemo.php:14 { …}
+    }
+    closed: false
+  }
+  1 => Generator {
+    executing: {
+      Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() {
+        %sGeneratorDemo.php:10 {
+          ›     yield 1;
+          › }
+          › 
+        }
+      }
+    }
+    closed: false
+  }
+]
+EODUMP;
+
+        $r = new \ReflectionGenerator($generator);
+        $this->assertDumpMatchesFormat($expectedDump, [$r, $r->getExecutingGenerator()]);
+
+        foreach ($generator as $v) {
+        }
+
+        $expectedDump = <<<'EODUMP'
+Generator {
+  closed: true
+}
+EODUMP;
+        $this->assertDumpMatchesFormat($expectedDump, $generator);
+    }
+}
+
+function reflectionParameterFixture(NotLoadableClass $arg1 = null, $arg2)
+{
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/SplCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/SplCasterTest.php
new file mode 100644
index 000000000..67033df09
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/SplCasterTest.php
@@ -0,0 +1,232 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+class SplCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    public function getCastFileInfoTests()
+    {
+        return [
+            [__FILE__, <<<'EOTXT'
+SplFileInfo {
+%Apath: "%sCaster"
+  filename: "SplCasterTest.php"
+  basename: "SplCasterTest.php"
+  pathname: "%sSplCasterTest.php"
+  extension: "php"
+  realPath: "%sSplCasterTest.php"
+  aTime: %s-%s-%d %d:%d:%d
+  mTime: %s-%s-%d %d:%d:%d
+  cTime: %s-%s-%d %d:%d:%d
+  inode: %i
+  size: %d
+  perms: 0%d
+  owner: %d
+  group: %d
+  type: "file"
+  writable: true
+  readable: true
+  executable: false
+  file: true
+  dir: false
+  link: false
+%A}
+EOTXT
+            ],
+            ['https://example.com/about', <<<'EOTXT'
+SplFileInfo {
+%Apath: "https://example.com"
+  filename: "about"
+  basename: "about"
+  pathname: "https://example.com/about"
+  extension: ""
+  realPath: false
+%A}
+EOTXT
+            ],
+        ];
+    }
+
+    /** @dataProvider getCastFileInfoTests */
+    public function testCastFileInfo($file, $dump)
+    {
+        $this->assertDumpMatchesFormat($dump, new \SplFileInfo($file));
+    }
+
+    public function testCastFileObject()
+    {
+        $var = new \SplFileObject(__FILE__);
+        $var->setFlags(\SplFileObject::DROP_NEW_LINE | \SplFileObject::SKIP_EMPTY);
+        $dump = <<<'EOTXT'
+SplFileObject {
+%Apath: "%sCaster"
+  filename: "SplCasterTest.php"
+  basename: "SplCasterTest.php"
+  pathname: "%sSplCasterTest.php"
+  extension: "php"
+  realPath: "%sSplCasterTest.php"
+  aTime: %s-%s-%d %d:%d:%d
+  mTime: %s-%s-%d %d:%d:%d
+  cTime: %s-%s-%d %d:%d:%d
+  inode: %i
+  size: %d
+  perms: 0%d
+  owner: %d
+  group: %d
+  type: "file"
+  writable: true
+  readable: true
+  executable: false
+  file: true
+  dir: false
+  link: false
+%AcsvControl: array:%d [
+    0 => ","
+    1 => """
+%A]
+  flags: DROP_NEW_LINE|SKIP_EMPTY
+  maxLineLen: 0
+  fstat: array:26 [
+    "dev" => %d
+    "ino" => %i
+    "nlink" => %d
+    "rdev" => 0
+    "blksize" => %i
+    "blocks" => %i
+     …20
+  ]
+  eof: false
+  key: 0
+}
+EOTXT;
+        $this->assertDumpMatchesFormat($dump, $var);
+    }
+
+    /**
+     * @dataProvider provideCastSplDoublyLinkedList
+     */
+    public function testCastSplDoublyLinkedList($modeValue, $modeDump)
+    {
+        $var = new \SplDoublyLinkedList();
+        $var->setIteratorMode($modeValue);
+        $dump = <<<EOTXT
+SplDoublyLinkedList {
+%Amode: $modeDump
+  dllist: []
+}
+EOTXT;
+        $this->assertDumpMatchesFormat($dump, $var);
+    }
+
+    public function provideCastSplDoublyLinkedList()
+    {
+        return [
+            [\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'],
+            [\SplDoublyLinkedList::IT_MODE_LIFO, 'IT_MODE_LIFO | IT_MODE_KEEP'],
+            [\SplDoublyLinkedList::IT_MODE_FIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_FIFO | IT_MODE_DELETE'],
+            [\SplDoublyLinkedList::IT_MODE_LIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_LIFO | IT_MODE_DELETE'],
+        ];
+    }
+
+    public function testCastObjectStorageIsntModified()
+    {
+        $var = new \SplObjectStorage();
+        $var->attach(new \stdClass());
+        $var->rewind();
+        $current = $var->current();
+
+        $this->assertDumpMatchesFormat('%A', $var);
+        $this->assertSame($current, $var->current());
+    }
+
+    public function testCastObjectStorageDumpsInfo()
+    {
+        $var = new \SplObjectStorage();
+        $var->attach(new \stdClass(), new \DateTime());
+
+        $this->assertDumpMatchesFormat('%ADateTime%A', $var);
+    }
+
+    public function testCastArrayObject()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM as different internal details.');
+        }
+        $var = new \ArrayObject([123]);
+        $var->foo = 234;
+
+        $expected = <<<EOTXT
+ArrayObject {
+  +"foo": 234
+  flag::STD_PROP_LIST: false
+  flag::ARRAY_AS_PROPS: false
+  iteratorClass: "ArrayIterator"
+  storage: array:1 [
+    0 => 123
+  ]
+}
+EOTXT;
+        $this->assertDumpEquals($expected, $var);
+    }
+
+    public function testArrayIterator()
+    {
+        if (\defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM as different internal details.');
+        }
+        $var = new MyArrayIterator([234]);
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Tests\Caster\MyArrayIterator {
+  -foo: 123
+  flag::STD_PROP_LIST: false
+  flag::ARRAY_AS_PROPS: false
+  storage: array:1 [
+    0 => 234
+  ]
+}
+EOTXT;
+        $this->assertDumpEquals($expected, $var);
+    }
+
+    public function testBadSplFileInfo()
+    {
+        $var = new BadSplFileInfo();
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Tests\Caster\BadSplFileInfo {
+  ⚠: "The parent constructor was not called: the object is in an invalid state"
+}
+EOTXT;
+        $this->assertDumpEquals($expected, $var);
+    }
+}
+
+class MyArrayIterator extends \ArrayIterator
+{
+    private $foo = 123;
+}
+
+class BadSplFileInfo extends \SplFileInfo
+{
+    public function __construct()
+    {
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/StubCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/StubCasterTest.php
new file mode 100644
index 000000000..945833ebc
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/StubCasterTest.php
@@ -0,0 +1,192 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\ArgsStub;
+use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Caster\LinkStub;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Symfony\Component\VarDumper\Tests\Fixtures\FooInterface;
+
+class StubCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testArgsStubWithDefaults($foo = 234, $bar = 456)
+    {
+        $args = [new ArgsStub([123], __FUNCTION__, __CLASS__)];
+
+        $expectedDump = <<<'EODUMP'
+array:1 [
+  0 => {
+    $foo: 123
+  }
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $args);
+    }
+
+    public function testArgsStubWithExtraArgs($foo = 234)
+    {
+        $args = [new ArgsStub([123, 456], __FUNCTION__, __CLASS__)];
+
+        $expectedDump = <<<'EODUMP'
+array:1 [
+  0 => {
+    $foo: 123
+    ...: {
+      456
+    }
+  }
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $args);
+    }
+
+    public function testArgsStubNoParamWithExtraArgs()
+    {
+        $args = [new ArgsStub([123], __FUNCTION__, __CLASS__)];
+
+        $expectedDump = <<<'EODUMP'
+array:1 [
+  0 => {
+    123
+  }
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $args);
+    }
+
+    public function testArgsStubWithClosure()
+    {
+        $args = [new ArgsStub([123], '{closure}', null)];
+
+        $expectedDump = <<<'EODUMP'
+array:1 [
+  0 => {
+    123
+  }
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $args);
+    }
+
+    public function testLinkStub()
+    {
+        $var = [new LinkStub(__CLASS__, 0, __FILE__)];
+
+        $cloner = new VarCloner();
+        $dumper = new HtmlDumper();
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $dumper->setDisplayOptions(['fileLinkFormat' => '%f:%l']);
+        $dump = $dumper->dump($cloner->cloneVar($var), true);
+
+        $expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<a href="%sStubCasterTest.php:0" rel="noopener noreferrer"><span class=sf-dump-str title="55 characters">Symfony\Component\VarDumper\Tests\Caster\StubCasterTest</span></a>"
+</samp>]
+</bar>
+EODUMP;
+
+        $this->assertStringMatchesFormat($expectedDump, $dump);
+    }
+
+    public function testLinkStubWithNoFileLink()
+    {
+        $var = [new LinkStub('example.com', 0, 'http://example.com')];
+
+        $cloner = new VarCloner();
+        $dumper = new HtmlDumper();
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $dumper->setDisplayOptions(['fileLinkFormat' => '%f:%l']);
+        $dump = $dumper->dump($cloner->cloneVar($var), true);
+
+        $expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<a href="http://example.com" target="_blank" rel="noopener noreferrer"><span class=sf-dump-str title="11 characters">example.com</span></a>"
+</samp>]
+</bar>
+EODUMP;
+
+        $this->assertStringMatchesFormat($expectedDump, $dump);
+    }
+
+    public function testClassStub()
+    {
+        $var = [new ClassStub('hello', [FooInterface::class, 'foo'])];
+
+        $cloner = new VarCloner();
+        $dumper = new HtmlDumper();
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $dump = $dumper->dump($cloner->cloneVar($var), true, ['fileLinkFormat' => '%f:%l']);
+
+        $expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<a href="%sFooInterface.php:10" rel="noopener noreferrer"><span class=sf-dump-str title="5 characters">hello</span></a>"
+</samp>]
+</bar>
+EODUMP;
+
+        $this->assertStringMatchesFormat($expectedDump, $dump);
+    }
+
+    public function testClassStubWithNotExistingClass()
+    {
+        $var = [new ClassStub(NotExisting::class)];
+
+        $cloner = new VarCloner();
+        $dumper = new HtmlDumper();
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $dump = $dumper->dump($cloner->cloneVar($var), true);
+
+        $expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<span class=sf-dump-str title="Symfony\Component\VarDumper\Tests\Caster\NotExisting
+52 characters"><span class="sf-dump-ellipsis sf-dump-ellipsis-class">Symfony\Component\VarDumper\Tests\Caster</span><span class=sf-dump-ellipsis>\</span>NotExisting</span>"
+</samp>]
+</bar>
+EODUMP;
+
+        $this->assertStringMatchesFormat($expectedDump, $dump);
+    }
+
+    public function testClassStubWithNotExistingMethod()
+    {
+        $var = [new ClassStub('hello', [FooInterface::class, 'missing'])];
+
+        $cloner = new VarCloner();
+        $dumper = new HtmlDumper();
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $dump = $dumper->dump($cloner->cloneVar($var), true, ['fileLinkFormat' => '%f:%l']);
+
+        $expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<a href="%sFooInterface.php:5" rel="noopener noreferrer"><span class=sf-dump-str title="5 characters">hello</span></a>"
+</samp>]
+</bar>
+EODUMP;
+
+        $this->assertStringMatchesFormat($expectedDump, $dump);
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Caster/XmlReaderCasterTest.php b/lib/symfony/var-dumper/Tests/Caster/XmlReaderCasterTest.php
new file mode 100644
index 000000000..1d7b3f627
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Caster/XmlReaderCasterTest.php
@@ -0,0 +1,248 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Baptiste Clavié <clavie.b@gmail.com>
+ */
+class XmlReaderCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    /** @var \XmlReader */
+    private $reader;
+
+    protected function setUp()
+    {
+        $this->reader = new \XmlReader();
+        $this->reader->open(__DIR__.'/../Fixtures/xml_reader.xml');
+    }
+
+    protected function tearDown()
+    {
+        $this->reader->close();
+    }
+
+    public function testParserProperty()
+    {
+        $this->reader->setParserProperty(\XMLReader::SUBST_ENTITIES, true);
+
+        $expectedDump = <<<'EODUMP'
+XMLReader {
+  +nodeType: NONE
+  parserProperties: {
+    SUBST_ENTITIES: true
+     …3
+  }
+   …12
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $this->reader);
+    }
+
+    /**
+     * @dataProvider provideNodes
+     */
+    public function testNodes($seek, $expectedDump)
+    {
+        while ($seek--) {
+            $this->reader->read();
+        }
+        $this->assertDumpMatchesFormat($expectedDump, $this->reader);
+    }
+
+    public function provideNodes()
+    {
+        return [
+            [0, <<<'EODUMP'
+XMLReader {
+  +nodeType: NONE
+   …13
+}
+EODUMP
+            ],
+            [1, <<<'EODUMP'
+XMLReader {
+  +localName: "foo"
+  +nodeType: ELEMENT
+  +baseURI: "%sxml_reader.xml"
+   …11
+}
+EODUMP
+            ],
+            [2, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: SIGNIFICANT_WHITESPACE
+  +depth: 1
+  +value: """
+    \n
+        
+    """
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+            ],
+            [3, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: ELEMENT
+  +depth: 1
+  +baseURI: "%sxml_reader.xml"
+   …10
+}
+EODUMP
+            ],
+            [4, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: END_ELEMENT
+  +depth: 1
+  +baseURI: "%sxml_reader.xml"
+   …10
+}
+EODUMP
+            ],
+            [6, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: ELEMENT
+  +depth: 1
+  +isEmptyElement: true
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+            ],
+            [9, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: TEXT
+  +depth: 2
+  +value: "With text"
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+            ],
+            [12, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: ELEMENT
+  +depth: 1
+  +attributeCount: 2
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+            ],
+            [13, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: END_ELEMENT
+  +depth: 1
+  +baseURI: "%sxml_reader.xml"
+   …10
+}
+EODUMP
+            ],
+            [15, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: ELEMENT
+  +depth: 1
+  +attributeCount: 1
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+            ],
+            [16, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: SIGNIFICANT_WHITESPACE
+  +depth: 2
+  +value: """
+    \n
+            
+    """
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+            ],
+            [17, <<<'EODUMP'
+XMLReader {
+  +localName: "baz"
+  +prefix: "baz"
+  +nodeType: ELEMENT
+  +depth: 2
+  +namespaceURI: "http://symfony.com"
+  +baseURI: "%sxml_reader.xml"
+   …8
+}
+EODUMP
+            ],
+            [18, <<<'EODUMP'
+XMLReader {
+  +localName: "baz"
+  +prefix: "baz"
+  +nodeType: END_ELEMENT
+  +depth: 2
+  +namespaceURI: "http://symfony.com"
+  +baseURI: "%sxml_reader.xml"
+   …8
+}
+EODUMP
+            ],
+            [19, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: SIGNIFICANT_WHITESPACE
+  +depth: 2
+  +value: """
+    \n
+        
+    """
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+            ],
+            [21, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: SIGNIFICANT_WHITESPACE
+  +depth: 1
+  +value: "\n"
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+            ],
+            [22, <<<'EODUMP'
+XMLReader {
+  +localName: "foo"
+  +nodeType: END_ELEMENT
+  +baseURI: "%sxml_reader.xml"
+   …11
+}
+EODUMP
+            ],
+        ];
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Cloner/DataTest.php b/lib/symfony/var-dumper/Tests/Cloner/DataTest.php
new file mode 100644
index 000000000..d4b6c24c1
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Cloner/DataTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Cloner;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+
+class DataTest extends TestCase
+{
+    public function testBasicData()
+    {
+        $values = [1 => 123, 4.5, 'abc', null, false];
+        $data = $this->cloneVar($values);
+        $clonedValues = [];
+
+        $this->assertInstanceOf(Data::class, $data);
+        $this->assertCount(\count($values), $data);
+        $this->assertFalse(isset($data->{0}));
+        $this->assertFalse(isset($data[0]));
+
+        foreach ($data as $k => $v) {
+            $this->assertTrue(isset($data->{$k}));
+            $this->assertTrue(isset($data[$k]));
+            $this->assertSame(\gettype($values[$k]), $data->seek($k)->getType());
+            $this->assertSame($values[$k], $data->seek($k)->getValue());
+            $this->assertSame($values[$k], $data->{$k});
+            $this->assertSame($values[$k], $data[$k]);
+            $this->assertSame((string) $values[$k], (string) $data->seek($k));
+
+            $clonedValues[$k] = $v->getValue();
+        }
+
+        $this->assertSame($values, $clonedValues);
+    }
+
+    public function testObject()
+    {
+        $data = $this->cloneVar(new \Exception('foo'));
+
+        $this->assertSame('Exception', $data->getType());
+
+        $this->assertSame('foo', $data->message);
+        $this->assertSame('foo', $data->{Caster::PREFIX_PROTECTED.'message'});
+
+        $this->assertSame('foo', $data['message']);
+        $this->assertSame('foo', $data[Caster::PREFIX_PROTECTED.'message']);
+
+        $this->assertStringMatchesFormat('Exception (count=%d)', (string) $data);
+    }
+
+    public function testArray()
+    {
+        $values = [[], [123]];
+        $data = $this->cloneVar($values);
+
+        $this->assertSame($values, $data->getValue(true));
+
+        $children = $data->getValue();
+
+        $this->assertIsArray($children);
+
+        $this->assertInstanceOf(Data::class, $children[0]);
+        $this->assertInstanceOf(Data::class, $children[1]);
+
+        $this->assertEquals($children[0], $data[0]);
+        $this->assertEquals($children[1], $data[1]);
+
+        $this->assertSame($values[0], $children[0]->getValue(true));
+        $this->assertSame($values[1], $children[1]->getValue(true));
+    }
+
+    public function testStub()
+    {
+        $data = $this->cloneVar([new ClassStub('stdClass')]);
+        $data = $data[0];
+
+        $this->assertSame('string', $data->getType());
+        $this->assertSame('stdClass', $data->getValue());
+        $this->assertSame('stdClass', (string) $data);
+    }
+
+    public function testHardRefs()
+    {
+        $values = [[]];
+        $values[1] = &$values[0];
+        $values[2][0] = &$values[2];
+
+        $data = $this->cloneVar($values);
+
+        $this->assertSame([], $data[0]->getValue());
+        $this->assertSame([], $data[1]->getValue());
+        $this->assertEquals([$data[2]->getValue()], $data[2]->getValue(true));
+
+        $this->assertSame('array (count=3)', (string) $data);
+    }
+
+    private function cloneVar($value)
+    {
+        $cloner = new VarCloner();
+
+        return $cloner->cloneVar($value);
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Cloner/VarClonerTest.php b/lib/symfony/var-dumper/Tests/Cloner/VarClonerTest.php
new file mode 100644
index 000000000..f6784be49
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Cloner/VarClonerTest.php
@@ -0,0 +1,505 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Cloner;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Tests\Fixtures\Php74;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class VarClonerTest extends TestCase
+{
+    public function testMaxIntBoundary()
+    {
+        $data = [PHP_INT_MAX => 123];
+
+        $cloner = new VarCloner();
+        $clone = $cloner->cloneVar($data);
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Cloner\Data Object
+(
+    [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
+        (
+            [0] => Array
+                (
+                    [0] => Array
+                        (
+                            [1] => 1
+                        )
+
+                )
+
+            [1] => Array
+                (
+                    [%s] => 123
+                )
+
+        )
+
+    [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
+    [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+    [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+)
+
+EOTXT;
+        $this->assertSame(sprintf($expected, PHP_INT_MAX), print_r($clone, true));
+    }
+
+    public function testClone()
+    {
+        $json = json_decode('{"1":{"var":"val"},"2":{"var":"val"}}');
+
+        $cloner = new VarCloner();
+        $clone = $cloner->cloneVar($json);
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Cloner\Data Object
+(
+    [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
+        (
+            [0] => Array
+                (
+                    [0] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => 4
+                            [class] => stdClass
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 1
+                            [attr] => Array
+                                (
+                                )
+
+                        )
+
+                )
+
+            [1] => Array
+                (
+                    [\000+\0001] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => 4
+                            [class] => stdClass
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 2
+                            [attr] => Array
+                                (
+                                )
+
+                        )
+
+                    [\000+\0002] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => 4
+                            [class] => stdClass
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 3
+                            [attr] => Array
+                                (
+                                )
+
+                        )
+
+                )
+
+            [2] => Array
+                (
+                    [\000+\000var] => val
+                )
+
+            [3] => Array
+                (
+                    [\000+\000var] => val
+                )
+
+        )
+
+    [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
+    [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+    [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+)
+
+EOTXT;
+        $this->assertStringMatchesFormat($expected, print_r($clone, true));
+    }
+
+    public function testLimits()
+    {
+        // Level 0:
+        $data = [
+            // Level 1:
+            [
+                // Level 2:
+                [
+                    // Level 3:
+                    'Level 3 Item 0',
+                    'Level 3 Item 1',
+                    'Level 3 Item 2',
+                    'Level 3 Item 3',
+                ],
+                [
+                    'Level 3 Item 4',
+                    'Level 3 Item 5',
+                    'Level 3 Item 6',
+                ],
+                [
+                    'Level 3 Item 7',
+                ],
+            ],
+            [
+                [
+                    'Level 3 Item 8',
+                ],
+                'Level 2 Item 0',
+            ],
+            [
+                'Level 2 Item 1',
+            ],
+            'Level 1 Item 0',
+            [
+                // Test setMaxString:
+                'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+                'SHORT',
+            ],
+        ];
+
+        $cloner = new VarCloner();
+        $cloner->setMinDepth(2);
+        $cloner->setMaxItems(5);
+        $cloner->setMaxString(20);
+        $clone = $cloner->cloneVar($data);
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Cloner\Data Object
+(
+    [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
+        (
+            [0] => Array
+                (
+                    [0] => Array
+                        (
+                            [2] => 1
+                        )
+
+                )
+
+            [1] => Array
+                (
+                    [0] => Array
+                        (
+                            [2] => 2
+                        )
+
+                    [1] => Array
+                        (
+                            [2] => 3
+                        )
+
+                    [2] => Array
+                        (
+                            [2] => 4
+                        )
+
+                    [3] => Level 1 Item 0
+                    [4] => Array
+                        (
+                            [2] => 5
+                        )
+
+                )
+
+            [2] => Array
+                (
+                    [0] => Array
+                        (
+                            [2] => 6
+                        )
+
+                    [1] => Array
+                        (
+                            [0] => 2
+                            [2] => 7
+                        )
+
+                    [2] => Array
+                        (
+                            [0] => 1
+                            [2] => 0
+                        )
+
+                )
+
+            [3] => Array
+                (
+                    [0] => Array
+                        (
+                            [0] => 1
+                            [2] => 0
+                        )
+
+                    [1] => Level 2 Item 0
+                )
+
+            [4] => Array
+                (
+                    [0] => Level 2 Item 1
+                )
+
+            [5] => Array
+                (
+                    [0] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => 2
+                            [class] => 2
+                            [value] => ABCDEFGHIJKLMNOPQRST
+                            [cut] => 6
+                            [handle] => 0
+                            [refCount] => 0
+                            [position] => 0
+                            [attr] => Array
+                                (
+                                )
+
+                        )
+
+                    [1] => SHORT
+                )
+
+            [6] => Array
+                (
+                    [0] => Level 3 Item 0
+                    [1] => Level 3 Item 1
+                    [2] => Level 3 Item 2
+                    [3] => Level 3 Item 3
+                )
+
+            [7] => Array
+                (
+                    [0] => Level 3 Item 4
+                )
+
+        )
+
+    [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
+    [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+    [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+)
+
+EOTXT;
+        $this->assertStringMatchesFormat($expected, print_r($clone, true));
+    }
+
+    public function testJsonCast()
+    {
+        if (2 == ini_get('xdebug.overload_var_dump')) {
+            $this->markTestSkipped('xdebug is active');
+        }
+
+        $data = (array) json_decode('{"1":{}}');
+
+        $cloner = new VarCloner();
+        $clone = $cloner->cloneVar($data);
+
+        $expected = <<<'EOTXT'
+object(Symfony\Component\VarDumper\Cloner\Data)#%i (6) {
+  ["data":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  array(2) {
+    [0]=>
+    array(1) {
+      [0]=>
+      array(1) {
+        [1]=>
+        int(1)
+      }
+    }
+    [1]=>
+    array(1) {
+      ["1"]=>
+      object(Symfony\Component\VarDumper\Cloner\Stub)#%i (8) {
+        ["type"]=>
+        int(4)
+        ["class"]=>
+        string(8) "stdClass"
+        ["value"]=>
+        NULL
+        ["cut"]=>
+        int(0)
+        ["handle"]=>
+        int(%i)
+        ["refCount"]=>
+        int(0)
+        ["position"]=>
+        int(0)
+        ["attr"]=>
+        array(0) {
+        }
+      }
+    }
+  }
+  ["position":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(0)
+  ["key":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(0)
+  ["maxDepth":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(20)
+  ["maxItemsPerDepth":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(-1)
+  ["useRefHandles":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(-1)
+}
+
+EOTXT;
+        ob_start();
+        var_dump($clone);
+        $this->assertStringMatchesFormat(\PHP_VERSION_ID >= 70200 ? str_replace('"1"', '1', $expected) : $expected, ob_get_clean());
+    }
+
+    public function testCaster()
+    {
+        $cloner = new VarCloner([
+            '*' => function ($obj, $array) {
+                return ['foo' => 123];
+            },
+            __CLASS__ => function ($obj, $array) {
+                ++$array['foo'];
+
+                return $array;
+            },
+        ]);
+        $clone = $cloner->cloneVar($this);
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Cloner\Data Object
+(
+    [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
+        (
+            [0] => Array
+                (
+                    [0] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => 4
+                            [class] => %s
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 1
+                            [attr] => Array
+                                (
+                                )
+
+                        )
+
+                )
+
+            [1] => Array
+                (
+                    [foo] => 124
+                )
+
+        )
+
+    [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
+    [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+    [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+)
+
+EOTXT;
+        $this->assertStringMatchesFormat($expected, print_r($clone, true));
+    }
+
+    /**
+     * @requires PHP 7.4
+     */
+    public function testPhp74()
+    {
+        $data = new Php74();
+
+        $cloner = new VarCloner();
+        $clone = $cloner->cloneVar($data);
+
+        $expected = <<<'EOTXT'
+Symfony\Component\VarDumper\Cloner\Data Object
+(
+    [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
+        (
+            [0] => Array
+                (
+                    [0] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => 4
+                            [class] => Symfony\Component\VarDumper\Tests\Fixtures\Php74
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 1
+                            [attr] => Array
+                                (
+                                )
+
+                        )
+
+                )
+
+            [1] => Array
+                (
+                    [p1] => 123
+                    [p2] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => 4
+                            [class] => stdClass
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 0
+                            [attr] => Array
+                                (
+                                )
+
+                        )
+
+                )
+
+        )
+
+    [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
+    [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+    [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+)
+
+EOTXT;
+        $this->assertStringMatchesFormat($expected, print_r($clone, true));
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Dumper/CliDumperTest.php b/lib/symfony/var-dumper/Tests/Dumper/CliDumperTest.php
new file mode 100644
index 000000000..9520b4fe1
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Dumper/CliDumperTest.php
@@ -0,0 +1,591 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CliDumperTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testGet()
+    {
+        require __DIR__.'/../Fixtures/dumb-var.php';
+
+        $dumper = new CliDumper('php://output');
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+        $cloner->addCasters([
+            ':stream' => function ($res, $a) {
+                unset($a['uri'], $a['wrapper_data']);
+
+                return $a;
+            },
+        ]);
+        $data = $cloner->cloneVar($var);
+
+        ob_start();
+        $dumper->dump($data);
+        $out = ob_get_clean();
+        $out = preg_replace('/[ \t]+$/m', '', $out);
+        $intMax = PHP_INT_MAX;
+        $res = (int) $var['res'];
+
+        $r = \defined('HHVM_VERSION') ? '' : '#%d';
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+array:24 [
+  "number" => 1
+  0 => &1 null
+  "const" => 1.1
+  1 => true
+  2 => false
+  3 => NAN
+  4 => INF
+  5 => -INF
+  6 => {$intMax}
+  "str" => "déjà\\n"
+  7 => b"é\\x00"
+  "[]" => []
+  "res" => stream resource {@{$res}
+%A  wrapper_type: "plainfile"
+    stream_type: "STDIO"
+    mode: "r"
+    unread_bytes: 0
+    seekable: true
+%A  options: []
+  }
+  "obj" => Symfony\Component\VarDumper\Tests\Fixture\DumbFoo {#%d
+    +foo: "foo"
+    +"bar": "bar"
+  }
+  "closure" => Closure {{$r}
+    class: "Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest"
+    this: Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest {{$r} …}
+    parameters: {
+      \$a: {}
+      &\$b: {
+        typeHint: "PDO"
+        default: null
+      }
+    }
+    file: "%s%eTests%eFixtures%edumb-var.php"
+    line: "{$var['line']} to {$var['line']}"
+  }
+  "line" => {$var['line']}
+  "nobj" => array:1 [
+    0 => &3 {#%d}
+  ]
+  "recurs" => &4 array:1 [
+    0 => &4 array:1 [&4]
+  ]
+  8 => &1 null
+  "sobj" => Symfony\Component\VarDumper\Tests\Fixture\DumbFoo {#%d}
+  "snobj" => &3 {#%d}
+  "snobj2" => {#%d}
+  "file" => "{$var['file']}"
+  b"bin-key-é" => ""
+]
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    /**
+     * @dataProvider provideDumpWithCommaFlagTests
+     */
+    public function testDumpWithCommaFlag($expected, $flags)
+    {
+        $dumper = new CliDumper(null, null, $flags);
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+
+        $var = [
+            'array' => ['a', 'b'],
+            'string' => 'hello',
+            'multiline string' => "this\nis\na\multiline\nstring",
+        ];
+
+        $dump = $dumper->dump($cloner->cloneVar($var), true);
+
+        $this->assertSame($expected, $dump);
+    }
+
+    public function testDumpWithCommaFlagsAndExceptionCodeExcerpt()
+    {
+        $dumper = new CliDumper(null, null, CliDumper::DUMP_TRAILING_COMMA);
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+
+        $ex = new \RuntimeException('foo');
+
+        $dump = $dumper->dump($cloner->cloneVar($ex)->withRefHandles(false), true);
+
+        $this->assertStringMatchesFormat(<<<'EOTXT'
+RuntimeException {
+  #message: "foo"
+  #code: 0
+  #file: "%ACliDumperTest.php"
+  #line: %d
+  trace: {
+    %ACliDumperTest.php:%d {
+      › 
+      › $ex = new \RuntimeException('foo');
+      › 
+    }
+    %A
+  }
+}
+
+EOTXT
+            , $dump);
+    }
+
+    public function provideDumpWithCommaFlagTests()
+    {
+        $expected = <<<'EOTXT'
+array:3 [
+  "array" => array:2 [
+    0 => "a",
+    1 => "b"
+  ],
+  "string" => "hello",
+  "multiline string" => """
+    this\n
+    is\n
+    a\multiline\n
+    string
+    """
+]
+
+EOTXT;
+
+        yield [$expected, CliDumper::DUMP_COMMA_SEPARATOR];
+
+        $expected = <<<'EOTXT'
+array:3 [
+  "array" => array:2 [
+    0 => "a",
+    1 => "b",
+  ],
+  "string" => "hello",
+  "multiline string" => """
+    this\n
+    is\n
+    a\multiline\n
+    string
+    """,
+]
+
+EOTXT;
+
+        yield [$expected, CliDumper::DUMP_TRAILING_COMMA];
+    }
+
+    /**
+     * @requires extension xml
+     */
+    public function testXmlResource()
+    {
+        $var = xml_parser_create();
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+xml resource {
+  current_byte_index: %i
+  current_column_number: %i
+  current_line_number: 1
+  error_code: XML_ERROR_NONE
+}
+EOTXT
+            ,
+            $var
+        );
+    }
+
+    public function testJsonCast()
+    {
+        $var = (array) json_decode('{"0":{},"1":null}');
+        foreach ($var as &$v) {
+        }
+        $var[] = &$v;
+        $var[''] = 2;
+
+        if (\PHP_VERSION_ID >= 70200) {
+            $this->assertDumpMatchesFormat(
+                <<<'EOTXT'
+array:4 [
+  0 => {}
+  1 => &1 null
+  2 => &1 null
+  "" => 2
+]
+EOTXT
+                ,
+                $var
+            );
+        } else {
+            $this->assertDumpMatchesFormat(
+                <<<'EOTXT'
+array:4 [
+  "0" => {}
+  "1" => &1 null
+  0 => &1 null
+  "" => 2
+]
+EOTXT
+                ,
+                $var
+            );
+        }
+    }
+
+    public function testObjectCast()
+    {
+        $var = (object) [1 => 1];
+        $var->{1} = 2;
+
+        if (\PHP_VERSION_ID >= 70200) {
+            $this->assertDumpMatchesFormat(
+                <<<'EOTXT'
+{
+  +"1": 2
+}
+EOTXT
+                ,
+                $var
+            );
+        } else {
+            $this->assertDumpMatchesFormat(
+                <<<'EOTXT'
+{
+  +1: 1
+  +"1": 2
+}
+EOTXT
+                ,
+                $var
+            );
+        }
+    }
+
+    public function testClosedResource()
+    {
+        if (\defined('HHVM_VERSION') && HHVM_VERSION_ID < 30600) {
+            $this->markTestSkipped();
+        }
+
+        $var = fopen(__FILE__, 'r');
+        fclose($var);
+
+        $dumper = new CliDumper('php://output');
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar($var);
+
+        ob_start();
+        $dumper->dump($data);
+        $out = ob_get_clean();
+        $res = (int) $var;
+
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+Closed resource @{$res}
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    public function testFlags()
+    {
+        putenv('DUMP_LIGHT_ARRAY=1');
+        putenv('DUMP_STRING_LENGTH=1');
+
+        $var = [
+            range(1, 3),
+            ['foo', 2 => 'bar'],
+        ];
+
+        $this->assertDumpEquals(
+            <<<EOTXT
+[
+  [
+    1
+    2
+    3
+  ]
+  [
+    0 => (3) "foo"
+    2 => (3) "bar"
+  ]
+]
+EOTXT
+            ,
+            $var
+        );
+
+        putenv('DUMP_LIGHT_ARRAY=');
+        putenv('DUMP_STRING_LENGTH=');
+    }
+
+    /**
+     * @requires function Twig\Template::getSourceContext
+     */
+    public function testThrowingCaster()
+    {
+        $out = fopen('php://memory', 'r+b');
+
+        require_once __DIR__.'/../Fixtures/Twig.php';
+        $twig = new \__TwigTemplate_VarDumperFixture_u75a09(new Environment(new FilesystemLoader()));
+
+        $dumper = new CliDumper();
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+        $cloner->addCasters([
+            ':stream' => function ($res, $a) {
+                unset($a['wrapper_data']);
+
+                return $a;
+            },
+        ]);
+        $cloner->addCasters([
+            ':stream' => eval('return function () use ($twig) {
+                try {
+                    $twig->render([]);
+                } catch (\Twig\Error\RuntimeError $e) {
+                    throw $e->getPrevious();
+                }
+            };'),
+        ]);
+        $ref = (int) $out;
+
+        $data = $cloner->cloneVar($out);
+        $dumper->dump($data, $out);
+        $out = stream_get_contents($out, -1, 0);
+
+        $r = \defined('HHVM_VERSION') ? '' : '#%d';
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+stream resource {@{$ref}
+  ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {{$r}
+    #message: "Unexpected Exception thrown from a caster: Foobar"
+    trace: {
+      %sTwig.php:2 {
+        › foo bar
+        ›   twig source
+        › 
+      }
+      %s%eTemplate.php:%d { …}
+      %s%eTemplate.php:%d { …}
+      %s%eTemplate.php:%d { …}
+      %s%eTests%eDumper%eCliDumperTest.php:%d { …}
+%A  }
+  }
+%Awrapper_type: "PHP"
+  stream_type: "MEMORY"
+  mode: "%s+b"
+  unread_bytes: 0
+  seekable: true
+  uri: "php://memory"
+%Aoptions: []
+}
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    public function testRefsInProperties()
+    {
+        $var = (object) ['foo' => 'foo'];
+        $var->bar = &$var->foo;
+
+        $dumper = new CliDumper();
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+
+        $data = $cloner->cloneVar($var);
+        $out = $dumper->dump($data, true);
+
+        $r = \defined('HHVM_VERSION') ? '' : '#%d';
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+{{$r}
+  +"foo": &1 "foo"
+  +"bar": &1 "foo"
+}
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     * @requires PHP 5.6
+     */
+    public function testSpecialVars56()
+    {
+        $var = $this->getSpecialVars();
+
+        $this->assertDumpEquals(
+            <<<'EOTXT'
+array:3 [
+  0 => array:1 [
+    0 => &1 array:1 [
+      0 => &1 array:1 [&1]
+    ]
+  ]
+  1 => array:1 [
+    "GLOBALS" => &2 array:1 [
+      "GLOBALS" => &2 array:1 [&2]
+    ]
+  ]
+  2 => &2 array:1 [&2]
+]
+EOTXT
+            ,
+            $var
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testGlobalsNoExt()
+    {
+        $var = $this->getSpecialVars();
+        unset($var[0]);
+        $out = '';
+
+        $dumper = new CliDumper(function ($line, $depth) use (&$out) {
+            if ($depth >= 0) {
+                $out .= str_repeat('  ', $depth).$line."\n";
+            }
+        });
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+
+        $refl = new \ReflectionProperty($cloner, 'useExt');
+        $refl->setAccessible(true);
+        $refl->setValue($cloner, false);
+
+        $data = $cloner->cloneVar($var);
+        $dumper->dump($data);
+
+        $this->assertSame(
+            <<<'EOTXT'
+array:2 [
+  1 => array:1 [
+    "GLOBALS" => &1 array:1 [
+      "GLOBALS" => &1 array:1 [&1]
+    ]
+  ]
+  2 => &1 array:1 [&1]
+]
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testBuggyRefs()
+    {
+        if (\PHP_VERSION_ID >= 50600) {
+            $this->markTestSkipped('PHP 5.6 fixed refs counting');
+        }
+
+        $var = $this->getSpecialVars();
+        $var = $var[0];
+
+        $dumper = new CliDumper();
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+
+        $data = $cloner->cloneVar($var)->withMaxDepth(3);
+        $out = '';
+        $dumper->dump($data, function ($line, $depth) use (&$out) {
+            if ($depth >= 0) {
+                $out .= str_repeat('  ', $depth).$line."\n";
+            }
+        });
+
+        $this->assertSame(
+            <<<'EOTXT'
+array:1 [
+  0 => array:1 [
+    0 => array:1 [
+      0 => array:1 [ …1]
+    ]
+  ]
+]
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    public function testIncompleteClass()
+    {
+        $unserializeCallbackHandler = ini_set('unserialize_callback_func', null);
+        $var = unserialize('O:8:"Foo\Buzz":0:{}');
+        ini_set('unserialize_callback_func', $unserializeCallbackHandler);
+
+        $this->assertDumpMatchesFormat(
+            <<<EOTXT
+__PHP_Incomplete_Class(Foo\Buzz) {}
+EOTXT
+            ,
+            $var
+        );
+    }
+
+    private function getSpecialVars()
+    {
+        foreach (array_keys($GLOBALS) as $var) {
+            if ('GLOBALS' !== $var) {
+                unset($GLOBALS[$var]);
+            }
+        }
+
+        $var = function &() {
+            $var = [];
+            $var[] = &$var;
+
+            return $var;
+        };
+
+        return [$var(), $GLOBALS, &$GLOBALS];
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Dumper/FunctionsTest.php b/lib/symfony/var-dumper/Tests/Dumper/FunctionsTest.php
new file mode 100644
index 000000000..7444d4bf5
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Dumper/FunctionsTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\VarDumper;
+
+class FunctionsTest extends TestCase
+{
+    public function testDumpReturnsFirstArg()
+    {
+        $this->setupVarDumper();
+
+        $var1 = 'a';
+
+        ob_start();
+        $return = dump($var1);
+        ob_end_clean();
+
+        $this->assertEquals($var1, $return);
+    }
+
+    public function testDumpReturnsAllArgsInArray()
+    {
+        $this->setupVarDumper();
+
+        $var1 = 'a';
+        $var2 = 'b';
+        $var3 = 'c';
+
+        ob_start();
+        $return = dump($var1, $var2, $var3);
+        ob_end_clean();
+
+        $this->assertEquals([$var1, $var2, $var3], $return);
+    }
+
+    protected function setupVarDumper()
+    {
+        $cloner = new VarCloner();
+        $dumper = new CliDumper('php://output');
+        VarDumper::setHandler(function ($var) use ($cloner, $dumper) {
+            $dumper->dump($cloner->cloneVar($var));
+        });
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php b/lib/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php
new file mode 100644
index 000000000..8a7e68ebf
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php
@@ -0,0 +1,168 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class HtmlDumperTest extends TestCase
+{
+    public function testGet()
+    {
+        if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
+            $this->markTestSkipped('A custom file_link_format is defined.');
+        }
+
+        require __DIR__.'/../Fixtures/dumb-var.php';
+
+        $dumper = new HtmlDumper('php://output');
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $cloner = new VarCloner();
+        $cloner->addCasters([
+            ':stream' => function ($res, $a) {
+                unset($a['uri'], $a['wrapper_data']);
+
+                return $a;
+            },
+        ]);
+        $data = $cloner->cloneVar($var);
+
+        ob_start();
+        $dumper->dump($data);
+        $out = ob_get_clean();
+        $out = preg_replace('/[ \t]+$/m', '', $out);
+        $var['file'] = htmlspecialchars($var['file'], ENT_QUOTES, 'UTF-8');
+        $intMax = PHP_INT_MAX;
+        preg_match('/sf-dump-\d+/', $out, $dumpId);
+        $dumpId = $dumpId[0];
+        $res = (int) $var['res'];
+
+        $r = \defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+<foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp>
+  "<span class=sf-dump-key>number</span>" => <span class=sf-dump-num>1</span>
+  <span class=sf-dump-key>0</span> => <a class=sf-dump-ref href=#{$dumpId}-ref01 title="2 occurrences">&amp;1</a> <span class=sf-dump-const>null</span>
+  "<span class=sf-dump-key>const</span>" => <span class=sf-dump-num>1.1</span>
+  <span class=sf-dump-key>1</span> => <span class=sf-dump-const>true</span>
+  <span class=sf-dump-key>2</span> => <span class=sf-dump-const>false</span>
+  <span class=sf-dump-key>3</span> => <span class=sf-dump-num>NAN</span>
+  <span class=sf-dump-key>4</span> => <span class=sf-dump-num>INF</span>
+  <span class=sf-dump-key>5</span> => <span class=sf-dump-num>-INF</span>
+  <span class=sf-dump-key>6</span> => <span class=sf-dump-num>{$intMax}</span>
+  "<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;<span class=sf-dump-default>\\n</span></span>"
+  <span class=sf-dump-key>7</span> => b"<span class=sf-dump-str title="2 binary or non-UTF-8 characters">&%s;<span class=sf-dump-default>\\x00</span></span>"
+  "<span class=sf-dump-key>[]</span>" => []
+  "<span class=sf-dump-key>res</span>" => <span class=sf-dump-note>stream resource</span> <a class=sf-dump-ref>@{$res}</a><samp>
+%A  <span class=sf-dump-meta>wrapper_type</span>: "<span class=sf-dump-str title="9 characters">plainfile</span>"
+    <span class=sf-dump-meta>stream_type</span>: "<span class=sf-dump-str title="5 characters">STDIO</span>"
+    <span class=sf-dump-meta>mode</span>: "<span class=sf-dump-str>r</span>"
+    <span class=sf-dump-meta>unread_bytes</span>: <span class=sf-dump-num>0</span>
+    <span class=sf-dump-meta>seekable</span>: <span class=sf-dump-const>true</span>
+%A  <span class=sf-dump-meta>options</span>: []
+  </samp>}
+  "<span class=sf-dump-key>obj</span>" => <abbr title="Symfony\Component\VarDumper\Tests\Fixture\DumbFoo" class=sf-dump-note>DumbFoo</abbr> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="2 occurrences">#%d</a><samp id={$dumpId}-ref2%d>
+    +<span class=sf-dump-public title="Public property">foo</span>: "<span class=sf-dump-str title="3 characters">foo</span>"
+    +"<span class=sf-dump-public title="Runtime added dynamic property">bar</span>": "<span class=sf-dump-str title="3 characters">bar</span>"
+  </samp>}
+  "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {{$r}<samp>
+    <span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest
+55 characters"><span class="sf-dump-ellipsis sf-dump-ellipsis-class">Symfony\Component\VarDumper\Tests\Dumper</span><span class=sf-dump-ellipsis>\</span>HtmlDumperTest</span>"
+    <span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {{$r} &%s;}
+    <span class=sf-dump-meta>parameters</span>: {<samp>
+      <span class=sf-dump-meta>\$a</span>: {}
+      <span class=sf-dump-meta>&amp;\$b</span>: {<samp>
+        <span class=sf-dump-meta>typeHint</span>: "<span class=sf-dump-str title="3 characters">PDO</span>"
+        <span class=sf-dump-meta>default</span>: <span class=sf-dump-const>null</span>
+      </samp>}
+    </samp>}
+    <span class=sf-dump-meta>file</span>: "<span class=sf-dump-str title="{$var['file']}
+%d characters"><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%s%eVarDumper</span><span class=sf-dump-ellipsis>%e</span>Tests%eFixtures%edumb-var.php</span>"
+    <span class=sf-dump-meta>line</span>: "<span class=sf-dump-str title="%d characters">{$var['line']} to {$var['line']}</span>"
+  </samp>}
+  "<span class=sf-dump-key>line</span>" => <span class=sf-dump-num>{$var['line']}</span>
+  "<span class=sf-dump-key>nobj</span>" => <span class=sf-dump-note>array:1</span> [<samp>
+    <span class=sf-dump-index>0</span> => <a class=sf-dump-ref href=#{$dumpId}-ref03 title="2 occurrences">&amp;3</a> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="3 occurrences">#%d</a>}
+  </samp>]
+  "<span class=sf-dump-key>recurs</span>" => <a class=sf-dump-ref href=#{$dumpId}-ref04 title="2 occurrences">&amp;4</a> <span class=sf-dump-note>array:1</span> [<samp id={$dumpId}-ref04>
+    <span class=sf-dump-index>0</span> => <a class=sf-dump-ref href=#{$dumpId}-ref04 title="2 occurrences">&amp;4</a> <span class=sf-dump-note>array:1</span> [<a class=sf-dump-ref href=#{$dumpId}-ref04 title="2 occurrences">&amp;4</a>]
+  </samp>]
+  <span class=sf-dump-key>8</span> => <a class=sf-dump-ref href=#{$dumpId}-ref01 title="2 occurrences">&amp;1</a> <span class=sf-dump-const>null</span>
+  "<span class=sf-dump-key>sobj</span>" => <abbr title="Symfony\Component\VarDumper\Tests\Fixture\DumbFoo" class=sf-dump-note>DumbFoo</abbr> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="2 occurrences">#%d</a>}
+  "<span class=sf-dump-key>snobj</span>" => <a class=sf-dump-ref href=#{$dumpId}-ref03 title="2 occurrences">&amp;3</a> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="3 occurrences">#%d</a>}
+  "<span class=sf-dump-key>snobj2</span>" => {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="3 occurrences">#%d</a>}
+  "<span class=sf-dump-key>file</span>" => "<span class=sf-dump-str title="%d characters">{$var['file']}</span>"
+  b"<span class=sf-dump-key>bin-key-&%s;</span>" => ""
+</samp>]
+</bar>
+
+EOTXT
+            ,
+
+            $out
+        );
+    }
+
+    public function testCharset()
+    {
+        $var = mb_convert_encoding('Словарь', 'CP1251', 'UTF-8');
+
+        $dumper = new HtmlDumper('php://output', 'CP1251');
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $cloner = new VarCloner();
+
+        $data = $cloner->cloneVar($var);
+        $out = $dumper->dump($data, true);
+
+        $this->assertStringMatchesFormat(
+            <<<'EOTXT'
+<foo></foo><bar>b"<span class=sf-dump-str title="7 binary or non-UTF-8 characters">&#1057;&#1083;&#1086;&#1074;&#1072;&#1088;&#1100;</span>"
+</bar>
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    public function testAppend()
+    {
+        $out = fopen('php://memory', 'r+b');
+
+        $dumper = new HtmlDumper();
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $cloner = new VarCloner();
+
+        $dumper->dump($cloner->cloneVar(123), $out);
+        $dumper->dump($cloner->cloneVar(456), $out);
+
+        $out = stream_get_contents($out, -1, 0);
+
+        $this->assertSame(<<<'EOTXT'
+<foo></foo><bar><span class=sf-dump-num>123</span>
+</bar>
+<bar><span class=sf-dump-num>456</span>
+</bar>
+
+EOTXT
+            ,
+            $out
+        );
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Fixtures/FooInterface.php b/lib/symfony/var-dumper/Tests/Fixtures/FooInterface.php
new file mode 100644
index 000000000..874110a5b
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Fixtures/FooInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+interface FooInterface
+{
+    /**
+     * Hello.
+     */
+    public function foo();
+}
diff --git a/lib/symfony/var-dumper/Tests/Fixtures/GeneratorDemo.php b/lib/symfony/var-dumper/Tests/Fixtures/GeneratorDemo.php
new file mode 100644
index 000000000..e2d24c8c0
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Fixtures/GeneratorDemo.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+class GeneratorDemo
+{
+    public static function foo()
+    {
+        yield 1;
+    }
+
+    public function baz()
+    {
+        yield from bar();
+    }
+}
+
+function bar()
+{
+    yield from GeneratorDemo::foo();
+}
diff --git a/lib/symfony/var-dumper/Tests/Fixtures/NotLoadableClass.php b/lib/symfony/var-dumper/Tests/Fixtures/NotLoadableClass.php
new file mode 100644
index 000000000..d8e0cb359
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Fixtures/NotLoadableClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+class NotLoadableClass extends NotLoadableClass
+{
+}
diff --git a/lib/symfony/var-dumper/Tests/Fixtures/Php74.php b/lib/symfony/var-dumper/Tests/Fixtures/Php74.php
new file mode 100644
index 000000000..724fbeb7b
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Fixtures/Php74.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+class Php74
+{
+    public $p1 = 123;
+    public \stdClass $p2;
+
+    public function __construct()
+    {
+        $this->p2 = new \stdClass();
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Fixtures/Twig.php b/lib/symfony/var-dumper/Tests/Fixtures/Twig.php
new file mode 100644
index 000000000..8b84d820f
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Fixtures/Twig.php
@@ -0,0 +1,38 @@
+<?php
+
+/* foo.twig */
+class __TwigTemplate_VarDumperFixture_u75a09 extends Twig\Template
+{
+    private $path;
+
+    public function __construct(Twig\Environment $env = null, $path = null)
+    {
+        if (null !== $env) {
+            parent::__construct($env);
+        }
+        $this->parent = false;
+        $this->blocks = [];
+        $this->path = $path;
+    }
+
+    protected function doDisplay(array $context, array $blocks = [])
+    {
+        // line 2
+        throw new \Exception('Foobar');
+    }
+
+    public function getTemplateName()
+    {
+        return 'foo.twig';
+    }
+
+    public function getDebugInfo()
+    {
+        return [20 => 1, 21 => 2];
+    }
+
+    public function getSourceContext()
+    {
+        return new Twig\Source("   foo bar\n     twig source\n\n", 'foo.twig', $this->path ?: __FILE__);
+    }
+}
diff --git a/lib/symfony/var-dumper/Tests/Fixtures/dumb-var.php b/lib/symfony/var-dumper/Tests/Fixtures/dumb-var.php
new file mode 100644
index 000000000..de51cebc2
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Fixtures/dumb-var.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixture;
+
+if (!class_exists('Symfony\Component\VarDumper\Tests\Fixture\DumbFoo')) {
+    class DumbFoo
+    {
+        public $foo = 'foo';
+    }
+}
+
+$foo = new DumbFoo();
+$foo->bar = 'bar';
+
+$g = fopen(__FILE__, 'r');
+
+$var = [
+    'number' => 1, null,
+    'const' => 1.1, true, false, NAN, INF, -INF, PHP_INT_MAX,
+    'str' => "déjà\n", "\xE9\x00",
+    '[]' => [],
+    'res' => $g,
+    'obj' => $foo,
+    'closure' => function ($a, \PDO &$b = null) {},
+    'line' => __LINE__ - 1,
+    'nobj' => [(object) []],
+];
+
+$r = [];
+$r[] = &$r;
+
+$var['recurs'] = &$r;
+$var[] = &$var[0];
+$var['sobj'] = $var['obj'];
+$var['snobj'] = &$var['nobj'][0];
+$var['snobj2'] = $var['nobj'][0];
+$var['file'] = __FILE__;
+$var["bin-key-\xE9"] = '';
+
+unset($g, $r);
diff --git a/lib/symfony/var-dumper/Tests/Fixtures/xml_reader.xml b/lib/symfony/var-dumper/Tests/Fixtures/xml_reader.xml
new file mode 100644
index 000000000..740c399fc
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Fixtures/xml_reader.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<foo>
+    <bar></bar>
+    <bar />
+    <bar>With text</bar>
+    <bar foo="bar" baz="fubar"></bar>
+    <bar xmlns:baz="http://symfony.com">
+        <baz:baz></baz:baz>
+    </bar>
+</foo>
diff --git a/lib/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php b/lib/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
new file mode 100644
index 000000000..18042fb3b
--- /dev/null
+++ b/lib/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Test;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+class VarDumperTestTraitTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testItComparesLargeData()
+    {
+        $howMany = 700;
+        $data = array_fill_keys(range(0, $howMany), ['a', 'b', 'c', 'd']);
+
+        $expected = sprintf("array:%d [\n", $howMany + 1);
+        for ($i = 0; $i <= $howMany; ++$i) {
+            $expected .= <<<EODUMP
+  $i => array:4 [
+    0 => "a"
+    1 => "b"
+    2 => "c"
+    3 => "d"
+  ]\n
+EODUMP;
+        }
+        $expected .= "]\n";
+
+        $this->assertDumpEquals($expected, $data);
+    }
+}
diff --git a/lib/symfony/web-profiler-bundle/Tests/Controller/ProfilerControllerTest.php b/lib/symfony/web-profiler-bundle/Tests/Controller/ProfilerControllerTest.php
new file mode 100644
index 000000000..c55c67e53
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/Controller/ProfilerControllerTest.php
@@ -0,0 +1,200 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController;
+use Symfony\Bundle\WebProfilerBundle\Csp\ContentSecurityPolicyHandler;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Profiler\Profile;
+
+class ProfilerControllerTest extends TestCase
+{
+    /**
+     * @dataProvider getEmptyTokenCases
+     */
+    public function testEmptyToken($token)
+    {
+        $urlGenerator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock();
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $profiler = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $controller = new ProfilerController($urlGenerator, $profiler, $twig, []);
+
+        $response = $controller->toolbarAction(Request::create('/_wdt/empty'), $token);
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    public function getEmptyTokenCases()
+    {
+        return [
+            [null],
+            // "empty" is also a valid empty token case, see https://github.com/symfony/symfony/issues/10806
+            ['empty'],
+        ];
+    }
+
+    /**
+     * @dataProvider getOpenFileCases
+     */
+    public function testOpeningDisallowedPaths($path, $isAllowed)
+    {
+        $urlGenerator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock();
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $profiler = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $controller = new ProfilerController($urlGenerator, $profiler, $twig, [], 'bottom', null, __DIR__.'/../..');
+
+        try {
+            $response = $controller->openAction(Request::create('/_wdt/open', Request::METHOD_GET, ['file' => $path]));
+            $this->assertEquals(200, $response->getStatusCode());
+            $this->assertTrue($isAllowed);
+        } catch (NotFoundHttpException $e) {
+            $this->assertFalse($isAllowed);
+        }
+    }
+
+    public function getOpenFileCases()
+    {
+        return [
+            ['README.md', true],
+            ['composer.json', true],
+            ['Controller/ProfilerController.php', true],
+            ['.gitignore', false],
+            ['../TwigBundle/README.md', false],
+            ['Controller/../README.md', false],
+            ['Controller/./ProfilerController.php', false],
+        ];
+    }
+
+    /**
+     * @dataProvider provideCspVariants
+     */
+    public function testReturns404onTokenNotFound($withCsp)
+    {
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $profiler = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $profiler
+            ->expects($this->exactly(2))
+            ->method('loadProfile')
+            ->willReturnCallback(function ($token) {
+                return 'found' == $token ? new Profile($token) : null;
+            })
+        ;
+
+        $controller = $this->createController($profiler, $twig, $withCsp);
+
+        $response = $controller->toolbarAction(Request::create('/_wdt/found'), 'found');
+        $this->assertEquals(200, $response->getStatusCode());
+
+        $response = $controller->toolbarAction(Request::create('/_wdt/notFound'), 'notFound');
+        $this->assertEquals(404, $response->getStatusCode());
+    }
+
+    /**
+     * @dataProvider provideCspVariants
+     */
+    public function testSearchResult($withCsp)
+    {
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $profiler = $this
+            ->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $controller = $this->createController($profiler, $twig, $withCsp);
+
+        $tokens = [
+            [
+                'token' => 'token1',
+                'ip' => '127.0.0.1',
+                'method' => 'GET',
+                'url' => 'http://example.com/',
+                'time' => 0,
+                'parent' => null,
+                'status_code' => 200,
+            ],
+            [
+                'token' => 'token2',
+                'ip' => '127.0.0.1',
+                'method' => 'GET',
+                'url' => 'http://example.com/not_found',
+                'time' => 0,
+                'parent' => null,
+                'status_code' => 404,
+            ],
+        ];
+        $profiler
+            ->expects($this->once())
+            ->method('find')
+            ->willReturn($tokens);
+
+        $request = Request::create('/_profiler/empty/search/results', 'GET', [
+            'limit' => 2,
+            'ip' => '127.0.0.1',
+            'method' => 'GET',
+            'url' => 'http://example.com/',
+        ]);
+
+        $twig->expects($this->once())
+            ->method('render')
+            ->with($this->stringEndsWith('results.html.twig'), $this->equalTo([
+                'token' => 'empty',
+                'profile' => null,
+                'tokens' => $tokens,
+                'ip' => '127.0.0.1',
+                'method' => 'GET',
+                'status_code' => null,
+                'url' => 'http://example.com/',
+                'start' => null,
+                'end' => null,
+                'limit' => 2,
+                'panel' => null,
+                'request' => $request,
+            ]));
+
+        $response = $controller->searchResultsAction($request, 'empty');
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    public function provideCspVariants()
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
+
+    private function createController($profiler, $twig, $withCSP)
+    {
+        $urlGenerator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock();
+
+        if ($withCSP) {
+            $nonceGenerator = $this->getMockBuilder('Symfony\Bundle\WebProfilerBundle\Csp\NonceGenerator')->getMock();
+
+            return new ProfilerController($urlGenerator, $profiler, $twig, [], 'bottom', new ContentSecurityPolicyHandler($nonceGenerator));
+        }
+
+        return new ProfilerController($urlGenerator, $profiler, $twig, []);
+    }
+}
diff --git a/lib/symfony/web-profiler-bundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php b/lib/symfony/web-profiler-bundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
new file mode 100644
index 000000000..acccc7cbf
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
@@ -0,0 +1,207 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests\Csp;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\WebProfilerBundle\Csp\ContentSecurityPolicyHandler;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class ContentSecurityPolicyHandlerTest extends TestCase
+{
+    /**
+     * @dataProvider provideRequestAndResponses
+     */
+    public function testGetNonces($nonce, $expectedNonce, Request $request, Response $response)
+    {
+        $cspHandler = new ContentSecurityPolicyHandler($this->mockNonceGenerator($nonce));
+
+        $this->assertSame($expectedNonce, $cspHandler->getNonces($request, $response));
+    }
+
+    /**
+     * @dataProvider provideRequestAndResponsesForOnKernelResponse
+     */
+    public function testOnKernelResponse($nonce, $expectedNonce, Request $request, Response $response, array $expectedCsp)
+    {
+        $cspHandler = new ContentSecurityPolicyHandler($this->mockNonceGenerator($nonce));
+
+        $this->assertSame($expectedNonce, $cspHandler->updateResponseHeaders($request, $response));
+
+        $this->assertFalse($response->headers->has('X-SymfonyProfiler-Script-Nonce'));
+        $this->assertFalse($response->headers->has('X-SymfonyProfiler-Style-Nonce'));
+
+        foreach ($expectedCsp as $header => $value) {
+            $this->assertSame($value, $response->headers->get($header));
+        }
+    }
+
+    public function provideRequestAndResponses()
+    {
+        $nonce = bin2hex(random_bytes(16));
+
+        $requestScriptNonce = 'request-with-headers-script-nonce';
+        $requestStyleNonce = 'request-with-headers-style-nonce';
+
+        $responseScriptNonce = 'response-with-headers-script-nonce';
+        $responseStyleNonce = 'response-with-headers-style-nonce';
+
+        $requestNonceHeaders = [
+            'X-SymfonyProfiler-Script-Nonce' => $requestScriptNonce,
+            'X-SymfonyProfiler-Style-Nonce' => $requestStyleNonce,
+        ];
+        $responseNonceHeaders = [
+            'X-SymfonyProfiler-Script-Nonce' => $responseScriptNonce,
+            'X-SymfonyProfiler-Style-Nonce' => $responseStyleNonce,
+        ];
+
+        return [
+            [$nonce, ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce], $this->createRequest(), $this->createResponse()],
+            [$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce], $this->createRequest($requestNonceHeaders), $this->createResponse($responseNonceHeaders)],
+            [$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce], $this->createRequest($requestNonceHeaders), $this->createResponse()],
+            [$nonce, ['csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce], $this->createRequest(), $this->createResponse($responseNonceHeaders)],
+        ];
+    }
+
+    public function provideRequestAndResponsesForOnKernelResponse()
+    {
+        $nonce = bin2hex(random_bytes(16));
+
+        $requestScriptNonce = 'request-with-headers-script-nonce';
+        $requestStyleNonce = 'request-with-headers-style-nonce';
+
+        $responseScriptNonce = 'response-with-headers-script-nonce';
+        $responseStyleNonce = 'response-with-headers-style-nonce';
+
+        $requestNonceHeaders = [
+            'X-SymfonyProfiler-Script-Nonce' => $requestScriptNonce,
+            'X-SymfonyProfiler-Style-Nonce' => $requestStyleNonce,
+        ];
+        $responseNonceHeaders = [
+            'X-SymfonyProfiler-Script-Nonce' => $responseScriptNonce,
+            'X-SymfonyProfiler-Style-Nonce' => $responseStyleNonce,
+        ];
+
+        return [
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(),
+                ['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce],
+                $this->createRequest($requestNonceHeaders),
+                $this->createResponse($responseNonceHeaders),
+                ['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce],
+                $this->createRequest($requestNonceHeaders),
+                $this->createResponse(),
+                ['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce],
+                $this->createRequest(),
+                $this->createResponse($responseNonceHeaders),
+                ['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(['Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:']),
+                ['Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:', 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'']),
+                ['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'; style-src \'self\' domain.com \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'; style-src \'self\' domain-report-only.com \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'']),
+                ['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(['Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'']),
+                ['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'']),
+                ['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\'']),
+                ['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\'']),
+                ['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null],
+            ],
+            [
+                $nonce,
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
+                $this->createRequest(),
+                $this->createResponse(['Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\'']),
+                ['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\''],
+            ],
+        ];
+    }
+
+    private function createRequest(array $headers = [])
+    {
+        $request = new Request();
+        $request->headers->add($headers);
+
+        return $request;
+    }
+
+    private function createResponse(array $headers = [])
+    {
+        $response = new Response();
+        $response->headers->add($headers);
+
+        return $response;
+    }
+
+    private function mockNonceGenerator($value)
+    {
+        $generator = $this->getMockBuilder('Symfony\Bundle\WebProfilerBundle\Csp\NonceGenerator')->getMock();
+
+        $generator->expects($this->any())
+            ->method('generate')
+            ->willReturn($value);
+
+        return $generator;
+    }
+}
diff --git a/lib/symfony/web-profiler-bundle/Tests/DependencyInjection/ConfigurationTest.php b/lib/symfony/web-profiler-bundle/Tests/DependencyInjection/ConfigurationTest.php
new file mode 100644
index 000000000..232f864cc
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\WebProfilerBundle\DependencyInjection\Configuration;
+use Symfony\Component\Config\Definition\Processor;
+
+class ConfigurationTest extends TestCase
+{
+    /**
+     * @dataProvider getDebugModes
+     */
+    public function testConfigTree($options, $results)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration();
+        $config = $processor->processConfiguration($configuration, [$options]);
+
+        $this->assertEquals($results, $config);
+    }
+
+    /**
+     * @dataProvider getPositionConfig
+     * @group legacy
+     * @expectedDeprecation The "web_profiler.position" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.
+     */
+    public function testPositionConfig($options, $results)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration();
+        $config = $processor->processConfiguration($configuration, [$options]);
+
+        $this->assertEquals($results, $config);
+    }
+
+    public function getDebugModes()
+    {
+        return [
+            [[], ['intercept_redirects' => false, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt']],
+            [['intercept_redirects' => true], ['intercept_redirects' => true, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt']],
+            [['intercept_redirects' => false], ['intercept_redirects' => false, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt']],
+            [['toolbar' => true], ['intercept_redirects' => false, 'toolbar' => true, 'position' => 'bottom', 'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt']],
+            [['excluded_ajax_paths' => 'test'], ['intercept_redirects' => false, 'toolbar' => false, 'position' => 'bottom', 'excluded_ajax_paths' => 'test']],
+        ];
+    }
+
+    public function getPositionConfig()
+    {
+        return [
+            [['position' => 'top'], ['intercept_redirects' => false, 'toolbar' => false, 'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt', 'position' => 'top']],
+            [['position' => 'bottom'], ['intercept_redirects' => false, 'toolbar' => false, 'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt', 'position' => 'bottom']],
+        ];
+    }
+}
diff --git a/lib/symfony/web-profiler-bundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/lib/symfony/web-profiler-bundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
new file mode 100644
index 000000000..7ec5f7dc2
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -0,0 +1,136 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests\DependencyInjection;
+
+use Symfony\Bundle\WebProfilerBundle\DependencyInjection\WebProfilerExtension;
+use Symfony\Bundle\WebProfilerBundle\Tests\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+class WebProfilerExtensionTest extends TestCase
+{
+    private $kernel;
+    /**
+     * @var \Symfony\Component\DependencyInjection\Container
+     */
+    private $container;
+
+    public static function assertSaneContainer(Container $container, $message = '', $knownPrivates = [])
+    {
+        $errors = [];
+        $knownPrivates[] = 'debug.file_link_formatter.url_format';
+        foreach ($container->getServiceIds() as $id) {
+            if (\in_array($id, $knownPrivates, true)) { // to be removed in 4.0
+                continue;
+            }
+            try {
+                $container->get($id);
+            } catch (\Exception $e) {
+                $errors[$id] = $e->getMessage();
+            }
+        }
+
+        self::assertEquals([], $errors, $message);
+    }
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
+
+        $this->container = new ContainerBuilder();
+        $this->container->register('event_dispatcher', EventDispatcher::class)->setPublic(true);
+        $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'))->setPublic(true);
+        $this->container->register('twig', 'Twig\Environment')->setPublic(true);
+        $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument([])->setPublic(true);
+        $this->container->register('twig', 'Twig\Environment')->addArgument(new Reference('twig_loader'))->setPublic(true);
+        $this->container->setParameter('kernel.bundles', []);
+        $this->container->setParameter('kernel.cache_dir', __DIR__);
+        $this->container->setParameter('kernel.debug', false);
+        $this->container->setParameter('kernel.project_dir', __DIR__);
+        $this->container->setParameter('kernel.charset', 'UTF-8');
+        $this->container->setParameter('debug.file_link_format', null);
+        $this->container->setParameter('profiler.class', ['Symfony\\Component\\HttpKernel\\Profiler\\Profiler']);
+        $this->container->register('profiler', $this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\Profiler'))
+            ->setPublic(true)
+            ->addArgument(new Definition($this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface')));
+        $this->container->setParameter('data_collector.templates', []);
+        $this->container->set('kernel', $this->kernel);
+        $this->container->addCompilerPass(new RegisterListenersPass());
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        $this->container = null;
+        $this->kernel = null;
+    }
+
+    /**
+     * @dataProvider getDebugModes
+     */
+    public function testDefaultConfig($debug)
+    {
+        $this->container->setParameter('kernel.debug', $debug);
+
+        $extension = new WebProfilerExtension();
+        $extension->load([[]], $this->container);
+
+        $this->assertFalse($this->container->has('web_profiler.debug_toolbar'));
+
+        $this->assertSaneContainer($this->getCompiledContainer());
+    }
+
+    /**
+     * @dataProvider getDebugModes
+     */
+    public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listenerInjected, $listenerEnabled)
+    {
+        $extension = new WebProfilerExtension();
+        $extension->load([['toolbar' => $toolbarEnabled, 'intercept_redirects' => $interceptRedirects]], $this->container);
+
+        $this->assertSame($listenerInjected, $this->container->has('web_profiler.debug_toolbar'));
+
+        $this->assertSaneContainer($this->getCompiledContainer(), '', ['web_profiler.csp.handler']);
+
+        if ($listenerInjected) {
+            $this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
+        }
+    }
+
+    public function getDebugModes()
+    {
+        return [
+            [false, false, false, false],
+            [true,  false, true,  true],
+            [false, true,  true,  false],
+            [true,  true,  true,  true],
+        ];
+    }
+
+    private function getCompiledContainer()
+    {
+        if ($this->container->has('web_profiler.debug_toolbar')) {
+            $this->container->getDefinition('web_profiler.debug_toolbar')->setPublic(true);
+        }
+        $this->container->compile();
+        $this->container->set('kernel', $this->kernel);
+
+        return $this->container;
+    }
+}
diff --git a/lib/symfony/web-profiler-bundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/lib/symfony/web-profiler-bundle/Tests/EventListener/WebDebugToolbarListenerTest.php
new file mode 100644
index 000000000..f8255f389
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -0,0 +1,341 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\WebProfilerBundle\EventListener\WebDebugToolbarListener;
+use Symfony\Component\HttpFoundation\HeaderBag;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+class WebDebugToolbarListenerTest extends TestCase
+{
+    /**
+     * @dataProvider getInjectToolbarTests
+     */
+    public function testInjectToolbar($content, $expected)
+    {
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $m = new \ReflectionMethod($listener, 'injectToolbar');
+        $m->setAccessible(true);
+
+        $response = new Response($content);
+
+        $m->invoke($listener, $response, Request::create('/'), ['csp_script_nonce' => 'scripto', 'csp_style_nonce' => 'stylo']);
+        $this->assertEquals($expected, $response->getContent());
+    }
+
+    public function getInjectToolbarTests()
+    {
+        return [
+            ['<html><head></head><body></body></html>', "<html><head></head><body>\nWDT\n</body></html>"],
+            ['<html>
+            <head></head>
+            <body>
+            <textarea><html><head></head><body></body></html></textarea>
+            </body>
+            </html>', "<html>
+            <head></head>
+            <body>
+            <textarea><html><head></head><body></body></html></textarea>
+            \nWDT\n</body>
+            </html>"],
+        ];
+    }
+
+    /**
+     * @dataProvider provideRedirects
+     */
+    public function testHtmlRedirectionIsIntercepted($statusCode, $hasSession)
+    {
+        $response = new Response('Some content', $statusCode);
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html', $hasSession), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock('Redirection'), true);
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('Redirection', $response->getContent());
+    }
+
+    public function testNonHtmlRedirectionIsNotIntercepted()
+    {
+        $response = new Response('Some content', '301');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'json', true), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock('Redirection'), true);
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals(301, $response->getStatusCode());
+        $this->assertEquals('Some content', $response->getContent());
+    }
+
+    public function testToolbarIsInjected()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals("<html><head></head><body>\nWDT\n</body></html>", $response->getContent());
+    }
+
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedOnNonHtmlContentType()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+        $response->headers->set('Content-Type', 'text/xml');
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedOnContentDispositionAttachment()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+        $response->headers->set('Content-Disposition', 'attachment; filename=test.html');
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html'), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
+    /**
+     * @depends testToolbarIsInjected
+     * @dataProvider provideRedirects
+     */
+    public function testToolbarIsNotInjectedOnRedirection($statusCode, $hasSession)
+    {
+        $response = new Response('<html><head></head><body></body></html>', $statusCode);
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html', $hasSession), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
+    public function provideRedirects()
+    {
+        return [
+            [301, true],
+            [302, true],
+            [301, false],
+            [302, false],
+        ];
+    }
+
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedWhenThereIsNoNoXDebugTokenResponseHeader()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedWhenOnSubRequest()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::SUB_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedOnIncompleteHtmlResponses()
+    {
+        $response = new Response('<div>Some content</div>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<div>Some content</div>', $response->getContent());
+    }
+
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedOnXmlHttpRequests()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(true), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
+    /**
+     * @depends testToolbarIsInjected
+     */
+    public function testToolbarIsNotInjectedOnNonHtmlRequests()
+    {
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'json'), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock());
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
+    }
+
+    public function testXDebugUrlHeader()
+    {
+        $response = new Response();
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $urlGenerator = $this->getUrlGeneratorMock();
+        $urlGenerator
+            ->expects($this->once())
+            ->method('generate')
+            ->with('_profiler', ['token' => 'xxxxxxxx'], UrlGeneratorInterface::ABSOLUTE_URL)
+            ->willReturn('http://mydomain.com/_profiler/xxxxxxxx')
+        ;
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, 'bottom', $urlGenerator);
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('http://mydomain.com/_profiler/xxxxxxxx', $response->headers->get('X-Debug-Token-Link'));
+    }
+
+    public function testThrowingUrlGenerator()
+    {
+        $response = new Response();
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $urlGenerator = $this->getUrlGeneratorMock();
+        $urlGenerator
+            ->expects($this->once())
+            ->method('generate')
+            ->with('_profiler', ['token' => 'xxxxxxxx'])
+            ->willThrowException(new \Exception('foo'))
+        ;
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, 'bottom', $urlGenerator);
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('Exception: foo', $response->headers->get('X-Debug-Error'));
+    }
+
+    public function testThrowingErrorCleanup()
+    {
+        $response = new Response();
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $urlGenerator = $this->getUrlGeneratorMock();
+        $urlGenerator
+            ->expects($this->once())
+            ->method('generate')
+            ->with('_profiler', ['token' => 'xxxxxxxx'])
+            ->willThrowException(new \Exception("This\nmultiline\r\ntabbed text should\tcome out\r on\n \ta single plain\r\nline"))
+        ;
+
+        $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, 'bottom', $urlGenerator);
+        $listener->onKernelResponse($event);
+
+        $this->assertEquals('Exception: This multiline tabbed text should come out on a single plain line', $response->headers->get('X-Debug-Error'));
+    }
+
+    protected function getRequestMock($isXmlHttpRequest = false, $requestFormat = 'html', $hasSession = true)
+    {
+        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->setMethods(['getSession', 'isXmlHttpRequest', 'getRequestFormat'])->disableOriginalConstructor()->getMock();
+        $request->expects($this->any())
+            ->method('isXmlHttpRequest')
+            ->willReturn($isXmlHttpRequest);
+        $request->expects($this->any())
+            ->method('getRequestFormat')
+            ->willReturn($requestFormat);
+
+        $request->headers = new HeaderBag();
+
+        if ($hasSession) {
+            $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
+            $request->expects($this->any())
+                ->method('getSession')
+                ->willReturn($session);
+        }
+
+        return $request;
+    }
+
+    protected function getTwigMock($render = 'WDT')
+    {
+        $templating = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+        $templating->expects($this->any())
+            ->method('render')
+            ->willReturn($render);
+
+        return $templating;
+    }
+
+    protected function getUrlGeneratorMock()
+    {
+        return $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock();
+    }
+
+    protected function getKernelMock()
+    {
+        return $this->getMockBuilder('Symfony\Component\HttpKernel\Kernel')->disableOriginalConstructor()->getMock();
+    }
+}
diff --git a/lib/symfony/web-profiler-bundle/Tests/Fixtures/profile.data b/lib/symfony/web-profiler-bundle/Tests/Fixtures/profile.data
new file mode 100644
index 000000000..ab76cea63
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/Fixtures/profile.data
@@ -0,0 +1 @@
+Tzo0NToiU3ltZm9ueVxDb21wb25lbnRcSHR0cEtlcm5lbFxQcm9maWxlclxQcm9maWxlIjo4OntzOjUyOiIAU3ltZm9ueVxDb21wb25lbnRcSHR0cEtlcm5lbFxQcm9maWxlclxQcm9maWxlAHRva2VuIjtzOjU6IlRPS0VOIjtzOjUzOiIAU3ltZm9ueVxDb21wb25lbnRcSHR0cEtlcm5lbFxQcm9maWxlclxQcm9maWxlAHBhcmVudCI7TjtzOjU1OiIAU3ltZm9ueVxDb21wb25lbnRcSHR0cEtlcm5lbFxQcm9maWxlclxQcm9maWxlAGNoaWxkcmVuIjthOjA6e31zOjU3OiIAU3ltZm9ueVxDb21wb25lbnRcSHR0cEtlcm5lbFxQcm9maWxlclxQcm9maWxlAGNvbGxlY3RvcnMiO2E6MDp7fXM6NDk6IgBTeW1mb255XENvbXBvbmVudFxIdHRwS2VybmVsXFByb2ZpbGVyXFByb2ZpbGUAaXAiO047czo1MzoiAFN5bWZvbnlcQ29tcG9uZW50XEh0dHBLZXJuZWxcUHJvZmlsZXJcUHJvZmlsZQBtZXRob2QiO047czo1MDoiAFN5bWZvbnlcQ29tcG9uZW50XEh0dHBLZXJuZWxcUHJvZmlsZXJcUHJvZmlsZQB1cmwiO047czo1MToiAFN5bWZvbnlcQ29tcG9uZW50XEh0dHBLZXJuZWxcUHJvZmlsZXJcUHJvZmlsZQB0aW1lIjtOO30=
\ No newline at end of file
diff --git a/lib/symfony/web-profiler-bundle/Tests/Profiler/TemplateManagerTest.php b/lib/symfony/web-profiler-bundle/Tests/Profiler/TemplateManagerTest.php
new file mode 100644
index 000000000..ab4a42fc0
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/Profiler/TemplateManagerTest.php
@@ -0,0 +1,171 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests\Profiler;
+
+use Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager;
+use Symfony\Bundle\WebProfilerBundle\Tests\TestCase;
+use Symfony\Component\HttpKernel\Profiler\Profile;
+use Twig\Environment;
+use Twig\Loader\LoaderInterface;
+use Twig\Loader\SourceContextLoaderInterface;
+
+/**
+ * Test for TemplateManager class.
+ *
+ * @author Artur Wielogórski <wodor@wodor.net>
+ */
+class TemplateManagerTest extends TestCase
+{
+    /**
+     * @var Environment
+     */
+    protected $twigEnvironment;
+
+    /**
+     * @var \Symfony\Component\HttpKernel\Profiler\Profiler
+     */
+    protected $profiler;
+
+    /**
+     * @var \Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager
+     */
+    protected $templateManager;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $profiler = $this->mockProfiler();
+        $twigEnvironment = $this->mockTwigEnvironment();
+        $templates = [
+            'data_collector.foo' => ['foo', 'FooBundle:Collector:foo'],
+            'data_collector.bar' => ['bar', 'FooBundle:Collector:bar'],
+            'data_collector.baz' => ['baz', 'FooBundle:Collector:baz'],
+        ];
+
+        $this->templateManager = new TemplateManager($profiler, $twigEnvironment, $templates);
+    }
+
+    public function testGetNameOfInvalidTemplate()
+    {
+        $this->expectException('Symfony\Component\HttpKernel\Exception\NotFoundHttpException');
+        $this->templateManager->getName(new Profile('token'), 'notexistingpanel');
+    }
+
+    /**
+     * if template exists in both profile and profiler then its name should be returned.
+     */
+    public function testGetNameValidTemplate()
+    {
+        $this->profiler->expects($this->any())
+            ->method('has')
+            ->withAnyParameters()
+            ->willReturnCallback([$this, 'profilerHasCallback']);
+
+        $this->assertEquals('FooBundle:Collector:foo.html.twig', $this->templateManager->getName(new ProfileDummy(), 'foo'));
+    }
+
+    /**
+     * template should be loaded for 'foo' because other collectors are
+     * missing in profile or in profiler.
+     */
+    public function testGetTemplates()
+    {
+        $this->profiler->expects($this->any())
+            ->method('has')
+            ->withAnyParameters()
+            ->willReturnCallback([$this, 'profileHasCollectorCallback']);
+
+        $result = $this->templateManager->getTemplates(new ProfileDummy());
+        $this->assertArrayHasKey('foo', $result);
+        $this->assertArrayNotHasKey('bar', $result);
+        $this->assertArrayNotHasKey('baz', $result);
+    }
+
+    public function profilerHasCallback($panel)
+    {
+        switch ($panel) {
+            case 'foo':
+            case 'bar':
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public function profileHasCollectorCallback($panel)
+    {
+        switch ($panel) {
+            case 'foo':
+            case 'baz':
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    protected function mockProfile()
+    {
+        return $this->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profile')->disableOriginalConstructor()->getMock();
+    }
+
+    protected function mockTwigEnvironment()
+    {
+        $this->twigEnvironment = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
+
+        $this->twigEnvironment->expects($this->any())
+            ->method('loadTemplate')
+            ->willReturn('loadedTemplate');
+
+        if (Environment::MAJOR_VERSION > 1) {
+            $loader = $this->createMock(LoaderInterface::class);
+            $loader
+                ->expects($this->any())
+                ->method('exists')
+                ->willReturn(true);
+        } else {
+            $loader = $this->createMock(SourceContextLoaderInterface::class);
+        }
+
+        $this->twigEnvironment->expects($this->any())->method('getLoader')->willReturn($loader);
+
+        return $this->twigEnvironment;
+    }
+
+    protected function mockProfiler()
+    {
+        $this->profiler = $this->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        return $this->profiler;
+    }
+}
+
+class ProfileDummy extends Profile
+{
+    public function __construct()
+    {
+        parent::__construct('token');
+    }
+
+    public function hasCollector($name)
+    {
+        switch ($name) {
+            case 'foo':
+            case 'bar':
+                return true;
+            default:
+                return false;
+        }
+    }
+}
diff --git a/lib/symfony/web-profiler-bundle/Tests/Resources/IconTest.php b/lib/symfony/web-profiler-bundle/Tests/Resources/IconTest.php
new file mode 100644
index 000000000..c3d691d4d
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/Resources/IconTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests\Resources;
+
+use PHPUnit\Framework\TestCase;
+
+class IconTest extends TestCase
+{
+    /**
+     * @dataProvider provideIconFilePaths
+     */
+    public function testIconFileContents($iconFilePath)
+    {
+        $this->assertRegExp('~<svg xmlns="http://www.w3.org/2000/svg" width="\d+" height="\d+" viewBox="0 0 \d+ \d+">.*</svg>~s', file_get_contents($iconFilePath), sprintf('The SVG metadata of the %s icon is different than expected (use the same as the other icons).', $iconFilePath));
+    }
+
+    public function provideIconFilePaths()
+    {
+        return array_map(function ($filePath) { return (array) $filePath; }, glob(__DIR__.'/../../Resources/views/Icon/*.svg'));
+    }
+}
diff --git a/lib/symfony/web-profiler-bundle/Tests/TestCase.php b/lib/symfony/web-profiler-bundle/Tests/TestCase.php
new file mode 100644
index 000000000..581ad2e2e
--- /dev/null
+++ b/lib/symfony/web-profiler-bundle/Tests/TestCase.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests;
+
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+
+class TestCase extends PHPUnitTestCase
+{
+}
diff --git a/lib/symfony/yaml/Tests/Command/LintCommandTest.php b/lib/symfony/yaml/Tests/Command/LintCommandTest.php
new file mode 100644
index 000000000..349897859
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Command/LintCommandTest.php
@@ -0,0 +1,137 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Yaml\Command\LintCommand;
+
+/**
+ * Tests the YamlLintCommand.
+ *
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+class LintCommandTest extends TestCase
+{
+    private $files;
+
+    public function testLintCorrectFile()
+    {
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile('foo: bar');
+
+        $ret = $tester->execute(['filename' => $filename], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertRegExp('/^\/\/ OK in /', trim($tester->getDisplay()));
+    }
+
+    public function testLintIncorrectFile()
+    {
+        $incorrectContent = '
+foo:
+bar';
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile($incorrectContent);
+
+        $ret = $tester->execute(['filename' => $filename], ['decorated' => false]);
+
+        $this->assertEquals(1, $ret, 'Returns 1 in case of error');
+        $this->assertStringContainsString('Unable to parse at line 3 (near "bar").', trim($tester->getDisplay()));
+    }
+
+    public function testConstantAsKey()
+    {
+        $yaml = <<<YAML
+!php/const 'Symfony\Component\Yaml\Tests\Command\Foo::TEST': bar
+YAML;
+        $ret = $this->createCommandTester()->execute(['filename' => $this->createFile($yaml)], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
+        $this->assertSame(0, $ret, 'lint:yaml exits with code 0 in case of success');
+    }
+
+    public function testCustomTags()
+    {
+        $yaml = <<<YAML
+foo: !my_tag {foo: bar}
+YAML;
+        $ret = $this->createCommandTester()->execute(['filename' => $this->createFile($yaml), '--parse-tags' => true], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
+        $this->assertSame(0, $ret, 'lint:yaml exits with code 0 in case of success');
+    }
+
+    public function testCustomTagsError()
+    {
+        $yaml = <<<YAML
+foo: !my_tag {foo: bar}
+YAML;
+        $ret = $this->createCommandTester()->execute(['filename' => $this->createFile($yaml)], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
+        $this->assertSame(1, $ret, 'lint:yaml exits with code 1 in case of error');
+    }
+
+    public function testLintFileNotReadable()
+    {
+        $this->expectException('RuntimeException');
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile('');
+        unlink($filename);
+
+        $tester->execute(['filename' => $filename], ['decorated' => false]);
+    }
+
+    /**
+     * @return string Path to the new file
+     */
+    private function createFile($content)
+    {
+        $filename = tempnam(sys_get_temp_dir().'/framework-yml-lint-test', 'sf-');
+        file_put_contents($filename, $content);
+
+        $this->files[] = $filename;
+
+        return $filename;
+    }
+
+    /**
+     * @return CommandTester
+     */
+    protected function createCommandTester()
+    {
+        $application = new Application();
+        $application->add(new LintCommand());
+        $command = $application->find('lint:yaml');
+
+        return new CommandTester($command);
+    }
+
+    protected function setUp()
+    {
+        $this->files = [];
+        @mkdir(sys_get_temp_dir().'/framework-yml-lint-test');
+    }
+
+    protected function tearDown()
+    {
+        foreach ($this->files as $file) {
+            if (file_exists($file)) {
+                unlink($file);
+            }
+        }
+
+        rmdir(sys_get_temp_dir().'/framework-yml-lint-test');
+    }
+}
+
+class Foo
+{
+    const TEST = 'foo';
+}
diff --git a/lib/symfony/yaml/Tests/DumperTest.php b/lib/symfony/yaml/Tests/DumperTest.php
new file mode 100644
index 000000000..1a1ef25a5
--- /dev/null
+++ b/lib/symfony/yaml/Tests/DumperTest.php
@@ -0,0 +1,606 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Yaml\Dumper;
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Tag\TaggedValue;
+use Symfony\Component\Yaml\Yaml;
+
+class DumperTest extends TestCase
+{
+    protected $parser;
+    protected $dumper;
+    protected $path;
+
+    protected $array = [
+        '' => 'bar',
+        'foo' => '#bar',
+        'foo\'bar' => [],
+        'bar' => [1, 'foo'],
+        'foobar' => [
+            'foo' => 'bar',
+            'bar' => [1, 'foo'],
+            'foobar' => [
+                'foo' => 'bar',
+                'bar' => [1, 'foo'],
+            ],
+        ],
+    ];
+
+    protected function setUp()
+    {
+        $this->parser = new Parser();
+        $this->dumper = new Dumper();
+        $this->path = __DIR__.'/Fixtures';
+    }
+
+    protected function tearDown()
+    {
+        $this->parser = null;
+        $this->dumper = null;
+        $this->path = null;
+        $this->array = null;
+    }
+
+    public function testIndentationInConstructor()
+    {
+        $dumper = new Dumper(7);
+        $expected = <<<'EOF'
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+       - 1
+       - foo
+foobar:
+       foo: bar
+       bar:
+              - 1
+              - foo
+       foobar:
+              foo: bar
+              bar:
+                     - 1
+                     - foo
+
+EOF;
+        $this->assertEquals($expected, $dumper->dump($this->array, 4, 0));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testSetIndentation()
+    {
+        $this->dumper->setIndentation(7);
+
+        $expected = <<<'EOF'
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+       - 1
+       - foo
+foobar:
+       foo: bar
+       bar:
+              - 1
+              - foo
+       foobar:
+              foo: bar
+              bar:
+                     - 1
+                     - foo
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 4, 0));
+    }
+
+    public function testSpecifications()
+    {
+        $files = $this->parser->parse(file_get_contents($this->path.'/index.yml'));
+        foreach ($files as $file) {
+            $yamls = file_get_contents($this->path.'/'.$file.'.yml');
+
+            // split YAMLs documents
+            foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
+                if (!$yaml) {
+                    continue;
+                }
+
+                $test = $this->parser->parse($yaml);
+                if (isset($test['dump_skip']) && $test['dump_skip']) {
+                    continue;
+                } elseif (isset($test['todo']) && $test['todo']) {
+                    // TODO
+                } else {
+                    eval('$expected = '.trim($test['php']).';');
+                    $this->assertSame($expected, $this->parser->parse($this->dumper->dump($expected, 10)), $test['test']);
+                }
+            }
+        }
+    }
+
+    public function testInlineLevel()
+    {
+        $expected = <<<'EOF'
+{ '': bar, foo: '#bar', 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, -10), '->dump() takes an inline level argument');
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 0), '->dump() takes an inline level argument');
+
+        $expected = <<<'EOF'
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar: [1, foo]
+foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } }
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 1), '->dump() takes an inline level argument');
+
+        $expected = <<<'EOF'
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+    - 1
+    - foo
+foobar:
+    foo: bar
+    bar: [1, foo]
+    foobar: { foo: bar, bar: [1, foo] }
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 2), '->dump() takes an inline level argument');
+
+        $expected = <<<'EOF'
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+    - 1
+    - foo
+foobar:
+    foo: bar
+    bar:
+        - 1
+        - foo
+    foobar:
+        foo: bar
+        bar: [1, foo]
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 3), '->dump() takes an inline level argument');
+
+        $expected = <<<'EOF'
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+    - 1
+    - foo
+foobar:
+    foo: bar
+    bar:
+        - 1
+        - foo
+    foobar:
+        foo: bar
+        bar:
+            - 1
+            - foo
+
+EOF;
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 4), '->dump() takes an inline level argument');
+        $this->assertEquals($expected, $this->dumper->dump($this->array, 10), '->dump() takes an inline level argument');
+    }
+
+    public function testObjectSupportEnabled()
+    {
+        $dump = $this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, Yaml::DUMP_OBJECT);
+
+        $this->assertEquals('{ foo: !php/object \'O:30:"Symfony\Component\Yaml\Tests\A":1:{s:1:"a";s:3:"foo";}\', bar: 1 }', $dump, '->dump() is able to dump objects');
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testObjectSupportEnabledPassingTrue()
+    {
+        $dump = $this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, false, true);
+
+        $this->assertEquals('{ foo: !php/object \'O:30:"Symfony\Component\Yaml\Tests\A":1:{s:1:"a";s:3:"foo";}\', bar: 1 }', $dump, '->dump() is able to dump objects');
+    }
+
+    public function testObjectSupportDisabledButNoExceptions()
+    {
+        $dump = $this->dumper->dump(['foo' => new A(), 'bar' => 1]);
+
+        $this->assertEquals('{ foo: null, bar: 1 }', $dump, '->dump() does not dump objects when disabled');
+    }
+
+    public function testObjectSupportDisabledWithExceptions()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\DumpException');
+        $this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testObjectSupportDisabledWithExceptionsPassingTrue()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\DumpException');
+        $this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, true);
+    }
+
+    public function testEmptyArray()
+    {
+        $dump = $this->dumper->dump([]);
+        $this->assertEquals('{  }', $dump);
+
+        $dump = $this->dumper->dump([], 0, 0, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE);
+        $this->assertEquals('[]', $dump);
+
+        $dump = $this->dumper->dump([], 9, 0, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE);
+        $this->assertEquals('[]', $dump);
+
+        $dump = $this->dumper->dump(new \ArrayObject(), 0, 0, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE | Yaml::DUMP_OBJECT_AS_MAP);
+        $this->assertEquals('{  }', $dump);
+
+        $dump = $this->dumper->dump(new \stdClass(), 0, 0, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE | Yaml::DUMP_OBJECT_AS_MAP);
+        $this->assertEquals('{  }', $dump);
+    }
+
+    /**
+     * @dataProvider getEscapeSequences
+     */
+    public function testEscapedEscapeSequencesInQuotedScalar($input, $expected)
+    {
+        $this->assertEquals($expected, $this->dumper->dump($input));
+    }
+
+    public function getEscapeSequences()
+    {
+        return [
+            'empty string' => ['', "''"],
+            'null' => ["\x0", '"\\0"'],
+            'bell' => ["\x7", '"\\a"'],
+            'backspace' => ["\x8", '"\\b"'],
+            'horizontal-tab' => ["\t", '"\\t"'],
+            'line-feed' => ["\n", '"\\n"'],
+            'vertical-tab' => ["\v", '"\\v"'],
+            'form-feed' => ["\xC", '"\\f"'],
+            'carriage-return' => ["\r", '"\\r"'],
+            'escape' => ["\x1B", '"\\e"'],
+            'space' => [' ', "' '"],
+            'double-quote' => ['"', "'\"'"],
+            'slash' => ['/', '/'],
+            'backslash' => ['\\', '\\'],
+            'next-line' => ["\xC2\x85", '"\\N"'],
+            'non-breaking-space' => ["\xc2\xa0", '"\\_"'],
+            'line-separator' => ["\xE2\x80\xA8", '"\\L"'],
+            'paragraph-separator' => ["\xE2\x80\xA9", '"\\P"'],
+            'colon' => [':', "':'"],
+        ];
+    }
+
+    public function testBinaryDataIsDumpedBase64Encoded()
+    {
+        $binaryData = file_get_contents(__DIR__.'/Fixtures/arrow.gif');
+        $expected = '{ data: !!binary '.base64_encode($binaryData).' }';
+
+        $this->assertSame($expected, $this->dumper->dump(['data' => $binaryData]));
+    }
+
+    public function testNonUtf8DataIsDumpedBase64Encoded()
+    {
+        // "für" (ISO-8859-1 encoded)
+        $this->assertSame('!!binary ZsM/cg==', $this->dumper->dump("f\xc3\x3fr"));
+    }
+
+    /**
+     * @dataProvider objectAsMapProvider
+     */
+    public function testDumpObjectAsMap($object, $expected)
+    {
+        $yaml = $this->dumper->dump($object, 0, 0, Yaml::DUMP_OBJECT_AS_MAP);
+
+        $this->assertEquals($expected, Yaml::parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
+    }
+
+    public function objectAsMapProvider()
+    {
+        $tests = [];
+
+        $bar = new \stdClass();
+        $bar->class = 'classBar';
+        $bar->args = ['bar'];
+        $zar = new \stdClass();
+        $foo = new \stdClass();
+        $foo->bar = $bar;
+        $foo->zar = $zar;
+        $object = new \stdClass();
+        $object->foo = $foo;
+        $tests['stdClass'] = [$object, $object];
+
+        $arrayObject = new \ArrayObject();
+        $arrayObject['foo'] = 'bar';
+        $arrayObject['baz'] = 'foobar';
+        $parsedArrayObject = new \stdClass();
+        $parsedArrayObject->foo = 'bar';
+        $parsedArrayObject->baz = 'foobar';
+        $tests['ArrayObject'] = [$arrayObject, $parsedArrayObject];
+
+        $a = new A();
+        $tests['arbitrary-object'] = [$a, null];
+
+        return $tests;
+    }
+
+    public function testDumpingArrayObjectInstancesRespectsInlineLevel()
+    {
+        $deep = new \ArrayObject(['deep1' => 'd', 'deep2' => 'e']);
+        $inner = new \ArrayObject(['inner1' => 'b', 'inner2' => 'c', 'inner3' => $deep]);
+        $outer = new \ArrayObject(['outer1' => 'a', 'outer2' => $inner]);
+
+        $yaml = $this->dumper->dump($outer, 2, 0, Yaml::DUMP_OBJECT_AS_MAP);
+
+        $expected = <<<YAML
+outer1: a
+outer2:
+    inner1: b
+    inner2: c
+    inner3: { deep1: d, deep2: e }
+
+YAML;
+        $this->assertSame($expected, $yaml);
+    }
+
+    public function testDumpingArrayObjectInstancesWithNumericKeysInlined()
+    {
+        $deep = new \ArrayObject(['d', 'e']);
+        $inner = new \ArrayObject(['b', 'c', $deep]);
+        $outer = new \ArrayObject(['a', $inner]);
+
+        $yaml = $this->dumper->dump($outer, 0, 0, Yaml::DUMP_OBJECT_AS_MAP);
+        $expected = <<<YAML
+{ 0: a, 1: { 0: b, 1: c, 2: { 0: d, 1: e } } }
+YAML;
+        $this->assertSame($expected, $yaml);
+    }
+
+    public function testDumpingArrayObjectInstancesWithNumericKeysRespectsInlineLevel()
+    {
+        $deep = new \ArrayObject(['d', 'e']);
+        $inner = new \ArrayObject(['b', 'c', $deep]);
+        $outer = new \ArrayObject(['a', $inner]);
+        $yaml = $this->dumper->dump($outer, 2, 0, Yaml::DUMP_OBJECT_AS_MAP);
+        $expected = <<<YAML
+0: a
+1:
+    0: b
+    1: c
+    2: { 0: d, 1: e }
+
+YAML;
+        $this->assertEquals($expected, $yaml);
+    }
+
+    public function testDumpEmptyArrayObjectInstanceAsMap()
+    {
+        $this->assertSame('{  }', $this->dumper->dump(new \ArrayObject(), 2, 0, Yaml::DUMP_OBJECT_AS_MAP));
+    }
+
+    public function testDumpEmptyStdClassInstanceAsMap()
+    {
+        $this->assertSame('{  }', $this->dumper->dump(new \stdClass(), 2, 0, Yaml::DUMP_OBJECT_AS_MAP));
+    }
+
+    public function testDumpingStdClassInstancesRespectsInlineLevel()
+    {
+        $deep = new \stdClass();
+        $deep->deep1 = 'd';
+        $deep->deep2 = 'e';
+
+        $inner = new \stdClass();
+        $inner->inner1 = 'b';
+        $inner->inner2 = 'c';
+        $inner->inner3 = $deep;
+
+        $outer = new \stdClass();
+        $outer->outer1 = 'a';
+        $outer->outer2 = $inner;
+
+        $yaml = $this->dumper->dump($outer, 2, 0, Yaml::DUMP_OBJECT_AS_MAP);
+
+        $expected = <<<YAML
+outer1: a
+outer2:
+    inner1: b
+    inner2: c
+    inner3: { deep1: d, deep2: e }
+
+YAML;
+        $this->assertSame($expected, $yaml);
+    }
+
+    public function testDumpingTaggedValueSequenceRespectsInlineLevel()
+    {
+        $data = [
+            new TaggedValue('user', [
+                'username' => 'jane',
+            ]),
+            new TaggedValue('user', [
+                'username' => 'john',
+            ]),
+        ];
+
+        $yaml = $this->dumper->dump($data, 2);
+
+        $expected = <<<YAML
+- !user
+  username: jane
+- !user
+  username: john
+
+YAML;
+        $this->assertSame($expected, $yaml);
+    }
+
+    public function testDumpingTaggedValueSequenceWithInlinedTagValues()
+    {
+        $data = [
+            new TaggedValue('user', [
+                'username' => 'jane',
+            ]),
+            new TaggedValue('user', [
+                'username' => 'john',
+            ]),
+        ];
+
+        $yaml = $this->dumper->dump($data, 1);
+
+        $expected = <<<YAML
+- !user { username: jane }
+- !user { username: john }
+
+YAML;
+        $this->assertSame($expected, $yaml);
+    }
+
+    public function testDumpingTaggedValueMapRespectsInlineLevel()
+    {
+        $data = [
+            'user1' => new TaggedValue('user', [
+                'username' => 'jane',
+            ]),
+            'user2' => new TaggedValue('user', [
+                'username' => 'john',
+            ]),
+        ];
+
+        $yaml = $this->dumper->dump($data, 2);
+
+        $expected = <<<YAML
+user1: !user
+    username: jane
+user2: !user
+    username: john
+
+YAML;
+        $this->assertSame($expected, $yaml);
+    }
+
+    public function testDumpingTaggedValueMapWithInlinedTagValues()
+    {
+        $data = [
+            'user1' => new TaggedValue('user', [
+                'username' => 'jane',
+            ]),
+            'user2' => new TaggedValue('user', [
+                'username' => 'john',
+            ]),
+        ];
+
+        $yaml = $this->dumper->dump($data, 1);
+
+        $expected = <<<YAML
+user1: !user { username: jane }
+user2: !user { username: john }
+
+YAML;
+        $this->assertSame($expected, $yaml);
+    }
+
+    public function testDumpingNotInlinedScalarTaggedValue()
+    {
+        $data = [
+            'user1' => new TaggedValue('user', 'jane'),
+            'user2' => new TaggedValue('user', 'john'),
+        ];
+        $expected = <<<YAML
+user1: !user jane
+user2: !user john
+
+YAML;
+
+        $this->assertSame($expected, $this->dumper->dump($data, 2));
+    }
+
+    public function testDumpingNotInlinedNullTaggedValue()
+    {
+        $data = [
+            'foo' => new TaggedValue('bar', null),
+        ];
+        $expected = <<<YAML
+foo: !bar null
+
+YAML;
+
+        $this->assertSame($expected, $this->dumper->dump($data, 2));
+    }
+
+    public function testDumpMultiLineStringAsScalarBlock()
+    {
+        $data = [
+            'data' => [
+                'single_line' => 'foo bar baz',
+                'multi_line' => "foo\nline with trailing spaces:\n  \nbar\ninteger like line:\n123456789\nempty line:\n\nbaz",
+                'multi_line_with_carriage_return' => "foo\nbar\r\nbaz",
+                'nested_inlined_multi_line_string' => [
+                    'inlined_multi_line' => "foo\nbar\r\nempty line:\n\nbaz",
+                ],
+            ],
+        ];
+
+        $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+    }
+
+    public function testDumpMultiLineStringAsScalarBlockWhenFirstLineHasLeadingSpace()
+    {
+        $data = [
+            'data' => [
+                'multi_line' => "    the first line has leading spaces\nThe second line does not.",
+            ],
+        ];
+
+        $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block_leading_space_in_first_line.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+    }
+
+    public function testCarriageReturnIsMaintainedWhenDumpingAsMultiLineLiteralBlock()
+    {
+        $this->assertSame("- \"a\\r\\nb\\nc\"\n", $this->dumper->dump(["a\r\nb\nc"], 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+    }
+
+    public function testZeroIndentationThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The indentation must be greater than zero');
+        new Dumper(0);
+    }
+
+    public function testNegativeIndentationThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The indentation must be greater than zero');
+        new Dumper(-4);
+    }
+}
+
+class A
+{
+    public $a = 'foo';
+}
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml b/lib/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
new file mode 100644
index 000000000..81b4129aa
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
@@ -0,0 +1,31 @@
+--- %YAML:1.0
+test: Simple Alias Example
+brief: >
+    If you need to refer to the same item of data twice,
+    you can give that item an alias.  The alias is a plain
+    string, starting with an ampersand.  The item may then
+    be referred to by the alias throughout your document
+    by using an asterisk before the name of the alias.
+    This is called an anchor.
+yaml: |
+    - &showell Steve
+    - Clark
+    - Brian
+    - Oren
+    - *showell
+php: |
+    ['Steve', 'Clark', 'Brian', 'Oren', 'Steve']
+
+---
+test: Alias of a Mapping
+brief: >
+    An alias can be used on any item of data, including
+    sequences, mappings, and other complex data types.
+yaml: |
+    - &hello
+        Meat: pork
+        Starch: potato
+    - banana
+    - *hello
+php: |
+    [['Meat'=>'pork', 'Starch'=>'potato'], 'banana', ['Meat'=>'pork', 'Starch'=>'potato']]
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml b/lib/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
new file mode 100644
index 000000000..1a08d8ea9
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
@@ -0,0 +1,202 @@
+--- %YAML:1.0
+test: Simple Sequence
+brief: |
+    You can specify a list in YAML by placing each
+    member of the list on a new line with an opening
+    dash. These lists are called sequences.
+yaml: |
+    - apple
+    - banana
+    - carrot
+php: |
+    ['apple', 'banana', 'carrot']
+---
+test: Sequence With Item Being Null In The Middle
+brief: |
+    You can specify a list in YAML by placing each
+    member of the list on a new line with an opening
+    dash. These lists are called sequences.
+yaml: |
+    - apple
+    -
+    - carrot
+php: |
+    ['apple', null, 'carrot']
+---
+test: Sequence With Last Item Being Null
+brief: |
+    You can specify a list in YAML by placing each
+    member of the list on a new line with an opening
+    dash. These lists are called sequences.
+yaml: |
+    - apple
+    - banana
+    -
+php: |
+    ['apple', 'banana', null]
+---
+test: Nested Sequences
+brief: |
+    You can include a sequence within another
+    sequence by giving the sequence an empty
+    dash, followed by an indented list.
+yaml: |
+    -
+     - foo
+     - bar
+     - baz
+php: |
+    [['foo', 'bar', 'baz']]
+---
+test: Mixed Sequences
+brief: |
+    Sequences can contain any YAML data,
+    including strings and other sequences.
+yaml: |
+    - apple
+    -
+     - foo
+     - bar
+     - x123
+    - banana
+    - carrot
+php: |
+    ['apple', ['foo', 'bar', 'x123'], 'banana', 'carrot']
+---
+test: Deeply Nested Sequences
+brief: |
+    Sequences can be nested even deeper, with each
+    level of indentation representing a level of
+    depth.
+yaml: |
+    -
+     -
+      - uno
+      - dos
+php: |
+    [[['uno', 'dos']]]
+---
+test: Simple Mapping
+brief: |
+    You can add a keyed list (also known as a dictionary or
+    hash) to your document by placing each member of the
+    list on a new line, with a colon separating the key
+    from its value.  In YAML, this type of list is called
+    a mapping.
+yaml: |
+    foo: whatever
+    bar: stuff
+php: |
+    ['foo' => 'whatever', 'bar' => 'stuff']
+---
+test: Sequence in a Mapping
+brief: |
+    A value in a mapping can be a sequence.
+yaml: |
+    foo: whatever
+    bar:
+     - uno
+     - dos
+php: |
+    ['foo' => 'whatever', 'bar' => ['uno', 'dos']]
+---
+test: Nested Mappings
+brief: |
+    A value in a mapping can be another mapping.
+yaml: |
+    foo: whatever
+    bar:
+     fruit: apple
+     name: steve
+     sport: baseball
+php: |
+    [
+      'foo' => 'whatever',
+      'bar' => [
+         'fruit' => 'apple',
+         'name' => 'steve',
+         'sport' => 'baseball'
+      ]
+    ]
+---
+test: Mixed Mapping
+brief: |
+    A mapping can contain any assortment
+    of mappings and sequences as values.
+yaml: |
+    foo: whatever
+    bar:
+     -
+       fruit: apple
+       name: steve
+       sport: baseball
+     - more
+     -
+       python: rocks
+       perl: papers
+       ruby: scissorses
+php: |
+    [
+      'foo' => 'whatever',
+      'bar' => [
+        [
+            'fruit' => 'apple',
+            'name' => 'steve',
+            'sport' => 'baseball'
+        ],
+        'more',
+        [
+            'python' => 'rocks',
+            'perl' => 'papers',
+            'ruby' => 'scissorses'
+        ]
+      ]
+    ]
+---
+test: Mapping-in-Sequence Shortcut
+todo: true
+brief: |
+     If you are adding a mapping to a sequence, you
+     can place the mapping on the same line as the
+     dash as a shortcut.
+yaml: |
+     - work on YAML.py:
+        - work on Store
+php: |
+    [['work on YAML.py' => ['work on Store']]]
+---
+test: Sequence-in-Mapping Shortcut
+todo: true
+brief: |
+     The dash in a sequence counts as indentation, so
+     you can add a sequence inside of a mapping without
+     needing spaces as indentation.
+yaml: |
+     allow:
+     - 'localhost'
+     - '%.sourceforge.net'
+     - '%.freepan.org'
+php: |
+     ['allow' => ['localhost', '%.sourceforge.net', '%.freepan.org']]
+---
+todo: true
+test: Merge key
+brief: |
+     A merge key ('<<') can be used in a mapping to insert other mappings.  If
+     the value associated with the merge key is a mapping, each of its key/value
+     pairs is inserted into the current mapping.
+yaml: |
+     mapping:
+       name: Joe
+       job: Accountant
+       <<:
+         age: 38
+php: |
+     [
+       'mapping' =>
+       [
+         'name' => 'Joe',
+         'job' => 'Accountant',
+         'age' => 38
+       ]
+     ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml b/lib/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
new file mode 100644
index 000000000..1f3a2e544
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
@@ -0,0 +1,51 @@
+---
+test: One Element Mapping
+brief: |
+    A mapping with one key/value pair
+yaml: |
+    foo: bar
+php: |
+    ['foo' => 'bar']
+---
+test: Multi Element Mapping
+brief: |
+    More than one key/value pair
+yaml: |
+    red: baron
+    white: walls
+    blue: berries
+php: |
+    [
+     'red' => 'baron',
+     'white' => 'walls',
+     'blue' => 'berries',
+    ]
+---
+test: Values aligned
+brief: |
+    Often times human editors of documents will align the values even
+    though YAML emitters generally don't.
+yaml: |
+    red:   baron
+    white: walls
+    blue:  berries
+php: |
+    [
+     'red' => 'baron',
+     'white' => 'walls',
+     'blue' => 'berries',
+    ]
+---
+test: Colons aligned
+brief: |
+    Spaces can come before the ': ' key/value separator.
+yaml: |
+    red   : baron
+    white : walls
+    blue  : berries
+php: |
+    [
+     'red' => 'baron',
+     'white' => 'walls',
+     'blue' => 'berries',
+    ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml b/lib/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
new file mode 100644
index 000000000..67cb47adb
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
@@ -0,0 +1,85 @@
+--- %YAML:1.0
+test: Trailing Document Separator
+todo: true
+brief: >
+    You can separate YAML documents
+    with a string of three dashes.
+yaml: |
+    - foo: 1
+      bar: 2
+    ---
+    more: stuff
+python: |
+    [
+        [ { 'foo': 1, 'bar': 2 } ],
+        { 'more': 'stuff' }
+    ]
+ruby: |
+    [ { 'foo' => 1, 'bar' => 2 } ]
+
+---
+test: Leading Document Separator
+todo: true
+brief: >
+    You can explicitly give an opening
+    document separator to your YAML stream.
+yaml: |
+    ---
+    - foo: 1
+      bar: 2
+    ---
+    more: stuff
+python: |
+    [
+        [ {'foo': 1, 'bar': 2}],
+        {'more': 'stuff'}
+    ]
+ruby: |
+    [ { 'foo' => 1, 'bar' => 2 } ]
+
+---
+test: YAML Header
+todo: true
+brief: >
+    The opening separator can contain directives
+    to the YAML parser, such as the version
+    number.
+yaml: |
+    --- %YAML:1.0
+    foo: 1
+    bar: 2
+php: |
+    ['foo' => 1, 'bar' => 2]
+documents: 1
+
+---
+test: Red Herring Document Separator
+brief: >
+    Separators included in blocks or strings
+    are treated as blocks or strings, as the
+    document separator should have no indentation
+    preceding it.
+yaml: |
+    foo: |
+        ---
+php: |
+    ['foo' => "---\n"]
+
+---
+test: Multiple Document Separators in Block
+brief: >
+    This technique allows you to embed other YAML
+    documents within literal blocks.
+yaml: |
+    foo: |
+        ---
+        foo: bar
+        ---
+        yo: baz
+    bar: |
+        fooness
+php: |
+    [
+       'foo' => "---\nfoo: bar\n---\nyo: baz\n",
+       'bar' => "fooness\n"
+    ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml b/lib/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
new file mode 100644
index 000000000..e8697f931
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
@@ -0,0 +1,25 @@
+---
+test: Missing value for hash item
+todo: true
+brief: |
+    Third item in this hash doesn't have a value
+yaml: |
+    okay: value
+    also okay: ~
+    causes error because no value specified
+    last key: value okay here too
+python-error: causes error because no value specified
+
+---
+test: Not indenting enough
+brief: |
+    There was a bug in PyYaml where it was off by one
+    in the indentation check.  It was allowing the YAML
+    below.
+# This is actually valid YAML now. Someone should tell showell.
+yaml: |
+    foo:
+    firstline: 1
+    secondline: 2
+php: |
+  ['foo' => null, 'firstline' => 1, 'secondline' => 2]
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml b/lib/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
new file mode 100644
index 000000000..cc562cd9d
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
@@ -0,0 +1,60 @@
+---
+test: Simple Inline Array
+brief: >
+    Sequences can be contained on a
+    single line, using the inline syntax.
+    Separate each entry with commas and
+    enclose in square brackets.
+yaml: |
+    seq: [ a, b, c ]
+php: |
+    ['seq' => ['a', 'b', 'c']]
+---
+test: Simple Inline Hash
+brief: >
+    Mapping can also be contained on
+    a single line, using the inline
+    syntax.  Each key-value pair is
+    separated by a colon, with a comma
+    between each entry in the mapping.
+    Enclose with curly braces.
+yaml: |
+    hash: { name: Steve, foo: bar }
+php: |
+    ['hash' => ['name' => 'Steve', 'foo' => 'bar']]
+---
+test: Multi-line Inline Collections
+todo: true
+brief: >
+    Both inline sequences and inline mappings
+    can span multiple lines, provided that you
+    indent the additional lines.
+yaml: |
+    languages: [ Ruby,
+                 Perl,
+                 Python ]
+    websites: { YAML: yaml.org,
+                Ruby: ruby-lang.org,
+                Python: python.org,
+                Perl: use.perl.org }
+php: |
+    [
+      'languages' => ['Ruby', 'Perl', 'Python'],
+      'websites' => [
+        'YAML' => 'yaml.org',
+        'Ruby' => 'ruby-lang.org',
+        'Python' => 'python.org',
+        'Perl' => 'use.perl.org'
+      ]
+    ]
+---
+test: Commas in Values (not in the spec!)
+todo: true
+brief: >
+    List items in collections are delimited by commas, but
+    there must be a space after each comma.  This allows you
+    to add numbers without quoting.
+yaml: |
+    attendances: [ 45,123, 70,000, 17,222 ]
+php: |
+    ['attendances' => [45123, 70000, 17222]]
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml b/lib/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
new file mode 100644
index 000000000..2895202a2
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
@@ -0,0 +1,176 @@
+--- %YAML:1.0
+test: Single ending newline
+brief: >
+    A pipe character, followed by an indented
+    block of text is treated as a literal
+    block, in which newlines are preserved
+    throughout the block, including the final
+    newline.
+yaml: |
+    ---
+    this: |
+        Foo
+        Bar
+php: |
+    ['this' => "Foo\nBar\n"]
+---
+test: The '+' indicator
+brief: >
+    The '+' indicator says to keep newlines at the end of text
+    blocks.
+yaml: |
+    normal: |
+      extra new lines not kept
+
+    preserving: |+
+      extra new lines are kept
+
+
+    dummy: value
+php: |
+    [
+        'normal' => "extra new lines not kept\n",
+        'preserving' => "extra new lines are kept\n\n\n",
+        'dummy' => 'value'
+    ]
+---
+test: Three trailing newlines in literals
+brief: >
+    To give you more control over how space
+    is preserved in text blocks, YAML has
+    the keep '+' and chomp '-' indicators.
+    The keep indicator will preserve all
+    ending newlines, while the chomp indicator
+    will strip all ending newlines.
+yaml: |
+    clipped: |
+        This has one newline.
+
+
+
+    same as "clipped" above: "This has one newline.\n"
+
+    stripped: |-
+        This has no newline.
+
+
+
+    same as "stripped" above: "This has no newline."
+
+    kept: |+
+        This has four newlines.
+
+
+
+    same as "kept" above: "This has four newlines.\n\n\n\n"
+php: |
+    [
+      'clipped' => "This has one newline.\n",
+      'same as "clipped" above' => "This has one newline.\n",
+      'stripped' => 'This has no newline.',
+      'same as "stripped" above' => 'This has no newline.',
+      'kept' => "This has four newlines.\n\n\n\n",
+      'same as "kept" above' => "This has four newlines.\n\n\n\n"
+    ]
+---
+test: Extra trailing newlines with spaces
+todo: true
+brief: >
+    Normally, only a single newline is kept
+    from the end of a literal block, unless the
+    keep '+' character is used in combination
+    with the pipe.  The following example
+    will preserve all ending whitespace
+    since the last line of both literal blocks
+    contains spaces which extend past the indentation
+    level.
+yaml: |
+    ---
+    this: |
+        Foo
+
+
+    kept: |+
+        Foo
+
+
+php: |
+    ['this' => "Foo\n\n  \n",
+      'kept' => "Foo\n\n  \n"]
+
+---
+test: Folded Block in a Sequence
+brief: >
+    A greater-then character, followed by an indented
+    block of text is treated as a folded block, in
+    which lines of text separated by a single newline
+    are concatenated as a single line.
+yaml: |
+    ---
+    - apple
+    - banana
+    - >
+        can't you see
+        the beauty of yaml?
+        hmm
+    - dog
+php: |
+    [
+        'apple',
+        'banana',
+        "can't you see the beauty of yaml? hmm\n",
+        'dog'
+    ]
+---
+test: Folded Block as a Mapping Value
+brief: >
+    Both literal and folded blocks can be
+    used in collections, as values in a
+    sequence or a mapping.
+yaml: |
+    ---
+    quote: >
+        Mark McGwire's
+        year was crippled
+        by a knee injury.
+    source: espn
+php: |
+    [
+        'quote' => "Mark McGwire's year was crippled by a knee injury.\n",
+        'source' => 'espn'
+    ]
+---
+test: Three trailing newlines in folded blocks
+brief: >
+    The keep and chomp indicators can also
+    be applied to folded blocks.
+yaml: |
+    clipped: >
+        This has one newline.
+
+
+
+    same as "clipped" above: "This has one newline.\n"
+
+    stripped: >-
+        This has no newline.
+
+
+
+    same as "stripped" above: "This has no newline."
+
+    kept: >+
+        This has four newlines.
+
+
+
+    same as "kept" above: "This has four newlines.\n\n\n\n"
+php: |
+    [
+      'clipped' => "This has one newline.\n",
+      'same as "clipped" above' => "This has one newline.\n",
+      'stripped' => 'This has no newline.',
+      'same as "stripped" above' => 'This has no newline.',
+      'kept' => "This has four newlines.\n\n\n\n",
+      'same as "kept" above' => "This has four newlines.\n\n\n\n"
+    ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml b/lib/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
new file mode 100644
index 000000000..ea8e36ed0
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
@@ -0,0 +1,45 @@
+--- %YAML:1.0
+test: Empty Sequence
+brief: >
+    You can represent the empty sequence
+    with an empty inline sequence.
+yaml: |
+    empty: []
+php: |
+    ['empty' => []]
+---
+test: Empty Mapping
+brief: >
+    You can represent the empty mapping
+    with an empty inline mapping.
+yaml: |
+    empty: {}
+php: |
+    ['empty' => []]
+---
+test: Empty Sequence as Entire Document
+yaml: |
+    []
+php: |
+    []
+---
+test: Empty Mapping as Entire Document
+yaml: |
+    {}
+php: |
+    []
+---
+test: Null as Document
+yaml: |
+    ~
+php: |
+    null
+---
+test: Empty String
+brief: >
+    You can represent an empty string
+    with a pair of quotes.
+yaml: |
+    ''
+php: |
+    ''
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/lib/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
new file mode 100644
index 000000000..dd2d776fa
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
@@ -0,0 +1,1701 @@
+--- %YAML:1.0
+test: Sequence of scalars
+spec: 2.1
+yaml: |
+  - Mark McGwire
+  - Sammy Sosa
+  - Ken Griffey
+php: |
+  ['Mark McGwire', 'Sammy Sosa', 'Ken Griffey']
+---
+test: Mapping of scalars to scalars
+spec: 2.2
+yaml: |
+  hr:  65
+  avg: 0.278
+  rbi: 147
+php: |
+  ['hr' => 65, 'avg' => 0.278, 'rbi' => 147]
+---
+test: Mapping of scalars to sequences
+spec: 2.3
+yaml: |
+    american:
+       - Boston Red Sox
+       - Detroit Tigers
+       - New York Yankees
+    national:
+       - New York Mets
+       - Chicago Cubs
+       - Atlanta Braves
+php: |
+    ['american' =>
+        ['Boston Red Sox', 'Detroit Tigers',
+          'New York Yankees'],
+      'national' =>
+        ['New York Mets', 'Chicago Cubs',
+          'Atlanta Braves']
+    ]
+---
+test: Sequence of mappings
+spec: 2.4
+yaml: |
+    -
+      name: Mark McGwire
+      hr:   65
+      avg:  0.278
+    -
+      name: Sammy Sosa
+      hr:   63
+      avg:  0.288
+php: |
+    [
+      ['name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278],
+      ['name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288]
+    ]
+---
+test: Legacy A5
+todo: true
+spec: legacy_A5
+yaml: |
+    ?
+        - New York Yankees
+        - Atlanta Braves
+    :
+      - 2001-07-02
+      - 2001-08-12
+      - 2001-08-14
+    ?
+        - Detroit Tigers
+        - Chicago Cubs
+    :
+      - 2001-07-23
+perl-busted: >
+    YAML.pm will be able to emulate this behavior soon. In this regard
+    it may be somewhat more correct than Python's native behavior which
+    can only use tuples as mapping keys. PyYAML will also need to figure
+    out some clever way to roundtrip structured keys.
+python: |
+    [
+    {
+        ('New York Yankees', 'Atlanta Braves'):
+            [yaml.timestamp('2001-07-02'),
+             yaml.timestamp('2001-08-12'),
+             yaml.timestamp('2001-08-14')],
+        ('Detroit Tigers', 'Chicago Cubs'):
+        [yaml.timestamp('2001-07-23')]
+    }
+    ]
+ruby: |
+    {
+      [ 'New York Yankees', 'Atlanta Braves' ] =>
+        [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ],
+      [ 'Detroit Tigers', 'Chicago Cubs' ] =>
+        [ Date.new( 2001, 7, 23 ) ]
+    }
+syck: |
+  struct test_node seq1[] = {
+      { T_STR, 0, "New York Yankees" },
+      { T_STR, 0, "Atlanta Braves" },
+      end_node
+  };
+  struct test_node seq2[] = {
+      { T_STR, 0, "2001-07-02" },
+      { T_STR, 0, "2001-08-12" },
+      { T_STR, 0, "2001-08-14" },
+      end_node
+  };
+  struct test_node seq3[] = {
+      { T_STR, 0, "Detroit Tigers" },
+      { T_STR, 0, "Chicago Cubs" },
+      end_node
+  };
+  struct test_node seq4[] = {
+      { T_STR, 0, "2001-07-23" },
+      end_node
+  };
+  struct test_node map[] = {
+      { T_SEQ, 0, 0, seq1 },
+      { T_SEQ, 0, 0, seq2 },
+      { T_SEQ, 0, 0, seq3 },
+      { T_SEQ, 0, 0, seq4 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_MAP, 0, 0, map },
+      end_node
+  };
+
+---
+test: Sequence of sequences
+spec: 2.5
+yaml: |
+  - [ name         , hr , avg   ]
+  - [ Mark McGwire , 65 , 0.278 ]
+  - [ Sammy Sosa   , 63 , 0.288 ]
+php: |
+  [
+    [ 'name', 'hr', 'avg' ],
+    [ 'Mark McGwire', 65, 0.278 ],
+    [ 'Sammy Sosa', 63, 0.288 ]
+  ]
+---
+test: Mapping of mappings
+todo: true
+spec: 2.6
+yaml: |
+  Mark McGwire: {hr: 65, avg: 0.278}
+  Sammy Sosa: {
+      hr: 63,
+      avg: 0.288
+    }
+php: |
+  [
+    'Mark McGwire' =>
+      [ 'hr' => 65, 'avg' => 0.278 ],
+    'Sammy Sosa' =>
+      [ 'hr' => 63, 'avg' => 0.288 ]
+  ]
+---
+test: Two documents in a stream each with a leading comment
+todo: true
+spec: 2.7
+yaml: |
+  # Ranking of 1998 home runs
+  ---
+  - Mark McGwire
+  - Sammy Sosa
+  - Ken Griffey
+
+  # Team ranking
+  ---
+  - Chicago Cubs
+  - St Louis Cardinals
+ruby: |
+  y = YAML::Stream.new
+  y.add( [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ] )
+  y.add( [ 'Chicago Cubs', 'St Louis Cardinals' ] )
+documents: 2
+
+---
+test: Play by play feed from a game
+todo: true
+spec: 2.8
+yaml: |
+  ---
+  time: 20:03:20
+  player: Sammy Sosa
+  action: strike (miss)
+  ...
+  ---
+  time: 20:03:47
+  player: Sammy Sosa
+  action: grand slam
+  ...
+perl: |
+  [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ]
+documents: 2
+
+---
+test: Single document with two comments
+spec: 2.9
+yaml: |
+  hr: # 1998 hr ranking
+    - Mark McGwire
+    - Sammy Sosa
+  rbi:
+    # 1998 rbi ranking
+    - Sammy Sosa
+    - Ken Griffey
+php: |
+  [
+    'hr' => [ 'Mark McGwire', 'Sammy Sosa' ],
+    'rbi' => [ 'Sammy Sosa', 'Ken Griffey' ]
+  ]
+---
+test: Node for Sammy Sosa appears twice in this document
+spec: 2.10
+yaml: |
+   ---
+   hr:
+      - Mark McGwire
+      # Following node labeled SS
+      - &SS Sammy Sosa
+   rbi:
+      - *SS # Subsequent occurrence
+      - Ken Griffey
+php: |
+   [
+      'hr' =>
+         ['Mark McGwire', 'Sammy Sosa'],
+      'rbi' =>
+         ['Sammy Sosa', 'Ken Griffey']
+   ]
+---
+test: Mapping between sequences
+todo: true
+spec: 2.11
+yaml: |
+   ? # PLAY SCHEDULE
+     - Detroit Tigers
+     - Chicago Cubs
+   :
+     - 2001-07-23
+
+   ? [ New York Yankees,
+       Atlanta Braves ]
+   : [ 2001-07-02, 2001-08-12,
+       2001-08-14 ]
+ruby: |
+   {
+      [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
+      [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ]
+   }
+syck: |
+  struct test_node seq1[] = {
+      { T_STR, 0, "New York Yankees" },
+      { T_STR, 0, "Atlanta Braves" },
+      end_node
+  };
+  struct test_node seq2[] = {
+      { T_STR, 0, "2001-07-02" },
+      { T_STR, 0, "2001-08-12" },
+      { T_STR, 0, "2001-08-14" },
+      end_node
+  };
+  struct test_node seq3[] = {
+      { T_STR, 0, "Detroit Tigers" },
+      { T_STR, 0, "Chicago Cubs" },
+      end_node
+  };
+  struct test_node seq4[] = {
+      { T_STR, 0, "2001-07-23" },
+      end_node
+  };
+  struct test_node map[] = {
+      { T_SEQ, 0, 0, seq3 },
+      { T_SEQ, 0, 0, seq4 },
+      { T_SEQ, 0, 0, seq1 },
+      { T_SEQ, 0, 0, seq2 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_MAP, 0, 0, map },
+      end_node
+  };
+
+---
+test: Sequence key shortcut
+spec: 2.12
+yaml: |
+  ---
+  # products purchased
+  - item    : Super Hoop
+    quantity: 1
+  - item    : Basketball
+    quantity: 4
+  - item    : Big Shoes
+    quantity: 1
+php: |
+  [
+    [
+      'item' => 'Super Hoop',
+      'quantity' => 1,
+    ],
+    [
+      'item' => 'Basketball',
+      'quantity' => 4,
+    ],
+    [
+      'item' => 'Big Shoes',
+      'quantity' => 1,
+    ]
+  ]
+perl: |
+  [
+     { item => 'Super Hoop', quantity => 1 },
+     { item => 'Basketball', quantity => 4 },
+     { item => 'Big Shoes',  quantity => 1 }
+  ]
+
+ruby: |
+  [
+     { 'item' => 'Super Hoop', 'quantity' => 1 },
+     { 'item' => 'Basketball', 'quantity' => 4 },
+     { 'item' => 'Big Shoes', 'quantity' => 1 }
+  ]
+python: |
+  [
+       { 'item': 'Super Hoop', 'quantity': 1 },
+       { 'item': 'Basketball', 'quantity': 4 },
+       { 'item': 'Big Shoes',  'quantity': 1 }
+  ]
+syck: |
+  struct test_node map1[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Super Hoop" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "1" },
+      end_node
+  };
+  struct test_node map2[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Basketball" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "4" },
+      end_node
+  };
+  struct test_node map3[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Big Shoes" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "1" },
+      end_node
+  };
+  struct test_node seq[] = {
+      { T_MAP, 0, 0, map1 },
+      { T_MAP, 0, 0, map2 },
+      { T_MAP, 0, 0, map3 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_SEQ, 0, 0, seq },
+      end_node
+  };
+
+
+---
+test: Literal perserves newlines
+todo: true
+spec: 2.13
+yaml: |
+  # ASCII Art
+  --- |
+    \//||\/||
+    // ||  ||_
+perl: |
+  "\\//||\\/||\n// ||  ||_\n"
+ruby: |
+  "\\//||\\/||\n// ||  ||_\n"
+python: |
+    [
+        flushLeft(
+        """
+        \//||\/||
+        // ||  ||_
+        """
+        )
+    ]
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "\\//||\\/||\n// ||  ||_\n" },
+      end_node
+  };
+
+---
+test: Folded treats newlines as a space
+todo: true
+spec: 2.14
+yaml: |
+  ---
+    Mark McGwire's
+    year was crippled
+    by a knee injury.
+perl: |
+  "Mark McGwire's year was crippled by a knee injury."
+ruby: |
+  "Mark McGwire's year was crippled by a knee injury."
+python: |
+    [ "Mark McGwire's year was crippled by a knee injury." ]
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "Mark McGwire's year was crippled by a knee injury." },
+      end_node
+  };
+
+---
+test: Newlines preserved for indented and blank lines
+todo: true
+spec: 2.15
+yaml: |
+  --- >
+   Sammy Sosa completed another
+   fine season with great stats.
+
+     63 Home Runs
+     0.288 Batting Average
+
+   What a year!
+perl: |
+  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n"
+ruby: |
+  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n"
+python: |
+    [
+        flushLeft(
+        """
+        Sammy Sosa completed another fine season with great stats.
+
+          63 Home Runs
+          0.288 Batting Average
+
+        What a year!
+        """
+        )
+    ]
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n" },
+      end_node
+  };
+
+
+---
+test: Indentation determines scope
+spec: 2.16
+yaml: |
+  name: Mark McGwire
+  accomplishment: >
+     Mark set a major league
+     home run record in 1998.
+  stats: |
+     65 Home Runs
+     0.278 Batting Average
+php: |
+  [
+    'name' => 'Mark McGwire',
+    'accomplishment' => "Mark set a major league home run record in 1998.\n",
+    'stats' => "65 Home Runs\n0.278 Batting Average\n"
+  ]
+---
+test: Quoted scalars
+todo: true
+spec: 2.17
+yaml: |
+  unicode: "Sosa did fine.\u263A"
+  control: "\b1998\t1999\t2000\n"
+  hexesc:  "\x0D\x0A is \r\n"
+
+  single: '"Howdy!" he cried.'
+  quoted: ' # not a ''comment''.'
+  tie-fighter: '|\-*-/|'
+ruby: |
+  {
+    "tie-fighter" => "|\\-*-/|",
+    "control"=>"\0101998\t1999\t2000\n",
+    "unicode"=>"Sosa did fine." + ["263A".hex ].pack('U*'),
+    "quoted"=>" # not a 'comment'.",
+    "single"=>"\"Howdy!\" he cried.",
+    "hexesc"=>"\r\n is \r\n"
+  }
+---
+test: Multiline flow scalars
+todo: true
+spec: 2.18
+yaml: |
+  plain:
+    This unquoted scalar
+    spans many lines.
+
+  quoted: "So does this
+    quoted scalar.\n"
+ruby: |
+  {
+    'plain' => 'This unquoted scalar spans many lines.',
+    'quoted' => "So does this quoted scalar.\n"
+  }
+---
+test: Integers
+spec: 2.19
+yaml: |
+  canonical: 12345
+  octal: 014
+  hexadecimal: 0xC
+php: |
+  [
+    'canonical' => 12345,
+    'octal' => 014,
+    'hexadecimal' => 0xC
+  ]
+---
+test: Decimal Integer
+deprecated: true
+spec: 2.19
+yaml: |
+  decimal: +12,345
+php: |
+  [
+    'decimal' => 12345.0,
+  ]
+---
+# FIX: spec shows parens around -inf and NaN
+test: Floating point
+spec: 2.20
+yaml: |
+  canonical: 1.23015e+3
+  exponential: 12.3015e+02
+  negative infinity: -.inf
+  not a number: .NaN
+  float as whole number: !!float 1
+php: |
+  [
+    'canonical' => 1230.15,
+    'exponential' => 1230.15,
+    'negative infinity' => log(0),
+    'not a number' => -log(0),
+    'float as whole number' => (float) 1
+  ]
+---
+test: Fixed Floating point
+deprecated: true
+spec: 2.20
+yaml: |
+  fixed: 1,230.15
+php: |
+  [
+    'fixed' => 1230.15,
+  ]
+---
+test: Timestamps
+todo: true
+spec: 2.22
+yaml: |
+  canonical: 2001-12-15T02:59:43.1Z
+  iso8601:  2001-12-14t21:59:43.10-05:00
+  spaced:  2001-12-14 21:59:43.10 -05:00
+  date:   2002-12-14 # Time is noon UTC
+php: |
+  [
+    'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
+    'iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+    'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+    'date' => Date.new( 2002, 12, 14 )
+  ]
+---
+test: legacy Timestamps test
+todo: true
+spec: legacy D4
+yaml: |
+    canonical: 2001-12-15T02:59:43.00Z
+    iso8601:  2001-02-28t21:59:43.00-05:00
+    spaced:  2001-12-14 21:59:43.00 -05:00
+    date:   2002-12-14
+php: |
+   [
+     'canonical' => Time::utc( 2001, 12, 15, 2, 59, 43, 0 ),
+     'iso8601' => YAML::mktime( 2001, 2, 28, 21, 59, 43, 0, "-05:00" ),
+     'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0, "-05:00" ),
+     'date' => Date.new( 2002, 12, 14 )
+   ]
+---
+test: Various explicit families
+todo: true
+spec: 2.23
+yaml: |
+  not-date: !!str 2002-04-28
+  picture: !binary |
+   R0lGODlhDAAMAIQAAP//9/X
+   17unp5WZmZgAAAOfn515eXv
+   Pz7Y6OjuDg4J+fn5OTk6enp
+   56enmleECcgggoBADs=
+
+  application specific tag: !!something |
+   The semantics of the tag
+   above may be different for
+   different documents.
+
+ruby-setup: |
+  YAML.add_private_type( "something" ) do |type, val|
+    "SOMETHING: #{val}"
+  end
+ruby: |
+  {
+    'not-date' => '2002-04-28',
+    'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;",
+    'application specific tag' => "SOMETHING: The semantics of the tag\nabove may be different for\ndifferent documents.\n"
+  }
+---
+test: Application specific family
+todo: true
+spec: 2.24
+yaml: |
+  # Establish a tag prefix
+  --- !clarkevans.com,2002/graph/^shape
+    # Use the prefix: shorthand for
+    # !clarkevans.com,2002/graph/circle
+  - !^circle
+    center: &ORIGIN {x: 73, 'y': 129}
+    radius: 7
+  - !^line # !clarkevans.com,2002/graph/line
+    start: *ORIGIN
+    finish: { x: 89, 'y': 102 }
+  - !^label
+    start: *ORIGIN
+    color: 0xFFEEBB
+    value: Pretty vector drawing.
+ruby-setup: |
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/shape' ) { |type, val|
+    if Array === val
+      val << "Shape Container"
+      val
+    else
+      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
+    end
+  }
+  one_shape_proc = Proc.new { |type, val|
+    scheme, domain, type = type.split( /:/, 3 )
+    if val.is_a? ::Hash
+      val['TYPE'] = "Shape: #{type}"
+      val
+    else
+      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
+    end
+  }
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/circle', &one_shape_proc )
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/line', &one_shape_proc )
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/label', &one_shape_proc )
+ruby: |
+  [
+    {
+      "radius" => 7,
+      "center"=>
+      {
+        "x" => 73,
+        "y" => 129
+      },
+      "TYPE" => "Shape: graph/circle"
+    }, {
+      "finish" =>
+      {
+        "x" => 89,
+        "y" => 102
+      },
+      "TYPE" => "Shape: graph/line",
+      "start" =>
+      {
+        "x" => 73,
+        "y" => 129
+      }
+    }, {
+      "TYPE" => "Shape: graph/label",
+      "value" => "Pretty vector drawing.",
+      "start" =>
+      {
+        "x" => 73,
+        "y" => 129
+      },
+      "color" => 16772795
+    },
+    "Shape Container"
+  ]
+# ---
+# test: Unordered set
+# spec: 2.25
+# yaml: |
+#   # sets are represented as a
+#   # mapping where each key is
+#   # associated with the empty string
+#   --- !set
+#   ? Mark McGwire
+#   ? Sammy Sosa
+#   ? Ken Griff
+---
+test: Ordered mappings
+todo: true
+spec: 2.26
+yaml: |
+  # ordered maps are represented as
+  # a sequence of mappings, with
+  # each mapping having one key
+  --- !omap
+  - Mark McGwire: 65
+  - Sammy Sosa: 63
+  - Ken Griffy: 58
+ruby: |
+  YAML::Omap[
+    'Mark McGwire', 65,
+    'Sammy Sosa', 63,
+    'Ken Griffy', 58
+  ]
+---
+test: Invoice
+dump_skip: true
+spec: 2.27
+yaml: |
+  --- !clarkevans.com,2002/^invoice
+  invoice: 34843
+  date   : 2001-01-23
+  bill-to: &id001
+      given  : Chris
+      family : Dumars
+      address:
+          lines: |
+              458 Walkman Dr.
+              Suite #292
+          city    : Royal Oak
+          state   : MI
+          postal  : 48046
+  ship-to: *id001
+  product:
+      -
+        sku         : BL394D
+        quantity    : 4
+        description : Basketball
+        price       : 450.00
+      -
+        sku         : BL4438H
+        quantity    : 1
+        description : Super Hoop
+        price       : 2392.00
+  tax  : 251.42
+  total: 4443.52
+  comments: >
+    Late afternoon is best.
+    Backup contact is Nancy
+    Billsmer @ 338-4338.
+php: |
+  [
+     'invoice' => 34843, 'date' => gmmktime(0, 0, 0, 1, 23, 2001),
+     'bill-to' =>
+      [ 'given' => 'Chris', 'family' => 'Dumars', 'address' => [ 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ] ]
+     , 'ship-to' =>
+      [ 'given' => 'Chris', 'family' => 'Dumars', 'address' => [ 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ] ]
+     , 'product' =>
+       [
+        [ 'sku' => 'BL394D', 'quantity' => 4, 'description' => 'Basketball', 'price' => 450.00 ],
+        [ 'sku' => 'BL4438H', 'quantity' => 1, 'description' => 'Super Hoop', 'price' => 2392.00 ]
+       ],
+     'tax' => 251.42, 'total' => 4443.52,
+     'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n"
+  ]
+---
+test: Log file
+todo: true
+spec: 2.28
+yaml: |
+  ---
+  Time: 2001-11-23 15:01:42 -05:00
+  User: ed
+  Warning: >
+    This is an error message
+    for the log file
+  ---
+  Time: 2001-11-23 15:02:31 -05:00
+  User: ed
+  Warning: >
+    A slightly different error
+    message.
+  ---
+  Date: 2001-11-23 15:03:17 -05:00
+  User: ed
+  Fatal: >
+    Unknown variable "bar"
+  Stack:
+    - file: TopClass.py
+      line: 23
+      code: |
+        x = MoreObject("345\n")
+    - file: MoreClass.py
+      line: 58
+      code: |-
+        foo = bar
+ruby: |
+  y = YAML::Stream.new
+  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
+           'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
+  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
+           'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
+  y.add( { 'Date' => YAML::mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
+           'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
+           'Stack' => [
+           { 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
+           { 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
+documents: 3
+
+---
+test: Throwaway comments
+yaml: |
+   ### These are four throwaway comment  ###
+
+   ### lines (the second line is empty). ###
+   this: |   # Comments may trail lines.
+      contains three lines of text.
+      The third one starts with a
+      # character. This isn't a comment.
+
+   # These are three throwaway comment
+   # lines (the first line is empty).
+php: |
+   [
+     'this' => "contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"
+   ]
+---
+test: Document with a single value
+todo: true
+yaml: |
+   --- >
+   This YAML stream contains a single text value.
+   The next stream is a log file - a sequence of
+   log entries. Adding an entry to the log is a
+   simple matter of appending it at the end.
+ruby: |
+   "This YAML stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end.\n"
+---
+test: Document stream
+todo: true
+yaml: |
+   ---
+   at: 2001-08-12 09:25:00.00 Z
+   type: GET
+   HTTP: '1.0'
+   url: '/index.html'
+   ---
+   at: 2001-08-12 09:25:10.00 Z
+   type: GET
+   HTTP: '1.0'
+   url: '/toc.html'
+ruby: |
+   y = YAML::Stream.new
+   y.add( {
+      'at' => Time::utc( 2001, 8, 12, 9, 25, 00 ),
+      'type' => 'GET',
+      'HTTP' => '1.0',
+      'url' => '/index.html'
+   } )
+   y.add( {
+      'at' => Time::utc( 2001, 8, 12, 9, 25, 10 ),
+      'type' => 'GET',
+      'HTTP' => '1.0',
+      'url' => '/toc.html'
+   } )
+documents: 2
+
+---
+test: Top level mapping
+yaml: |
+   # This stream is an example of a top-level mapping.
+   invoice : 34843
+   date    : 2001-01-23
+   total   : 4443.52
+php: |
+   [
+      'invoice' => 34843,
+      'date' => gmmktime(0, 0, 0, 1, 23, 2001),
+      'total' => 4443.52
+   ]
+---
+test: Single-line documents
+todo: true
+yaml: |
+  # The following is a sequence of three documents.
+  # The first contains an empty mapping, the second
+  # an empty sequence, and the last an empty string.
+  --- {}
+  --- [ ]
+  --- ''
+ruby: |
+  y = YAML::Stream.new
+  y.add( {} )
+  y.add( [] )
+  y.add( '' )
+documents: 3
+
+---
+test: Document with pause
+todo: true
+yaml: |
+  # A communication channel based on a YAML stream.
+  ---
+  sent at: 2002-06-06 11:46:25.10 Z
+  payload: Whatever
+  # Receiver can process this as soon as the following is sent:
+  ...
+  # Even if the next message is sent long after:
+  ---
+  sent at: 2002-06-06 12:05:53.47 Z
+  payload: Whatever
+  ...
+ruby: |
+  y = YAML::Stream.new
+  y.add(
+    { 'sent at' => YAML::mktime( 2002, 6, 6, 11, 46, 25, 0.10 ),
+      'payload' => 'Whatever' }
+  )
+  y.add(
+    { "payload" => "Whatever", "sent at" => YAML::mktime( 2002, 6, 6, 12, 5, 53, 0.47 ) }
+  )
+documents: 2
+
+---
+test: Explicit typing
+deprecated: Using the non-specific tag "!" is deprecated since Symfony 3.4 as its behavior will change in 4.0.
+yaml: |
+   integer: 12
+   also int: ! "12"
+   string: !!str 12
+php: |
+   [ 'integer' => 12, 'also int' => 12, 'string' => '12' ]
+---
+test: Private types
+todo: true
+yaml: |
+  # Both examples below make use of the 'x-private:ball'
+  # type family URI, but with different semantics.
+  ---
+  pool: !!ball
+    number: 8
+    color: black
+  ---
+  bearing: !!ball
+    material: steel
+ruby: |
+  y = YAML::Stream.new
+  y.add( { 'pool' =>
+    YAML::PrivateType.new( 'ball',
+      { 'number' => 8, 'color' => 'black' } ) }
+  )
+  y.add( { 'bearing' =>
+    YAML::PrivateType.new( 'ball',
+      { 'material' => 'steel' } ) }
+  )
+documents: 2
+
+---
+test: Type family under yaml.org
+yaml: |
+  # The URI is 'tag:yaml.org,2002:str'
+  - !!str a Unicode string
+php: |
+  [ 'a Unicode string' ]
+---
+test: Type family under perl.yaml.org
+todo: true
+yaml: |
+  # The URI is 'tag:perl.yaml.org,2002:Text::Tabs'
+  - !perl/Text::Tabs {}
+ruby: |
+  [ YAML::DomainType.new( 'perl.yaml.org,2002', 'Text::Tabs', {} ) ]
+---
+test: Type family under clarkevans.com
+todo: true
+yaml: |
+  # The URI is 'tag:clarkevans.com,2003-02:timesheet'
+  - !clarkevans.com,2003-02/timesheet {}
+ruby: |
+  [ YAML::DomainType.new( 'clarkevans.com,2003-02', 'timesheet', {} ) ]
+---
+test: URI Escaping
+todo: true
+yaml: |
+  same:
+    - !domain.tld,2002/type\x30 value
+    - !domain.tld,2002/type0 value
+  different: # As far as the YAML parser is concerned
+    - !domain.tld,2002/type%30 value
+    - !domain.tld,2002/type0 value
+ruby-setup: |
+  YAML.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
+    "ONE: #{val}"
+  }
+  YAML.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
+    "TWO: #{val}"
+  }
+ruby: |
+  { 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value', 'ONE: value' ] }
+---
+test: URI Prefixing
+todo: true
+yaml: |
+  # 'tag:domain.tld,2002:invoice' is some type family.
+  invoice: !domain.tld,2002/^invoice
+    # 'seq' is shorthand for 'tag:yaml.org,2002:seq'.
+    # This does not effect '^customer' below
+    # because it is does not specify a prefix.
+    customers: !seq
+      # '^customer' is shorthand for the full
+      # notation 'tag:domain.tld,2002:customer'.
+      - !^customer
+        given : Chris
+        family : Dumars
+ruby-setup: |
+  YAML.add_domain_type( "domain.tld,2002", /(invoice|customer)/ ) { |type, val|
+    if val.is_a? ::Hash
+      scheme, domain, type = type.split( /:/, 3 )
+      val['type'] = "domain #{type}"
+      val
+    else
+      raise YAML::Error, "Not a Hash in domain.tld/invoice: " + val.inspect
+    end
+  }
+ruby: |
+  { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }
+
+---
+test: Overriding anchors
+yaml: |
+  anchor : &A001 This scalar has an anchor.
+  override : &A001 >
+   The alias node below is a
+   repeated use of this value.
+  alias : *A001
+php: |
+  [ 'anchor' => 'This scalar has an anchor.',
+    'override' => "The alias node below is a repeated use of this value.\n",
+    'alias' => "The alias node below is a repeated use of this value.\n"]
+---
+test: Flow and block formatting
+todo: true
+yaml: |
+  empty: []
+  flow: [ one, two, three # May span lines,
+           , four,           # indentation is
+             five ]          # mostly ignored.
+  block:
+   - First item in top sequence
+   -
+    - Subordinate sequence entry
+   - >
+     A folded sequence entry
+   - Sixth item in top sequence
+ruby: |
+  { 'empty' => [], 'flow' => [ 'one', 'two', 'three', 'four', 'five' ],
+    'block' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
+    "A folded sequence entry\n", 'Sixth item in top sequence' ] }
+---
+test: Complete mapping test
+todo: true
+yaml: |
+ empty: {}
+ flow: { one: 1, two: 2 }
+ spanning: { one: 1,
+    two: 2 }
+ block:
+  first : First entry
+  second:
+   key: Subordinate mapping
+  third:
+   - Subordinate sequence
+   - { }
+   - Previous mapping is empty.
+   - A key: value pair in a sequence.
+     A second: key:value pair.
+   - The previous entry is equal to the following one.
+   -
+     A key: value pair in a sequence.
+     A second: key:value pair.
+  !float 12 : This key is a float.
+  ? >
+   ?
+  : This key had to be protected.
+  "\a" : This key had to be escaped.
+  ? >
+   This is a
+   multi-line
+   folded key
+  : Whose value is
+    also multi-line.
+  ? this also works as a key
+  : with a value at the next line.
+  ?
+   - This key
+   - is a sequence
+  :
+   - With a sequence value.
+  ?
+   This: key
+   is a: mapping
+  :
+   with a: mapping value.
+ruby: |
+  { 'empty' => {}, 'flow' => { 'one' => 1, 'two' => 2 },
+    'spanning' => { 'one' => 1, 'two' => 2 },
+    'block' => { 'first' => 'First entry', 'second' =>
+    { 'key' => 'Subordinate mapping' }, 'third' =>
+      [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
+        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
+        'The previous entry is equal to the following one.',
+        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
+    12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
+    "\a" => 'This key had to be escaped.',
+    "This is a multi-line folded key\n" => "Whose value is also multi-line.",
+    'this also works as a key' => 'with a value at the next line.',
+    [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }
+  # Couldn't recreate map exactly, so we'll do a detailed check to be sure it's entact
+  obj_y['block'].keys.each { |k|
+    if Hash === k
+      v = obj_y['block'][k]
+      if k['This'] == 'key' and k['is a'] == 'mapping' and v['with a'] == 'mapping value.'
+         obj_r['block'][k] = v
+      end
+    end
+  }
+---
+test: Literal explicit indentation
+yaml: |
+   # Explicit indentation must
+   # be given in all the three
+   # following cases.
+   leading spaces: |2
+         This value starts with four spaces.
+
+   leading line break: |2
+
+     This value starts with a line break.
+
+   leading comment indicator: |2
+     # first line starts with a
+     # character.
+
+   # Explicit indentation may
+   # also be given when it is
+   # not required.
+   redundant: |2
+     This value is indented 2 spaces.
+php: |
+   [
+      'leading spaces' => "    This value starts with four spaces.\n",
+      'leading line break' => "\nThis value starts with a line break.\n",
+      'leading comment indicator' => "# first line starts with a\n# character.\n",
+      'redundant' => "This value is indented 2 spaces.\n"
+   ]
+---
+test: Chomping and keep modifiers
+yaml: |
+    clipped: |
+        This has one newline.
+
+    same as "clipped" above: "This has one newline.\n"
+
+    stripped: |-
+        This has no newline.
+
+    same as "stripped" above: "This has no newline."
+
+    kept: |+
+        This has two newlines.
+
+    same as "kept" above: "This has two newlines.\n\n"
+php: |
+    [
+      'clipped' => "This has one newline.\n",
+      'same as "clipped" above' => "This has one newline.\n",
+      'stripped' => 'This has no newline.',
+      'same as "stripped" above' => 'This has no newline.',
+      'kept' => "This has two newlines.\n\n",
+      'same as "kept" above' => "This has two newlines.\n\n"
+    ]
+---
+test: Literal combinations
+todo: true
+yaml: |
+   empty: |
+
+   literal: |
+    The \ ' " characters may be
+    freely used. Leading white
+       space is significant.
+
+    Line breaks are significant.
+    Thus this value contains one
+    empty line and ends with a
+    single line break, but does
+    not start with one.
+
+   is equal to: "The \\ ' \" characters may \
+    be\nfreely used. Leading white\n   space \
+    is significant.\n\nLine breaks are \
+    significant.\nThus this value contains \
+    one\nempty line and ends with a\nsingle \
+    line break, but does\nnot start with one.\n"
+
+   # Comments may follow a block
+   # scalar value. They must be
+   # less indented.
+
+   # Modifiers may be combined in any order.
+   indented and chomped: |2-
+       This has no newline.
+
+   also written as: |-2
+       This has no newline.
+
+   both are equal to: "  This has no newline."
+php: |
+   [
+     'empty' => '',
+     'literal' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " +
+       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" +
+       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n",
+     'is equal to' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " +
+       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" +
+       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n",
+     'indented and chomped' => '  This has no newline.',
+     'also written as' => '  This has no newline.',
+     'both are equal to' => '  This has no newline.'
+   [
+---
+test: Folded combinations
+todo: true
+yaml: |
+   empty: >
+
+   one paragraph: >
+    Line feeds are converted
+    to spaces, so this value
+    contains no line breaks
+    except for the final one.
+
+   multiple paragraphs: >2
+
+     An empty line, either
+     at the start or in
+     the value:
+
+     Is interpreted as a
+     line break. Thus this
+     value contains three
+     line breaks.
+
+   indented text: >
+       This is a folded
+       paragraph followed
+       by a list:
+        * first entry
+        * second entry
+       Followed by another
+       folded paragraph,
+       another list:
+
+        * first entry
+
+        * second entry
+
+       And a final folded
+       paragraph.
+
+   above is equal to: |
+       This is a folded paragraph followed by a list:
+        * first entry
+        * second entry
+       Followed by another folded paragraph, another list:
+
+        * first entry
+
+        * second entry
+
+       And a final folded paragraph.
+
+   # Explicit comments may follow
+   # but must be less indented.
+php: |
+   [
+     'empty' => '',
+     'one paragraph' => 'Line feeds are converted to spaces, so this value'.
+       " contains no line breaks except for the final one.\n",
+     'multiple paragraphs' => "\nAn empty line, either at the start or in the value:\n".
+       "Is interpreted as a line break. Thus this value contains three line breaks.\n",
+     'indented text' => "This is a folded paragraph followed by a list:\n".
+       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
+       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n",
+     'above is equal to' => "This is a folded paragraph followed by a list:\n".
+       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
+       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n"
+   ]
+---
+test: Single quotes
+todo: true
+yaml: |
+   empty: ''
+   second: '! : \ etc. can be used freely.'
+   third: 'a single quote '' must be escaped.'
+   span: 'this contains
+         six spaces
+
+         and one
+         line break'
+   is same as: "this contains six spaces\nand one line break"
+php: |
+   [
+     'empty' => '',
+     'second' => '! : \\ etc. can be used freely.',
+     'third' => "a single quote ' must be escaped.",
+     'span' => "this contains six spaces\nand one line break",
+     'is same as' => "this contains six spaces\nand one line break"
+   ]
+---
+test: Double quotes
+todo: true
+yaml: |
+   empty: ""
+   second: "! : etc. can be used freely."
+   third: "a \" or a \\ must be escaped."
+   fourth: "this value ends with an LF.\n"
+   span: "this contains
+     four  \
+         spaces"
+   is equal to: "this contains four  spaces"
+php: |
+   [
+     'empty' => '',
+     'second' => '! : etc. can be used freely.',
+     'third' => 'a " or a \\ must be escaped.',
+     'fourth' => "this value ends with an LF.\n",
+     'span' => "this contains four  spaces",
+     'is equal to' => "this contains four  spaces"
+   ]
+---
+test: Unquoted strings
+todo: true
+yaml: |
+   first: There is no unquoted empty string.
+
+   second: 12          ## This is an integer.
+
+   third: !!str 12      ## This is a string.
+
+   span: this contains
+         six spaces
+
+         and one
+         line break
+
+   indicators: this has no comments.
+               #:foo and bar# are
+               both text.
+
+   flow: [ can span
+              lines, # comment
+              like
+              this ]
+
+   note: { one-line keys: but multi-line values }
+
+php: |
+   [
+     'first' => 'There is no unquoted empty string.',
+     'second' => 12,
+     'third' => '12',
+     'span' => "this contains six spaces\nand one line break",
+     'indicators' => "this has no comments. #:foo and bar# are both text.",
+     'flow' => [ 'can span lines', 'like this' ],
+     'note' => { 'one-line keys' => 'but multi-line values' }
+   ]
+---
+test: Spanning sequences
+todo: true
+yaml: |
+   # The following are equal seqs
+   # with different identities.
+   flow: [ one, two ]
+   spanning: [ one,
+        two ]
+   block:
+     - one
+     - two
+php: |
+   [
+     'flow' => [ 'one', 'two' ],
+     'spanning' => [ 'one', 'two' ],
+     'block' => [ 'one', 'two' ]
+   ]
+---
+test: Flow mappings
+yaml: |
+   # The following are equal maps
+   # with different identities.
+   flow: { one: 1, two: 2 }
+   block:
+       one: 1
+       two: 2
+php: |
+   [
+     'flow' => [ 'one' => 1, 'two' => 2 ],
+     'block' => [ 'one' => 1, 'two' => 2 ]
+   ]
+---
+test: Representations of 12
+todo: true
+yaml: |
+   - 12 # An integer
+   # The following scalars
+   # are loaded to the
+   # string value '1' '2'.
+   - !!str 12
+   - '12'
+   - "12"
+   - "\
+     1\
+     2\
+     "
+   # Strings containing paths and regexps can be unquoted:
+   - /foo/bar
+   - d:/foo/bar
+   - foo/bar
+   - /a.*b/
+php: |
+   [ 12, '12', '12', '12', '12', '/foo/bar', 'd:/foo/bar', 'foo/bar', '/a.*b/' ]
+---
+test: "Null"
+todo: true
+yaml: |
+   canonical: ~
+
+   english: null
+
+   # This sequence has five
+   # entries, two with values.
+   sparse:
+     - ~
+     - 2nd entry
+     - Null
+     - 4th entry
+     -
+
+   four: This mapping has five keys,
+         only two with values.
+
+php: |
+   [
+     'canonical' => null,
+     'english' => null,
+     'sparse' => [ null, '2nd entry', null, '4th entry', null ]],
+     'four' => 'This mapping has five keys, only two with values.'
+   ]
+---
+test: Omap
+todo: true
+yaml: |
+   # Explicitly typed dictionary.
+   Bestiary: !omap
+     - aardvark: African pig-like ant eater. Ugly.
+     - anteater: South-American ant eater. Two species.
+     - anaconda: South-American constrictor snake. Scary.
+     # Etc.
+ruby: |
+   {
+     'Bestiary' => YAML::Omap[
+       'aardvark', 'African pig-like ant eater. Ugly.',
+       'anteater', 'South-American ant eater. Two species.',
+       'anaconda', 'South-American constrictor snake. Scary.'
+     ]
+   }
+
+---
+test: Pairs
+todo: true
+yaml: |
+  # Explicitly typed pairs.
+  tasks: !pairs
+    - meeting: with team.
+    - meeting: with boss.
+    - break: lunch.
+    - meeting: with client.
+ruby: |
+  {
+    'tasks' => YAML::Pairs[
+      'meeting', 'with team.',
+      'meeting', 'with boss.',
+      'break', 'lunch.',
+      'meeting', 'with client.'
+    ]
+  }
+
+---
+test: Set
+todo: true
+yaml: |
+  # Explicitly typed set.
+  baseball players: !set
+    Mark McGwire:
+    Sammy Sosa:
+    Ken Griffey:
+ruby: |
+  {
+    'baseball players' => YAML::Set[
+      'Mark McGwire', nil,
+      'Sammy Sosa', nil,
+      'Ken Griffey', nil
+    ]
+  }
+
+---
+test: Integer
+yaml: |
+   canonical: 12345
+   octal: 014
+   hexadecimal: 0xC
+php: |
+   [
+     'canonical' => 12345,
+     'octal' => 12,
+     'hexadecimal' => 12
+   ]
+---
+test: Decimal
+deprecated: true
+yaml: |
+   decimal: +12,345
+php: |
+   [
+     'decimal' => 12345.0,
+   ]
+---
+test: Fixed Float
+deprecated: true
+yaml: |
+   fixed: 1,230.15
+php: |
+  [
+    'fixed' => 1230.15,
+  ]
+---
+test: Float
+yaml: |
+   canonical: 1.23015e+3
+   exponential: 12.3015e+02
+   negative infinity: -.inf
+   not a number: .NaN
+php: |
+  [
+    'canonical' => 1230.15,
+    'exponential' => 1230.15,
+    'negative infinity' => log(0),
+    'not a number' => -log(0)
+  ]
+---
+test: Timestamp
+todo: true
+yaml: |
+   canonical:       2001-12-15T02:59:43.1Z
+   valid iso8601:   2001-12-14t21:59:43.10-05:00
+   space separated: 2001-12-14 21:59:43.10 -05:00
+   date (noon UTC): 2002-12-14
+ruby: |
+   [
+     'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
+     'valid iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+     'space separated' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+     'date (noon UTC)' => Date.new( 2002, 12, 14 )
+   ]
+---
+test: Binary
+todo: true
+yaml: |
+   canonical: !binary "\
+    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5\
+    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+\
+    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC\
+    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs="
+   base64: !binary |
+    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5
+    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+
+    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC
+    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs=
+   description: >
+    The binary value above is a tiny arrow
+    encoded as a gif image.
+ruby-setup: |
+   arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
+ruby: |
+   {
+     'canonical' => arrow_gif,
+     'base64' => arrow_gif,
+     'description' => "The binary value above is a tiny arrow encoded as a gif image.\n"
+   }
+
+---
+test: Merge key
+todo: true
+yaml: |
+  ---
+  - &CENTER { x: 1, y: 2 }
+  - &LEFT { x: 0, y: 2 }
+  - &BIG { r: 10 }
+  - &SMALL { r: 1 }
+
+  # All the following maps are equal:
+
+  - # Explicit keys
+    x: 1
+    y: 2
+    r: 10
+    label: center/big
+
+  - # Merge one map
+    << : *CENTER
+    r: 10
+    label: center/big
+
+  - # Merge multiple maps
+    << : [ *CENTER, *BIG ]
+    label: center/big
+
+  - # Override
+    << : [ *BIG, *LEFT, *SMALL ]
+    x: 1
+    label: center/big
+
+ruby-setup: |
+  center = { 'x' => 1, 'y' => 2 }
+  left = { 'x' => 0, 'y' => 2 }
+  big = { 'r' => 10 }
+  small = { 'r' => 1 }
+  node1 = { 'x' => 1, 'y' => 2, 'r' => 10, 'label' => 'center/big' }
+  node2 = center.dup
+  node2.update( { 'r' => 10, 'label' => 'center/big' } )
+  node3 = big.dup
+  node3.update( center )
+  node3.update( { 'label' => 'center/big' } )
+  node4 = small.dup
+  node4.update( left )
+  node4.update( big )
+  node4.update( { 'x' => 1, 'label' => 'center/big' } )
+
+ruby: |
+  [
+    center, left, big, small, node1, node2, node3, node4
+  ]
+
+---
+test: Default key
+todo: true
+yaml: |
+   ---     # Old schema
+   link with:
+     - library1.dll
+     - library2.dll
+   ---     # New schema
+   link with:
+     - = : library1.dll
+       version: 1.2
+     - = : library2.dll
+       version: 2.3
+ruby: |
+   y = YAML::Stream.new
+   y.add( { 'link with' => [ 'library1.dll', 'library2.dll' ] } )
+   obj_h = Hash[ 'version' => 1.2 ]
+   obj_h.default = 'library1.dll'
+   obj_h2 = Hash[ 'version' => 2.3 ]
+   obj_h2.default = 'library2.dll'
+   y.add( { 'link with' => [ obj_h, obj_h2 ] } )
+documents: 2
+
+---
+test: Special keys
+todo: true
+yaml: |
+   "!": These three keys
+   "&": had to be quoted
+   "=": and are normal strings.
+   # NOTE: the following node should NOT be serialized this way.
+   encoded node :
+    !special '!' : '!type'
+    !special|canonical '&' : 12
+    = : value
+   # The proper way to serialize the above node is as follows:
+   node : !!type &12 value
+ruby: |
+   { '!' => 'These three keys', '&' => 'had to be quoted',
+     '=' => 'and are normal strings.',
+     'encoded node' => YAML::PrivateType.new( 'type', 'value' ),
+     'node' => YAML::PrivateType.new( 'type', 'value' ) }
diff --git a/lib/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml b/lib/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
new file mode 100644
index 000000000..e96b55362
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
@@ -0,0 +1,266 @@
+--- %YAML:1.0
+test: Strings
+brief: >
+    Any group of characters beginning with an
+    alphabetic or numeric character is a string,
+    unless it belongs to one of the groups below
+    (such as an Integer or Time).
+yaml: |
+    String
+php: |
+    'String'
+---
+test: String characters
+brief: >
+    A string can contain any alphabetic or
+    numeric character, along with many
+    punctuation characters, including the
+    period, dash, space, quotes, exclamation, and
+    question mark.
+yaml: |
+    - What's Yaml?
+    - It's for writing data structures in plain text.
+    - And?
+    - And what? That's not good enough for you?
+    - No, I mean, "And what about Yaml?"
+    - Oh, oh yeah. Uh.. Yaml for Ruby.
+php: |
+    [
+      "What's Yaml?",
+      "It's for writing data structures in plain text.",
+      "And?",
+      "And what? That's not good enough for you?",
+      "No, I mean, \"And what about Yaml?\"",
+      "Oh, oh yeah. Uh.. Yaml for Ruby."
+    ]
+---
+test: Indicators in Strings
+brief: >
+    Be careful using indicators in strings.  In particular,
+    the comma, colon, and pound sign must be used carefully.
+yaml: |
+    the colon followed by space is an indicator: but is a string:right here
+    same for the pound sign: here we have it#in a string
+    the comma can, honestly, be used in most cases: [ but not in, inline collections ]
+php: |
+    [
+      'the colon followed by space is an indicator' => 'but is a string:right here',
+      'same for the pound sign' => 'here we have it#in a string',
+      'the comma can, honestly, be used in most cases' => ['but not in', 'inline collections']
+    ]
+---
+test: Forcing Strings
+brief: >
+    Any YAML type can be forced into a string using the
+    explicit !!str method.
+yaml: |
+    date string: !!str 2001-08-01
+    number string: !!str 192
+php: |
+    [
+      'date string' => '2001-08-01',
+      'number string' => '192'
+    ]
+---
+test: Single-quoted Strings
+brief: >
+    You can also enclose your strings within single quotes,
+    which allows use of slashes, colons, and other indicators
+    freely.  Inside single quotes, you can represent a single
+    quote in your string by using two single quotes next to
+    each other.
+yaml: |
+    all my favorite symbols: '#:!/%.)'
+    a few i hate: '&(*'
+    why do i hate them?: 'it''s very hard to explain'
+    entities: '&pound; me'
+php: |
+    [
+      'all my favorite symbols' => '#:!/%.)',
+      'a few i hate' => '&(*',
+      'why do i hate them?' => 'it\'s very hard to explain',
+      'entities' => '&pound; me'
+    ]
+---
+test: Double-quoted Strings
+brief: >
+    Enclosing strings in double quotes allows you
+    to use escapings to represent ASCII and
+    Unicode characters.
+yaml: |
+    i know where i want my line breaks: "one here\nand another here\n"
+php: |
+    [
+      'i know where i want my line breaks' => "one here\nand another here\n"
+    ]
+---
+test: Multi-line Quoted Strings
+todo: true
+brief: >
+    Both single- and double-quoted strings may be
+    carried on to new lines in your YAML document.
+    They must be indented a step and indentation
+    is interpreted as a single space.
+yaml: |
+    i want a long string: "so i'm going to
+      let it go on and on to other lines
+      until i end it with a quote."
+php: |
+    ['i want a long string' => "so i'm going to ".
+         "let it go on and on to other lines ".
+         "until i end it with a quote."
+    ]
+
+---
+test: Plain scalars
+todo: true
+brief: >
+    Unquoted strings may also span multiple lines, if they
+    are free of YAML space indicators and indented.
+yaml: |
+    - My little toe is broken in two places;
+    - I'm crazy to have skied this way;
+    - I'm not the craziest he's seen, since there was always the German guy
+      who skied for 3 hours on a broken shin bone (just below the kneecap);
+    - Nevertheless, second place is respectable, and he doesn't
+      recommend going for the record;
+    - He's going to put my foot in plaster for a month;
+    - This would impair my skiing ability somewhat for the
+      duration, as can be imagined.
+php: |
+    [
+      "My little toe is broken in two places;",
+      "I'm crazy to have skied this way;",
+      "I'm not the craziest he's seen, since there was always ".
+         "the German guy who skied for 3 hours on a broken shin ".
+         "bone (just below the kneecap);",
+      "Nevertheless, second place is respectable, and he doesn't ".
+         "recommend going for the record;",
+      "He's going to put my foot in plaster for a month;",
+      "This would impair my skiing ability somewhat for the duration, ".
+         "as can be imagined."
+    ]
+---
+test: 'Null'
+brief: >
+    You can use the tilde '~' character for a null value.
+yaml: |
+    name: Mr. Show
+    hosted by: Bob and David
+    date of next season: ~
+php: |
+    [
+      'name' => 'Mr. Show',
+      'hosted by' => 'Bob and David',
+      'date of next season' => null
+    ]
+---
+test: Boolean
+brief: >
+    You can use 'true' and 'false' for Boolean values.
+yaml: |
+    Is Gus a Liar?: true
+    Do I rely on Gus for Sustenance?: false
+php: |
+    [
+      'Is Gus a Liar?' => true,
+      'Do I rely on Gus for Sustenance?' => false
+    ]
+---
+test: Integers
+dump_skip: true
+brief: >
+    An integer is a series of numbers, optionally
+    starting with a positive or negative sign.  Integers
+    may also contain commas for readability.
+yaml: |
+    zero: 0
+    simple: 12
+php: |
+    [
+      'zero' => 0,
+      'simple' => 12,
+    ]
+---
+test: Positive Big Integer
+deprecated: true
+dump_skip: true
+brief: >
+    An integer is a series of numbers, optionally
+    starting with a positive or negative sign.  Integers
+    may also contain commas for readability.
+yaml: |
+    one-thousand: 1,000
+php: |
+    [
+      'one-thousand' => 1000.0,
+    ]
+---
+test: Negative Big Integer
+deprecated: true
+dump_skip: true
+brief: >
+    An integer is a series of numbers, optionally
+    starting with a positive or negative sign.  Integers
+    may also contain commas for readability.
+yaml: |
+    negative one-thousand: -1,000
+php: |
+    [
+      'negative one-thousand' => -1000.0
+    ]
+---
+test: Floats
+dump_skip: true
+brief: >
+     Floats are represented by numbers with decimals,
+     allowing for scientific notation, as well as
+     positive and negative infinity and "not a number."
+yaml: |
+     a simple float: 2.00
+     scientific notation: 1.00009e+3
+php: |
+     [
+       'a simple float' => 2.0,
+       'scientific notation' => 1000.09
+     ]
+---
+test: Larger Float
+dump_skip: true
+deprecated: true
+brief: >
+     Floats are represented by numbers with decimals,
+     allowing for scientific notation, as well as
+     positive and negative infinity and "not a number."
+yaml: |
+     larger float: 1,000.09
+php: |
+     [
+       'larger float' => 1000.09,
+     ]
+---
+test: Time
+todo: true
+brief: >
+    You can represent timestamps by using
+    ISO8601 format, or a variation which
+    allows spaces between the date, time and
+    time zone.
+yaml: |
+    iso8601: 2001-12-14t21:59:43.10-05:00
+    space separated: 2001-12-14 21:59:43.10 -05:00
+php: |
+    [
+      'iso8601' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+      'space separated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" )
+    ]
+---
+test: Date
+todo: true
+brief: >
+    A date can be represented by its year,
+    month and day in ISO8601 order.
+yaml: |
+    1976-07-31
+php: |
+    date( 1976, 7, 31 )
diff --git a/lib/symfony/yaml/Tests/Fixtures/arrow.gif b/lib/symfony/yaml/Tests/Fixtures/arrow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..443aca422f7624b271903e5fbb577c7f99786c0e
GIT binary patch
literal 185
zcmZ?wbhEHb<YC}pXklRZ|Nr~fukT*Ie43V)#=yYv{Q2{^xVX=s-}d$OJ$Ue7{`~oq
zCr@6!eEGb2^D;9tlarGdFJ9cz((?b`Pa=`xKR(~YlvIWC%#sWRcTe8{1|6U^K)ZPu
z7+7@_6#5zs<~?>0d66k_<YE_x%=rdim8$pu4O$C!Y%omYl|ILKm{CqZU7?AKk--`O
DSo&ob

literal 0
HcmV?d00001

diff --git a/lib/symfony/yaml/Tests/Fixtures/booleanMappingKeys.yml b/lib/symfony/yaml/Tests/Fixtures/booleanMappingKeys.yml
new file mode 100644
index 000000000..88287f1b9
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/booleanMappingKeys.yml
@@ -0,0 +1,11 @@
+--- %YAML:1.0
+test: Miscellaneous
+spec: 2.21
+yaml: |
+  true: true
+  false: false
+php: |
+  [
+    'true' => true,
+    'false' => false,
+  ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/embededPhp.yml b/lib/symfony/yaml/Tests/Fixtures/embededPhp.yml
new file mode 100644
index 000000000..ec456ed09
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/embededPhp.yml
@@ -0,0 +1 @@
+value: <?php echo 1 + 2 + 3 ?>
diff --git a/lib/symfony/yaml/Tests/Fixtures/escapedCharacters.yml b/lib/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
new file mode 100644
index 000000000..87d352db1
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
@@ -0,0 +1,155 @@
+test: outside double quotes
+yaml: |
+    \0 \ \a \b \n
+php: |
+    "\\0 \\ \\a \\b \\n"
+---
+test: 'null'
+yaml: |
+    "\0"
+php: |
+    "\x00"
+---
+test: bell
+yaml: |
+    "\a"
+php: |
+    "\x07"
+---
+test: backspace
+yaml: |
+    "\b"
+php: |
+    "\x08"
+---
+test: horizontal tab (1)
+yaml: |
+    "\t"
+php: |
+    "\x09"
+---
+test: horizontal tab (2)
+yaml: |
+    "\	"
+php: |
+    "\x09"
+---
+test: line feed
+yaml: |
+    "\n"
+php: |
+    "\x0a"
+---
+test: vertical tab
+yaml: |
+    "\v"
+php: |
+    "\x0b"
+---
+test: form feed
+yaml: |
+    "\f"
+php: |
+    "\x0c"
+---
+test: carriage return
+yaml: |
+    "\r"
+php: |
+    "\x0d"
+---
+test: escape
+yaml: |
+    "\e"
+php: |
+   "\x1b"
+---
+test: space
+yaml: |
+    "\ "
+php: |
+    "\x20"
+---
+test: slash
+yaml: |
+    "\/"
+php: |
+    "\x2f"
+---
+test: backslash
+yaml: |
+    "\\"
+php: |
+    "\\"
+---
+test: Unicode next line
+yaml: |
+    "\N"
+php: |
+    "\xc2\x85"
+---
+test: Unicode non-breaking space
+yaml: |
+    "\_"
+php: |
+    "\xc2\xa0"
+---
+test: Unicode line separator
+yaml: |
+    "\L"
+php: |
+    "\xe2\x80\xa8"
+---
+test: Unicode paragraph separator
+yaml: |
+    "\P"
+php: |
+    "\xe2\x80\xa9"
+---
+test: Escaped 8-bit Unicode
+yaml: |
+    "\x42"
+php: |
+    "B"
+---
+test: Escaped 16-bit Unicode
+yaml: |
+    "\u20ac"
+php: |
+    "\xe2\x82\xac"
+---
+test: Escaped 32-bit Unicode
+yaml: |
+    "\U00000043"
+php: |
+    "C"
+---
+test: Example 5.13 Escaped Characters
+note: |
+    Currently throws an error parsing first line. Maybe Symfony Yaml doesn't support
+    continuation of string across multiple lines? Keeping test here but disabled.
+todo: true
+yaml: |
+    "Fun with \\
+    \" \a \b \e \f \
+    \n \r \t \v \0 \
+    \  \_ \N \L \P \
+    \x41 \u0041 \U00000041"
+php: |
+    "Fun with \x5C\n\x22 \x07 \x08 \x1B \x0C\n\x0A \x0D \x09 \x0B \x00\n\x20 \xA0 \x85 \xe2\x80\xa8 \xe2\x80\xa9\nA A A"
+---
+test: Double quotes with a line feed
+yaml: |
+   { double: "some value\n \"some quoted string\" and 'some single quotes one'" }
+php: |
+    [
+        'double' => "some value\n \"some quoted string\" and 'some single quotes one'"
+    ]
+---
+test: Backslashes
+yaml: |
+    { single: 'foo\Var', no-quotes: foo\Var, double: "foo\\Var" }
+php: |
+    [
+        'single' => 'foo\Var', 'no-quotes' => 'foo\Var', 'double' => 'foo\Var'
+    ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/index.yml b/lib/symfony/yaml/Tests/Fixtures/index.yml
new file mode 100644
index 000000000..3216a89eb
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/index.yml
@@ -0,0 +1,18 @@
+- escapedCharacters
+- sfComments
+- sfCompact
+- sfTests
+- sfObjects
+- sfMergeKey
+- sfQuotes
+- YtsAnchorAlias
+- YtsBasicTests
+- YtsBlockMapping
+- YtsDocumentSeparator
+- YtsErrorTests
+- YtsFlowCollections
+- YtsFoldedScalars
+- YtsNullsAndEmpties
+- YtsSpecificationExamples
+- YtsTypeTransfers
+- unindentedCollections
diff --git a/lib/symfony/yaml/Tests/Fixtures/legacyBooleanMappingKeys.yml b/lib/symfony/yaml/Tests/Fixtures/legacyBooleanMappingKeys.yml
new file mode 100644
index 000000000..db950165e
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/legacyBooleanMappingKeys.yml
@@ -0,0 +1,23 @@
+--- %YAML:1.0
+test: Miscellaneous
+spec: 2.21
+yaml: |
+  true: true
+  false: false
+php: |
+  [
+    1 => true,
+    0 => false,
+  ]
+---
+test: Boolean
+yaml: |
+   false: used as key
+   logical:  true
+   answer: false
+php: |
+   [
+     false => 'used as key',
+     'logical' => true,
+     'answer' => false
+   ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/legacyNonStringKeys.yml b/lib/symfony/yaml/Tests/Fixtures/legacyNonStringKeys.yml
new file mode 100644
index 000000000..4e2820185
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/legacyNonStringKeys.yml
@@ -0,0 +1,2 @@
+- legacyBooleanMappingKeys
+- legacyNullMappingKey
diff --git a/lib/symfony/yaml/Tests/Fixtures/legacyNullMappingKey.yml b/lib/symfony/yaml/Tests/Fixtures/legacyNullMappingKey.yml
new file mode 100644
index 000000000..14f93c2d1
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/legacyNullMappingKey.yml
@@ -0,0 +1,9 @@
+--- %YAML:1.0
+test: Miscellaneous
+spec: 2.21
+yaml: |
+  null: ~
+php: |
+  [
+    '' => null,
+  ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml b/lib/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml
new file mode 100644
index 000000000..9d72f09be
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml
@@ -0,0 +1,14 @@
+data:
+    single_line: 'foo bar baz'
+    multi_line: |
+        foo
+        line with trailing spaces:
+          
+        bar
+        integer like line:
+        123456789
+        empty line:
+        
+        baz
+    multi_line_with_carriage_return: "foo\nbar\r\nbaz"
+    nested_inlined_multi_line_string: { inlined_multi_line: "foo\nbar\r\nempty line:\n\nbaz" }
diff --git a/lib/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block_leading_space_in_first_line.yml b/lib/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block_leading_space_in_first_line.yml
new file mode 100644
index 000000000..3f2dedd10
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block_leading_space_in_first_line.yml
@@ -0,0 +1,4 @@
+data:
+    multi_line: |4
+            the first line has leading spaces
+        The second line does not.
diff --git a/lib/symfony/yaml/Tests/Fixtures/nonStringKeys.yml b/lib/symfony/yaml/Tests/Fixtures/nonStringKeys.yml
new file mode 100644
index 000000000..354b0791e
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/nonStringKeys.yml
@@ -0,0 +1,3 @@
+- booleanMappingKeys
+- numericMappingKeys
+- nullMappingKey
diff --git a/lib/symfony/yaml/Tests/Fixtures/not_readable.yml b/lib/symfony/yaml/Tests/Fixtures/not_readable.yml
new file mode 100644
index 000000000..3216a89eb
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/not_readable.yml
@@ -0,0 +1,18 @@
+- escapedCharacters
+- sfComments
+- sfCompact
+- sfTests
+- sfObjects
+- sfMergeKey
+- sfQuotes
+- YtsAnchorAlias
+- YtsBasicTests
+- YtsBlockMapping
+- YtsDocumentSeparator
+- YtsErrorTests
+- YtsFlowCollections
+- YtsFoldedScalars
+- YtsNullsAndEmpties
+- YtsSpecificationExamples
+- YtsTypeTransfers
+- unindentedCollections
diff --git a/lib/symfony/yaml/Tests/Fixtures/nullMappingKey.yml b/lib/symfony/yaml/Tests/Fixtures/nullMappingKey.yml
new file mode 100644
index 000000000..cd90f7b4c
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/nullMappingKey.yml
@@ -0,0 +1,9 @@
+--- %YAML:1.0
+test: Miscellaneous
+spec: 2.21
+yaml: |
+  null: ~
+php: |
+  [
+    'null' => null,
+  ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/numericMappingKeys.yml b/lib/symfony/yaml/Tests/Fixtures/numericMappingKeys.yml
new file mode 100644
index 000000000..246447e4d
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/numericMappingKeys.yml
@@ -0,0 +1,23 @@
+--- %YAML:1.0
+test: A sequence with an unordered array
+brief: >
+  A sequence with an unordered array
+yaml: |
+  1: foo
+  0: bar
+php: |
+  [1 => 'foo', 0 => 'bar']
+---
+test: Integers as Map Keys
+brief: >
+    An integer can be used as dictionary key.
+yaml: |
+    1: one
+    2: two
+    3: three
+php: |
+    [
+        1 => 'one',
+        2 => 'two',
+        3 => 'three'
+    ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/sfComments.yml b/lib/symfony/yaml/Tests/Fixtures/sfComments.yml
new file mode 100644
index 000000000..af3ab3859
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/sfComments.yml
@@ -0,0 +1,76 @@
+--- %YAML:1.0
+test: Comments at the end of a line
+brief: >
+    Comments at the end of a line
+yaml: |
+    ex1: "foo # bar"
+    ex2: "foo # bar" # comment
+    ex3: 'foo # bar' # comment
+    ex4: foo # comment
+    ex5: foo	#	comment with tab before  
+    ex6: foo#foo # comment here
+    ex7: foo 	# ignore me # and me
+php: |
+    ['ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo', 'ex5' => 'foo', 'ex6' => 'foo#foo', 'ex7' => 'foo']
+---
+test: Comments in the middle
+brief: >
+  Comments in the middle
+yaml: |
+    foo:
+    # some comment
+    # some comment
+      bar: foo
+    # some comment
+    # some comment
+php: |
+    ['foo' => ['bar' => 'foo']]
+---
+test: Comments on a hash line
+brief: >
+  Comments on a hash line
+yaml: |
+    foo:   # a comment
+      foo: bar # a comment
+php: |
+    ['foo' => ['foo' => 'bar']]
+---
+test: 'Value starting with a #'
+brief: >
+  'Value starting with a #'
+yaml: |
+    foo:   '#bar'
+php: |
+    ['foo' => '#bar']
+---
+test: Document starting with a comment and a separator
+brief: >
+  Commenting before document start is allowed
+yaml: |
+    # document comment
+    ---
+    foo: bar # a comment
+php: |
+    ['foo' => 'bar']
+---
+test: Comment containing a colon on a hash line
+brief: >
+    Comment containing a colon on a scalar line
+yaml: 'foo # comment: this is also part of the comment'
+php: |
+    'foo'
+---
+test: 'Hash key containing a #'
+brief: >
+    'Hash key containing a #'
+yaml: 'foo#bar: baz'
+php: |
+    ['foo#bar' => 'baz']
+---
+test: 'Hash key ending with a space and a #'
+brief: >
+    'Hash key ending with a space and a #'
+yaml: |
+    'foo #': baz
+php: |
+    ['foo #' => 'baz']
diff --git a/lib/symfony/yaml/Tests/Fixtures/sfCompact.yml b/lib/symfony/yaml/Tests/Fixtures/sfCompact.yml
new file mode 100644
index 000000000..8cadae2c1
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/sfCompact.yml
@@ -0,0 +1,159 @@
+--- %YAML:1.0
+test: Compact notation
+brief: |
+    Compact notation for sets of mappings with single element
+yaml: |
+  ---
+  # products purchased
+  - item    : Super Hoop
+  - item    : Basketball
+    quantity: 1
+  - item:
+      name: Big Shoes
+      nick: Biggies
+    quantity: 1
+php: |
+  [
+    [
+      'item' => 'Super Hoop',
+    ],
+    [
+      'item' => 'Basketball',
+      'quantity' => 1,
+    ],
+    [
+      'item' => [
+        'name' => 'Big Shoes',
+        'nick' => 'Biggies'
+      ],
+      'quantity' => 1
+    ]
+  ]
+---
+test: Compact notation combined with inline notation
+brief: |
+    Combinations of compact and inline notation are allowed
+yaml: |
+  ---
+  items:
+    - { item: Super Hoop, quantity: 1 }
+    - [ Basketball, Big Shoes ]
+php: |
+  [
+    'items' => [
+      [
+        'item' => 'Super Hoop',
+        'quantity' => 1,
+      ],
+      [
+        'Basketball',
+        'Big Shoes'
+      ]
+      ]
+    ]
+--- %YAML:1.0
+test: Compact notation
+brief: |
+    Compact notation for sets of mappings with single element
+yaml: |
+  ---
+  # products purchased
+  - item    : Super Hoop
+  - item    : Basketball
+    quantity: 1
+  - item:
+      name: Big Shoes
+      nick: Biggies
+    quantity: 1
+php: |
+  [
+    [
+      'item' => 'Super Hoop',
+    ],
+    [
+      'item' => 'Basketball',
+      'quantity' => 1,
+    ],
+    [
+      'item' => [
+        'name' => 'Big Shoes',
+        'nick' => 'Biggies'
+      ],
+      'quantity' => 1
+    ]
+  ]
+---
+test: Compact notation combined with inline notation
+brief: |
+    Combinations of compact and inline notation are allowed
+yaml: |
+  ---
+  items:
+    - { item: Super Hoop, quantity: 1 }
+    - [ Basketball, Big Shoes ]
+php: |
+  [
+    'items' => [
+      [
+        'item' => 'Super Hoop',
+        'quantity' => 1,
+      ],
+      [
+        'Basketball',
+        'Big Shoes'
+      ]
+    ]
+  ]
+--- %YAML:1.0
+test: Compact notation
+brief: |
+    Compact notation for sets of mappings with single element
+yaml: |
+  ---
+  # products purchased
+  - item    : Super Hoop
+  - item    : Basketball
+    quantity: 1
+  - item:
+      name: Big Shoes
+      nick: Biggies
+    quantity: 1
+php: |
+  [
+    [
+      'item' => 'Super Hoop',
+    ],
+    [
+      'item' => 'Basketball',
+      'quantity' => 1,
+    ],
+    [
+      'item' => [
+        'name' => 'Big Shoes',
+        'nick' => 'Biggies'
+      ],
+      'quantity' => 1
+    ]
+  ]
+---
+test: Compact notation combined with inline notation
+brief: |
+    Combinations of compact and inline notation are allowed
+yaml: |
+  ---
+  items:
+    - { item: Super Hoop, quantity: 1 }
+    - [ Basketball, Big Shoes ]
+php: |
+  [
+    'items' => [
+      [
+        'item' => 'Super Hoop',
+        'quantity' => 1,
+      ],
+      [
+        'Basketball',
+        'Big Shoes'
+      ]
+    ]
+  ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/sfMergeKey.yml b/lib/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
new file mode 100644
index 000000000..af787ae43
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
@@ -0,0 +1,61 @@
+--- %YAML:1.0
+test: Simple In Place Substitution
+brief: >
+    If you want to reuse an entire alias, only overwriting what is different
+    you can use a << in place substitution. This is not part of the official
+    YAML spec, but a widely implemented extension. See the following URL for
+    details: http://yaml.org/type/merge.html
+yaml: |
+    foo: &foo
+        a: Steve
+        b: Clark
+        c: Brian
+        e: notnull
+    bar:
+        a: before
+        d: other
+        e: ~
+        <<: *foo
+        b: new
+        x: Oren
+        c:
+            foo: bar
+            bar: foo
+    bar_inline: {a: before, d: other, <<: *foo, b: new, x: Oren, c: { foo: bar, bar: foo}}
+    foo2: &foo2
+        a: Ballmer
+    ding: &dong [ fi, fei, fo, fam]
+    check:
+        <<:
+            - *foo
+            - *dong
+        isit: tested
+    head:
+        <<: [ *foo , *dong , *foo2 ]
+    taz: &taz
+        a: Steve
+        w:
+            p: 1234
+    nested:
+        <<: *taz
+        d: Doug
+        w: &nestedref
+            p: 12345
+        z:
+            <<: *nestedref
+    head_inline: &head_inline { <<: [ *foo , *dong , *foo2 ] }
+    recursive_inline: { <<: *head_inline, c: { <<: *foo2 } }
+php: |
+    [
+        'foo' => ['a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'e' => 'notnull'],
+        'bar' => ['a' => 'before', 'd' => 'other', 'e' => null, 'b' => 'new', 'c' => ['foo' => 'bar', 'bar' => 'foo'], 'x' => 'Oren'],
+        'bar_inline' => ['a' => 'before', 'd' => 'other', 'b' => 'new', 'c' => ['foo' => 'bar', 'bar' => 'foo'], 'e' => 'notnull', 'x' => 'Oren'],
+        'foo2' => ['a' => 'Ballmer'],
+        'ding' => ['fi', 'fei', 'fo', 'fam'],
+        'check' => ['a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'e' => 'notnull', 'fi', 'fei', 'fo', 'fam', 'isit' => 'tested'],
+        'head' => ['a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'e' => 'notnull', 'fi', 'fei', 'fo', 'fam'],
+        'taz' => ['a' => 'Steve', 'w' => ['p' => 1234]],
+        'nested' => ['a' => 'Steve', 'w' => ['p' => 12345], 'd' => 'Doug', 'z' => ['p' => 12345]],
+        'head_inline' => ['a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'e' => 'notnull', 'fi', 'fei', 'fo', 'fam'],
+        'recursive_inline' => ['a' => 'Steve', 'b' => 'Clark', 'c' => ['a' => 'Ballmer'], 'e' => 'notnull', 'fi', 'fei', 'fo', 'fam'],
+    ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/sfObjects.yml b/lib/symfony/yaml/Tests/Fixtures/sfObjects.yml
new file mode 100644
index 000000000..144615f2a
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/sfObjects.yml
@@ -0,0 +1,11 @@
+--- %YAML:1.0
+test: Objects
+brief: >
+    Comments at the end of a line
+yaml: |
+    ex1: "foo # bar"
+    ex2: "foo # bar" # comment
+    ex3: 'foo # bar' # comment
+    ex4: foo # comment
+php: |
+    ['ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo']
diff --git a/lib/symfony/yaml/Tests/Fixtures/sfQuotes.yml b/lib/symfony/yaml/Tests/Fixtures/sfQuotes.yml
new file mode 100644
index 000000000..c8326fdb2
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/sfQuotes.yml
@@ -0,0 +1,33 @@
+--- %YAML:1.0
+test: Some characters at the beginning of a string must be escaped
+brief: >
+    Some characters at the beginning of a string must be escaped
+yaml: |
+    foo: '| bar'
+php: |
+    ['foo' => '| bar']
+---
+test: A key can be a quoted string
+brief: >
+  A key can be a quoted string
+yaml: |
+    "foo1": bar
+    'foo2': bar
+    "foo \" bar": bar
+    'foo '' bar': bar
+    'foo3: ': bar
+    "foo4: ": bar
+    foo5: { "foo \" bar: ": bar, 'foo '' bar: ': bar }
+php: |
+    [
+      'foo1' => 'bar',
+      'foo2' => 'bar',
+      'foo " bar' => 'bar',
+      'foo \' bar' => 'bar',
+      'foo3: ' => 'bar',
+      'foo4: ' => 'bar',
+      'foo5' => [
+        'foo " bar: ' => 'bar',
+        'foo \' bar: ' => 'bar',
+      ],
+    ]
diff --git a/lib/symfony/yaml/Tests/Fixtures/sfTests.yml b/lib/symfony/yaml/Tests/Fixtures/sfTests.yml
new file mode 100644
index 000000000..2ea417a72
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/sfTests.yml
@@ -0,0 +1,140 @@
+--- %YAML:1.0
+test: Multiple quoted string on one line
+brief: >
+    Multiple quoted string on one line
+yaml: |
+    stripped_title: { name: "foo bar", help: "bar foo" }
+php: |
+    ['stripped_title' => ['name' => 'foo bar', 'help' => 'bar foo']]
+---
+test: Empty sequence
+yaml: |
+    foo: [ ]
+php: |
+    ['foo' => []]
+---
+test: Empty value
+yaml: |
+    foo:
+php: |
+    ['foo' => null]
+---
+test: Inline string parsing
+brief: >
+    Inline string parsing
+yaml: |
+    test: ['complex: string', 'another [string]']
+php: |
+    ['test' => ['complex: string', 'another [string]']]
+---
+test: Boolean
+brief: >
+    Boolean
+yaml: |
+    - false
+    - true
+    - null
+    - ~
+    - 'false'
+    - 'true'
+    - 'null'
+    - '~'
+php: |
+    [
+      false,
+      true,
+      null,
+      null,
+      'false',
+      'true',
+      'null',
+      '~',
+    ]
+---
+test: Empty lines in literal blocks
+brief: >
+  Empty lines in literal blocks
+yaml: |
+  foo:
+    bar: |
+      foo
+
+
+        
+      bar
+php: |
+  ['foo' => ['bar' => "foo\n\n\n  \nbar\n"]]
+---
+test: Empty lines in folded blocks
+brief: >
+  Empty lines in folded blocks
+yaml: |
+  foo:
+    bar: >
+
+      foo
+
+      
+      bar
+php: |
+  ['foo' => ['bar' => "\nfoo\n\nbar\n"]]
+---
+test: IP addresses
+brief: >
+  IP addresses
+yaml: |
+  foo: 10.0.0.2
+php: |
+  ['foo' => '10.0.0.2']
+---
+test: A sequence with an embedded mapping
+brief: >
+  A sequence with an embedded mapping
+yaml: |
+  - foo
+  - bar: { bar: foo }
+php: |
+  ['foo', ['bar' => ['bar' => 'foo']]]
+---
+test: Octal
+brief: as in spec example 2.19, octal value is converted
+yaml: |
+  foo: 0123
+php: |
+  ['foo' => 83]
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: "0123"
+php: |
+  ['foo' => '0123']
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: '0123'
+php: |
+  ['foo' => '0123']
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: |
+    0123
+php: |
+  ['foo' => "0123\n"]
+---
+test: Document as a simple hash
+brief: Document as a simple hash
+yaml: |
+  { foo: bar }
+php: |
+  ['foo' => 'bar']
+---
+test: Document as a simple array
+brief: Document as a simple array
+yaml: |
+  [ foo, bar ]
+php: |
+  ['foo', 'bar']
diff --git a/lib/symfony/yaml/Tests/Fixtures/unindentedCollections.yml b/lib/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
new file mode 100644
index 000000000..c85952df4
--- /dev/null
+++ b/lib/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
@@ -0,0 +1,82 @@
+--- %YAML:1.0
+test: Unindented collection
+brief: >
+    Unindented collection
+yaml: |
+    collection:
+    - item1
+    - item2
+    - item3
+php: |
+    ['collection' => ['item1', 'item2', 'item3']]
+---
+test: Nested unindented collection (two levels)
+brief: >
+    Nested unindented collection
+yaml: |
+    collection:
+        key:
+        - a
+        - b
+        - c
+php: |
+    ['collection' => ['key' => ['a', 'b', 'c']]]
+---
+test: Nested unindented collection (three levels)
+brief: >
+    Nested unindented collection
+yaml: |
+    collection:
+        key:
+            subkey:
+            - one
+            - two
+            - three
+php: |
+    ['collection' => ['key' => ['subkey' => ['one', 'two', 'three']]]]
+---
+test: Key/value after unindented collection (1)
+brief: >
+    Key/value after unindented collection (1)
+yaml: |
+    collection:
+        key:
+        - a
+        - b
+        - c
+    foo: bar
+php: |
+    ['collection' => ['key' => ['a', 'b', 'c']], 'foo' => 'bar']
+---
+test: Key/value after unindented collection (at the same level)
+brief: >
+    Key/value after unindented collection
+yaml: |
+    collection:
+        key:
+        - a
+        - b
+        - c
+        foo: bar
+php: |
+    ['collection' => ['key' => ['a', 'b', 'c'], 'foo' => 'bar']]
+---
+test: Shortcut Key after unindented collection
+brief: >
+    Key/value after unindented collection
+yaml: |
+    collection:
+    - key: foo
+      foo: bar
+php: |
+    ['collection' => [['key' => 'foo', 'foo' => 'bar']]]
+---
+test: Shortcut Key after unindented collection with custom spaces
+brief: >
+    Key/value after unindented collection
+yaml: |
+    collection:
+    -  key: foo
+       foo: bar
+php: |
+    ['collection' => [['key' => 'foo', 'foo' => 'bar']]]
diff --git a/lib/symfony/yaml/Tests/InlineTest.php b/lib/symfony/yaml/Tests/InlineTest.php
new file mode 100644
index 000000000..014a12a70
--- /dev/null
+++ b/lib/symfony/yaml/Tests/InlineTest.php
@@ -0,0 +1,784 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Yaml\Inline;
+use Symfony\Component\Yaml\Yaml;
+
+class InlineTest extends TestCase
+{
+    protected function setUp()
+    {
+        Inline::initialize(0, 0);
+    }
+
+    /**
+     * @dataProvider getTestsForParse
+     */
+    public function testParse($yaml, $value, $flags = 0)
+    {
+        $this->assertSame($value, Inline::parse($yaml, $flags), sprintf('::parse() converts an inline YAML to a PHP structure (%s)', $yaml));
+    }
+
+    /**
+     * @dataProvider getTestsForParseWithMapObjects
+     */
+    public function testParseWithMapObjects($yaml, $value, $flags = Yaml::PARSE_OBJECT_FOR_MAP)
+    {
+        $actual = Inline::parse($yaml, $flags);
+
+        $this->assertSame(serialize($value), serialize($actual));
+    }
+
+    /**
+     * @dataProvider getTestsForParsePhpConstants
+     */
+    public function testParsePhpConstants($yaml, $value)
+    {
+        $actual = Inline::parse($yaml, Yaml::PARSE_CONSTANT);
+
+        $this->assertSame($value, $actual);
+    }
+
+    public function getTestsForParsePhpConstants()
+    {
+        return [
+            ['!php/const Symfony\Component\Yaml\Yaml::PARSE_CONSTANT', Yaml::PARSE_CONSTANT],
+            ['!php/const PHP_INT_MAX', PHP_INT_MAX],
+            ['[!php/const PHP_INT_MAX]', [PHP_INT_MAX]],
+            ['{ foo: !php/const PHP_INT_MAX }', ['foo' => PHP_INT_MAX]],
+            ['!php/const NULL', null],
+        ];
+    }
+
+    public function testParsePhpConstantThrowsExceptionWhenUndefined()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('The constant "WRONG_CONSTANT" is not defined');
+        Inline::parse('!php/const WRONG_CONSTANT', Yaml::PARSE_CONSTANT);
+    }
+
+    public function testParsePhpConstantThrowsExceptionOnInvalidType()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessageRegExp('#The string "!php/const PHP_INT_MAX" could not be parsed as a constant.*#');
+        Inline::parse('!php/const PHP_INT_MAX', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since Symfony 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 1.
+     * @dataProvider getTestsForParseLegacyPhpConstants
+     */
+    public function testDeprecatedConstantTag($yaml, $expectedValue)
+    {
+        $this->assertSame($expectedValue, Inline::parse($yaml, Yaml::PARSE_CONSTANT));
+    }
+
+    public function getTestsForParseLegacyPhpConstants()
+    {
+        return [
+            ['!php/const:Symfony\Component\Yaml\Yaml::PARSE_CONSTANT', Yaml::PARSE_CONSTANT],
+            ['!php/const:PHP_INT_MAX', PHP_INT_MAX],
+            ['[!php/const:PHP_INT_MAX]', [PHP_INT_MAX]],
+            ['{ foo: !php/const:PHP_INT_MAX }', ['foo' => PHP_INT_MAX]],
+            ['!php/const:NULL', null],
+        ];
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getTestsForParseWithMapObjects
+     */
+    public function testParseWithMapObjectsPassingTrue($yaml, $value)
+    {
+        $actual = Inline::parse($yaml, false, false, true);
+
+        $this->assertSame(serialize($value), serialize($actual));
+    }
+
+    /**
+     * @dataProvider getTestsForDump
+     */
+    public function testDump($yaml, $value, $parseFlags = 0)
+    {
+        $this->assertEquals($yaml, Inline::dump($value), sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
+
+        $this->assertSame($value, Inline::parse(Inline::dump($value), $parseFlags), 'check consistency');
+    }
+
+    public function testDumpNumericValueWithLocale()
+    {
+        $locale = setlocale(LC_NUMERIC, 0);
+        if (false === $locale) {
+            $this->markTestSkipped('Your platform does not support locales.');
+        }
+
+        try {
+            $requiredLocales = ['fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252'];
+            if (false === setlocale(LC_NUMERIC, $requiredLocales)) {
+                $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $requiredLocales));
+            }
+
+            $this->assertEquals('1.2', Inline::dump(1.2));
+            $this->assertStringContainsStringIgnoringCase('fr', setlocale(LC_NUMERIC, 0));
+        } finally {
+            setlocale(LC_NUMERIC, $locale);
+        }
+    }
+
+    public function testHashStringsResemblingExponentialNumericsShouldNotBeChangedToINF()
+    {
+        $value = '686e444';
+
+        $this->assertSame($value, Inline::parse(Inline::dump($value)));
+    }
+
+    public function testParseScalarWithNonEscapedBlackslashShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('Found unknown escape character "\V".');
+        Inline::parse('"Foo\Var"');
+    }
+
+    public function testParseScalarWithNonEscapedBlackslashAtTheEndShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        Inline::parse('"Foo\\"');
+    }
+
+    public function testParseScalarWithIncorrectlyQuotedStringShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $value = "'don't do somthin' like that'";
+        Inline::parse($value);
+    }
+
+    public function testParseScalarWithIncorrectlyDoubleQuotedStringShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $value = '"don"t do somthin" like that"';
+        Inline::parse($value);
+    }
+
+    public function testParseInvalidMappingKeyShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $value = '{ "foo " bar": "bar" }';
+        Inline::parse($value);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Using a colon after an unquoted mapping key that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}") is deprecated since Symfony 3.2 and will throw a ParseException in 4.0 on line 1.
+     * throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
+     */
+    public function testParseMappingKeyWithColonNotFollowedBySpace()
+    {
+        Inline::parse('{1:""}');
+    }
+
+    public function testParseInvalidMappingShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        Inline::parse('[foo] bar');
+    }
+
+    public function testParseInvalidSequenceShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        Inline::parse('{ foo: bar } bar');
+    }
+
+    public function testParseInvalidTaggedSequenceShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        Inline::parse('!foo { bar: baz } qux', Yaml::PARSE_CUSTOM_TAGS);
+    }
+
+    public function testParseScalarWithCorrectlyQuotedStringShouldReturnString()
+    {
+        $value = "'don''t do somthin'' like that'";
+        $expect = "don't do somthin' like that";
+
+        $this->assertSame($expect, Inline::parseScalar($value));
+    }
+
+    /**
+     * @dataProvider getDataForParseReferences
+     */
+    public function testParseReferences($yaml, $expected)
+    {
+        $this->assertSame($expected, Inline::parse($yaml, 0, ['var' => 'var-value']));
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getDataForParseReferences
+     */
+    public function testParseReferencesAsFifthArgument($yaml, $expected)
+    {
+        $this->assertSame($expected, Inline::parse($yaml, false, false, false, ['var' => 'var-value']));
+    }
+
+    public function getDataForParseReferences()
+    {
+        return [
+            'scalar' => ['*var', 'var-value'],
+            'list' => ['[ *var ]', ['var-value']],
+            'list-in-list' => ['[[ *var ]]', [['var-value']]],
+            'map-in-list' => ['[ { key: *var } ]', [['key' => 'var-value']]],
+            'embedded-mapping-in-list' => ['[ key: *var ]', [['key' => 'var-value']]],
+            'map' => ['{ key: *var }', ['key' => 'var-value']],
+            'list-in-map' => ['{ key: [*var] }', ['key' => ['var-value']]],
+            'map-in-map' => ['{ foo: { bar: *var } }', ['foo' => ['bar' => 'var-value']]],
+        ];
+    }
+
+    public function testParseMapReferenceInSequence()
+    {
+        $foo = [
+            'a' => 'Steve',
+            'b' => 'Clark',
+            'c' => 'Brian',
+        ];
+        $this->assertSame([$foo], Inline::parse('[*foo]', 0, ['foo' => $foo]));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testParseMapReferenceInSequenceAsFifthArgument()
+    {
+        $foo = [
+            'a' => 'Steve',
+            'b' => 'Clark',
+            'c' => 'Brian',
+        ];
+        $this->assertSame([$foo], Inline::parse('[*foo]', false, false, false, ['foo' => $foo]));
+    }
+
+    public function testParseUnquotedAsterisk()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('A reference must contain at least one character at line 1.');
+        Inline::parse('{ foo: * }');
+    }
+
+    public function testParseUnquotedAsteriskFollowedByAComment()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('A reference must contain at least one character at line 1.');
+        Inline::parse('{ foo: * #foo }');
+    }
+
+    /**
+     * @dataProvider getReservedIndicators
+     */
+    public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)
+    {
+        $this->expectException(ParseException::class);
+        $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));
+
+        Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
+    }
+
+    public function getReservedIndicators()
+    {
+        return [['@'], ['`']];
+    }
+
+    /**
+     * @dataProvider getScalarIndicators
+     */
+    public function testParseUnquotedScalarStartingWithScalarIndicator($indicator)
+    {
+        $this->expectException(ParseException::class);
+        $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));
+
+        Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
+    }
+
+    public function getScalarIndicators()
+    {
+        return [['|'], ['>']];
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Not quoting the scalar "%bar " starting with the "%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0 on line 1.
+     * throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
+     */
+    public function testParseUnquotedScalarStartingWithPercentCharacter()
+    {
+        Inline::parse('{ foo: %bar }');
+    }
+
+    /**
+     * @dataProvider getDataForIsHash
+     */
+    public function testIsHash($array, $expected)
+    {
+        $this->assertSame($expected, Inline::isHash($array));
+    }
+
+    public function getDataForIsHash()
+    {
+        return [
+            [[], false],
+            [[1, 2, 3], false],
+            [[2 => 1, 1 => 2, 0 => 3], true],
+            [['foo' => 1, 'bar' => 2], true],
+        ];
+    }
+
+    public function getTestsForParse()
+    {
+        return [
+            ['', ''],
+            ['null', null],
+            ['false', false],
+            ['true', true],
+            ['12', 12],
+            ['-12', -12],
+            ['1_2', 12],
+            ['_12', '_12'],
+            ['12_', 12],
+            ['"quoted string"', 'quoted string'],
+            ["'quoted string'", 'quoted string'],
+            ['12.30e+02', 12.30e+02],
+            ['123.45_67', 123.4567],
+            ['0x4D2', 0x4D2],
+            ['0x_4_D_2_', 0x4D2],
+            ['02333', 02333],
+            ['0_2_3_3_3', 02333],
+            ['.Inf', -log(0)],
+            ['-.Inf', log(0)],
+            ["'686e444'", '686e444'],
+            ['686e444', 646e444],
+            ['123456789123456789123456789123456789', '123456789123456789123456789123456789'],
+            ['"foo\r\nbar"', "foo\r\nbar"],
+            ["'foo#bar'", 'foo#bar'],
+            ["'foo # bar'", 'foo # bar'],
+            ["'#cfcfcf'", '#cfcfcf'],
+            ['::form_base.html.twig', '::form_base.html.twig'],
+
+            // Pre-YAML-1.2 booleans
+            ["'y'", 'y'],
+            ["'n'", 'n'],
+            ["'yes'", 'yes'],
+            ["'no'", 'no'],
+            ["'on'", 'on'],
+            ["'off'", 'off'],
+
+            ['2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)],
+            ['2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)],
+            ['2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)],
+            ['1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)],
+            ['1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)],
+
+            ['"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''],
+            ["'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''],
+
+            // sequences
+            // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
+            ['[foo, http://urls.are/no/mappings, false, null, 12]', ['foo', 'http://urls.are/no/mappings', false, null, 12]],
+            ['[  foo  ,   bar , false  ,  null     ,  12  ]', ['foo', 'bar', false, null, 12]],
+            ['[\'foo,bar\', \'foo bar\']', ['foo,bar', 'foo bar']],
+
+            // mappings
+            ['{foo: bar,bar: foo,"false": false, "null": null,integer: 12}', ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12]],
+            ['{ foo  : bar, bar : foo, "false"  :   false,  "null"  :   null,  integer :  12  }', ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12]],
+            ['{foo: \'bar\', bar: \'foo: bar\'}', ['foo' => 'bar', 'bar' => 'foo: bar']],
+            ['{\'foo\': \'bar\', "bar": \'foo: bar\'}', ['foo' => 'bar', 'bar' => 'foo: bar']],
+            ['{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', ['foo\'' => 'bar', 'bar"' => 'foo: bar']],
+            ['{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', ['foo: ' => 'bar', 'bar: ' => 'foo: bar']],
+            ['{"foo:bar": "baz"}', ['foo:bar' => 'baz']],
+            ['{"foo":"bar"}', ['foo' => 'bar']],
+
+            // nested sequences and mappings
+            ['[foo, [bar, foo]]', ['foo', ['bar', 'foo']]],
+            ['[foo, {bar: foo}]', ['foo', ['bar' => 'foo']]],
+            ['{ foo: {bar: foo} }', ['foo' => ['bar' => 'foo']]],
+            ['{ foo: [bar, foo] }', ['foo' => ['bar', 'foo']]],
+            ['{ foo:{bar: foo} }', ['foo' => ['bar' => 'foo']]],
+            ['{ foo:[bar, foo] }', ['foo' => ['bar', 'foo']]],
+
+            ['[  foo, [  bar, foo  ]  ]', ['foo', ['bar', 'foo']]],
+
+            ['[{ foo: {bar: foo} }]', [['foo' => ['bar' => 'foo']]]],
+
+            ['[foo, [bar, [foo, [bar, foo]], foo]]', ['foo', ['bar', ['foo', ['bar', 'foo']], 'foo']]],
+
+            ['[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', ['foo', ['bar' => 'foo', 'foo' => ['foo', ['bar' => 'foo']]], ['foo', ['bar' => 'foo']]]],
+
+            ['[foo, bar: { foo: bar }]', ['foo', '1' => ['bar' => ['foo' => 'bar']]]],
+            ['[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', ['foo', '@foo.baz', ['%foo%' => 'foo is %foo%', 'bar' => '%foo%'], true, '@service_container']],
+        ];
+    }
+
+    public function getTestsForParseWithMapObjects()
+    {
+        return [
+            ['', ''],
+            ['null', null],
+            ['false', false],
+            ['true', true],
+            ['12', 12],
+            ['-12', -12],
+            ['"quoted string"', 'quoted string'],
+            ["'quoted string'", 'quoted string'],
+            ['12.30e+02', 12.30e+02],
+            ['0x4D2', 0x4D2],
+            ['02333', 02333],
+            ['.Inf', -log(0)],
+            ['-.Inf', log(0)],
+            ["'686e444'", '686e444'],
+            ['686e444', 646e444],
+            ['123456789123456789123456789123456789', '123456789123456789123456789123456789'],
+            ['"foo\r\nbar"', "foo\r\nbar"],
+            ["'foo#bar'", 'foo#bar'],
+            ["'foo # bar'", 'foo # bar'],
+            ["'#cfcfcf'", '#cfcfcf'],
+            ['::form_base.html.twig', '::form_base.html.twig'],
+
+            ['2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)],
+            ['2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)],
+            ['2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)],
+            ['1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)],
+            ['1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)],
+
+            ['"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''],
+            ["'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''],
+
+            // sequences
+            // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
+            ['[foo, http://urls.are/no/mappings, false, null, 12]', ['foo', 'http://urls.are/no/mappings', false, null, 12]],
+            ['[  foo  ,   bar , false  ,  null     ,  12  ]', ['foo', 'bar', false, null, 12]],
+            ['[\'foo,bar\', \'foo bar\']', ['foo,bar', 'foo bar']],
+
+            // mappings
+            ['{foo: bar,bar: foo,"false": false,"null": null,integer: 12}', (object) ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12], Yaml::PARSE_OBJECT_FOR_MAP],
+            ['{ foo  : bar, bar : foo,  "false"  :   false,  "null"  :   null,  integer :  12  }', (object) ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12], Yaml::PARSE_OBJECT_FOR_MAP],
+            ['{foo: \'bar\', bar: \'foo: bar\'}', (object) ['foo' => 'bar', 'bar' => 'foo: bar']],
+            ['{\'foo\': \'bar\', "bar": \'foo: bar\'}', (object) ['foo' => 'bar', 'bar' => 'foo: bar']],
+            ['{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', (object) ['foo\'' => 'bar', 'bar"' => 'foo: bar']],
+            ['{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', (object) ['foo: ' => 'bar', 'bar: ' => 'foo: bar']],
+            ['{"foo:bar": "baz"}', (object) ['foo:bar' => 'baz']],
+            ['{"foo":"bar"}', (object) ['foo' => 'bar']],
+
+            // nested sequences and mappings
+            ['[foo, [bar, foo]]', ['foo', ['bar', 'foo']]],
+            ['[foo, {bar: foo}]', ['foo', (object) ['bar' => 'foo']]],
+            ['{ foo: {bar: foo} }', (object) ['foo' => (object) ['bar' => 'foo']]],
+            ['{ foo: [bar, foo] }', (object) ['foo' => ['bar', 'foo']]],
+
+            ['[  foo, [  bar, foo  ]  ]', ['foo', ['bar', 'foo']]],
+
+            ['[{ foo: {bar: foo} }]', [(object) ['foo' => (object) ['bar' => 'foo']]]],
+
+            ['[foo, [bar, [foo, [bar, foo]], foo]]', ['foo', ['bar', ['foo', ['bar', 'foo']], 'foo']]],
+
+            ['[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', ['foo', (object) ['bar' => 'foo', 'foo' => ['foo', (object) ['bar' => 'foo']]], ['foo', (object) ['bar' => 'foo']]]],
+
+            ['[foo, bar: { foo: bar }]', ['foo', '1' => (object) ['bar' => (object) ['foo' => 'bar']]]],
+            ['[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', ['foo', '@foo.baz', (object) ['%foo%' => 'foo is %foo%', 'bar' => '%foo%'], true, '@service_container']],
+
+            ['{}', new \stdClass()],
+            ['{ foo  : bar, bar : {}  }', (object) ['foo' => 'bar', 'bar' => new \stdClass()]],
+            ['{ foo  : [], bar : {}  }', (object) ['foo' => [], 'bar' => new \stdClass()]],
+            ['{foo: \'bar\', bar: {} }', (object) ['foo' => 'bar', 'bar' => new \stdClass()]],
+            ['{\'foo\': \'bar\', "bar": {}}', (object) ['foo' => 'bar', 'bar' => new \stdClass()]],
+            ['{\'foo\': \'bar\', "bar": \'{}\'}', (object) ['foo' => 'bar', 'bar' => '{}']],
+
+            ['[foo, [{}, {}]]', ['foo', [new \stdClass(), new \stdClass()]]],
+            ['[foo, [[], {}]]', ['foo', [[], new \stdClass()]]],
+            ['[foo, [[{}, {}], {}]]', ['foo', [[new \stdClass(), new \stdClass()], new \stdClass()]]],
+            ['[foo, {bar: {}}]', ['foo', '1' => (object) ['bar' => new \stdClass()]]],
+        ];
+    }
+
+    public function getTestsForDump()
+    {
+        return [
+            ['null', null],
+            ['false', false],
+            ['true', true],
+            ['12', 12],
+            ["'1_2'", '1_2'],
+            ['_12', '_12'],
+            ["'12_'", '12_'],
+            ["'quoted string'", 'quoted string'],
+            ['!!float 1230', 12.30e+02],
+            ['1234', 0x4D2],
+            ['1243', 02333],
+            ["'0x_4_D_2_'", '0x_4_D_2_'],
+            ["'0_2_3_3_3'", '0_2_3_3_3'],
+            ['.Inf', -log(0)],
+            ['-.Inf', log(0)],
+            ["'686e444'", '686e444'],
+            ['"foo\r\nbar"', "foo\r\nbar"],
+            ["'foo#bar'", 'foo#bar'],
+            ["'foo # bar'", 'foo # bar'],
+            ["'#cfcfcf'", '#cfcfcf'],
+
+            ["'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''],
+
+            ["'-dash'", '-dash'],
+            ["'-'", '-'],
+
+            // Pre-YAML-1.2 booleans
+            ["'y'", 'y'],
+            ["'n'", 'n'],
+            ["'yes'", 'yes'],
+            ["'no'", 'no'],
+            ["'on'", 'on'],
+            ["'off'", 'off'],
+
+            // sequences
+            ['[foo, bar, false, null, 12]', ['foo', 'bar', false, null, 12]],
+            ['[\'foo,bar\', \'foo bar\']', ['foo,bar', 'foo bar']],
+
+            // mappings
+            ['{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }', ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12]],
+            ['{ foo: bar, bar: \'foo: bar\' }', ['foo' => 'bar', 'bar' => 'foo: bar']],
+
+            // nested sequences and mappings
+            ['[foo, [bar, foo]]', ['foo', ['bar', 'foo']]],
+
+            ['[foo, [bar, [foo, [bar, foo]], foo]]', ['foo', ['bar', ['foo', ['bar', 'foo']], 'foo']]],
+
+            ['{ foo: { bar: foo } }', ['foo' => ['bar' => 'foo']]],
+
+            ['[foo, { bar: foo }]', ['foo', ['bar' => 'foo']]],
+
+            ['[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]', ['foo', ['bar' => 'foo', 'foo' => ['foo', ['bar' => 'foo']]], ['foo', ['bar' => 'foo']]]],
+
+            ['[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', ['foo', '@foo.baz', ['%foo%' => 'foo is %foo%', 'bar' => '%foo%'], true, '@service_container']],
+
+            ['{ foo: { bar: { 1: 2, baz: 3 } } }', ['foo' => ['bar' => [1 => 2, 'baz' => 3]]]],
+        ];
+    }
+
+    /**
+     * @dataProvider getTimestampTests
+     */
+    public function testParseTimestampAsUnixTimestampByDefault($yaml, $year, $month, $day, $hour, $minute, $second)
+    {
+        $this->assertSame(gmmktime($hour, $minute, $second, $month, $day, $year), Inline::parse($yaml));
+    }
+
+    /**
+     * @dataProvider getTimestampTests
+     */
+    public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $hour, $minute, $second, $timezone)
+    {
+        $expected = new \DateTime($yaml);
+        $expected->setTimeZone(new \DateTimeZone('UTC'));
+        $expected->setDate($year, $month, $day);
+
+        if (\PHP_VERSION_ID >= 70100) {
+            $expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
+        } else {
+            $expected->setTime($hour, $minute, $second);
+        }
+
+        $date = Inline::parse($yaml, Yaml::PARSE_DATETIME);
+        $this->assertEquals($expected, $date);
+        $this->assertSame($timezone, $date->format('O'));
+    }
+
+    public function getTimestampTests()
+    {
+        return [
+            'canonical' => ['2001-12-15T02:59:43.1Z', 2001, 12, 15, 2, 59, 43.1, '+0000'],
+            'ISO-8601' => ['2001-12-15t21:59:43.10-05:00', 2001, 12, 16, 2, 59, 43.1, '-0500'],
+            'spaced' => ['2001-12-15 21:59:43.10 -5', 2001, 12, 16, 2, 59, 43.1, '-0500'],
+            'date' => ['2001-12-15', 2001, 12, 15, 0, 0, 0, '+0000'],
+        ];
+    }
+
+    /**
+     * @dataProvider getTimestampTests
+     */
+    public function testParseNestedTimestampListAsDateTimeObject($yaml, $year, $month, $day, $hour, $minute, $second)
+    {
+        $expected = new \DateTime($yaml);
+        $expected->setTimeZone(new \DateTimeZone('UTC'));
+        $expected->setDate($year, $month, $day);
+        if (\PHP_VERSION_ID >= 70100) {
+            $expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
+        } else {
+            $expected->setTime($hour, $minute, $second);
+        }
+
+        $expectedNested = ['nested' => [$expected]];
+        $yamlNested = "{nested: [$yaml]}";
+
+        $this->assertEquals($expectedNested, Inline::parse($yamlNested, Yaml::PARSE_DATETIME));
+    }
+
+    /**
+     * @dataProvider getDateTimeDumpTests
+     */
+    public function testDumpDateTime($dateTime, $expected)
+    {
+        $this->assertSame($expected, Inline::dump($dateTime));
+    }
+
+    public function getDateTimeDumpTests()
+    {
+        $tests = [];
+
+        $dateTime = new \DateTime('2001-12-15 21:59:43', new \DateTimeZone('UTC'));
+        $tests['date-time-utc'] = [$dateTime, '2001-12-15T21:59:43+00:00'];
+
+        $dateTime = new \DateTimeImmutable('2001-07-15 21:59:43', new \DateTimeZone('Europe/Berlin'));
+        $tests['immutable-date-time-europe-berlin'] = [$dateTime, '2001-07-15T21:59:43+02:00'];
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider getBinaryData
+     */
+    public function testParseBinaryData($data)
+    {
+        $this->assertSame('Hello world', Inline::parse($data));
+    }
+
+    public function getBinaryData()
+    {
+        return [
+            'enclosed with double quotes' => ['!!binary "SGVsbG8gd29ybGQ="'],
+            'enclosed with single quotes' => ["!!binary 'SGVsbG8gd29ybGQ='"],
+            'containing spaces' => ['!!binary  "SGVs bG8gd 29ybGQ="'],
+        ];
+    }
+
+    /**
+     * @dataProvider getInvalidBinaryData
+     */
+    public function testParseInvalidBinaryData($data, $expectedMessage)
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessageRegExp($expectedMessage);
+
+        Inline::parse($data);
+    }
+
+    public function getInvalidBinaryData()
+    {
+        return [
+            'length not a multiple of four' => ['!!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'],
+            'invalid characters' => ['!!binary "SGVsbG8#d29ybGQ="', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'too many equals characters' => ['!!binary "SGVsbG8gd29yb==="', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'misplaced equals character' => ['!!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'],
+        ];
+    }
+
+    public function testNotSupportedMissingValue()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('Malformed inline YAML string: {this, is not, supported} at line 1.');
+        Inline::parse('{this, is not, supported}');
+    }
+
+    public function testVeryLongQuotedStrings()
+    {
+        $longStringWithQuotes = str_repeat("x\r\n\\\"x\"x", 1000);
+
+        $yamlString = Inline::dump(['longStringWithQuotes' => $longStringWithQuotes]);
+        $arrayFromYaml = Inline::parse($yamlString);
+
+        $this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Omitting the key of a mapping is deprecated and will throw a ParseException in 4.0 on line 1.
+     */
+    public function testOmittedMappingKeyIsParsedAsColon()
+    {
+        $this->assertSame([':' => 'foo'], Inline::parse('{: foo}'));
+    }
+
+    /**
+     * @dataProvider getTestsForNullValues
+     */
+    public function testParseMissingMappingValueAsNull($yaml, $expected)
+    {
+        $this->assertSame($expected, Inline::parse($yaml));
+    }
+
+    public function getTestsForNullValues()
+    {
+        return [
+            'null before closing curly brace' => ['{foo:}', ['foo' => null]],
+            'null before comma' => ['{foo:, bar: baz}', ['foo' => null, 'bar' => 'baz']],
+        ];
+    }
+
+    public function testTheEmptyStringIsAValidMappingKey()
+    {
+        $this->assertSame(['' => 'foo'], Inline::parse('{ "": foo }'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Implicit casting of incompatible mapping keys to strings is deprecated since Symfony 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 1.
+     * @dataProvider getNotPhpCompatibleMappingKeyData
+     */
+    public function testImplicitStringCastingOfMappingKeysIsDeprecated($yaml, $expected)
+    {
+        $this->assertSame($expected, Inline::parse($yaml));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Using the Yaml::PARSE_KEYS_AS_STRINGS flag is deprecated since Symfony 3.4 as it will be removed in 4.0. Quote your keys when they are evaluable instead.
+     * @expectedDeprecation Implicit casting of incompatible mapping keys to strings is deprecated since Symfony 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 1.
+     * @dataProvider getNotPhpCompatibleMappingKeyData
+     */
+    public function testExplicitStringCastingOfMappingKeys($yaml, $expected)
+    {
+        $this->assertSame($expected, Yaml::parse($yaml, Yaml::PARSE_KEYS_AS_STRINGS));
+    }
+
+    public function getNotPhpCompatibleMappingKeyData()
+    {
+        return [
+            'boolean-true' => ['{true: "foo"}', ['true' => 'foo']],
+            'boolean-false' => ['{false: "foo"}', ['false' => 'foo']],
+            'null' => ['{null: "foo"}', ['null' => 'foo']],
+            'float' => ['{0.25: "foo"}', ['0.25' => 'foo']],
+        ];
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Support for the !str tag is deprecated since Symfony 3.4. Use the !!str tag instead on line 1.
+     */
+    public function testDeprecatedStrTag()
+    {
+        $this->assertSame(['foo' => 'bar'], Inline::parse('{ foo: !str bar }'));
+    }
+
+    public function testUnfinishedInlineMap()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('Unexpected end of line, expected one of ",}" at line 1 (near "{abc: \'def\'").');
+        Inline::parse("{abc: 'def'");
+    }
+}
diff --git a/lib/symfony/yaml/Tests/ParseExceptionTest.php b/lib/symfony/yaml/Tests/ParseExceptionTest.php
new file mode 100644
index 000000000..39579ede7
--- /dev/null
+++ b/lib/symfony/yaml/Tests/ParseExceptionTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Yaml\Exception\ParseException;
+
+class ParseExceptionTest extends TestCase
+{
+    public function testGetMessage()
+    {
+        $exception = new ParseException('Error message', 42, 'foo: bar', '/var/www/app/config.yml');
+        $message = 'Error message in "/var/www/app/config.yml" at line 42 (near "foo: bar")';
+
+        $this->assertEquals($message, $exception->getMessage());
+    }
+
+    public function testGetMessageWithUnicodeInFilename()
+    {
+        $exception = new ParseException('Error message', 42, 'foo: bar', 'äöü.yml');
+        $message = 'Error message in "äöü.yml" at line 42 (near "foo: bar")';
+
+        $this->assertEquals($message, $exception->getMessage());
+    }
+}
diff --git a/lib/symfony/yaml/Tests/ParserTest.php b/lib/symfony/yaml/Tests/ParserTest.php
new file mode 100644
index 000000000..dc7c122d5
--- /dev/null
+++ b/lib/symfony/yaml/Tests/ParserTest.php
@@ -0,0 +1,2319 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Tag\TaggedValue;
+use Symfony\Component\Yaml\Yaml;
+
+class ParserTest extends TestCase
+{
+    /** @var Parser */
+    protected $parser;
+
+    protected function setUp()
+    {
+        $this->parser = new Parser();
+    }
+
+    protected function tearDown()
+    {
+        $this->parser = null;
+
+        chmod(__DIR__.'/Fixtures/not_readable.yml', 0644);
+    }
+
+    /**
+     * @dataProvider getDataFormSpecifications
+     */
+    public function testSpecifications($expected, $yaml, $comment, $deprecated)
+    {
+        $deprecations = [];
+
+        if ($deprecated) {
+            set_error_handler(function ($type, $msg) use (&$deprecations) {
+                if (E_USER_DEPRECATED !== $type) {
+                    restore_error_handler();
+
+                    return \call_user_func_array('PHPUnit\Util\ErrorHandler::handleError', \func_get_args());
+                }
+
+                $deprecations[] = $msg;
+
+                return null;
+            });
+        }
+
+        $this->assertEquals($expected, var_export($this->parser->parse($yaml), true), $comment);
+
+        if ($deprecated) {
+            restore_error_handler();
+
+            $this->assertCount(1, $deprecations);
+            $this->assertStringContainsString(true !== $deprecated ? $deprecated : 'Using the comma as a group separator for floats is deprecated since Symfony 3.2 and will be removed in 4.0 on line 1.', $deprecations[0]);
+        }
+    }
+
+    public function getDataFormSpecifications()
+    {
+        return $this->loadTestsFromFixtureFiles('index.yml');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecationMessage Using the Yaml::PARSE_KEYS_AS_STRINGS flag is deprecated since Symfony 3.4 as it will be removed in 4.0. Quote your keys when they are evaluable
+     * @dataProvider getNonStringMappingKeysData
+     */
+    public function testNonStringMappingKeys($expected, $yaml, $comment)
+    {
+        $this->assertSame($expected, var_export($this->parser->parse($yaml, Yaml::PARSE_KEYS_AS_STRINGS), true), $comment);
+    }
+
+    public function getNonStringMappingKeysData()
+    {
+        return $this->loadTestsFromFixtureFiles('nonStringKeys.yml');
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getLegacyNonStringMappingKeysData
+     */
+    public function testLegacyNonStringMappingKeys($expected, $yaml, $comment)
+    {
+        $this->assertSame($expected, var_export($this->parser->parse($yaml), true), $comment);
+    }
+
+    public function getLegacyNonStringMappingKeysData()
+    {
+        return $this->loadTestsFromFixtureFiles('legacyNonStringKeys.yml');
+    }
+
+    public function testTabsInYaml()
+    {
+        // test tabs in YAML
+        $yamls = [
+            "foo:\n	bar",
+            "foo:\n 	bar",
+            "foo:\n	 bar",
+            "foo:\n 	 bar",
+        ];
+
+        foreach ($yamls as $yaml) {
+            try {
+                $this->parser->parse($yaml);
+
+                $this->fail('YAML files must not contain tabs');
+            } catch (\Exception $e) {
+                $this->assertInstanceOf('\Exception', $e, 'YAML files must not contain tabs');
+                $this->assertEquals('A YAML file cannot contain tabs as indentation at line 2 (near "'.strpbrk($yaml, "\t").'").', $e->getMessage(), 'YAML files must not contain tabs');
+            }
+        }
+    }
+
+    public function testEndOfTheDocumentMarker()
+    {
+        $yaml = <<<'EOF'
+--- %YAML:1.0
+foo
+...
+EOF;
+
+        $this->assertEquals('foo', $this->parser->parse($yaml));
+    }
+
+    public function getBlockChompingTests()
+    {
+        $tests = [];
+
+        $yaml = <<<'EOF'
+foo: |-
+    one
+    two
+bar: |-
+    one
+    two
+
+EOF;
+        $expected = [
+            'foo' => "one\ntwo",
+            'bar' => "one\ntwo",
+        ];
+        $tests['Literal block chomping strip with single trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: |-
+    one
+    two
+
+bar: |-
+    one
+    two
+
+
+EOF;
+        $expected = [
+            'foo' => "one\ntwo",
+            'bar' => "one\ntwo",
+        ];
+        $tests['Literal block chomping strip with multiple trailing newlines'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+{}
+
+
+EOF;
+        $expected = [];
+        $tests['Literal block chomping strip with multiple trailing newlines after a 1-liner'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: |-
+    one
+    two
+bar: |-
+    one
+    two
+EOF;
+        $expected = [
+            'foo' => "one\ntwo",
+            'bar' => "one\ntwo",
+        ];
+        $tests['Literal block chomping strip without trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: |
+    one
+    two
+bar: |
+    one
+    two
+
+EOF;
+        $expected = [
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo\n",
+        ];
+        $tests['Literal block chomping clip with single trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: |
+    one
+    two
+
+bar: |
+    one
+    two
+
+
+EOF;
+        $expected = [
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo\n",
+        ];
+        $tests['Literal block chomping clip with multiple trailing newlines'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo:
+- bar: |
+    one
+
+    two
+EOF;
+        $expected = [
+            'foo' => [
+                [
+                    'bar' => "one\n\ntwo",
+                ],
+            ],
+        ];
+        $tests['Literal block chomping clip with embedded blank line inside unindented collection'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: |
+    one
+    two
+bar: |
+    one
+    two
+EOF;
+        $expected = [
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo",
+        ];
+        $tests['Literal block chomping clip without trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: |+
+    one
+    two
+bar: |+
+    one
+    two
+
+EOF;
+        $expected = [
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo\n",
+        ];
+        $tests['Literal block chomping keep with single trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: |+
+    one
+    two
+
+bar: |+
+    one
+    two
+
+
+EOF;
+        $expected = [
+            'foo' => "one\ntwo\n\n",
+            'bar' => "one\ntwo\n\n",
+        ];
+        $tests['Literal block chomping keep with multiple trailing newlines'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: |+
+    one
+    two
+bar: |+
+    one
+    two
+EOF;
+        $expected = [
+            'foo' => "one\ntwo\n",
+            'bar' => "one\ntwo",
+        ];
+        $tests['Literal block chomping keep without trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >-
+    one
+    two
+bar: >-
+    one
+    two
+
+EOF;
+        $expected = [
+            'foo' => 'one two',
+            'bar' => 'one two',
+        ];
+        $tests['Folded block chomping strip with single trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >-
+    one
+    two
+
+bar: >-
+    one
+    two
+
+
+EOF;
+        $expected = [
+            'foo' => 'one two',
+            'bar' => 'one two',
+        ];
+        $tests['Folded block chomping strip with multiple trailing newlines'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >-
+    one
+    two
+bar: >-
+    one
+    two
+EOF;
+        $expected = [
+            'foo' => 'one two',
+            'bar' => 'one two',
+        ];
+        $tests['Folded block chomping strip without trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >
+    one
+    two
+bar: >
+    one
+    two
+
+EOF;
+        $expected = [
+            'foo' => "one two\n",
+            'bar' => "one two\n",
+        ];
+        $tests['Folded block chomping clip with single trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >
+    one
+    two
+
+bar: >
+    one
+    two
+
+
+EOF;
+        $expected = [
+            'foo' => "one two\n",
+            'bar' => "one two\n",
+        ];
+        $tests['Folded block chomping clip with multiple trailing newlines'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >
+    one
+    two
+bar: >
+    one
+    two
+EOF;
+        $expected = [
+            'foo' => "one two\n",
+            'bar' => 'one two',
+        ];
+        $tests['Folded block chomping clip without trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >+
+    one
+    two
+bar: >+
+    one
+    two
+
+EOF;
+        $expected = [
+            'foo' => "one two\n",
+            'bar' => "one two\n",
+        ];
+        $tests['Folded block chomping keep with single trailing newline'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >+
+    one
+    two
+
+bar: >+
+    one
+    two
+
+
+EOF;
+        $expected = [
+            'foo' => "one two\n\n",
+            'bar' => "one two\n\n",
+        ];
+        $tests['Folded block chomping keep with multiple trailing newlines'] = [$expected, $yaml];
+
+        $yaml = <<<'EOF'
+foo: >+
+    one
+    two
+bar: >+
+    one
+    two
+EOF;
+        $expected = [
+            'foo' => "one two\n",
+            'bar' => 'one two',
+        ];
+        $tests['Folded block chomping keep without trailing newline'] = [$expected, $yaml];
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider getBlockChompingTests
+     */
+    public function testBlockChomping($expected, $yaml)
+    {
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    /**
+     * Regression test for issue #7989.
+     *
+     * @see https://github.com/symfony/symfony/issues/7989
+     */
+    public function testBlockLiteralWithLeadingNewlines()
+    {
+        $yaml = <<<'EOF'
+foo: |-
+
+
+    bar
+
+EOF;
+        $expected = [
+            'foo' => "\n\nbar",
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testObjectSupportEnabled()
+    {
+        $input = <<<'EOF'
+foo: !php/object O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+EOF;
+        $this->assertEquals(['foo' => new B(), 'bar' => 1], $this->parser->parse($input, Yaml::PARSE_OBJECT), '->parse() is able to parse objects');
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testObjectSupportEnabledPassingTrue()
+    {
+        $input = <<<'EOF'
+foo: !php/object:O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+EOF;
+        $this->assertEquals(['foo' => new B(), 'bar' => 1], $this->parser->parse($input, false, true), '->parse() is able to parse objects');
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider deprecatedObjectValueProvider
+     */
+    public function testObjectSupportEnabledWithDeprecatedTag($yaml)
+    {
+        $this->assertEquals(['foo' => new B(), 'bar' => 1], $this->parser->parse($yaml, Yaml::PARSE_OBJECT), '->parse() is able to parse objects');
+    }
+
+    public function deprecatedObjectValueProvider()
+    {
+        return [
+            [
+                <<<YAML
+foo: !!php/object:O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+YAML
+            ],
+            [
+                <<<YAML
+foo: !php/object:O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+YAML
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidDumpedObjectProvider
+     */
+    public function testObjectSupportDisabledButNoExceptions($input)
+    {
+        $this->assertEquals(['foo' => null, 'bar' => 1], $this->parser->parse($input), '->parse() does not parse objects');
+    }
+
+    /**
+     * @dataProvider getObjectForMapTests
+     */
+    public function testObjectForMap($yaml, $expected)
+    {
+        $flags = Yaml::PARSE_OBJECT_FOR_MAP;
+
+        $this->assertEquals($expected, $this->parser->parse($yaml, $flags));
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getObjectForMapTests
+     */
+    public function testObjectForMapEnabledWithMappingUsingBooleanToggles($yaml, $expected)
+    {
+        $this->assertEquals($expected, $this->parser->parse($yaml, false, false, true));
+    }
+
+    public function getObjectForMapTests()
+    {
+        $tests = [];
+
+        $yaml = <<<'EOF'
+foo:
+    fiz: [cat]
+EOF;
+        $expected = new \stdClass();
+        $expected->foo = new \stdClass();
+        $expected->foo->fiz = ['cat'];
+        $tests['mapping'] = [$yaml, $expected];
+
+        $yaml = '{ "foo": "bar", "fiz": "cat" }';
+        $expected = new \stdClass();
+        $expected->foo = 'bar';
+        $expected->fiz = 'cat';
+        $tests['inline-mapping'] = [$yaml, $expected];
+
+        $yaml = "foo: bar\nbaz: foobar";
+        $expected = new \stdClass();
+        $expected->foo = 'bar';
+        $expected->baz = 'foobar';
+        $tests['object-for-map-is-applied-after-parsing'] = [$yaml, $expected];
+
+        $yaml = <<<'EOT'
+array:
+  - key: one
+  - key: two
+EOT;
+        $expected = new \stdClass();
+        $expected->array = [];
+        $expected->array[0] = new \stdClass();
+        $expected->array[0]->key = 'one';
+        $expected->array[1] = new \stdClass();
+        $expected->array[1]->key = 'two';
+        $tests['nest-map-and-sequence'] = [$yaml, $expected];
+
+        $yaml = <<<'YAML'
+map:
+  1: one
+  2: two
+YAML;
+        $expected = new \stdClass();
+        $expected->map = new \stdClass();
+        $expected->map->{1} = 'one';
+        $expected->map->{2} = 'two';
+        $tests['numeric-keys'] = [$yaml, $expected];
+
+        $yaml = <<<'YAML'
+map:
+  '0': one
+  '1': two
+YAML;
+        $expected = new \stdClass();
+        $expected->map = new \stdClass();
+        $expected->map->{0} = 'one';
+        $expected->map->{1} = 'two';
+        $tests['zero-indexed-numeric-keys'] = [$yaml, $expected];
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider invalidDumpedObjectProvider
+     */
+    public function testObjectsSupportDisabledWithExceptions($yaml)
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->parser->parse($yaml, Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
+    }
+
+    public function testCanParseContentWithTrailingSpaces()
+    {
+        $yaml = "items:  \n  foo: bar";
+
+        $expected = [
+            'items' => ['foo' => 'bar'],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider invalidDumpedObjectProvider
+     */
+    public function testObjectsSupportDisabledWithExceptionsUsingBooleanToggles($yaml)
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->parser->parse($yaml, true);
+    }
+
+    public function invalidDumpedObjectProvider()
+    {
+        $yamlTag = <<<'EOF'
+foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+EOF;
+        $localTag = <<<'EOF'
+foo: !php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+EOF;
+
+        return [
+            'yaml-tag' => [$yamlTag],
+            'local-tag' => [$localTag],
+        ];
+    }
+
+    /**
+     * @requires extension iconv
+     */
+    public function testNonUtf8Exception()
+    {
+        $yamls = [
+            iconv('UTF-8', 'ISO-8859-1', "foo: 'äöüß'"),
+            iconv('UTF-8', 'ISO-8859-15', "euro: '€'"),
+            iconv('UTF-8', 'CP1252', "cp1252: '©ÉÇáñ'"),
+        ];
+
+        foreach ($yamls as $yaml) {
+            try {
+                $this->parser->parse($yaml);
+
+                $this->fail('charsets other than UTF-8 are rejected.');
+            } catch (\Exception $e) {
+                $this->assertInstanceOf('Symfony\Component\Yaml\Exception\ParseException', $e, 'charsets other than UTF-8 are rejected.');
+            }
+        }
+    }
+
+    public function testUnindentedCollectionException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $yaml = <<<'EOF'
+
+collection:
+-item1
+-item2
+-item3
+
+EOF;
+
+        $this->parser->parse($yaml);
+    }
+
+    public function testShortcutKeyUnindentedCollectionException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $yaml = <<<'EOF'
+
+collection:
+-  key: foo
+  foo: bar
+
+EOF;
+
+        $this->parser->parse($yaml);
+    }
+
+    public function testMultipleDocumentsNotSupportedException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessageRegExp('/^Multiple documents are not supported.+/');
+        Yaml::parse(<<<'EOL'
+# Ranking of 1998 home runs
+---
+- Mark McGwire
+- Sammy Sosa
+- Ken Griffey
+
+# Team ranking
+---
+- Chicago Cubs
+- St Louis Cardinals
+EOL
+        );
+    }
+
+    public function testSequenceInAMapping()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        Yaml::parse(<<<'EOF'
+yaml:
+  hash: me
+  - array stuff
+EOF
+        );
+    }
+
+    public function testSequenceInMappingStartedBySingleDashLine()
+    {
+        $yaml = <<<'EOT'
+a:
+-
+  b:
+  -
+    bar: baz
+- foo
+d: e
+EOT;
+        $expected = [
+            'a' => [
+                [
+                    'b' => [
+                        [
+                            'bar' => 'baz',
+                        ],
+                    ],
+                ],
+                'foo',
+            ],
+            'd' => 'e',
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testSequenceFollowedByCommentEmbeddedInMapping()
+    {
+        $yaml = <<<'EOT'
+a:
+    b:
+        - c
+# comment
+    d: e
+EOT;
+        $expected = [
+            'a' => [
+                'b' => ['c'],
+                'd' => 'e',
+            ],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testNonStringFollowedByCommentEmbeddedInMapping()
+    {
+        $yaml = <<<'EOT'
+a:
+    b:
+        {}
+# comment
+    d:
+        1.1
+# another comment
+EOT;
+        $expected = [
+            'a' => [
+                'b' => [],
+                'd' => 1.1,
+            ],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function getParseExceptionNotAffectedMultiLineStringLastResortParsing()
+    {
+        $tests = [];
+
+        $yaml = <<<'EOT'
+a
+    b:
+EOT;
+        $tests['parse error on first line'] = [$yaml];
+
+        $yaml = <<<'EOT'
+a
+
+b
+    c:
+EOT;
+        $tests['parse error due to inconsistent indentation'] = [$yaml];
+
+        $yaml = <<<'EOT'
+ &  *  !  |  >  '  "  %  @  ` #, { asd a;sdasd }-@^qw3
+EOT;
+        $tests['symfony/symfony/issues/22967#issuecomment-322067742'] = [$yaml];
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider getParseExceptionNotAffectedMultiLineStringLastResortParsing
+     */
+    public function testParseExceptionNotAffectedByMultiLineStringLastResortParsing($yaml)
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->parser->parse($yaml);
+    }
+
+    public function testMultiLineStringLastResortParsing()
+    {
+        $yaml = <<<'EOT'
+test:
+  You can have things that don't look like strings here
+  true
+  yes you can
+EOT;
+        $expected = [
+            'test' => 'You can have things that don\'t look like strings here true yes you can',
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+
+        $yaml = <<<'EOT'
+a:
+    b
+       c
+EOT;
+        $expected = [
+            'a' => 'b c',
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testMappingInASequence()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        Yaml::parse(<<<'EOF'
+yaml:
+  - array stuff
+  hash: me
+EOF
+        );
+    }
+
+    public function testScalarInSequence()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('missing colon');
+        Yaml::parse(<<<'EOF'
+foo:
+    - bar
+"missing colon"
+    foo: bar
+EOF
+        );
+    }
+
+    /**
+     * > It is an error for two equal keys to appear in the same mapping node.
+     * > In such a case the YAML processor may continue, ignoring the second
+     * > `key: value` pair and issuing an appropriate warning. This strategy
+     * > preserves a consistent information model for one-pass and random access
+     * > applications.
+     *
+     * @see http://yaml.org/spec/1.2/spec.html#id2759572
+     * @see http://yaml.org/spec/1.1/#id932806
+     * @group legacy
+     */
+    public function testMappingDuplicateKeyBlock()
+    {
+        $input = <<<'EOD'
+parent:
+    child: first
+    child: duplicate
+parent:
+    child: duplicate
+    child: duplicate
+EOD;
+        $expected = [
+            'parent' => [
+                'child' => 'first',
+            ],
+        ];
+        $this->assertSame($expected, Yaml::parse($input));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testMappingDuplicateKeyFlow()
+    {
+        $input = <<<'EOD'
+parent: { child: first, child: duplicate }
+parent: { child: duplicate, child: duplicate }
+EOD;
+        $expected = [
+            'parent' => [
+                'child' => 'first',
+            ],
+        ];
+        $this->assertSame($expected, Yaml::parse($input));
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider getParseExceptionOnDuplicateData
+     * @expectedDeprecation Duplicate key "%s" detected whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated %s and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line %d.
+     * throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
+     */
+    public function testParseExceptionOnDuplicate($input, $duplicateKey, $lineNumber)
+    {
+        Yaml::parse($input);
+    }
+
+    public function getParseExceptionOnDuplicateData()
+    {
+        $tests = [];
+
+        $yaml = <<<EOD
+parent: { child: first, child: duplicate }
+EOD;
+        $tests[] = [$yaml, 'child', 1];
+
+        $yaml = <<<EOD
+parent:
+  child: first,
+  child: duplicate
+EOD;
+        $tests[] = [$yaml, 'child', 3];
+
+        $yaml = <<<EOD
+parent: { child: foo }
+parent: { child: bar }
+EOD;
+        $tests[] = [$yaml, 'parent', 2];
+
+        $yaml = <<<EOD
+parent: { child_mapping: { value: bar},  child_mapping: { value: bar} }
+EOD;
+        $tests[] = [$yaml, 'child_mapping', 1];
+
+        $yaml = <<<EOD
+parent:
+  child_mapping:
+    value: bar
+  child_mapping:
+    value: bar
+EOD;
+        $tests[] = [$yaml, 'child_mapping', 4];
+
+        $yaml = <<<EOD
+parent: { child_sequence: ['key1', 'key2', 'key3'],  child_sequence: ['key1', 'key2', 'key3'] }
+EOD;
+        $tests[] = [$yaml, 'child_sequence', 1];
+
+        $yaml = <<<EOD
+parent:
+  child_sequence:
+    - key1
+    - key2
+    - key3
+  child_sequence:
+    - key1
+    - key2
+    - key3
+EOD;
+        $tests[] = [$yaml, 'child_sequence', 6];
+
+        return $tests;
+    }
+
+    public function testEmptyValue()
+    {
+        $input = <<<'EOF'
+hash:
+EOF;
+
+        $this->assertEquals(['hash' => null], Yaml::parse($input));
+    }
+
+    public function testCommentAtTheRootIndent()
+    {
+        $this->assertEquals([
+            'services' => [
+                'app.foo_service' => [
+                    'class' => 'Foo',
+                ],
+                'app/bar_service' => [
+                    'class' => 'Bar',
+                ],
+            ],
+        ], Yaml::parse(<<<'EOF'
+# comment 1
+services:
+# comment 2
+    # comment 3
+    app.foo_service:
+        class: Foo
+# comment 4
+    # comment 5
+    app/bar_service:
+        class: Bar
+EOF
+        ));
+    }
+
+    public function testStringBlockWithComments()
+    {
+        $this->assertEquals(['content' => <<<'EOT'
+# comment 1
+header
+
+    # comment 2
+    <body>
+        <h1>title</h1>
+    </body>
+
+footer # comment3
+EOT
+        ], Yaml::parse(<<<'EOF'
+content: |
+    # comment 1
+    header
+
+        # comment 2
+        <body>
+            <h1>title</h1>
+        </body>
+
+    footer # comment3
+EOF
+        ));
+    }
+
+    public function testFoldedStringBlockWithComments()
+    {
+        $this->assertEquals([['content' => <<<'EOT'
+# comment 1
+header
+
+    # comment 2
+    <body>
+        <h1>title</h1>
+    </body>
+
+footer # comment3
+EOT
+        ]], Yaml::parse(<<<'EOF'
+-
+    content: |
+        # comment 1
+        header
+
+            # comment 2
+            <body>
+                <h1>title</h1>
+            </body>
+
+        footer # comment3
+EOF
+        ));
+    }
+
+    public function testNestedFoldedStringBlockWithComments()
+    {
+        $this->assertEquals([[
+            'title' => 'some title',
+            'content' => <<<'EOT'
+# comment 1
+header
+
+    # comment 2
+    <body>
+        <h1>title</h1>
+    </body>
+
+footer # comment3
+EOT
+        ]], Yaml::parse(<<<'EOF'
+-
+    title: some title
+    content: |
+        # comment 1
+        header
+
+            # comment 2
+            <body>
+                <h1>title</h1>
+            </body>
+
+        footer # comment3
+EOF
+        ));
+    }
+
+    public function testReferenceResolvingInInlineStrings()
+    {
+        $this->assertEquals([
+            'var' => 'var-value',
+            'scalar' => 'var-value',
+            'list' => ['var-value'],
+            'list_in_list' => [['var-value']],
+            'map_in_list' => [['key' => 'var-value']],
+            'embedded_mapping' => [['key' => 'var-value']],
+            'map' => ['key' => 'var-value'],
+            'list_in_map' => ['key' => ['var-value']],
+            'map_in_map' => ['foo' => ['bar' => 'var-value']],
+        ], Yaml::parse(<<<'EOF'
+var:  &var var-value
+scalar: *var
+list: [ *var ]
+list_in_list: [[ *var ]]
+map_in_list: [ { key: *var } ]
+embedded_mapping: [ key: *var ]
+map: { key: *var }
+list_in_map: { key: [*var] }
+map_in_map: { foo: { bar: *var } }
+EOF
+        ));
+    }
+
+    public function testYamlDirective()
+    {
+        $yaml = <<<'EOF'
+%YAML 1.2
+---
+foo: 1
+bar: 2
+EOF;
+        $this->assertEquals(['foo' => 1, 'bar' => 2], $this->parser->parse($yaml));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Implicit casting of numeric key to string is deprecated since Symfony 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 2.
+     */
+    public function testFloatKeys()
+    {
+        $yaml = <<<'EOF'
+foo:
+    1.2: "bar"
+    1.3: "baz"
+EOF;
+
+        $expected = [
+            'foo' => [
+                '1.2' => 'bar',
+                '1.3' => 'baz',
+            ],
+        ];
+
+        $this->assertEquals($expected, $this->parser->parse($yaml));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Implicit casting of non-string key to string is deprecated since Symfony 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead on line 1.
+     */
+    public function testBooleanKeys()
+    {
+        $yaml = <<<'EOF'
+true: foo
+false: bar
+EOF;
+
+        $expected = [
+            1 => 'foo',
+            0 => 'bar',
+        ];
+
+        $this->assertEquals($expected, $this->parser->parse($yaml));
+    }
+
+    public function testExplicitStringCasting()
+    {
+        $yaml = <<<'EOF'
+'1.2': "bar"
+!!str 1.3: "baz"
+
+'true': foo
+!!str false: bar
+
+!!str null: 'null'
+'~': 'null'
+EOF;
+
+        $expected = [
+            '1.2' => 'bar',
+            '1.3' => 'baz',
+            'true' => 'foo',
+            'false' => 'bar',
+            'null' => 'null',
+            '~' => 'null',
+        ];
+
+        $this->assertEquals($expected, $this->parser->parse($yaml));
+    }
+
+    public function testColonInMappingValueException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('A colon cannot be used in an unquoted mapping value');
+        $yaml = <<<'EOF'
+foo: bar: baz
+EOF;
+
+        $this->parser->parse($yaml);
+    }
+
+    public function testColonInMappingValueExceptionNotTriggeredByColonInComment()
+    {
+        $yaml = <<<'EOT'
+foo:
+    bar: foobar # Note: a comment after a colon
+EOT;
+
+        $this->assertSame(['foo' => ['bar' => 'foobar']], $this->parser->parse($yaml));
+    }
+
+    /**
+     * @dataProvider getCommentLikeStringInScalarBlockData
+     */
+    public function testCommentLikeStringsAreNotStrippedInBlockScalars($yaml, $expectedParserResult)
+    {
+        $this->assertSame($expectedParserResult, $this->parser->parse($yaml));
+    }
+
+    public function getCommentLikeStringInScalarBlockData()
+    {
+        $tests = [];
+
+        $yaml = <<<'EOT'
+pages:
+    -
+        title: some title
+        content: |
+            # comment 1
+            header
+
+                # comment 2
+                <body>
+                    <h1>title</h1>
+                </body>
+
+            footer # comment3
+EOT;
+        $expected = [
+            'pages' => [
+                [
+                    'title' => 'some title',
+                    'content' => <<<'EOT'
+# comment 1
+header
+
+    # comment 2
+    <body>
+        <h1>title</h1>
+    </body>
+
+footer # comment3
+EOT
+                    ,
+                ],
+            ],
+        ];
+        $tests[] = [$yaml, $expected];
+
+        $yaml = <<<'EOT'
+test: |
+    foo
+    # bar
+    baz
+collection:
+    - one: |
+        foo
+        # bar
+        baz
+    - two: |
+        foo
+        # bar
+        baz
+EOT;
+        $expected = [
+            'test' => <<<'EOT'
+foo
+# bar
+baz
+
+EOT
+            ,
+            'collection' => [
+                [
+                    'one' => <<<'EOT'
+foo
+# bar
+baz
+
+EOT
+                    ,
+                ],
+                [
+                    'two' => <<<'EOT'
+foo
+# bar
+baz
+EOT
+                    ,
+                ],
+            ],
+        ];
+        $tests[] = [$yaml, $expected];
+
+        $yaml = <<<'EOT'
+foo:
+  bar:
+    scalar-block: >
+      line1
+      line2>
+  baz:
+# comment
+    foobar: ~
+EOT;
+        $expected = [
+            'foo' => [
+                'bar' => [
+                    'scalar-block' => "line1 line2>\n",
+                ],
+                'baz' => [
+                    'foobar' => null,
+                ],
+            ],
+        ];
+        $tests[] = [$yaml, $expected];
+
+        $yaml = <<<'EOT'
+a:
+    b: hello
+#    c: |
+#        first row
+#        second row
+    d: hello
+EOT;
+        $expected = [
+            'a' => [
+                'b' => 'hello',
+                'd' => 'hello',
+            ],
+        ];
+        $tests[] = [$yaml, $expected];
+
+        return $tests;
+    }
+
+    public function testBlankLinesAreParsedAsNewLinesInFoldedBlocks()
+    {
+        $yaml = <<<'EOT'
+test: >
+    <h2>A heading</h2>
+
+    <ul>
+    <li>a list</li>
+    <li>may be a good example</li>
+    </ul>
+EOT;
+
+        $this->assertSame(
+            [
+                'test' => <<<'EOT'
+<h2>A heading</h2>
+<ul> <li>a list</li> <li>may be a good example</li> </ul>
+EOT
+                ,
+            ],
+            $this->parser->parse($yaml)
+        );
+    }
+
+    public function testAdditionallyIndentedLinesAreParsedAsNewLinesInFoldedBlocks()
+    {
+        $yaml = <<<'EOT'
+test: >
+    <h2>A heading</h2>
+
+    <ul>
+      <li>a list</li>
+      <li>may be a good example</li>
+    </ul>
+EOT;
+
+        $this->assertSame(
+            [
+                'test' => <<<'EOT'
+<h2>A heading</h2>
+<ul>
+  <li>a list</li>
+  <li>may be a good example</li>
+</ul>
+EOT
+                ,
+            ],
+            $this->parser->parse($yaml)
+        );
+    }
+
+    /**
+     * @dataProvider getBinaryData
+     */
+    public function testParseBinaryData($data)
+    {
+        $this->assertSame(['data' => 'Hello world'], $this->parser->parse($data));
+    }
+
+    public function getBinaryData()
+    {
+        return [
+            'enclosed with double quotes' => ['data: !!binary "SGVsbG8gd29ybGQ="'],
+            'enclosed with single quotes' => ["data: !!binary 'SGVsbG8gd29ybGQ='"],
+            'containing spaces' => ['data: !!binary  "SGVs bG8gd 29ybGQ="'],
+            'in block scalar' => [
+                <<<'EOT'
+data: !!binary |
+    SGVsbG8gd29ybGQ=
+EOT
+    ],
+            'containing spaces in block scalar' => [
+                <<<'EOT'
+data: !!binary |
+    SGVs bG8gd 29ybGQ=
+EOT
+    ],
+        ];
+    }
+
+    /**
+     * @dataProvider getInvalidBinaryData
+     */
+    public function testParseInvalidBinaryData($data, $expectedMessage)
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessageRegExp($expectedMessage);
+
+        $this->parser->parse($data);
+    }
+
+    public function getInvalidBinaryData()
+    {
+        return [
+            'length not a multiple of four' => ['data: !!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'],
+            'invalid characters' => ['!!binary "SGVsbG8#d29ybGQ="', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'too many equals characters' => ['data: !!binary "SGVsbG8gd29yb==="', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'misplaced equals character' => ['data: !!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'length not a multiple of four in block scalar' => [
+                <<<'EOT'
+data: !!binary |
+    SGVsbG8d29ybGQ=
+EOT
+                ,
+                '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/',
+            ],
+            'invalid characters in block scalar' => [
+                <<<'EOT'
+data: !!binary |
+    SGVsbG8#d29ybGQ=
+EOT
+                ,
+                '/The base64 encoded data \(.*\) contains invalid characters/',
+            ],
+            'too many equals characters in block scalar' => [
+                <<<'EOT'
+data: !!binary |
+    SGVsbG8gd29yb===
+EOT
+                ,
+                '/The base64 encoded data \(.*\) contains invalid characters/',
+            ],
+            'misplaced equals character in block scalar' => [
+                <<<'EOT'
+data: !!binary |
+    SGVsbG8gd29ybG=Q
+EOT
+                ,
+                '/The base64 encoded data \(.*\) contains invalid characters/',
+            ],
+        ];
+    }
+
+    public function testParseDateAsMappingValue()
+    {
+        $yaml = <<<'EOT'
+date: 2002-12-14
+EOT;
+        $expectedDate = new \DateTime();
+        $expectedDate->setTimeZone(new \DateTimeZone('UTC'));
+        $expectedDate->setDate(2002, 12, 14);
+        $expectedDate->setTime(0, 0, 0);
+
+        $this->assertEquals(['date' => $expectedDate], $this->parser->parse($yaml, Yaml::PARSE_DATETIME));
+    }
+
+    /**
+     * @param $lineNumber
+     * @param $yaml
+     * @dataProvider parserThrowsExceptionWithCorrectLineNumberProvider
+     */
+    public function testParserThrowsExceptionWithCorrectLineNumber($lineNumber, $yaml)
+    {
+        $this->expectException('\Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage(sprintf('Unexpected characters near "," at line %d (near "bar: "123",").', $lineNumber));
+
+        $this->parser->parse($yaml);
+    }
+
+    public function parserThrowsExceptionWithCorrectLineNumberProvider()
+    {
+        return [
+            [
+                4,
+                <<<'YAML'
+foo:
+    -
+        # bar
+        bar: "123",
+YAML
+            ],
+            [
+                5,
+                <<<'YAML'
+foo:
+    -
+        # bar
+        # bar
+        bar: "123",
+YAML
+            ],
+            [
+                8,
+                <<<'YAML'
+foo:
+    -
+        # foobar
+        baz: 123
+bar:
+    -
+        # bar
+        bar: "123",
+YAML
+            ],
+            [
+                10,
+                <<<'YAML'
+foo:
+    -
+        # foobar
+        # foobar
+        baz: 123
+bar:
+    -
+        # bar
+        # bar
+        bar: "123",
+YAML
+            ],
+        ];
+    }
+
+    public function testParseMultiLineQuotedString()
+    {
+        $yaml = <<<EOT
+foo: "bar
+  baz
+   foobar
+foo"
+bar: baz
+EOT;
+
+        $this->assertSame(['foo' => 'bar baz foobar foo', 'bar' => 'baz'], $this->parser->parse($yaml));
+    }
+
+    public function testMultiLineQuotedStringWithTrailingBackslash()
+    {
+        $yaml = <<<YAML
+foobar:
+    "foo\
+    bar"
+YAML;
+
+        $this->assertSame(['foobar' => 'foobar'], $this->parser->parse($yaml));
+    }
+
+    public function testCommentCharactersInMultiLineQuotedStrings()
+    {
+        $yaml = <<<YAML
+foo:
+    foobar: 'foo
+      #bar'
+    bar: baz
+YAML;
+        $expected = [
+            'foo' => [
+                'foobar' => 'foo #bar',
+                'bar' => 'baz',
+            ],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testBlankLinesInQuotedMultiLineString()
+    {
+        $yaml = <<<YAML
+foobar: 'foo
+
+    bar'
+YAML;
+        $expected = [
+            'foobar' => "foo\nbar",
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testParseMultiLineUnquotedString()
+    {
+        $yaml = <<<EOT
+foo: bar
+  baz
+   foobar
+  foo
+bar: baz
+EOT;
+
+        $this->assertSame(['foo' => 'bar baz foobar foo', 'bar' => 'baz'], $this->parser->parse($yaml));
+    }
+
+    public function testParseMultiLineString()
+    {
+        $this->assertEquals("foo bar\nbaz", $this->parser->parse("foo\nbar\n\nbaz"));
+    }
+
+    /**
+     * @dataProvider multiLineDataProvider
+     */
+    public function testParseMultiLineMappingValue($yaml, $expected, $parseError)
+    {
+        $this->assertEquals($expected, $this->parser->parse($yaml));
+    }
+
+    public function multiLineDataProvider()
+    {
+        $tests = [];
+
+        $yaml = <<<'EOF'
+foo:
+- bar:
+    one
+
+    two
+    three
+EOF;
+        $expected = [
+            'foo' => [
+                [
+                    'bar' => "one\ntwo three",
+                ],
+            ],
+        ];
+
+        $tests[] = [$yaml, $expected, false];
+
+        $yaml = <<<'EOF'
+bar
+"foo"
+EOF;
+        $expected = 'bar "foo"';
+
+        $tests[] = [$yaml, $expected, false];
+
+        $yaml = <<<'EOF'
+bar
+"foo
+EOF;
+        $expected = 'bar "foo';
+
+        $tests[] = [$yaml, $expected, false];
+
+        $yaml = <<<'EOF'
+bar
+
+'foo'
+EOF;
+        $expected = "bar\n'foo'";
+
+        $tests[] = [$yaml, $expected, false];
+
+        $yaml = <<<'EOF'
+bar
+
+foo'
+EOF;
+        $expected = "bar\nfoo'";
+
+        $tests[] = [$yaml, $expected, false];
+
+        return $tests;
+    }
+
+    public function testTaggedInlineMapping()
+    {
+        $this->assertEquals(new TaggedValue('foo', ['foo' => 'bar']), $this->parser->parse('!foo {foo: bar}', Yaml::PARSE_CUSTOM_TAGS));
+    }
+
+    /**
+     * @dataProvider taggedValuesProvider
+     */
+    public function testCustomTagSupport($expected, $yaml)
+    {
+        $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_CUSTOM_TAGS));
+    }
+
+    public function taggedValuesProvider()
+    {
+        return [
+            'sequences' => [
+                [new TaggedValue('foo', ['yaml']), new TaggedValue('quz', ['bar'])],
+                <<<YAML
+- !foo
+    - yaml
+- !quz [bar]
+YAML
+            ],
+            'mappings' => [
+                new TaggedValue('foo', ['foo' => new TaggedValue('quz', ['bar']), 'quz' => new TaggedValue('foo', ['quz' => 'bar'])]),
+                <<<YAML
+!foo
+foo: !quz [bar]
+quz: !foo
+   quz: bar
+YAML
+            ],
+            'inline' => [
+                [new TaggedValue('foo', ['foo', 'bar']), new TaggedValue('quz', ['foo' => 'bar', 'quz' => new TaggedValue('bar', ['one' => 'bar'])])],
+                <<<YAML
+- !foo [foo, bar]
+- !quz {foo: bar, quz: !bar {one: bar}}
+YAML
+            ],
+        ];
+    }
+
+    public function testCustomTagsDisabled()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('Tags support is not enabled. Enable the `Yaml::PARSE_CUSTOM_TAGS` flag to use "!iterator" at line 1 (near "!iterator [foo]").');
+        $this->parser->parse('!iterator [foo]');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Using the unquoted scalar value "!iterator foo" is deprecated since Symfony 3.3 and will be considered as a tagged value in 4.0. You must quote it on line 1.
+     */
+    public function testUnsupportedTagWithScalar()
+    {
+        $this->assertEquals('!iterator foo', $this->parser->parse('!iterator foo'));
+    }
+
+    public function testExceptionWhenUsingUnsuportedBuiltInTags()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('The built-in tag "!!foo" is not implemented at line 1 (near "!!foo").');
+        $this->parser->parse('!!foo');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since Symfony 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 1.
+     */
+    public function testComplexMappingThrowsParseException()
+    {
+        $yaml = <<<YAML
+? "1"
+:
+  name: végétalien
+YAML;
+
+        $this->parser->parse($yaml);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since Symfony 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 2.
+     */
+    public function testComplexMappingNestedInMappingThrowsParseException()
+    {
+        $yaml = <<<YAML
+diet:
+  ? "1"
+  :
+    name: végétalien
+YAML;
+
+        $this->parser->parse($yaml);
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Starting an unquoted string with a question mark followed by a space is deprecated since Symfony 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0 on line 1.
+     */
+    public function testComplexMappingNestedInSequenceThrowsParseException()
+    {
+        $yaml = <<<YAML
+- ? "1"
+  :
+    name: végétalien
+YAML;
+
+        $this->parser->parse($yaml);
+    }
+
+    public function testParsingIniThrowsException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('Unable to parse at line 1 (near "[parameters]").');
+        $ini = <<<INI
+[parameters]
+  foo = bar
+  bar = %foo%
+INI;
+
+        $this->parser->parse($ini);
+    }
+
+    private function loadTestsFromFixtureFiles($testsFile)
+    {
+        $parser = new Parser();
+
+        $tests = [];
+        $files = $parser->parseFile(__DIR__.'/Fixtures/'.$testsFile);
+        foreach ($files as $file) {
+            $yamls = file_get_contents(__DIR__.'/Fixtures/'.$file.'.yml');
+
+            // split YAMLs documents
+            foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
+                if (!$yaml) {
+                    continue;
+                }
+
+                $test = $parser->parse($yaml);
+                if (isset($test['todo']) && $test['todo']) {
+                    // TODO
+                } else {
+                    eval('$expected = '.trim($test['php']).';');
+
+                    $tests[] = [var_export($expected, true), $test['yaml'], $test['test'], isset($test['deprecated']) ? $test['deprecated'] : false];
+                }
+            }
+        }
+
+        return $tests;
+    }
+
+    public function testCanParseVeryLongValue()
+    {
+        $longStringWithSpaces = str_repeat('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ', 20000);
+        $trickyVal = ['x' => $longStringWithSpaces];
+
+        $yamlString = Yaml::dump($trickyVal);
+        $arrayFromYaml = $this->parser->parse($yamlString);
+
+        $this->assertEquals($trickyVal, $arrayFromYaml);
+    }
+
+    public function testParserCleansUpReferencesBetweenRuns()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('Reference "foo" does not exist at line 2');
+        $yaml = <<<YAML
+foo: &foo
+    baz: foobar
+bar:
+    <<: *foo
+YAML;
+        $this->parser->parse($yaml);
+
+        $yaml = <<<YAML
+bar:
+    <<: *foo
+YAML;
+        $this->parser->parse($yaml);
+    }
+
+    public function testPhpConstantTagMappingKey()
+    {
+        $yaml = <<<YAML
+transitions:
+    !php/const 'Symfony\Component\Yaml\Tests\B::FOO':
+        from:
+            - !php/const 'Symfony\Component\Yaml\Tests\B::BAR'
+        to: !php/const 'Symfony\Component\Yaml\Tests\B::BAZ'
+YAML;
+        $expected = [
+            'transitions' => [
+                'foo' => [
+                    'from' => [
+                        'bar',
+                    ],
+                    'to' => 'baz',
+                ],
+            ],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml, Yaml::PARSE_CONSTANT));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since Symfony 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 2.
+     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since Symfony 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 4.
+     * @expectedDeprecation The !php/const: tag to indicate dumped PHP constants is deprecated since Symfony 3.4 and will be removed in 4.0. Use the !php/const (without the colon) tag instead on line 5.
+     */
+    public function testDeprecatedPhpConstantTagMappingKey()
+    {
+        $yaml = <<<YAML
+transitions:
+    !php/const:Symfony\Component\Yaml\Tests\B::FOO:
+        from:
+            - !php/const:Symfony\Component\Yaml\Tests\B::BAR
+        to: !php/const:Symfony\Component\Yaml\Tests\B::BAZ
+YAML;
+        $expected = [
+            'transitions' => [
+                'foo' => [
+                    'from' => [
+                        'bar',
+                    ],
+                    'to' => 'baz',
+                ],
+            ],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml, Yaml::PARSE_CONSTANT));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Using the Yaml::PARSE_KEYS_AS_STRINGS flag is deprecated since Symfony 3.4 as it will be removed in 4.0. Quote your keys when they are evaluable instead.
+     */
+    public function testPhpConstantTagMappingKeyWithKeysCastToStrings()
+    {
+        $yaml = <<<YAML
+transitions:
+    !php/const 'Symfony\Component\Yaml\Tests\B::FOO':
+        from:
+            - !php/const 'Symfony\Component\Yaml\Tests\B::BAR'
+        to: !php/const 'Symfony\Component\Yaml\Tests\B::BAZ'
+YAML;
+        $expected = [
+            'transitions' => [
+                'foo' => [
+                    'from' => [
+                        'bar',
+                    ],
+                    'to' => 'baz',
+                ],
+            ],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml, Yaml::PARSE_CONSTANT | Yaml::PARSE_KEYS_AS_STRINGS));
+    }
+
+    public function testMergeKeysWhenMappingsAreParsedAsObjects()
+    {
+        $yaml = <<<YAML
+foo: &FOO
+    bar: 1
+bar: &BAR
+    baz: 2
+    <<: *FOO
+baz:
+    baz_foo: 3
+    <<:
+        baz_bar: 4
+foobar:
+    bar: ~
+    <<: [*FOO, *BAR]
+YAML;
+        $expected = (object) [
+            'foo' => (object) [
+                'bar' => 1,
+            ],
+            'bar' => (object) [
+                'baz' => 2,
+                'bar' => 1,
+            ],
+            'baz' => (object) [
+                'baz_foo' => 3,
+                'baz_bar' => 4,
+            ],
+            'foobar' => (object) [
+                'bar' => null,
+                'baz' => 2,
+            ],
+        ];
+
+        $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
+    }
+
+    public function testFilenamesAreParsedAsStringsWithoutFlag()
+    {
+        $file = __DIR__.'/Fixtures/index.yml';
+
+        $this->assertSame($file, $this->parser->parse($file));
+    }
+
+    public function testParseFile()
+    {
+        $this->assertIsArray($this->parser->parseFile(__DIR__.'/Fixtures/index.yml'));
+    }
+
+    public function testParsingNonExistentFilesThrowsException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessageRegExp('#^File ".+/Fixtures/nonexistent.yml" does not exist\.$#');
+        $this->parser->parseFile(__DIR__.'/Fixtures/nonexistent.yml');
+    }
+
+    public function testParsingNotReadableFilesThrowsException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessageRegExp('#^File ".+/Fixtures/not_readable.yml" cannot be read\.$#');
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('chmod is not supported on Windows');
+        }
+
+        if (!getenv('USER') || 'root' === getenv('USER')) {
+            $this->markTestSkipped('This test will fail if run under superuser');
+        }
+
+        $file = __DIR__.'/Fixtures/not_readable.yml';
+        chmod($file, 0200);
+
+        $this->parser->parseFile($file);
+    }
+
+    public function testParseReferencesOnMergeKeys()
+    {
+        $yaml = <<<YAML
+mergekeyrefdef:
+    a: foo
+    <<: &quux
+        b: bar
+        c: baz
+mergekeyderef:
+    d: quux
+    <<: *quux
+YAML;
+        $expected = [
+            'mergekeyrefdef' => [
+                'a' => 'foo',
+                'b' => 'bar',
+                'c' => 'baz',
+            ],
+            'mergekeyderef' => [
+                'd' => 'quux',
+                'b' => 'bar',
+                'c' => 'baz',
+            ],
+        ];
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function testParseReferencesOnMergeKeysWithMappingsParsedAsObjects()
+    {
+        $yaml = <<<YAML
+mergekeyrefdef:
+    a: foo
+    <<: &quux
+        b: bar
+        c: baz
+mergekeyderef:
+    d: quux
+    <<: *quux
+YAML;
+        $expected = (object) [
+            'mergekeyrefdef' => (object) [
+                'a' => 'foo',
+                'b' => 'bar',
+                'c' => 'baz',
+            ],
+            'mergekeyderef' => (object) [
+                'd' => 'quux',
+                'b' => 'bar',
+                'c' => 'baz',
+            ],
+        ];
+
+        $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
+    }
+
+    public function testEvalRefException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('Reference "foo" does not exist');
+        $yaml = <<<EOE
+foo: { &foo { a: Steve, <<: *foo} }
+EOE;
+        $this->parser->parse($yaml);
+    }
+
+    /**
+     * @dataProvider circularReferenceProvider
+     */
+    public function testDetectCircularReferences($yaml)
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        $this->expectExceptionMessage('Circular reference [foo, bar, foo] detected');
+        $this->parser->parse($yaml, Yaml::PARSE_CUSTOM_TAGS);
+    }
+
+    public function circularReferenceProvider()
+    {
+        $tests = [];
+
+        $yaml = <<<YAML
+foo:
+    - &foo
+      - &bar
+        bar: foobar
+        baz: *foo
+YAML;
+        $tests['sequence'] = [$yaml];
+
+        $yaml = <<<YAML
+foo: &foo
+    bar: &bar
+        foobar: baz
+        baz: *foo
+YAML;
+        $tests['mapping'] = [$yaml];
+
+        $yaml = <<<YAML
+foo: &foo
+    bar: &bar
+        foobar: baz
+        <<: *foo
+YAML;
+        $tests['mapping with merge key'] = [$yaml];
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider indentedMappingData
+     */
+    public function testParseIndentedMappings($yaml, $expected)
+    {
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
+    public function indentedMappingData()
+    {
+        $tests = [];
+
+        $yaml = <<<YAML
+foo:
+  - bar: "foobar"
+    # A comment
+    baz: "foobaz"
+YAML;
+        $expected = [
+            'foo' => [
+                [
+                    'bar' => 'foobar',
+                    'baz' => 'foobaz',
+                ],
+            ],
+        ];
+        $tests['comment line is first line in indented block'] = [$yaml, $expected];
+
+        $yaml = <<<YAML
+foo:
+    - bar:
+        # comment
+        baz: [1, 2, 3]
+YAML;
+        $expected = [
+            'foo' => [
+                [
+                    'bar' => [
+                        'baz' => [1, 2, 3],
+                    ],
+                ],
+            ],
+        ];
+        $tests['mapping value on new line starting with a comment line'] = [$yaml, $expected];
+
+        $yaml = <<<YAML
+foo:
+  -
+    bar: foobar
+YAML;
+        $expected = [
+            'foo' => [
+                [
+                    'bar' => 'foobar',
+                ],
+            ],
+        ];
+        $tests['mapping in sequence starting on a new line'] = [$yaml, $expected];
+
+        $yaml = <<<YAML
+foo:
+
+    bar: baz
+YAML;
+        $expected = [
+            'foo' => [
+                'bar' => 'baz',
+            ],
+        ];
+        $tests['blank line at the beginning of an indented mapping value'] = [$yaml, $expected];
+
+        return $tests;
+    }
+
+    public function testMultiLineComment()
+    {
+        $yaml = <<<YAML
+parameters:
+    abc
+
+# Comment 
+YAML;
+
+        $this->assertSame(['parameters' => 'abc'], $this->parser->parse($yaml));
+    }
+
+    public function testParseValueWithModifiers()
+    {
+        $yaml = <<<YAML
+parameters:
+    abc: |+5 # plus five spaces indent
+         one
+         two
+         three
+         four
+         five
+YAML;
+        $this->assertSame(
+            [
+                'parameters' => [
+                    'abc' => implode("\n", ['one', 'two', 'three', 'four', 'five']),
+                ],
+            ],
+            $this->parser->parse($yaml)
+        );
+    }
+
+    public function testParseValueWithNegativeModifiers()
+    {
+        $yaml = <<<YAML
+parameters:
+    abc: |-3 # minus
+       one
+       two
+       three
+       four
+       five
+YAML;
+        $this->assertSame(
+            [
+                'parameters' => [
+                    'abc' => implode("\n", ['one', 'two', 'three', 'four', 'five']),
+                ],
+            ],
+            $this->parser->parse($yaml)
+        );
+    }
+}
+
+class B
+{
+    public $b = 'foo';
+
+    const FOO = 'foo';
+    const BAR = 'bar';
+    const BAZ = 'baz';
+}
diff --git a/lib/symfony/yaml/Tests/YamlTest.php b/lib/symfony/yaml/Tests/YamlTest.php
new file mode 100644
index 000000000..7be126649
--- /dev/null
+++ b/lib/symfony/yaml/Tests/YamlTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@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\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Yaml\Yaml;
+
+class YamlTest extends TestCase
+{
+    public function testParseAndDump()
+    {
+        $data = ['lorem' => 'ipsum', 'dolor' => 'sit'];
+        $yml = Yaml::dump($data);
+        $parsed = Yaml::parse($yml);
+        $this->assertEquals($data, $parsed);
+    }
+
+    public function testZeroIndentationThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The indentation must be greater than zero');
+        Yaml::dump(['lorem' => 'ipsum', 'dolor' => 'sit'], 2, 0);
+    }
+
+    public function testNegativeIndentationThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The indentation must be greater than zero');
+        Yaml::dump(['lorem' => 'ipsum', 'dolor' => 'sit'], 2, -4);
+    }
+}
diff --git a/lib/twig/twig/lib/Twig/Test/Function.php b/lib/twig/twig/lib/Twig/Test/Function.php
new file mode 100644
index 000000000..a789c4025
--- /dev/null
+++ b/lib/twig/twig/lib/Twig/Test/Function.php
@@ -0,0 +1,38 @@
+<?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.
+ */
+
+@trigger_error('The Twig_Test_Function class is deprecated since version 1.12 and will be removed in 2.0. Use \Twig\TwigTest 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 = [])
+    {
+        $options['callable'] = $function;
+
+        parent::__construct($options);
+
+        $this->function = $function;
+    }
+
+    public function compile()
+    {
+        return $this->function;
+    }
+}
diff --git a/lib/twig/twig/lib/Twig/Test/IntegrationTestCase.php b/lib/twig/twig/lib/Twig/Test/IntegrationTestCase.php
new file mode 100644
index 000000000..e302bdbaf
--- /dev/null
+++ b/lib/twig/twig/lib/Twig/Test/IntegrationTestCase.php
@@ -0,0 +1,11 @@
+<?php
+
+use Twig\Test\IntegrationTestCase;
+
+class_exists('Twig\Test\IntegrationTestCase');
+
+if (\false) {
+    class Twig_Test_IntegrationTestCase extends IntegrationTestCase
+    {
+    }
+}
diff --git a/lib/twig/twig/lib/Twig/Test/Method.php b/lib/twig/twig/lib/Twig/Test/Method.php
new file mode 100644
index 000000000..3559f34dc
--- /dev/null
+++ b/lib/twig/twig/lib/Twig/Test/Method.php
@@ -0,0 +1,42 @@
+<?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.
+ */
+
+use Twig\Extension\ExtensionInterface;
+
+@trigger_error('The Twig_Test_Method class is deprecated since version 1.12 and will be removed in 2.0. Use \Twig\TwigTest 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(ExtensionInterface $extension, $method, array $options = [])
+    {
+        $options['callable'] = [$extension, $method];
+
+        parent::__construct($options);
+
+        $this->extension = $extension;
+        $this->method = $method;
+    }
+
+    public function compile()
+    {
+        return sprintf('$this->env->getExtension(\'%s\')->%s', \get_class($this->extension), $this->method);
+    }
+}
diff --git a/lib/twig/twig/lib/Twig/Test/Node.php b/lib/twig/twig/lib/Twig/Test/Node.php
new file mode 100644
index 000000000..6b5de1597
--- /dev/null
+++ b/lib/twig/twig/lib/Twig/Test/Node.php
@@ -0,0 +1,40 @@
+<?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.
+ */
+
+@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 = [])
+    {
+        parent::__construct($options);
+
+        $this->class = $class;
+    }
+
+    public function getClass()
+    {
+        return $this->class;
+    }
+
+    public function compile()
+    {
+    }
+}
diff --git a/lib/twig/twig/lib/Twig/Test/NodeTestCase.php b/lib/twig/twig/lib/Twig/Test/NodeTestCase.php
new file mode 100644
index 000000000..62aaaaff7
--- /dev/null
+++ b/lib/twig/twig/lib/Twig/Test/NodeTestCase.php
@@ -0,0 +1,11 @@
+<?php
+
+use Twig\Test\NodeTestCase;
+
+class_exists('Twig\Test\NodeTestCase');
+
+if (\false) {
+    class Twig_Test_NodeTestCase extends NodeTestCase
+    {
+    }
+}