Merge branch '4.4' into 5.0

* 4.4:
  Add missing dots at the end of exception messages
  [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict)
  Fix bad merge
  Add missing dots at the end of exception messages

Author: fabpot

Test/HttpClientTestCase.php

@@ -164,7 +164,7 @@ public function testThrowingBufferCallback()
         $client = $this->getHttpClient(__FUNCTION__);
 
         $response = $client->request('GET', 'http://localhost:8057', ['buffer' => function () {
-            throw new \Exception('Boo');
+            throw new \Exception('Boo.');
         }]);
 
         $this->assertSame(200, $response->getStatusCode());
@@ -646,7 +646,7 @@ public function testOnProgressCancel()
         $response = $client->request('GET', 'http://localhost:8057/timeout-body', [
             'on_progress' => function ($dlNow) {
                 if (0 < $dlNow) {
-                    throw new \Exception('Aborting the request');
+                    throw new \Exception('Aborting the request.');
                 }
             },
         ]);
@@ -656,7 +656,7 @@ public function testOnProgressCancel()
             }
             $this->fail(ClientExceptionInterface::class.' expected');
         } catch (TransportExceptionInterface $e) {
-            $this->assertSame('Aborting the request', $e->getPrevious()->getMessage());
+            $this->assertSame('Aborting the request.', $e->getPrevious()->getMessage());
         }
 
         $this->assertNotNull($response->getInfo('error'));
@@ -670,7 +670,7 @@ public function testOnProgressError()
         $response = $client->request('GET', 'http://localhost:8057/timeout-body', [
             'on_progress' => function ($dlNow) {
                 if (0 < $dlNow) {
-                    throw new \Error('BUG');
+                    throw new \Error('BUG.');
                 }
             },
         ]);
@@ -680,7 +680,7 @@ public function testOnProgressError()
             }
             $this->fail('Error expected');
         } catch (\Error $e) {
-            $this->assertSame('BUG', $e->getMessage());
+            $this->assertSame('BUG.', $e->getMessage());
         }
 
         $this->assertNotNull($response->getInfo('error'));