Merge branch '2.3' into 2.7

* 2.3:
  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
	src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php

Author: nicolas-grekas

ConstraintValidator.php

@@ -118,9 +118,9 @@ protected function formatTypeOf($value)
      * This method returns the equivalent PHP tokens for most scalar types
      * (i.e. "false" for false, "1" for 1 etc.). Strings are always wrapped
      * in double quotes ("). Objects, arrays and resources are formatted as
-     * "object", "array" and "resource". If the parameter $prettyDateTime
-     * is set to true, {@link \DateTime} objects will be formatted as
-     * RFC-3339 dates ("Y-m-d H:i:s").
+     * "object", "array" and "resource". If the $format bitmask contains
+     * the PRETTY_DATE bit, then {@link \DateTime} objects will be formatted 
+     * as RFC-3339 dates ("Y-m-d H:i:s").
      *
      * Be careful when passing message parameters to a constraint violation
      * that (may) contain objects, arrays or resources. These parameters
@@ -159,7 +159,7 @@ protected function formatValue($value, $format = 0)
         }
 
         if (is_object($value)) {
-            if ($format & self::OBJECT_TO_STRING && method_exists($value, '__toString')) {
+            if (($format & self::OBJECT_TO_STRING) && method_exists($value, '__toString')) {
                 return $value->__toString();
             }
 

Tests/Constraints/EmailValidatorTest.php

@@ -11,10 +11,14 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use Symfony\Bridge\PhpUnit\DnsMock;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\EmailValidator;
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @group dns-sensitive
+ */
 class EmailValidatorTest extends AbstractConstraintValidatorTest
 {
     protected function getApiVersion()
@@ -103,4 +107,40 @@ public function testStrict()
 
         $this->assertNoViolation();
     }
+
+    /**
+     * @dataProvider getDnsChecks
+     */
+    public function testDnsChecks($type, $violation)
+    {
+        DnsMock::withMockedHosts(array('example.com' => array(array('type' => $violation ? false : $type))));
+
+        $constraint = new Email(array(
+            'message' => 'myMessage',
+            'MX' === $type ? 'checkMX' : 'checkHost' => true,
+        ));
+
+        $this->validator->validate('[email protected]', $constraint);
+
+        if (!$violation) {
+            $this->assertNoViolation();
+        } else {
+            $this->buildViolation('myMessage')
+                ->setParameter('{{ value }}', '"[email protected]"')
+                ->setCode($violation)
+                ->assertRaised();
+        }
+    }
+
+    public function getDnsChecks()
+    {
+        return array(
+            array('MX', false),
+            array('MX', Email::MX_CHECK_FAILED_ERROR),
+            array('A', false),
+            array('A', Email::HOST_CHECK_FAILED_ERROR),
+            array('AAAA', false),
+            array('AAAA', Email::HOST_CHECK_FAILED_ERROR),
+        );
+    }
 }