Merge branch '3.4' into 4.2

xabbuh · xabbuh · commit 6085bf10c494 · 2019-07-24T21:56:58.000+02:00
* 3.4:
  relax some assertions to make tests forward compatible
  fix typo
diff --git a/.travis.yml b/.travis.yml
@@ -214,7 +214,7 @@ install:
       composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
 
     - |
-      # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number than the next one
+      # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
       [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && LEGACY=,legacy
 
       export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -848,7 +848,8 @@ public function testPreferredChoices()
         ]);
 
         $this->assertEquals([3 => new ChoiceView($entity3, '3', 'Baz'), 2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['preferred_choices']);
-        $this->assertEquals([1 => new ChoiceView($entity1, '1', 'Foo')], $field->createView()->vars['choices']);
+        $this->assertArrayHasKey(1, $field->createView()->vars['choices']);
+        $this->assertEquals(new ChoiceView($entity1, '1', 'Foo'), $field->createView()->vars['choices'][1]);
     }
 
     public function testOverrideChoicesWithPreferredChoices()
@@ -868,7 +869,8 @@ public function testOverrideChoicesWithPreferredChoices()
         ]);
 
         $this->assertEquals([3 => new ChoiceView($entity3, '3', 'Baz')], $field->createView()->vars['preferred_choices']);
-        $this->assertEquals([2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['choices']);
+        $this->assertArrayHasKey(2, $field->createView()->vars['choices']);
+        $this->assertEquals(new ChoiceView($entity2, '2', 'Bar'), $field->createView()->vars['choices'][2]);
     }
 
     public function testDisallowChoicesThatAreNotIncludedChoicesSingleIdentifier()
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -441,7 +441,6 @@ public function testSingleChoiceWithPreferred()
         /following-sibling::option[@disabled="disabled"][not(@selected)][.="-- sep --"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
     ]
-    [count(./option)=3]
 '
         );
     }
@@ -464,7 +463,6 @@ public function testSingleChoiceWithPreferredAndNoSeparator()
         ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
     ]
-    [count(./option)=2]
 '
         );
     }
@@ -488,7 +486,6 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()
         /following-sibling::option[@disabled="disabled"][not(@selected)][.=""]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
     ]
-    [count(./option)=3]
 '
         );
     }
@@ -505,7 +502,6 @@ public function testChoiceWithOnlyPreferred()
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@class="my&class form-control"]
-    [count(./option)=2]
 '
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,6 @@ public function testSingleChoiceWithPreferred()`
`441`	`441`	`/following-sibling::option[@disabled="disabled"][not(@selected)][.="-- sep --"]`
`442`	`442`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`443`	`443`	`]`
`444`		`- [count(./option)=3]`
`445`	`444`	`'`
`446`	`445`	`);`
`447`	`446`	`}`
`@@ -464,7 +463,6 @@ public function testSingleChoiceWithPreferredAndNoSeparator()`
`464`	`463`	`./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`465`	`464`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`466`	`465`	`]`
`467`		`- [count(./option)=2]`
`468`	`466`	`'`
`469`	`467`	`);`
`470`	`468`	`}`
`@@ -488,7 +486,6 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()`
`488`	`486`	`/following-sibling::option[@disabled="disabled"][not(@selected)][.=""]`
`489`	`487`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`490`	`488`	`]`
`491`		`- [count(./option)=3]`
`492`	`489`	`'`
`493`	`490`	`);`
`494`	`491`	`}`
`@@ -505,7 +502,6 @@ public function testChoiceWithOnlyPreferred()`
`505`	`502`	`$this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],`
`506`	`503`	`'/select`
`507`	`504`	`[@class="my&class form-control"]`
`508`		`- [count(./option)=2]`
`509`	`505`	`'`
`510`	`506`	`);`
`511`	`507`	`}`