bug #26621 [Form] no type errors with invalid submitted data types (xabbuh)

fabpot · fabpot · commit 2349e977ff68 · 2018-03-22T08:23:40.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Form] no type errors with invalid submitted data types | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #26557 | License | MIT | Doc PR | Commits ------- 4217cc1 no type errors with invalid submitted data types
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -36,7 +36,7 @@ public function onSubmit(FormEvent $event)
     {
         $data = $event->getData();
 
-        if ($this->defaultProtocol && $data && !preg_match('~^[\w+.-]+://~', $data)) {
+        if ($this->defaultProtocol && $data && is_string($data) && !preg_match('~^[\w+.-]+://~', $data)) {
             $event->setData($this->defaultProtocol.'://'.$data);
         }
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
@@ -82,4 +82,12 @@ public function testThrowExceptionIfDefaultProtocolIsInvalid()
             'default_protocol' => array(),
         ));
     }
+
+    public function testSubmitWithNonStringDataDoesNotBreakTheFixUrlProtocolListener()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE);
+        $form->submit(array('domain.com', 'www.domain.com'));
+
+        $this->assertSame(array('domain.com', 'www.domain.com'), $form->getData());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function onSubmit(FormEvent $event)`
`36`	`36`	`{`
`37`	`37`	`$data = $event->getData();`
`38`	`38`
`39`		`- if ($this->defaultProtocol && $data && !preg_match('~^[\w+.-]+://~', $data)) {`
	`39`	`+ if ($this->defaultProtocol && $data && is_string($data) && !preg_match('~^[\w+.-]+://~', $data)) {`
`40`	`40`	`$event->setData($this->defaultProtocol.'://'.$data);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,12 @@ public function testThrowExceptionIfDefaultProtocolIsInvalid()`
`82`	`82`	`'default_protocol' => array(),`
`83`	`83`	`));`
`84`	`84`	`}`
	`85`	`+`
	`86`	`+ public function testSubmitWithNonStringDataDoesNotBreakTheFixUrlProtocolListener()`
	`87`	`+ {`
	`88`	`+ $form = $this->factory->create(static::TESTED_TYPE);`
	`89`	`+ $form->submit(array('domain.com', 'www.domain.com'));`
	`90`	`+`
	`91`	`+ $this->assertSame(array('domain.com', 'www.domain.com'), $form->getData());`
	`92`	`+ }`
`85`	`93`	`}`