Merge branch '1.x' into 2.x

* 1.x:
  fixed phpdoc
  fixed tpyo
  bumped version to 1.39.2-DEV
  prepared the 1.39.1 release
This commit is contained in:
Fabien Potencier
2019-04-16 21:17:07 +02:00
3 changed files with 7 additions and 3 deletions
+5 -1
View File
@@ -210,7 +210,11 @@
* improved the performance of the filesystem loader
* removed features that were deprecated in 1.x
* 1.39.1 (2019-XX-XX)
* 1.39.2 (2019-XX-XX)
* n/a
* 1.39.1 (2019-04-16)
* fixed EscaperNodeVisitor
+1 -1
View File
@@ -90,7 +90,7 @@ class Profile implements \IteratorAggregate, \Serializable
/**
* Returns the duration in microseconds.
*
* @return int
* @return float
*/
public function getDuration()
{
+1 -1
View File
@@ -12,7 +12,7 @@
namespace Twig\Sandbox;
/**
* Interfaces that all security policy classes must implements.
* Interface that all security policy classes must implements.
*
* @author Fabien Potencier <fabien@symfony.com>
*/