From df67e3d4ce0d4d3c790d983ca5e3fc5f79cbf64c Mon Sep 17 00:00:00 2001
From: Joao Inacio <joao.inacio@ez.no>
Date: Thu, 21 May 2015 16:05:56 +0100
Subject: [PATCH] Use global namespaces in EzPublishKernel

---
 ezpublish/EzPublishKernel.php | 105 ++++++++++++----------------------
 1 file changed, 35 insertions(+), 70 deletions(-)

diff --git a/ezpublish/EzPublishKernel.php b/ezpublish/EzPublishKernel.php
index ce5dfca9..bebdca20 100644
--- a/ezpublish/EzPublishKernel.php
+++ b/ezpublish/EzPublishKernel.php
@@ -7,43 +7,8 @@
  * @version //autogentag//
  */
 
-use Egulias\ListenersDebugCommandBundle\EguliasListenersDebugCommandBundle;
-use eZ\Bundle\EzPublishCoreBundle\EzPublishCoreBundle;
-use eZ\Bundle\EzPublishLegacySearchEngineBundle\EzPublishLegacySearchEngineBundle;
-use eZ\Bundle\EzPublishDebugBundle\EzPublishDebugBundle;
-use eZ\Bundle\EzPublishIOBundle\EzPublishIOBundle;
-use eZ\Bundle\EzPublishLegacyBundle\EzPublishLegacyBundle;
-use eZ\Bundle\EzPublishRestBundle\EzPublishRestBundle;
-use EzSystems\CommentsBundle\EzSystemsCommentsBundle;
-use EzSystems\DemoBundle\EzSystemsDemoBundle;
-use EzSystems\BehatBundle\EzSystemsBehatBundle;
 use eZ\Bundle\EzPublishCoreBundle\Kernel;
-use EzSystems\NgsymfonytoolsBundle\EzSystemsNgsymfonytoolsBundle;
-use EzSystems\PlatformUIBundle\EzSystemsPlatformUIBundle;
-use EzSystems\PlatformUIAssetsBundle\EzSystemsPlatformUIAssetsBundle;
-use FOS\HttpCacheBundle\FOSHttpCacheBundle;
-use Liip\ImagineBundle\LiipImagineBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
-use Symfony\Bundle\SecurityBundle\SecurityBundle;
-use Symfony\Bundle\TwigBundle\TwigBundle;
-use Symfony\Bundle\MonologBundle\MonologBundle;
-use Symfony\Bundle\AsseticBundle\AsseticBundle;
-use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
-use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
-use Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle;
-use Sensio\Bundle\DistributionBundle\SensioDistributionBundle;
-use Tedivm\StashBundle\TedivmStashBundle;
-use WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle;
-use WhiteOctober\BreadcrumbsBundle\WhiteOctoberBreadcrumbsBundle;
-use Nelmio\CorsBundle\NelmioCorsBundle;
-use Hautelook\TemplatedUriBundle\HautelookTemplatedUriBundle;
-use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Knp\Bundle\MenuBundle\KnpMenuBundle;
-use Oneup\FlysystemBundle\OneupFlysystemBundle;
-use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
-use EzSystems\PlatformInstallerBundle\EzSystemsPlatformInstallerBundle;
-use EzSystems\PrivacyCookieBundle\EzSystemsPrivacyCookieBundle;
 
 class EzPublishKernel extends Kernel
 {
@@ -57,49 +22,49 @@ class EzPublishKernel extends Kernel
     public function registerBundles()
     {
         $bundles = array(
-            new FrameworkBundle(),
-            new SecurityBundle(),
-            new TwigBundle(),
-            new MonologBundle(),
-            new SwiftmailerBundle(),
-            new AsseticBundle(),
-            new DoctrineBundle(),
-            new SensioFrameworkExtraBundle(),
-            new TedivmStashBundle(),
-            new HautelookTemplatedUriBundle(),
-            new LiipImagineBundle(),
-            new FOSHttpCacheBundle(),
-            new EzPublishCoreBundle(),
-            new EzPublishLegacySearchEngineBundle(),
-            new EzPublishLegacyBundle( $this ),
-            new EzPublishIOBundle(),
-            new EzSystemsDemoBundle(),
-            new EzPublishRestBundle(),
-            new EzSystemsCommentsBundle(),
-            new EzSystemsNgsymfonytoolsBundle(),
-            new EzSystemsPlatformUIAssetsBundle(),
-            new EzSystemsPlatformUIBundle(),
-            new WhiteOctoberPagerfantaBundle(),
-            new WhiteOctoberBreadcrumbsBundle(),
-            new NelmioCorsBundle(),
-            new KnpMenuBundle(),
-            new OneupFlysystemBundle(),
-            new EzSystemsPlatformInstallerBundle(),
-            new EzSystemsPrivacyCookieBundle()
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
+            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new Tedivm\StashBundle\TedivmStashBundle(),
+            new Hautelook\TemplatedUriBundle\HautelookTemplatedUriBundle(),
+            new Liip\ImagineBundle\LiipImagineBundle(),
+            new FOS\HttpCacheBundle\FOSHttpCacheBundle(),
+            new eZ\Bundle\EzPublishCoreBundle\EzPublishCoreBundle(),
+            new eZ\Bundle\EzPublishLegacySearchEngineBundle\EzPublishLegacySearchEngineBundle(),
+            new eZ\Bundle\EzPublishLegacyBundle\EzPublishLegacyBundle( $this ),
+            new eZ\Bundle\EzPublishIOBundle\EzPublishIOBundle(),
+            new EzSystems\DemoBundle\EzSystemsDemoBundle(),
+            new eZ\Bundle\EzPublishRestBundle\EzPublishRestBundle(),
+            new EzSystems\CommentsBundle\EzSystemsCommentsBundle(),
+            new EzSystems\NgsymfonytoolsBundle\EzSystemsNgsymfonytoolsBundle(),
+            new EzSystems\PlatformUIAssetsBundle\EzSystemsPlatformUIAssetsBundle(),
+            new EzSystems\PlatformUIBundle\EzSystemsPlatformUIBundle(),
+            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new WhiteOctober\BreadcrumbsBundle\WhiteOctoberBreadcrumbsBundle(),
+            new Nelmio\CorsBundle\NelmioCorsBundle(),
+            new Knp\Bundle\MenuBundle\KnpMenuBundle(),
+            new Oneup\FlysystemBundle\OneupFlysystemBundle(),
+            new EzSystems\PlatformInstallerBundle\EzSystemsPlatformInstallerBundle(),
+            new EzSystems\PrivacyCookieBundle\EzSystemsPrivacyCookieBundle()
         );
 
         switch ( $this->getEnvironment() )
         {
             case "test":
             case "behat":
-                $bundles[] = new EzSystemsBehatBundle();
+                $bundles[] = new EzSystems\BehatBundle\EzSystemsBehatBundle();
                 // No break, test also needs dev bundles
             case "dev":
-                $bundles[] = new EzPublishDebugBundle();
-                $bundles[] = new WebProfilerBundle();
-                $bundles[] = new SensioDistributionBundle();
-                $bundles[] = new SensioGeneratorBundle();
-                $bundles[] = new EguliasListenersDebugCommandBundle();
+                $bundles[] = new eZ\Bundle\EzPublishDebugBundle\EzPublishDebugBundle();
+                $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
+                $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
+                $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+                $bundles[] = new Egulias\ListenersDebugCommandBundle\EguliasListenersDebugCommandBundle();
         }
 
         return $bundles;