Merge pull request #1593 from soyuka/fix-1592

Fix 1592

Author: soyuka

features/bootstrap/FeatureContext.php

@@ -338,6 +338,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();
@@ -349,6 +350,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);
         }
 
@@ -401,12 +404,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);

phpstan.neon

@@ -10,6 +10,5 @@ parameters:
         - '#Call to an undefined method PHPUnit_Framework_MockObject_MockObject::[a-zA-Z0-9_]+\(\)#'
 
         # False positives
-        - '#Parameter \#2 \$dqlPart of method Doctrine\\ORM\\QueryBuilder::add\(\) expects Doctrine\\ORM\\Query\\Expr\\Base, Doctrine\\ORM\\Query\\Expr\\Join\[\] given#' # Fixed in Doctrine's master
         - '#Call to an undefined method Doctrine\\Common\\Persistence\\ObjectManager::getConnection\(\)#'
         - '#Class Symfony\\Component\\ExpressionLanguage\\ExpressionLanguage not found and could not be autoloaded#'

src/EventListener/EventPriorities.php

@@ -20,14 +20,17 @@
  */
 final class EventPriorities
 {
+    // kernel.request
     const PRE_READ = 5;
     const POST_READ = 3;
     const PRE_DESERIALIZE = 3;
     const POST_DESERIALIZE = 1;
+    // kernel.view
     const PRE_VALIDATE = 65;
     const POST_VALIDATE = 63;
     const PRE_WRITE = 33;
     const POST_WRITE = 31;
     const PRE_RESPOND = 9;
+    // kernel.response
     const POST_RESPOND = 0;
 }