Merge pull request #301 from roderik/doctrine-2.5-bc-break

[FormBundle] Fix Doctrine 2.5 BC break for the 3.0 branch
Kunstmaan · Apr 10, 2015 · 7feb023 · 7feb023
2 parents 390b03b + 3179696
commit 7feb023
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclHelperTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclHelperTest.php
@@ -110,6 +110,14 @@ protected function setUp()
             ->method('getQuoteStrategy')
             ->will($this->returnValue($strat));
 
+        $conf->expects($this->any())
+            ->method('getDefaultQueryHints')
+            ->willReturn(array());
+
+        $conf->expects($this->any())
+            ->method('isSecondLevelCacheEnabled')
+            ->willReturn(false);
+
         $this->em->expects($this->any())
             ->method('getConfiguration')
             ->will($this->returnValue($conf));

diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionField.php
@@ -26,7 +26,7 @@
  *     "email" = "Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\EmailFormSubmissionField"
  * })
  */
-class FormSubmissionField
+abstract class FormSubmissionField
 {
     /**
      * This id of this FormSubmissionField