Fabien Potencier 1327db55e9 Merge branch '2.x' into 3.x ...

* 2.x:
  Update format_time.rst
  Fix "include(template_from_string())"
  Fix PHPUnit config

2020-10-27 15:15:09 +01:00

..

Cache

Fix CS

2020-08-23 13:48:32 +02:00

Extension

Merge branch '2.x' into 3.x

2020-10-27 15:15:09 +01:00

Fixtures

Merge branch '2.x' into 3.x

2020-10-21 14:27:08 +02:00

Loader

Merge branch '2.x' into 3.x

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

Node

Migrate more tests

2020-08-23 12:47:51 +02:00

NodeVisitor

…

Profiler

Fix CS

2020-08-23 13:48:32 +02:00

Util

Merge branch '2.x' into 3.x

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

CompilerTest.php

…

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

2020-08-23 17:55:14 +02:00

ExpressionParserTest.php

Merge branch '1.x' into 2.x

2020-08-23 14:01:18 +02:00

FactoryRuntimeLoaderTest.php

…

FileExtensionEscapingStrategyTest.php

…

FilesystemHelper.php

…

IntegrationTest.php

Merge branch '2.x' into 3.x

2020-02-21 08:37:36 +01:00

LexerTest.php

…

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

Merge branch '1.x' into 2.x

2020-05-21 11:15:20 +02:00