Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4819a70

Browse filesBrowse files
[Bridge/Doctrine+Ldap] Fix tests
1 parent afe1668 commit 4819a70
Copy full SHA for 4819a70

File tree

3 files changed

+14
-8
lines changed
Filter options

3 files changed

+14
-8
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -995,13 +995,13 @@ public function testLoaderCaching()
995995
'property3' => 2,
996996
));
997997

998-
$choiceList1 = $form->get('property1')->getConfig()->getOption('choice_list');
999-
$choiceList2 = $form->get('property2')->getConfig()->getOption('choice_list');
1000-
$choiceList3 = $form->get('property3')->getConfig()->getOption('choice_list');
998+
$choiceLoader1 = $form->get('property1')->getConfig()->getOption('choice_loader');
999+
$choiceLoader2 = $form->get('property2')->getConfig()->getOption('choice_loader');
1000+
$choiceLoader3 = $form->get('property3')->getConfig()->getOption('choice_loader');
10011001

1002-
$this->assertInstanceOf('Symfony\Component\Form\ChoiceList\ChoiceListInterface', $choiceList1);
1003-
$this->assertSame($choiceList1, $choiceList2);
1004-
$this->assertSame($choiceList1, $choiceList3);
1002+
$this->assertInstanceOf('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface', $choiceLoader1);
1003+
$this->assertSame($choiceLoader1, $choiceLoader2);
1004+
$this->assertSame($choiceLoader1, $choiceLoader3);
10051005
}
10061006

10071007
public function testCacheChoiceLists()
@@ -1024,8 +1024,8 @@ public function testCacheChoiceLists()
10241024
'choice_label' => 'name',
10251025
));
10261026

1027-
$this->assertInstanceOf('Symfony\Component\Form\ChoiceList\ChoiceListInterface', $field1->getConfig()->getOption('choice_list'));
1028-
$this->assertSame($field1->getConfig()->getOption('choice_list'), $field2->getConfig()->getOption('choice_list'));
1027+
$this->assertInstanceOf('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface', $field1->getConfig()->getOption('choice_loader'));
1028+
$this->assertSame($field1->getConfig()->getOption('choice_loader'), $field2->getConfig()->getOption('choice_loader'));
10291029
}
10301030

10311031
/**

‎src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
use Symfony\Component\Security\Core\User\User;
1717
use Symfony\Component\Ldap\Exception\ConnectionException;
1818

19+
/**
20+
* @requires extension ldap
21+
*/
1922
class LdapBindAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
2023
{
2124
/**

‎src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
use Symfony\Component\Security\Core\User\LdapUserProvider;
1515
use Symfony\Component\Ldap\Exception\ConnectionException;
1616

17+
/**
18+
* @requires extension ldap
19+
*/
1720
class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
1821
{
1922
/**

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.