Merge branch '5.2' into 5.x

xabbuh · xabbuh · commit e144689f186f · 2021-01-05T20:51:30.000+01:00
* 5.2:
  fix code style
  [Uid] Hardcode UuidV3 &amp; UuidV5 TYPE conditional constants
  [Uid] Use the Uuid constructor when reconstructing an Ulid from its RFC-4122 version
  stop using void in test files
  parse cookie values containing the equal sign
  make some time dependent tests more resilient
  fix code style
  Remove full head content in HTML to text converter
  do not break when loading schemas from network paths on Windows
  apply the sort callback on the whole search result
diff --git a/Tests/Transport/TransportsTest.php b/Tests/Transport/TransportsTest.php
@@ -21,7 +21,7 @@
 
 class TransportsTest extends TestCase
 {
-    public function testSendToTransportDefinedByMessage(): void
+    public function testSendToTransportDefinedByMessage()
     {
         $transports = new Transports([
             'one' => $one = $this->createMock(TransportInterface::class),
@@ -39,7 +39,7 @@ public function testSendToTransportDefinedByMessage(): void
         $this->assertSame('one', $sentMessage->getTransport());
     }
 
-    public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATransport(): void
+    public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATransport()
     {
         $transports = new Transports([
             'one' => $one = $this->createMock(TransportInterface::class),
@@ -63,7 +63,7 @@ public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATranspor
         $this->assertSame('two', $sentMessage->getTransport());
     }
 
-    public function testThrowExceptionIfNoSupportedTransportWasFound(): void
+    public function testThrowExceptionIfNoSupportedTransportWasFound()
     {
         $transports = new Transports([
             'one' => $one = $this->createMock(TransportInterface::class),
@@ -79,7 +79,7 @@ public function testThrowExceptionIfNoSupportedTransportWasFound(): void
         $transports->send($message);
     }
 
-    public function testThrowExceptionIfTransportDefinedByMessageIsNotSupported(): void
+    public function testThrowExceptionIfTransportDefinedByMessageIsNotSupported()
     {
         $transports = new Transports([
             'one' => $one = $this->createMock(TransportInterface::class),
diff --git a/Tests/TransportFactoryTestCase.php b/Tests/TransportFactoryTestCase.php
@@ -55,7 +55,7 @@ public function incompleteDsnProvider(): iterable
     /**
      * @dataProvider supportsProvider
      */
-    public function testSupports(bool $expected, string $dsn): void
+    public function testSupports(bool $expected, string $dsn)
     {
         $factory = $this->createFactory();
 
@@ -65,7 +65,7 @@ public function testSupports(bool $expected, string $dsn): void
     /**
      * @dataProvider createProvider
      */
-    public function testCreate(string $expected, string $dsn): void
+    public function testCreate(string $expected, string $dsn)
     {
         $factory = $this->createFactory();
         $transport = $factory->create(Dsn::fromString($dsn));
@@ -76,7 +76,7 @@ public function testCreate(string $expected, string $dsn): void
     /**
      * @dataProvider unsupportedSchemeProvider
      */
-    public function testUnsupportedSchemeException(string $dsn, string $message = null): void
+    public function testUnsupportedSchemeException(string $dsn, string $message = null)
     {
         $factory = $this->createFactory();
 
@@ -93,7 +93,7 @@ public function testUnsupportedSchemeException(string $dsn, string $message = nu
     /**
      * @dataProvider incompleteDsnProvider
      */
-    public function testIncompleteDsnException(string $dsn, string $message = null): void
+    public function testIncompleteDsnException(string $dsn, string $message = null)
     {
         $factory = $this->createFactory();
 
diff --git a/Tests/TransportTestCase.php b/Tests/TransportTestCase.php
@@ -47,15 +47,15 @@ abstract public function unsupportedMessagesProvider(): iterable;
     /**
      * @dataProvider toStringProvider
      */
-    public function testToString(string $expected, TransportInterface $transport): void
+    public function testToString(string $expected, TransportInterface $transport)
     {
         $this->assertSame($expected, (string) $transport);
     }
 
     /**
      * @dataProvider supportedMessagesProvider
      */
-    public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null): void
+    public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
     {
         if (null === $transport) {
             $transport = $this->createTransport();
@@ -67,7 +67,7 @@ public function testSupportedMessages(MessageInterface $message, ?TransportInter
     /**
      * @dataProvider unsupportedMessagesProvider
      */
-    public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null): void
+    public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
     {
         if (null === $transport) {
             $transport = $this->createTransport();
@@ -79,7 +79,7 @@ public function testUnsupportedMessages(MessageInterface $message, ?TransportInt
     /**
      * @dataProvider unsupportedMessagesProvider
      */
-    public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null): void
+    public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null)
     {
         if (null === $transport) {
             $transport = $this->createTransport();
@@ -90,7 +90,7 @@ public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSe
         $transport->send($message);
     }
 
-    public function testCanSetCustomHost(): void
+    public function testCanSetCustomHost()
     {
         $transport = $this->createTransport();
 
@@ -99,7 +99,7 @@ public function testCanSetCustomHost(): void
         $this->assertStringContainsString(sprintf('://%s', $customHost), (string) $transport);
     }
 
-    public function testCanSetCustomPort(): void
+    public function testCanSetCustomPort()
     {
         $transport = $this->createTransport();
 
@@ -111,7 +111,7 @@ public function testCanSetCustomPort(): void
         $this->assertMatchesRegularExpression(sprintf('/^.*\/\/.*\:%s.*$/', $customPort), (string) $transport);
     }
 
-    public function testCanSetCustomHostAndPort(): void
+    public function testCanSetCustomHostAndPort()
     {
         $transport = $this->createTransport();
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`class TransportsTest extends TestCase`
`23`	`23`	`{`
`24`		`- public function testSendToTransportDefinedByMessage(): void`
	`24`	`+ public function testSendToTransportDefinedByMessage()`
`25`	`25`	`{`
`26`	`26`	`$transports = new Transports([`
`27`	`27`	`'one' => $one = $this->createMock(TransportInterface::class),`
`@@ -39,7 +39,7 @@ public function testSendToTransportDefinedByMessage(): void`
`39`	`39`	`$this->assertSame('one', $sentMessage->getTransport());`
`40`	`40`	`}`
`41`	`41`
`42`		`- public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATransport(): void`
	`42`	`+ public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATransport()`
`43`	`43`	`{`
`44`	`44`	`$transports = new Transports([`
`45`	`45`	`'one' => $one = $this->createMock(TransportInterface::class),`
`@@ -63,7 +63,7 @@ public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATranspor`
`63`	`63`	`$this->assertSame('two', $sentMessage->getTransport());`
`64`	`64`	`}`
`65`	`65`
`66`		`- public function testThrowExceptionIfNoSupportedTransportWasFound(): void`
	`66`	`+ public function testThrowExceptionIfNoSupportedTransportWasFound()`
`67`	`67`	`{`
`68`	`68`	`$transports = new Transports([`
`69`	`69`	`'one' => $one = $this->createMock(TransportInterface::class),`
`@@ -79,7 +79,7 @@ public function testThrowExceptionIfNoSupportedTransportWasFound(): void`
`79`	`79`	`$transports->send($message);`
`80`	`80`	`}`
`81`	`81`
`82`		`- public function testThrowExceptionIfTransportDefinedByMessageIsNotSupported(): void`
	`82`	`+ public function testThrowExceptionIfTransportDefinedByMessageIsNotSupported()`
`83`	`83`	`{`
`84`	`84`	`$transports = new Transports([`
`85`	`85`	`'one' => $one = $this->createMock(TransportInterface::class),`
Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,15 @@ abstract public function unsupportedMessagesProvider(): iterable;`
`47`	`47`	`/**`
`48`	`48`	`* @dataProvider toStringProvider`
`49`	`49`	`*/`
`50`		`- public function testToString(string $expected, TransportInterface $transport): void`
	`50`	`+ public function testToString(string $expected, TransportInterface $transport)`
`51`	`51`	`{`
`52`	`52`	`$this->assertSame($expected, (string) $transport);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`56`	`56`	`* @dataProvider supportedMessagesProvider`
`57`	`57`	`*/`
`58`		`- public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null): void`
	`58`	`+ public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)`
`59`	`59`	`{`
`60`	`60`	`if (null === $transport) {`
`61`	`61`	`$transport = $this->createTransport();`
`@@ -67,7 +67,7 @@ public function testSupportedMessages(MessageInterface $message, ?TransportInter`
`67`	`67`	`/**`
`68`	`68`	`* @dataProvider unsupportedMessagesProvider`
`69`	`69`	`*/`
`70`		`- public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null): void`
	`70`	`+ public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)`
`71`	`71`	`{`
`72`	`72`	`if (null === $transport) {`
`73`	`73`	`$transport = $this->createTransport();`
`@@ -79,7 +79,7 @@ public function testUnsupportedMessages(MessageInterface $message, ?TransportInt`
`79`	`79`	`/**`
`80`	`80`	`* @dataProvider unsupportedMessagesProvider`
`81`	`81`	`*/`
`82`		`- public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null): void`
	`82`	`+ public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null)`
`83`	`83`	`{`
`84`	`84`	`if (null === $transport) {`
`85`	`85`	`$transport = $this->createTransport();`
`@@ -90,7 +90,7 @@ public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSe`
`90`	`90`	`$transport->send($message);`
`91`	`91`	`}`
`92`	`92`
`93`		`- public function testCanSetCustomHost(): void`
	`93`	`+ public function testCanSetCustomHost()`
`94`	`94`	`{`
`95`	`95`	`$transport = $this->createTransport();`
`96`	`96`
`@@ -99,7 +99,7 @@ public function testCanSetCustomHost(): void`
`99`	`99`	`$this->assertStringContainsString(sprintf('://%s', $customHost), (string) $transport);`
`100`	`100`	`}`
`101`	`101`
`102`		`- public function testCanSetCustomPort(): void`
	`102`	`+ public function testCanSetCustomPort()`
`103`	`103`	`{`
`104`	`104`	`$transport = $this->createTransport();`
`105`	`105`
`@@ -111,7 +111,7 @@ public function testCanSetCustomPort(): void`
`111`	`111`	`$this->assertMatchesRegularExpression(sprintf('/^.\/\/.\:%s.*$/', $customPort), (string) $transport);`
`112`	`112`	`}`
`113`	`113`
`114`		`- public function testCanSetCustomHostAndPort(): void`
	`114`	`+ public function testCanSetCustomHostAndPort()`
`115`	`115`	`{`
`116`	`116`	`$transport = $this->createTransport();`
`117`	`117`