Merge pull request #1588 from soyuka/fix-doctrine

use doctrine 2.6

Author: soyuka

composer.json

@@ -33,7 +33,7 @@
         "behat/symfony2-extension": "^2.1.1",
         "behatch/contexts": "dev-master",
         "doctrine/doctrine-bundle": "^1.6.3",
-        "doctrine/orm": ">=2.5.2 <2.6",
+        "doctrine/orm": "^2.5.2",
         "doctrine/annotations": "^1.2",
         "friendsofsymfony/user-bundle": "^2.0",
         "guzzlehttp/guzzle": "^6.0",

features/bootstrap/FeatureContext.php

@@ -560,6 +560,7 @@ public function thereIsACompositeIdentifierObject()
         $item = new CompositeItem();
         $item->setField1('foobar');
         $this->manager->persist($item);
+        $this->manager->flush();
 
         for ($i = 0; $i < 4; ++$i) {
             $label = new CompositeLabel();
@@ -571,6 +572,8 @@ public function thereIsACompositeIdentifierObject()
             $rel->setValue('somefoobardummy');
 
             $this->manager->persist($label);
+            // since doctrine 2.6 we need existing identifiers on relations
+            $this->manager->flush();
             $this->manager->persist($rel);
         }
 
@@ -623,12 +626,16 @@ public function thereIsARelatedDummyWithFriends(int $nb)
         $relatedDummy = new RelatedDummy();
         $relatedDummy->setName('RelatedDummy with friends');
         $this->manager->persist($relatedDummy);
+        $this->manager->flush();
 
         for ($i = 1; $i <= $nb; ++$i) {
             $friend = new DummyFriend();
             $friend->setName('Friend-'.$i);
 
             $this->manager->persist($friend);
+            // since doctrine 2.6 we need existing identifiers on relations
+            // See https://github.com/doctrine/doctrine2/pull/6701
+            $this->manager->flush();
 
             $relation = new RelatedToDummyFriend();
             $relation->setName('Relation-'.$i);
@@ -740,6 +747,8 @@ public function createPeopleWithPets()
 
         $this->manager->persist($person);
         $this->manager->persist($pet);
+        // since doctrine 2.6 we need existing identifiers on relations
+        $this->manager->flush();
         $this->manager->persist($personToPet);
 
         $person->pets->add($personToPet);