diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #32969 Use assertContainsEquals when needed (jderusse) 

This PR was merged into the 3.4 branch.

Discussion
----------

Use assertContainsEquals when needed

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #32844
| License       | MIT
| Doc PR        | NA

This PR replaces deprecated paramèter `$checkForObjectIdentity` of methods `assertContains` by the dedicated method `assertContainsEquals`

Commits
-------

f842e59685 Use assert assertContainsEquals when needed
This commit is contained in:
Nicolas Grekas 2019-08-06 08:52:18 +02:00
parent 08573a1830 f842e59685
commit 443e923c7b
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
View File

@ -85,7 +85,7 @@ class MergeExtensionConfigurationPassTest extends TestCase
$pass = new MergeExtensionConfigurationPass();
$pass->process($container);
$this->assertContains(new FileResource(__FILE__), $container->getResources(), '', false, false);
$this->assertContainsEquals(new FileResource(__FILE__), $container->getResources());
}
public function testOverriddenEnvsAreMerged()

10
src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
View File

@ -32,11 +32,11 @@ class CountryTypeTest extends BaseTypeTest
->createView()->vars['choices'];
// Don't check objects for identity
$this->assertContains(new ChoiceView('DE', 'DE', 'Germany'), $choices, '', false, false);
$this->assertContains(new ChoiceView('GB', 'GB', 'United Kingdom'), $choices, '', false, false);
$this->assertContains(new ChoiceView('US', 'US', 'United States'), $choices, '', false, false);
$this->assertContains(new ChoiceView('FR', 'FR', 'France'), $choices, '', false, false);
$this->assertContains(new ChoiceView('MY', 'MY', 'Malaysia'), $choices, '', false, false);
$this->assertContainsEquals(new ChoiceView('DE', 'DE', 'Germany'), $choices);
$this->assertContainsEquals(new ChoiceView('GB', 'GB', 'United Kingdom'), $choices);
$this->assertContainsEquals(new ChoiceView('US', 'US', 'United States'), $choices);
$this->assertContainsEquals(new ChoiceView('FR', 'FR', 'France'), $choices);
$this->assertContainsEquals(new ChoiceView('MY', 'MY', 'Malaysia'), $choices);
}
public function testUnknownCountryIsNotIncluded()

6
src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
View File

@ -31,9 +31,9 @@ class CurrencyTypeTest extends BaseTypeTest
$choices = $this->factory->create(static::TESTED_TYPE)
->createView()->vars['choices'];
$this->assertContains(new ChoiceView('EUR', 'EUR', 'Euro'), $choices, '', false, false);
$this->assertContains(new ChoiceView('USD', 'USD', 'US Dollar'), $choices, '', false, false);
$this->assertContains(new ChoiceView('SIT', 'SIT', 'Slovenian Tolar'), $choices, '', false, false);
$this->assertContainsEquals(new ChoiceView('EUR', 'EUR', 'Euro'), $choices);
$this->assertContainsEquals(new ChoiceView('USD', 'USD', 'US Dollar'), $choices);
$this->assertContainsEquals(new ChoiceView('SIT', 'SIT', 'Slovenian Tolar'), $choices);
}
public function testSubmitNull($expected = null, $norm = null, $view = null)

12
src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
View File

@ -31,11 +31,11 @@ class LanguageTypeTest extends BaseTypeTest
$choices = $this->factory->create(static::TESTED_TYPE)
->createView()->vars['choices'];
$this->assertContains(new ChoiceView('en', 'en', 'English'), $choices, '', false, false);
$this->assertContains(new ChoiceView('en_GB', 'en_GB', 'British English'), $choices, '', false, false);
$this->assertContains(new ChoiceView('en_US', 'en_US', 'American English'), $choices, '', false, false);
$this->assertContains(new ChoiceView('fr', 'fr', 'French'), $choices, '', false, false);
$this->assertContains(new ChoiceView('my', 'my', 'Burmese'), $choices, '', false, false);
$this->assertContainsEquals(new ChoiceView('en', 'en', 'English'), $choices);
$this->assertContainsEquals(new ChoiceView('en_GB', 'en_GB', 'British English'), $choices);
$this->assertContainsEquals(new ChoiceView('en_US', 'en_US', 'American English'), $choices);
$this->assertContainsEquals(new ChoiceView('fr', 'fr', 'French'), $choices);
$this->assertContainsEquals(new ChoiceView('my', 'my', 'Burmese'), $choices);
}
public function testMultipleLanguagesIsNotIncluded()
@ -43,7 +43,7 @@ class LanguageTypeTest extends BaseTypeTest
$choices = $this->factory->create(static::TESTED_TYPE, 'language')
->createView()->vars['choices'];
$this->assertNotContains(new ChoiceView('mul', 'mul', 'Mehrsprachig'), $choices, '', false, false);
$this->assertNotContainsEquals(new ChoiceView('mul', 'mul', 'Mehrsprachig'), $choices);
}
public function testSubmitNull($expected = null, $norm = null, $view = null)

6
src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
View File

@ -31,9 +31,9 @@ class LocaleTypeTest extends BaseTypeTest
$choices = $this->factory->create(static::TESTED_TYPE)
->createView()->vars['choices'];
$this->assertContains(new ChoiceView('en', 'en', 'English'), $choices, '', false, false);
$this->assertContains(new ChoiceView('en_GB', 'en_GB', 'English (United Kingdom)'), $choices, '', false, false);
$this->assertContains(new ChoiceView('zh_Hant_HK', 'zh_Hant_HK', 'Chinese (Traditional, Hong Kong SAR China)'), $choices, '', false, false);
$this->assertContainsEquals(new ChoiceView('en', 'en', 'English'), $choices);
$this->assertContainsEquals(new ChoiceView('en_GB', 'en_GB', 'English (United Kingdom)'), $choices);
$this->assertContainsEquals(new ChoiceView('zh_Hant_HK', 'zh_Hant_HK', 'Chinese (Traditional, Hong Kong SAR China)'), $choices);
}
public function testSubmitNull($expected = null, $norm = null, $view = null)

6
src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
View File

@ -23,10 +23,10 @@ class TimezoneTypeTest extends BaseTypeTest
->createView()->vars['choices'];
$this->assertArrayHasKey('Africa', $choices);
$this->assertContains(new ChoiceView('Africa/Kinshasa', 'Africa/Kinshasa', 'Kinshasa'), $choices['Africa'], '', false, false);
$this->assertContainsEquals(new ChoiceView('Africa/Kinshasa', 'Africa/Kinshasa', 'Kinshasa'), $choices['Africa']);
$this->assertArrayHasKey('America', $choices);
$this->assertContains(new ChoiceView('America/New_York', 'America/New_York', 'New York'), $choices['America'], '', false, false);
$this->assertContainsEquals(new ChoiceView('America/New_York', 'America/New_York', 'New York'), $choices['America']);
}
public function testSubmitNull($expected = null, $norm = null, $view = null)
@ -70,6 +70,6 @@ class TimezoneTypeTest extends BaseTypeTest
$choices = $this->factory->create(static::TESTED_TYPE, null, ['regions' => \DateTimeZone::EUROPE])
->createView()->vars['choices'];
$this->assertContains(new ChoiceView('Europe/Amsterdam', 'Europe/Amsterdam', 'Amsterdam'), $choices, '', false, false);
$this->assertContainsEquals(new ChoiceView('Europe/Amsterdam', 'Europe/Amsterdam', 'Amsterdam'), $choices);
}
}

4
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
View File

@ -208,8 +208,8 @@ class UserAuthenticationProviderTest extends TestCase
$this->assertInstanceOf('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', $authToken);
$this->assertSame($user, $authToken->getUser());
$this->assertContains(new Role('ROLE_FOO'), $authToken->getRoles(), '', false, false);
$this->assertContains($switchUserRole, $authToken->getRoles(), '', false, false);
$this->assertContainsEquals(new Role('ROLE_FOO'), $authToken->getRoles());
$this->assertContainsEquals($switchUserRole, $authToken->getRoles());
$this->assertEquals('foo', $authToken->getCredentials());
$this->assertEquals(['foo' => 'bar'], $authToken->getAttributes(), '->authenticate() copies token attributes');
}