Fix compatibility with doctrine/orm ^2.6 (#181)

Content/Types/FormSelect.php

@@ -135,7 +135,7 @@ public function getViewData(PropertyInterface $property)
 
         $locale = $property->getStructure()->getLanguageCode();
 
-        $formEntity = $this->formRepository->findById($id, $locale);
+        $formEntity = $this->formRepository->loadById($id, $locale);
 
         if (!$formEntity) {
             return [];

Controller/DynamicController.php

@@ -177,6 +177,6 @@ protected function loadForm(Request $request)
             throw new BadRequestHttpException('"form" is required parameter');
         }
 
-        return $this->get('sulu_form.repository.form')->findById($formId);
+        return $this->get('sulu_form.repository.form')->loadById($formId);
     }
 }

Form/Builder.php

@@ -267,7 +267,7 @@ private function createForm($name, $type, $typeId, $locale, $formEntity, $webspa
      */
     private function loadFormEntity($id, $locale)
     {
-        $formEntity = $this->formRepository->findById($id, $locale);
+        $formEntity = $this->formRepository->loadById($id, $locale);
 
         if (!$formEntity) {
             return null;

Manager/FormManager.php

@@ -55,7 +55,7 @@ public function __construct(
      */
     public function findById($id, $locale = null)
     {
-        return $this->formRepository->findById($id, $locale);
+        return $this->formRepository->loadById($id, $locale);
     }
 
     /**
@@ -66,7 +66,7 @@ public function findById($id, $locale = null)
      */
     public function findAll($locale = null, $filters = [])
     {
-        return $this->formRepository->findAll($locale, $filters);
+        return $this->formRepository->loadAll($locale, $filters);
     }
 
     /**
@@ -77,7 +77,7 @@ public function findAll($locale = null, $filters = [])
      */
     public function count($locale = null, $filters = [])
     {
-        return $this->formRepository->count($locale, $filters);
+        return $this->formRepository->countByFilters($locale, $filters);
     }
 
     /**

Repository/FormRepository.php

@@ -22,7 +22,7 @@ class FormRepository extends \Doctrine\ORM\EntityRepository
      *
      * @return Form|null
      */
-    public function findById($id, $locale = null)
+    public function loadById($id, $locale = null)
     {
         $queryBuilder = $this->createQueryBuilder('form')
             ->leftJoin('form.translations', 'translation')->addSelect('translation')
@@ -48,7 +48,7 @@ public function findById($id, $locale = null)
      *
      * @return Form[]
      */
-    public function findAll($locale = null, $filters = [])
+    public function loadAll($locale = null, $filters = [])
     {
         $queryBuilder = $this->createQueryBuilder('form')
             ->leftJoin('form.translations', 'translation')->addSelect('translation')
@@ -71,7 +71,7 @@ public function findAll($locale = null, $filters = [])
      *
      * @return int
      */
-    public function count($locale = null, $filters = [])
+    public function countByFilters($locale = null, $filters = [])
     {
         $queryBuilder = $this->createQueryBuilder('form');
         $queryBuilder->select($queryBuilder->expr()->count('form.id'));

UPGRADE.md

@@ -1,5 +1,13 @@
 # Upgrade
 
+## 1.0.0-RC6
+
+For the compatibility with `doctrine/orm ^2.6` the function names of the FormRepository are rename to avoid inheritance issues.
+
+ - `findById` changed to `loadById`
+ - `findAll` changed to `loadAll`
+ - `count` changed to `countByFilters`
+
 ## 1.0.0-RC3
 
 ### Removed `dynamic_default_view` parameter