Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit 1ee8fba19d60 · 2016-03-16T17:19:48.000+01:00
* 2.8:
  [Validator] Test DNS Url constraints using checkdnsrr() mock
  Improved the PHPdoc of FileSystem::copy()
  [Validator] Test DNS Email constraints using checkdnsrr() mock
  [travis] Run real php subprocesses on hhvm for Process component tests
  bug #18161 [Translation] Add support for fuzzy tags in PoFileLoader
  [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers
  [Form] Fix INT64 cast to float in IntegerType.
  [SecurityBundle][PHPDoc] Added method doumentation for SecurityFactoryInterface
  FrameworkBundle: Client: getContainer(): fixed phpdoc
  [Validator] Updating inaccurate docblock comment

Conflicts:
	.travis.yml
diff --git a/Client.php b/Client.php
@@ -42,7 +42,7 @@ public function __construct(KernelInterface $kernel, array $server = array(), Hi
     /**
      * Returns the container.
      *
-     * @return ContainerInterface
+     * @return ContainerInterface|null Returns null when the Kernel has been shutdown or not started yet
      */
     public function getContainer()
     {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct(KernelInterface $kernel, array $server = array(), Hi`
`42`	`42`	`/**`
`43`	`43`	`* Returns the container.`
`44`	`44`	`*`
`45`		`- * @return ContainerInterface`
	`45`	`+ * @return ContainerInterface\|null Returns null when the Kernel has been shutdown or not started yet`
`46`	`46`	`*/`
`47`	`47`	`public function getContainer()`
`48`	`48`	`{`