TIP-890: TIP-860: fix bundle order in AppKernel to prevent errors on API

Mozlk · Oct 22, 2018 · 0357bff · 0357bff
1 parent bce06a9
commit 0357bff
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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(),
         ];
     }