Merge branch '4.2'

fabpot · fabpot · commit f117c682cf1d · 2019-01-14T16:34:34.000+01:00
* 4.2:
  bump required Twig version
  fix compatibility with Twig &gt;= 2.6.1
  [Form] SA fix
  fix compatibility with PHPUnit 4.8
  remove return type hint for PHP 5 compatibility
  SCA: minor code tweaks
  Component CssSelector tests
  [DebugClassLoader] Readd findFile() method
  [Console] Fix composer.json suggest/provide
  Revert "bug #29597 [DI] fix reporting bindings on overriden services as unused (nicolas-grekas)"
  Fixed exception wording
  Fix SwiftMailerHandler to support Monolog's latest reset functionality
diff --git a/Handler/SwiftMailerHandler.php b/Handler/SwiftMailerHandler.php
@@ -59,6 +59,14 @@ protected function send($content, array $records)
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->flushMemorySpool();
+    }
+
     /**
      * Flushes the mail queue if a memory spool is used.
      */

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,14 @@ protected function send($content, array $records)`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ /**`
	`63`	`+ * {@inheritdoc}`
	`64`	`+ */`
	`65`	`+ public function reset()`
	`66`	`+ {`
	`67`	`+ $this->flushMemorySpool();`
	`68`	`+ }`
	`69`	`+`
`62`	`70`	`/**`
`63`	`71`	`* Flushes the mail queue if a memory spool is used.`
`64`	`72`	`*/`