Fabien Potencier 6a50ca0639 Revert previous merge partially

2019-10-01 12:35:06 +02:00

..

Cache

Revert previous merge partially

2019-10-01 12:35:06 +02:00

Extension

Revert previous merge partially

2019-10-01 12:35:06 +02:00

Fixtures

Merge branch '2.x' into 3.x

2019-09-20 14:54:03 +02:00

Loader

Merge branch '2.x' into 3.x

2019-08-08 13:35:34 +02:00

Node

Merge branch '2.x' into 3.x

2019-08-08 13:35:34 +02:00

NodeVisitor

Merge branch '1.x' into 2.x

2019-08-08 13:33:07 +02:00

Profiler

fixed CS

2019-08-07 20:54:50 +02:00

Util

Merge branch '2.x' into 3.x

2019-08-08 13:35:34 +02:00

CompilerTest.php

Merge branch '1.x' into 2.x

2019-08-08 13:33:07 +02:00

ContainerRuntimeLoaderTest.php

removed usage of getmockBuilder() when not needed

2019-08-08 13:34:04 +02:00

CustomExtensionTest.php

Merge branch '2.x' into 3.x

2019-08-08 13:35:34 +02:00

EnvironmentTest.php

Merge branch '2.x' into 3.x

2019-08-08 13:35:34 +02:00

ErrorTest.php

Merge branch '1.x' into 2.x

2019-08-08 10:19:01 +02:00

ExpressionParserTest.php

Merge branch '1.x' into 2.x

2019-08-08 13:33:07 +02:00

FactoryRuntimeLoaderTest.php

…

FileExtensionEscapingStrategyTest.php

…

FilesystemHelper.php

…

IntegrationTest.php

Merge branch '2.x' into 3.x

2019-08-10 07:48:25 +02:00

LexerTest.php

Merge branch '1.x' into 2.x

2019-08-08 13:33:07 +02:00

ParserTest.php

Merge branch '2.x' into 3.x

2019-08-08 13:35:34 +02:00

TemplateTest.php

Merge branch '2.x' into 3.x

2019-08-08 13:35:34 +02:00

TemplateWrapperTest.php

…

TokenStreamTest.php

Revert previous merge partially

2019-10-01 12:35:06 +02:00