Merge branch '2.0' into 2.1

fabpot · fabpot · commit 22dbfc009fcf · 2013-02-23T07:41:44.000+01:00
* 2.0: [Form] Fixed "label" option to accept the value "0" [DomCrawler] lowered parsed protocol string (fixes #6986) Conflicts: src/Symfony/Component/Form/Extension/Core/Type/FieldType.php tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php
diff --git a/src/Symfony/Component/DomCrawler/Link.php b/src/Symfony/Component/DomCrawler/Link.php
@@ -46,7 +46,7 @@ class Link
      */
     public function __construct(\DOMNode $node, $currentUri, $method = 'GET')
     {
-        if (!in_array(substr($currentUri, 0, 4), array('http', 'file'))) {
+        if (!in_array(strtolower(substr($currentUri, 0, 4)), array('http', 'file'))) {
             throw new \InvalidArgumentException(sprintf('Current URI must be an absolute URL ("%s").', $currentUri));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class Link`
`46`	`46`	`*/`
`47`	`47`	`public function __construct(\DOMNode $node, $currentUri, $method = 'GET 5BAE ')`
`48`	`48`	`{`
`49`		`- if (!in_array(substr($currentUri, 0, 4), array('http', 'file'))) {`
	`49`	`+ if (!in_array(strtolower(substr($currentUri, 0, 4)), array('http', 'file'))) {`
`50`	`50`	`throw new \InvalidArgumentException(sprintf('Current URI must be an absolute URL ("%s").', $currentUri));`
`51`	`51`	`}`
`52`	`52`