Fabien Potencier c2fd9990fc Merge branch '1.x' into 2.x ...

* 1.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG

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

..

Cache

Fix compatibility with PHPUnit 8

2019-08-08 11:06:58 +02:00

Extension

Merge branch '1.x' into 2.x

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

Fixtures

Merge branch '1.x' into 2.x

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

Loader

Merge branch '1.x' into 2.x

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

Node

Merge branch '1.x' into 2.x

2019-08-08 13:33:07 +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 '1.x' into 2.x

2019-08-08 13:33:07 +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 '1.x' into 2.x

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

EnvironmentTest.php

removed usage of getmockBuilder() when not needed

2019-08-08 13:34:04 +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

moved the HTML extension to an external Composer package

2019-08-08 18:10:45 +02:00

LexerTest.php

Merge branch '1.x' into 2.x

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

ParserTest.php

Merge branch '1.x' into 2.x

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

TemplateTest.php

Merge branch '1.x' into 2.x

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

TemplateWrapperTest.php

…

TokenStreamTest.php

Fix compatibility with PHPUnit 8

2019-08-08 11:06:58 +02:00