symfony
diff --git a/‎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 b/‎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
diff --git a/‎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 b/‎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
diff --git a/‎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 b/‎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
@@ -995,13 +995,13 @@ public function testLoaderCaching()
             'property3' => 2,
         ));
 
-        $choiceList1 = $form->get('property1')->getConfig()->getOption('choice_list');
-        $choiceList2 = $form->get('property2')->getConfig()->getOption('choice_list');
-        $choiceList3 = $form->get('property3')->getConfig()->getOption('choice_list');
+        $choiceLoader1 = $form->get('property1')->getConfig()->getOption('choice_loader');
+        $choiceLoader2 = $form->get('property2')->getConfig()->getOption('choice_loader');
+        $choiceLoader3 = $form->get('property3')->getConfig()->getOption('choice_loader');
 
-        $this->assertInstanceOf('Symfony\Component\Form\ChoiceList\ChoiceListInterface', $choiceList1);
-        $this->assertSame($choiceList1, $choiceList2);
-        $this->assertSame($choiceList1, $choiceList3);
+        $this->assertInstanceOf('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface', $choiceLoader1);
+        $this->assertSame($choiceLoader1, $choiceLoader2);
+        $this->assertSame($choiceLoader1, $choiceLoader3);
     }
 
     public function testCacheChoiceLists()
@@ -1024,8 +1024,8 @@ public function testCacheChoiceLists()
             'choice_label' => 'name',
         ));
 
-        $this->assertInstanceOf('Symfony\Component\Form\ChoiceList\ChoiceListInterface', $field1->getConfig()->getOption('choice_list'));
-        $this->assertSame($field1->getConfig()->getOption('choice_list'), $field2->getConfig()->getOption('choice_list'));
+        $this->assertInstanceOf('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface', $field1->getConfig()->getOption('choice_loader'));
+        $this->assertSame($field1->getConfig()->getOption('choice_loader'), $field2->getConfig()->getOption('choice_loader'));
     }
 
     /**
 
@@ -16,6 +16,9 @@
 use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Ldap\Exception\ConnectionException;
 
+/**
+ * @requires extension ldap
+ */
 class LdapBindAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
 {
     /**
 
@@ -14,6 +14,9 @@
 use Symfony\Component\Security\Core\User\LdapUserProvider;
 use Symfony\Component\Ldap\Exception\ConnectionException;
 
+/**
+ * @requires extension ldap
+ */
 class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
 {
     /**