Merge pull request schmittjoh#53 from adrienbrault/fix-21error

Fix 21error

Form/ChoosePaymentMethodType.php

@@ -63,8 +63,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('method', 'choice', array(
             'choices' => $this->buildChoices($options['available_methods']),
             'expanded' => true,
-            'index_strategy' => ChoiceList::COPY_CHOICE,
-            'value_strategy' => ChoiceList::COPY_CHOICE,
         ));
 
         foreach ($options['available_methods'] as $method) {

Tests/Functional/BaseTestCase.php

@@ -27,6 +27,7 @@ protected final function importDatabaseSchema()
         $metadata = $em->getMetadataFactory()->getAllMetadata();
         if (!empty($metadata)) {
             $schemaTool = new \Doctrine\ORM\Tools\SchemaTool($em);
+            $schemaTool->dropDatabase();
             $schemaTool->createSchema($metadata);
         }
     }

Tests/Functional/PaymentWorkflowTest.php

@@ -9,8 +9,6 @@ class PaymentWorkflowTest extends BaseTestCase
 {
     public function testPaymentDetails()
     {
-        $this->markTestSkipped('Needs to be run separately because of some DB locking issues.');
-
         $client = $this->createClient();
         $this->importDatabaseSchema();
 

Tests/bootstrap.php

@@ -1,15 +1,14 @@
 <?php
 
-// this file searches for the autoload file of your project, and includes it
-$dir = __DIR__;
-$lastDir = null;
-while (($dir = dirname($dir)) && $dir !== $lastDir) {
-    $lastDir = $dir;
-
-    if (file_exists($file = $dir.'/app/autoload.php')) {
-        require_once $file;
-        return;
-    }
+use Doctrine\Common\Annotations\AnnotationRegistry;
+
+// Composer
+if (file_exists(__DIR__.'/../vendor/autoload.php')) {
+    $loader = require_once __DIR__.'/../vendor/autoload.php';
+
+    AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+
+    return $loader;
 }
 
-throw new \RuntimeException('Could not locate the project\'s bootstrap.php.cache. If your bundle is not inside a project, you need to replace this bootstrap file.');
+throw new \RuntimeException('Could not find vendor/autoload.php, make sure you ran composer.');

composer.json

@@ -16,8 +16,13 @@
         "symfony/framework-bundle": ">=2.0,<2.2-dev",
         "ext-mcrypt": "*"
     },
-    "recommend": {
-        "doctrine/doctrine-bundle": "dev-master"
+    "require-dev": {
+        "sensio/framework-extra-bundle": "*",
+        "doctrine/doctrine-bundle": "*",
+        "doctrine/orm": "*",
+        "jms/payment-paypal-bundle": "*",
+        "jms/aop-bundle": "*",
+        "jms/di-extra-bundle": "*"
     },
     "autoload": {
         "psr-0": { "JMS\\Payment\\CoreBundle": "" }