minor #12242 [Form] no need to add the url listener when it does not do anything (Tobion)

webmozart · webmozart · commit 91fde699aa09 · 2014-10-20T12:59:59.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Form] no need to add the url listener when it does not do anything | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - In line with #11696 Commits ------- 7aea1c9 [Form] no need to add the url listener when it does not do anything
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -24,6 +24,11 @@ class FixUrlProtocolListener implements EventSubscriberInterface
 {
     private $defaultProtocol;
 
+    /**
+     * Constructor.
+     *
+     * @param string|null $defaultProtocol The URL scheme to add when there is none or null to not modify the data
+     */
     public function __construct($defaultProtocol = 'http')
     {
         $this->defaultProtocol = $defaultProtocol;
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
@@ -23,7 +23,9 @@ class UrlType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new FixUrlProtocolListener($options['default_protocol']));
+        if (null !== $options['default_protocol']) {
+            $builder->addEventSubscriber(new FixUrlProtocolListener($options['default_protocol']));
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@ class FixUrlProtocolListener implements EventSubscriberInterface`
`24`	`24`	`{`
`25`	`25`	`private $defaultProtocol;`
`26`	`26`
	`27`	`+ /**`
	`28`	`+ * Constructor.`
	`29`	`+ *`
	`30`	`+ * @param string\|null $defaultProtocol The URL scheme to add when there is none or null to not modify the data`
	`31`	`+ */`
`27`	`32`	`public function __construct($defaultProtocol = 'http')`
`28`	`33`	`{`
`29`	`34`	`$this->defaultProtocol = $defaultProtocol;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,9 @@ class UrlType extends AbstractType`
`23`	`23`	`*/`
`24`	`24`	`public function buildForm(FormBuilderInterface $builder, array $options)`
`25`	`25`	`{`
`26`		`- $builder->addEventSubscriber(new FixUrlProtocolListener($options['default_protocol']));`
	`26`	`+ if (null !== $options['default_protocol']) {`
	`27`	`+ $builder->addEventSubscriber(new FixUrlProtocolListener($options['default_protocol']));`
	`28`	`+ }`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`/**`