Merge branch '4.4' into 5.0

fabpot · fabpot · commit 37f54f81d7af · 2020-03-15T15:33:06.000+01:00
* 4.4:
  Add missing dots at the end of exception messages
  [DI][Form] Fixed test suite (TimeType changes &amp; unresolved merge conflict)
  Fix bad merge
  Add missing dots at the end of exception messages
diff --git a/Cloner/Data.php b/Cloner/Data.php
@@ -392,7 +392,7 @@ private function dumpItem(DumperInterface $dumper, Cursor $cursor, array &$refs,
                     break;
 
                 default:
-                    throw new \RuntimeException(sprintf('Unexpected Stub type: %s', $item->type));
+                    throw new \RuntimeException(sprintf('Unexpected Stub type: %s.', $item->type));
             }
         } elseif ('array' === $type) {
             $dumper->enterHash($cursor, Cursor::HASH_INDEXED, 0, false);

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ private function dumpItem(DumperInterface $dumper, Cursor $cursor, array &$refs,`
`392`	`392`	`break;`
`393`	`393`
`394`	`394`	`default:`
`395`		`- throw new \RuntimeException(sprintf('Unexpected Stub type: %s', $item->type));`
	`395`	`+ throw new \RuntimeException(sprintf('Unexpected Stub type: %s.', $item->type));`
`396`	`396`	`}`
`397`	`397`	`} elseif ('array' === $type) {`
`398`	`398`	`$dumper->enterHash($cursor, Cursor::HASH_INDEXED, 0, false);`