Merge branch '2.4'

fabpot · fabpot · commit e0de9586aa1a · 2014-03-26T19:07:49.000+01:00
* 2.4: Check headers sent before sending PHP response Fix issue #10345 '[FrameworkBundle][Console] container:debug --parameter="" not working anymore' Fixed ACE domain checks on UrlValidator (#10031) handle array root element
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -55,7 +55,7 @@ public function describe(OutputInterface $output, $object, array $options = arra
                 $this->describeContainerService($this->resolveServiceDefinition($object, $options['id']), $options);
                 break;
             case $object instanceof ContainerBuilder && isset($options['parameter']):
-                $this->formatParameter($object->getParameter($options['parameter']));
+                $this->describeContainerParameter($object->getParameter($options['parameter']), $options);
                 break;
             case $object instanceof ContainerBuilder:
                 $this->describeContainerServices($object, $options);
@@ -114,6 +114,17 @@ abstract protected function describeRouteCollection(RouteCollection $routes, arr
      */
     abstract protected function describeRoute(Route $route, array $options = array());
 
+    /**
+     * Describes a specific container parameter.
+     *
+     * @param mixed $parameterValue
+     * @param array $options
+     */
+    protected function describeContainerParameter($parameterValue, array $options = array())
+    {
+        $this->write($this->formatParameter($parameterValue));
+    }
+
     /**
      * Describes container parameters.
      *
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -91,9 +91,11 @@ public function sendPhpResponse($exception)
             $exception = FlattenException::create($exception);
         }
 
-        header(sprintf('HTTP/1.0 %s', $exception->getStatusCode()));
-        foreach ($exception->getHeaders() as $name => $value) {
-            header($name.': '.$value, false);
+        if (!headers_sent()) {
+            header(sprintf('HTTP/1.0 %s', $exception->getStatusCode()));
+            foreach ($exception->getHeaders() as $name => $value) {
+                header($name.': '.$value, false);
+            }
         }
 
         echo $this->decorate($this->getContent($exception), $this->getStylesheet($exception));
diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php
@@ -95,7 +95,14 @@ public function __construct($message, $messageTemplate, array $messageParameters
      */
     public function __toString()
     {
-        $class = (string) (is_object($this->root) ? get_class($this->root) : $this->root);
+        if (is_object($this->root)) {
+            $class = get_class($this->root);
+        } elseif (is_array($this->root)) {
+            $class = "Array";
+        } else {
+            $class = (string) $this->root;
+        }
+
         $propertyPath = (string) $this->propertyPath;
         $code = $this->code;
 
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator
     const PATTERN = '~^
             (%s)://                                 # protocol
             (
-                ([\pL\pN\pS-]+\.)+[\pL]+                   # a domain name
+                ([\pL\pN\pS-]+\.)+([\pL]|xn\-\-[\pL\pN-]+)+                   # a domain name
                     |                                     #  or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}      # a IP address
                     |                                     #  or
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php b/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php
@@ -33,4 +33,23 @@ public function testToStringHandlesArrays()
 
         $this->assertSame($expected, (string) $violation);
     }
+
+    public function testToStringHandlesArrayRoots()
+    {
+        $violation = new ConstraintViolation(
+            '42 cannot be used here',
+            'this is the message template',
+            array(),
+            array('some_value' =>  42),
+            'some_value',
+            null
+        );
+
+        $expected = <<<EOF
+Array.some_value:
+    42 cannot be used here
+EOF;
+
+        $this->assertSame($expected, (string) $violation);
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -91,15 +91,28 @@ public function getValidUrls()
             array('http://[::1]:80/'),
             array('http://[1:2:3::4:5:6:7]/'),
             array('http://sãopaulo.com/'),
+            array('http://xn--sopaulo-xwa.com/'),
             array('http://sãopaulo.com.br/'),
+            array('http://xn--sopaulo-xwa.com.br/'),
             array('http://пример.испытание/'),
+            array('http://xn--e1afmkfd.xn--80akhbyknj4f/'),
             array('http://مثال.إختبار/'),
+            array('http://xn--mgbh0fb.xn--kgbechtv/'),
             array('http://例子.测试/'),
+            array('http://xn--fsqu00a.xn--0zwm56d/'),
             array('http://例子.測試/'),
+            array('http://xn--fsqu00a.xn--g6w251d/'),
             array('http://例え.テスト/'),
+            array('http://xn--r8jz45g.xn--zckzah/'),
             array('http://مثال.آزمایشی/'),
+            array('http://xn--mgbh0fb.xn--hgbk6aj7f53bba/'),
             array('http://실례.테스트/'),
+            array('http://xn--9n2bp8q.xn--9t4b11yi5a/'),
             array('http://العربية.idn.icann.org/'),
+            array('http://xn--ogb.idn.icann.org/'),
+            array('http://xn--e1afmkfd.xn--80akhbyknj4f.xn--e1afmkfd/'),
+            array('http://xn--espaa-rta.xn--ca-ol-fsay5a/'),
+            array('http://xn--d1abbgf6aiiy.xn--p1ai/'),
             array('http://☎.com/'),
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,11 @@ public function sendPhpResponse($exception)`
`91`	`91`	`$exception = FlattenException::create($exception);`
`92`	`92`	`}`
`93`	`93`
`94`		`- header(sprintf('HTTP/1.0 %s', $exception->getStatusCode()));`
`95`		`- foreach ($exception->getHeaders() as $name => $value) {`
`96`		`- header($name.': '.$value, false);`
	`94`	`+ if (!headers_sent()) {`
	`95`	`+ header(sprintf('HTTP/1.0 %s', $exception->getStatusCode()));`
	`96`	`+ foreach ($exception->getHeaders() as $name => $value) {`
	`97`	`+ header($name.': '.$value, false);`
	`98`	`+ }`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`echo $this->decorate($this->getContent($exception), $this->getStylesheet($exception));`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator`
`25`	`25`	`const PATTERN = '~^`
`26`	`26`	`(%s):// # protocol`
`27`	`27`	`(`
`28`		`- ([\pL\pN\pS-]+\.)+[\pL]+ # a domain name`
	`28`	`+ ([\pL\pN\pS-]+\.)+([\pL]\|xn\-\-[\pL\pN-]+)+ # a domain name`
`29`	`29`	`\| # or`
`30`	`30`	`\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} # a IP address`
`31`	`31`	`\| # or`