Merge branch '4.2'

Robin Chalas · Robin Chalas · commit 09dee1737d63 · 2019-04-06T16:23:27.000+02:00
* 4.2:
  fix merge
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -34,10 +34,7 @@ class FormConfigBuilder implements FormConfigBuilderInterface
      */
     private static $nativeRequestHandler;
 
-    /**
-     * @var bool
-     */
-
+    protected $locked = false;
     private $dispatcher;
     private $name;
 
