replace assertEmpty() with stricter assertions

Author: xabbuh

Tests/Extension/Core/Type/ChoiceTypeTest.php

@@ -878,7 +878,7 @@ public function testSubmitSingleExpandedRequired()
 
         $this->assertSame('b', $form->getData());
         $this->assertSame('b', $form->getViewData());
-        $this->assertEmpty($form->getExtraData());
+        $this->assertSame([], $form->getExtraData());
         $this->assertTrue($form->isSynchronized());
 
         $this->assertFalse($form[0]->getData());
@@ -906,7 +906,7 @@ public function testSubmitSingleExpandedRequiredInvalidChoice()
 
         $this->assertNull($form->getData());
         $this->assertSame('foobar', $form->getViewData());
-        $this->assertEmpty($form->getExtraData());
+        $this->assertSame([], $form->getExtraData());
         $this->assertFalse($form->isSynchronized());
 
         $this->assertFalse($form[0]->getData());
@@ -934,7 +934,7 @@ public function testSubmitSingleExpandedNonRequired()
 
         $this->assertSame('b', $form->getData());
         $this->assertSame('b', $form->getViewData());
-        $this->assertEmpty($form->getExtraData());
+        $this->assertSame([], $form->getExtraData());
         $this->assertTrue($form->isSynchronized());
 
         $this->assertFalse($form['placeholder']->getData());
@@ -964,7 +964,7 @@ public function testSubmitSingleExpandedNonRequiredInvalidChoice()
 
         $this->assertNull($form->getData());
         $this->assertSame('foobar', $form->getViewData());
-        $this->assertEmpty($form->getExtraData());
+        $this->assertSame([], $form->getExtraData());
         $this->assertFalse($form->isSynchronized());
 
         $this->assertFalse($form[0]->getData());
@@ -1348,7 +1348,7 @@ public function testSubmitMultipleExpanded()
 
         $this->assertSame(['a', 'c'], $form->getData());
         $this->assertSame(['a', 'c'], $form->getViewData());
-        $this->assertEmpty($form->getExtraData());
+        $this->assertSame([], $form->getExtraData());
         $this->assertTrue($form->isSynchronized());
 
         $this->assertTrue($form[0]->getData());
@@ -1375,7 +1375,7 @@ public function testSubmitMultipleExpandedInvalidScalarChoice()
 
         $this->assertNull($form->getData());
         $this->assertSame('foobar', $form->getViewData());
-        $this->assertEmpty($form->getExtraData());
+        $this->assertSame([], $form->getExtraData());
         $this->assertFalse($form->isSynchronized());
 
         $this->assertFalse($form[0]->getData());
@@ -1402,7 +1402,7 @@ public function testSubmitMultipleExpandedInvalidArrayChoice()
 
         $this->assertSame(['a'], $form->getData());
         $this->assertSame(['a'], $form->getViewData());
-        $this->assertEmpty($form->getExtraData());
+        $this->assertSame([], $form->getExtraData());
         $this->assertFalse($form->isValid());
 
         $this->assertTrue($form[0]->getData());

Tests/Extension/Core/Type/ColorTypeTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\Form\Extension\Core\Type\ColorType;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\FormErrorIterator;
 
 final class ColorTypeTest extends BaseTypeTestCase
 {
@@ -30,7 +31,8 @@ public function testValidationShouldPass(bool $html5, ?string $submittedValue)
 
         $form->submit($submittedValue);
 
-        $this->assertEmpty($form->getErrors());
+        $this->assertInstanceOf(FormErrorIterator::class, $form->getErrors());
+        $this->assertCount(0, $form->getErrors());
     }
 
     public static function validationShouldPassProvider(): array

Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Form\Extension\Core\DataMapper\DataMapper;
 use Symfony\Component\Form\Extension\Csrf\EventListener\CsrfValidationListener;
 use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormErrorIterator;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormFactoryBuilder;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -65,7 +66,8 @@ public function testArrayCsrfToken()
         $validation = new CsrfValidationListener('csrf', $this->tokenManager, 'unknown', 'Invalid.');
         $validation->preSubmit($event);
 
-        $this->assertNotEmpty($this->form->getErrors());
+        $this->assertInstanceOf(FormErrorIterator::class, $this->form->getErrors());
+        $this->assertGreaterThan(0, count($this->form->getErrors()));
     }
 
     public function testMaxPostSizeExceeded()
@@ -74,7 +76,8 @@ public function testMaxPostSizeExceeded()
         $validation = new CsrfValidationListener('csrf', $this->tokenManager, 'unknown', 'Error message', null, null, new ServerParamsPostMaxSizeExceeded());
 
         $validation->preSubmit($event);
-        $this->assertEmpty($this->form->getErrors());
+        $this->assertInstanceOf(FormErrorIterator::class, $this->form->getErrors());
+        $this->assertCount(0, $this->form->getErrors());
     }
 }
 

Tests/FormBuilderTest.php

@@ -173,8 +173,8 @@ public function testGetFormConfigErasesReferences()
         $children = $reflClass->getProperty('children');
         $unresolvedChildren = $reflClass->getProperty('unresolvedChildren');
 
-        $this->assertEmpty($children->getValue($config));
-        $this->assertEmpty($unresolvedChildren->getValue($config));
+        $this->assertSame([], $children->getValue($config));
+        $this->assertSame([], $unresolvedChildren->getValue($config));
     }
 
     public function testGetButtonBuilderBeforeExplicitlyResolvingAllChildren()