Merge branch '3.4' into 4.4

fabpot · fabpot · commit 11dcf08f12f2 · 2020-02-29T11:05:28.000+01:00
* 3.4:
  [Validator] Add missing vietnamese translations
  add German translation
  [Validator][ConstraintValidator] Update wrong PRETTY_DATE doc
  [DomCrawler][Form] Fix PHPDoc on get &amp; offsetGet
  prevent method calls on null values
  Return int if scale = 0
diff --git a/Form.php b/Form.php
@@ -279,7 +279,7 @@ public function remove($name)
      *
      * @param string $name The field name
      *
-     * @return FormField The field instance
+     * @return FormField|FormField[]|FormField[][] The value of the field
      *
      * @throws \InvalidArgumentException When field is not present in this form
      */
@@ -323,7 +323,7 @@ public function offsetExists($name)
      *
      * @param string $name The field name
      *
-     * @return FormField The associated Field instance
+     * @return FormField|FormField[]|FormField[][] The value of the field
      *
      * @throws \InvalidArgumentException if the field does not exist
      */
diff --git a/FormFieldRegistry.php b/FormFieldRegistry.php
@@ -66,7 +66,7 @@ public function remove(string $name)
     /**
      * Returns the value of the field based on the fully qualifed name and its children.
      *
-     * @return mixed The value of the field
+     * @return FormField|FormField[]|FormField[][] The value of the field
      *
      * @throws \InvalidArgumentException if the field does not exist
      */
diff --git a/Tests/FormTest.php b/Tests/FormTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DomCrawler\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DomCrawler\Field\TextareaFormField;
 use Symfony\Component\DomCrawler\Form;
 use Symfony\Component\DomCrawler\FormFieldRegistry;
 
@@ -965,7 +966,7 @@ protected function createTestMultipleForm()
         return $dom;
     }
 
-    public function testgetPhpValuesWithEmptyTextarea()
+    public function testGetPhpValuesWithEmptyTextarea()
     {
         $dom = new \DOMDocument();
         $dom->loadHTML('
@@ -980,4 +981,34 @@ public function testgetPhpValuesWithEmptyTextarea()
         $form = new Form($nodes->item(0), 'http://example.com');
         $this->assertEquals($form->getPhpValues(), ['example' => '']);
     }
+
+    public function testGetReturnTypes()
+    {
+        $dom = new \DOMDocument();
+        $dom->loadHTML('
+            <html>
+                <form>
+                    <textarea name="foo[collection][0][bar]">item 0</textarea>
+                </form>
+            </html>'
+        );
+
+        $nodes = $dom->getElementsByTagName('form');
+        $form = new Form($nodes->item(0), 'http://example.com');
+
+        // FormField
+        $this->assertInstanceOf(TextareaFormField::class, $textareaFormField = $form->get('foo[collection][0][bar]'));
+
+        // Array of FormField
+        $this->assertSame([
+            'bar' => $textareaFormField,
+        ], $form->get('foo[collection][0]'));
+
+        // Array of array of FormField
+        $this->assertSame([
+            [
+                'bar' => $textareaFormField,
+            ],
+        ], $form->get('foo[collection]'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public function remove($name)`
`279`	`279`	`*`
`280`	`280`	`* @param string $name The field name`
`281`	`281`	`*`
`282`		`- * @return FormField The field instance`
	`282`	`+ * @return FormField\|FormField[]\|FormField[][] The value of the field`
`283`	`283`	`*`
`284`	`284`	`* @throws \InvalidArgumentException When field is not present in this form`
`285`	`285`	`*/`
`@@ -323,7 +323,7 @@ public function offsetExists($name)`
`323`	`323`	`*`
`324`	`324`	`* @param string $name The field name`
`325`	`325`	`*`
`326`		`- * @return FormField The associated Field instance`
	`326`	`+ * @return FormField\|FormField[]\|FormField[][] The value of the field`
`327`	`327`	`*`
`328`	`328`	`* @throws \InvalidArgumentException if the field does not exist`
`329`	`329`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function remove(string $name)`
`66`	`66`	`/**`
`67`	`67`	`* Returns the value of the field based on the fully qualifed name and its children.`
`68`	`68`	`*`
`69`		`- * @return mixed The value of the field`
	`69`	`+ * @return FormField\|FormField[]\|FormField[][] The value of the field`
`70`	`70`	`*`
`71`	`71`	`* @throws \InvalidArgumentException if the field does not exist`
`72`	`72`	`*/`