Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit a8718e890695 · 2021-04-16T19:25:34.000+02:00
* 4.4:
  [DoctrineBridge] Allow bundles to define a driver type "attribute"
  fix test SocketStreamTest for Windows
  Fix issue with RequestMatcher when attribute is a closure
  [PropertyInfo] Use the right context for methods defined in traits
diff --git a/Tests/Transport/Smtp/Stream/SocketStreamTest.php b/Tests/Transport/Smtp/Stream/SocketStreamTest.php
@@ -20,7 +20,7 @@ class SocketStreamTest extends TestCase
     public function testSocketErrorNoConnection()
     {
         $this->expectException(TransportException::class);
-        $this->expectExceptionMessageMatches('/Connection refused|unable to connect/');
+        $this->expectExceptionMessageMatches('/Connection refused|unable to connect/i');
         $s = new SocketStream();
         $s->setTimeout(0.1);
         $s->setPort(9999);

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class SocketStreamTest extends TestCase`
`20`	`20`	`public function testSocketErrorNoConnection()`
`21`	`21`	`{`
`22`	`22`	`$this->expectException(TransportException::class);`
`23`		`- $this->expectExceptionMessageMatches('/Connection refused\|unable to connect/');`
	`23`	`+ $this->expectExceptionMessageMatches('/Connection refused\|unable to connect/i');`
`24`	`24`	`$s = new SocketStream();`
`25`	`25`	`$s->setTimeout(0.1);`
`26`	`26`	`$s->setPort(9999);`