Merge branch '3.1'

* 3.1:
  [HttpKernel] Fix assertion of deprecation in fragment renderer
  [Yaml] sync test and actually triggered message

Author: nicolas-grekas

Tests/Fragment/EsiFragmentRendererTest.php

@@ -32,7 +32,7 @@ public function testRenderFallbackToInlineStrategyIfEsiNotSupported()
      */
     public function testRenderFallbackWithObjectAttributesIsDeprecated()
     {
-        ErrorAssert::assertDeprecationsAreTriggered('Passing objects as part of URI attributes to the ESI and SSI rendering strategies is deprecated', function () {
+        ErrorAssert::assertDeprecationsAreTriggered('Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated', function () {
             $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
             $request = Request::create('/');
             $reference = new ControllerReference('main_controller', array('foo' => array('a' => array(), 'b' => new \stdClass())), array());