From 0357bffcf08c0982da5664c0ce04a12e35877851 Mon Sep 17 00:00:00 2001
From: "Julien Janvier (jjanvier)" <j.janvier@gmail.com>
Date: Fri, 19 Oct 2018 21:51:00 +0200
Subject: [PATCH] TIP-890: TIP-860: fix bundle order in AppKernel to prevent
 errors on API

---
 app/AppKernel.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 81e5b3f23..f97b31d9c 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -103,7 +103,6 @@ protected function getPimBundles()
     protected function getPimDependenciesBundles()
     {
         return [
-            new Akeneo\Tool\Bundle\ApiBundle\PimApiBundle(),
             new Akeneo\Tool\Bundle\ConnectorBundle\PimConnectorBundle(),
             new Akeneo\Tool\Bundle\ClassificationBundle\AkeneoClassificationBundle(),
             new Akeneo\Tool\Bundle\VersioningBundle\AkeneoVersioningBundle(),
@@ -116,6 +115,8 @@ protected function getPimDependenciesBundles()
             new Akeneo\Tool\Bundle\StorageUtilsBundle\AkeneoStorageUtilsBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
+            // PimApiBundle must be registered after FOSOAuthServerBundle
+            new Akeneo\Tool\Bundle\ApiBundle\PimApiBundle(),
             new Oneup\FlysystemBundle\OneupFlysystemBundle(),
         ];
     }