update due to last symfony changes

Admin/Admin.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Admin;
+namespace Sonata\BaseApplicationBundle\Admin;
 
 use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\Form\Form;
 
-use Bundle\Sonata\BaseApplicationBundle\Tool\Datagrid;
+use Sonata\BaseApplicationBundle\Tool\Datagrid;
 
 abstract class Admin extends ContainerAware
 {

Admin/EntityAdmin.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Admin;
+namespace Sonata\BaseApplicationBundle\Admin;
 
 use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\Form\Form;
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-use Bundle\Sonata\BaseApplicationBundle\Tool\Datagrid;
+use Sonata\BaseApplicationBundle\Tool\Datagrid;
 
 abstract class EntityAdmin extends Admin
 {
@@ -296,14 +296,14 @@ abstract class EntityAdmin extends Admin
         $targetForm   = $associatedAdmin->getForm($targetObject, $targetFields);
 
         // create the transformer
-        $transformer = new \Bundle\Sonata\BaseApplicationBundle\Form\ValueTransformer\ArrayToObjectTransformer(array(
+        $transformer = new \Sonata\BaseApplicationBundle\Form\ValueTransformer\ArrayToObjectTransformer(array(
             'em'        => $this->getEntityManager(),
             'className' => $fieldDescription->getTargetEntity()
         ));
 
         // create the "embedded" field
         if ($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_MANY) {
-            $field = new \Bundle\Sonata\BaseApplicationBundle\Form\EditableFieldGroup($fieldName, array(
+            $field = new \Sonata\BaseApplicationBundle\Form\EditableFieldGroup($fieldName, array(
                 'value_transformer' => $transformer,
             ));
 
@@ -437,7 +437,7 @@ abstract class EntityAdmin extends Admin
             }
 
             // use custom one to expose the newfield method
-            return new \Bundle\Sonata\BaseApplicationBundle\Form\EditableCollectionField($prototype);
+            return new \Sonata\BaseApplicationBundle\Form\EditableCollectionField($prototype);
         }
 
         return $this->getManyToManyField($object, $fieldDescription);

Admin/FieldDescription.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Admin;
+namespace Sonata\BaseApplicationBundle\Admin;
 
 /**
  * A FieldDescription hold the information about a field. A typical

Admin/Pool.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Admin;
+namespace Sonata\BaseApplicationBundle\Admin;
 
 
 class Pool

Controller/CRUDController.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Controller;
+namespace Sonata\BaseApplicationBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Form\Form;
 
 
-use Bundle\Sonata\BaseApplicationBundle\Tool\DoctrinePager as Pager;
+use Sonata\BaseApplicationBundle\Tool\DoctrinePager as Pager;
 
 class CRUDController extends Controller
 {

Controller/CoreController.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Controller;
+namespace Sonata\BaseApplicationBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

DependencyInjection/BaseApplicationExtension.php

@@ -9,7 +9,7 @@
  */
 
 
-namespace Bundle\Sonata\BaseApplicationBundle\DependencyInjection;
+namespace Sonata\BaseApplicationBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Resource\FileResource;
@@ -52,11 +52,11 @@ class BaseApplicationExtension extends Extension
 
         // register the twig extension
         $container
-            ->register('twig.extension.base_application', 'Bundle\Sonata\BaseApplicationBundle\Twig\Extension\BaseApplicationExtension')
+            ->register('twig.extension.base_application', 'Sonata\BaseApplicationBundle\Twig\Extension\BaseApplicationExtension')
             ->addTag('twig.extension');
 
         // registers crud action
-        $definition = new Definition('Bundle\Sonata\BaseApplicationBundle\Admin\Pool');
+        $definition = new Definition('Sonata\BaseApplicationBundle\Admin\Pool');
         $definition->addMethodCall('setContainer', array(new Reference('service_container')));
         foreach ($config['entities'] as $code => $configuration) {
             if (!isset($configuration['group'])) {
@@ -72,7 +72,7 @@ class BaseApplicationExtension extends Extension
 
         $container->setDefinition('base_application.admin.pool', $definition);
 
-        $definition = new Definition('Bundle\Sonata\BaseApplicationBundle\Route\AdminPoolLoader', array(new Reference('base_application.admin.pool')));
+        $definition = new Definition('Sonata\BaseApplicationBundle\Route\AdminPoolLoader', array(new Reference('base_application.admin.pool')));
         $definition->addTag('routing.loader');
 
         $container->setDefinition('base_application.route_loader', $definition);

Filter/BooleanFilter.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Filter;
+namespace Sonata\BaseApplicationBundle\Filter;
 
-use Bundle\Sonata\BaseApplicationBundle\Admin\FieldDescription;
+use Sonata\BaseApplicationBundle\Admin\FieldDescription;
 use Doctrine\ORM\QueryBuilder;
 
 class BooleanFilter extends Filter

Filter/CallbackFilter.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Filter;
+namespace Sonata\BaseApplicationBundle\Filter;
 
-use Bundle\Sonata\BaseApplicationBundle\Admin\FieldDescription;
+use Sonata\BaseApplicationBundle\Admin\FieldDescription;
 use Doctrine\ORM\QueryBuilder;
 
 class CallbackFilter extends Filter

Filter/ChoiceFilter.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Filter;
+namespace Sonata\BaseApplicationBundle\Filter;
 
-use Bundle\Sonata\BaseApplicationBundle\Admin\FieldDescription;
+use Sonata\BaseApplicationBundle\Admin\FieldDescription;
 use Doctrine\ORM\QueryBuilder;
 
 class ChoiceFilter extends Filter

Filter/Filter.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Filter;
+namespace Sonata\BaseApplicationBundle\Filter;
 
 use Symfony\Component\Form\Configurable;
-use Bundle\Sonata\BaseApplicationBundle\Admin\FieldDescription;
+use Sonata\BaseApplicationBundle\Admin\FieldDescription;
 use Doctrine\ORM\QueryBuilder;
 
 abstract class Filter extends Configurable

Filter/IntegerFilter.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Filter;
+namespace Sonata\BaseApplicationBundle\Filter;
 
-use Bundle\Sonata\BaseApplicationBundle\Admin\FieldDescription;
+use Sonata\BaseApplicationBundle\Admin\FieldDescription;
 use Doctrine\ORM\QueryBuilder;
 
 class IntegerFilter extends Filter

Filter/StringFilter.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Filter;
+namespace Sonata\BaseApplicationBundle\Filter;
 
-use Bundle\Sonata\BaseApplicationBundle\Admin\FieldDescription;
+use Sonata\BaseApplicationBundle\Admin\FieldDescription;
 use Doctrine\ORM\QueryBuilder;
 
 class StringFilter extends Filter

Form/EditableCollectionField.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\Sonata\BaseApplicationBundle\Form;
+namespace Sonata\BaseApplicationBundle\Form;
 
 /*
  * This file is part of the Symfony framework.

Form/EditableFieldGroup.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\Sonata\BaseApplicationBundle\Form;
+namespace Sonata\BaseApplicationBundle\Form;
 
 /*
  * This file is part of the Symfony framework.

Form/ValueTransformer/ArrayToObjectTransformer.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Form\ValueTransformer;
+namespace Sonata\BaseApplicationBundle\Form\ValueTransformer;
 
 use Symfony\Component\Form\ValueTransformer\BaseValueTransformer;
 use Symfony\Component\Form\Exception\InvalidPropertyException;

Resources/config/routing/base_application.admin

@@ -0,0 +1 @@
+dummy file to load the Sonata\BaseApplicationBundle\Route\AdminPoolLoader

Resources/doc/reference/form_field_definition.rst

@@ -9,9 +9,9 @@ Example
 .. code-block:: php
 
     <?php
-    namespace Bundle\Sonta\NewsBundle\Admin;
+    namespace Sonta\NewsBundle\Admin;
 
-    use Bundle\Sonata\BaseApplicationBundle\Admin\Admin;
+    use Sonata\BaseApplicationBundle\Admin\Admin;
 
     class PostAdmin extends Admin
     {

Resources/doc/reference/installation.rst

@@ -4,8 +4,8 @@ Installation
 To begin, add the dependent bundles to the ``src/Bundle`` directory. If using
 git, you can add them as submodules::
 
-  git submodule add git@github.com:sonata-project/jQueryBundle.git src/Bundle/Sonata/jQueryBundle
-  git submodule add git@github.com:sonata-project/BaseApplicationBundle.git src/Bundle/Sonata/BaseApplicationBundle
+  git submodule add git@github.com:sonata-project/jQueryBundle.git src/Sonata/jQueryBundle
+  git submodule add git@github.com:sonata-project/BaseApplicationBundle.git src/Sonata/BaseApplicationBundle
 
 Next, be sure to enable the bundles in your application kernel:
 
@@ -16,9 +16,9 @@ Next, be sure to enable the bundles in your application kernel:
   {
       return array(
           // ...
-          new Bundle\Sonata\jQueryBundle\SonatajQueryBundle(),
-          new Bundle\Sonata\BluePrintBundle\SonataBluePrintBundle(),
-          new Bundle\Sonata\BaseApplicationBundle\SonataBaseApplicationBundle(),
+          new Sonata\jQueryBundle\SonatajQueryBundle(),
+          new Sonata\BluePrintBundle\SonataBluePrintBundle(),
+          new Sonata\BaseApplicationBundle\SonataBaseApplicationBundle(),
           // ...
       );
   }
@@ -43,11 +43,11 @@ code to your application's routing file:
 
     # app/config/routing.yml
     base_application:
-        resource: BaseApplicationBundle/Resources/config/routing/base_application.xml
+        resource: @BaseApplicationBundle/Resources/config/routing/base_application.xml
         prefix: /admin
 
     admin:
-        resource: base_application
+        resource: @SonataBaseApplicationBundle/Resources/config/routing/base_application.admin
         prefix: /admin
 
 At this point you can access to the dashboard with the url: ``http://yoursite.local/admin/dashboard``.
@@ -72,20 +72,20 @@ Once you have created an admin class, you must declare the class to use it. Like
             post:
                 label:      Post
                 group:      blog
-                class:      Bundle\Sonata\NewsBundle\Admin\PostAdmin
+                class:      Sonata\NewsBundle\Admin\PostAdmin
                 entity:     Application\Sonata\NewsBundle\Entity\Post
-                controller: Bundle\Sonata\NewsBundle\Controller\PostAdminController
+                controller: Sonata\NewsBundle\Controller\PostAdminController
 
             tag:
                 label:      Tag
                 group:      blog
-                class:      Bundle\Sonata\NewsBundle\Admin\TagAdmin
+                class:      Sonata\NewsBundle\Admin\TagAdmin
                 entity:     Application\Sonata\NewsBundle\Entity\Tag
-                controller: Bundle\Sonata\NewsBundle\Controller\TagAdminController
+                controller: Sonata\NewsBundle\Controller\TagAdminController
 
             comment:
                 label:      Comment
                 group:      blog
-                class:      Bundle\Sonata\NewsBundle\Admin\CommentAdmin
+                class:      Sonata\NewsBundle\Admin\CommentAdmin
                 entity:     Application\Sonata\NewsBundle\Entity\Comment
-                controller: Bundle\Sonata\NewsBundle\Controller\CommentAdminController
+                controller: Sonata\NewsBundle\Controller\CommentAdminController

Resources/doc/reference/list_field_definition.rst

@@ -9,9 +9,9 @@ Example
 .. code-block:: php
 
     <?php
-    namespace Bundle\NewsBundle\Admin;
+    namespace Sonata\NewsBundle\Admin;
 
-    use Bundle\Sonata\BaseApplicationBundle\Admin\Admin;
+    use Sonata\BaseApplicationBundle\Admin\Admin;
 
     class PostAdmin extends Admin
     {

Resources/views/CRUD/edit_many_to_many.twig.html

@@ -18,7 +18,7 @@ file that was distributed with this source code.
         </span>
         
         <span id="field_actions_{{ admin.code }}_{{ field_element.id}}" >
-            <a href="{{ field_description.associationadmin.generateUrl('create') }}" onclick="start_field_dialog_form_add_{{ admin.code }}_{{ field_element.id }}(event)" class="action"><img src="{{ asset('bundles/baseapplication/famfamfam/add.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>
+            <a href="{{ field_description.associationadmin.generateUrl('create') }}" onclick="start_field_dialog_form_add_{{ admin.code }}_{{ field_element.id }}(event)" class="action"><img src="{{ asset('bundles/sonatabaseapplication/famfamfam/add.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>
         </span>
         
         <div style="display: hidden" id="field_dialog_{{ admin.code }}_{{ field_element.id }}">

Resources/views/CRUD/edit_many_to_one.twig.html

@@ -18,7 +18,7 @@ file that was distributed with this source code.
         </span>
         
         <span id="field_actions_{{ admin.code }}_{{ field_element.id}}" >
-            <a href="{{ field_description.associationadmin.generateUrl('create') }}" class="action" onclick="start_field_dialog_form_add_{{ admin.code }}_{{ field_element.id }}(event)"><img src="{{ asset('bundles/baseapplication/famfamfam/add.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>
+            <a href="{{ field_description.associationadmin.generateUrl('create') }}" class="action" onclick="start_field_dialog_form_add_{{ admin.code }}_{{ field_element.id }}(event)"><img src="{{ asset('bundles/sonatabaseapplication/famfamfam/add.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>
         </span>
         
         <div style="display: hidden" id="field_dialog_{{ admin.code }}_{{ field_element.id }}">

Resources/views/CRUD/edit_one_to_many.twig.html

@@ -63,7 +63,7 @@ file that was distributed with this source code.
                     onclick="start_field_retrieve_{{ admin.code }}_{{ field_element.id }}(event)"
                     class="action">
                     <img
-                        src="{{ asset('bundles/baseapplication/famfamfam/add.png') }}"
+                        src="{{ asset('bundles/sonatabaseapplication/famfamfam/add.png') }}"
                         alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}"
                      />
                 </a>

Resources/views/CRUD/edit_one_to_one.twig.html

@@ -41,10 +41,10 @@ file that was distributed with this source code.
             <span id="field_actions_{{ admin.code }}_{{ field_element.id}}" >
 
                 {% if field_description.options.edit == 'list' %}
-                    <a href="{{ field_description.associationadmin.generateUrl('list') }}" onclick="start_field_dialog_form_list_{{ admin.code }}_{{ field_element.id }}(event)" class="action"><img src="{{ asset('bundles/baseapplication/famfamfam/application_view_list.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>
+                    <a href="{{ field_description.associationadmin.generateUrl('list') }}" onclick="start_field_dialog_form_list_{{ admin.code }}_{{ field_element.id }}(event)" class="action"><img src="{{ asset('bundles/sonatabaseapplication/famfamfam/application_view_list.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>
                 {% endif %}
 
-                <a href="{{ field_description.associationadmin.generateUrl('create') }}" onclick="start_field_dialog_form_add_{{ admin.code }}_{{ field_element.id }}(event)" class="action"><img src="{{ asset('bundles/baseapplication/famfamfam/add.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>
+                <a href="{{ field_description.associationadmin.generateUrl('create') }}" onclick="start_field_dialog_form_add_{{ admin.code }}_{{ field_element.id }}(event)" class="action"><img src="{{ asset('bundles/sonatabaseapplication/famfamfam/add.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>
             </span>
 
             <div class="container sonata-ba-modal sonata-ba-modal-edit-one-to-one" style="display: none" id="field_dialog_{{ admin.code }}_{{ field_element.id }}">

Resources/views/CRUD/list_boolean.twig.html

@@ -11,5 +11,5 @@ file that was distributed with this source code.
 
 {% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
 
-{% block field%}<img src="/bundles/baseapplication/famfamfam/{% if value %}accept{% else %}exclamation{% endif %}.png" />{% endblock %}
+{% block field%}<img src="/bundles/sonatabaseapplication/famfamfam/{% if value %}accept{% else %}exclamation{% endif %}.png" />{% endblock %}
 

Resources/views/Core/dashboard.twig.html

@@ -26,8 +26,8 @@ file that was distributed with this source code.
                 {% for admin in group %}
                     <tr>
                         <td class="sonata-ba-list-label">{{ admin.label}}</td>
-                        <td><a href="{{ admin.generateUrl('create')}}"><img src="{{ asset('bundles/baseapplication/famfamfam/add.png') }}" /> {% trans 'link_add' from 'BaseApplicationBundle' %}</a></td>
-                        <td><a href="{{ admin.generateUrl('list')}}"><img src="{{ asset('bundles/baseapplication/famfamfam/application_view_list.png') }}" />{% trans 'link_list' from 'BaseApplicationBundle' %}</a></td>
+                        <td><a href="{{ admin.generateUrl('create')}}"><img src="{{ asset('bundles/sonatabaseapplication/famfamfam/add.png') }}" /> {% trans 'link_add' from 'BaseApplicationBundle' %}</a></td>
+                        <td><a href="{{ admin.generateUrl('list')}}"><img src="{{ asset('bundles/sonatabaseapplication/famfamfam/application_view_list.png') }}" />{% trans 'link_list' from 'BaseApplicationBundle' %}</a></td>
                     </tr>
                 {% endfor %}
             </tbody>

Route/AdminPoolLoader.php

@@ -9,14 +9,14 @@
  */
 
 
-namespace Bundle\Sonata\BaseApplicationBundle\Route;
+namespace Sonata\BaseApplicationBundle\Route;
 
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Loader\Loader;
 
 use Symfony\Component\Routing\Resource\FileResource;
-use Bundle\Sonata\BaseApplicationBundle\Admin\Pool;
+use Sonata\BaseApplicationBundle\Admin\Pool;
 
 class AdminPoolLoader extends Loader
 {
@@ -33,7 +33,7 @@ class AdminPoolLoader extends Loader
     function supports($resource, $type = null)
     {
 
-        if ($resource == 'base_application') {
+        if (substr($resource, -22) == 'base_application.admin') {
             return true;
         }
 

SonataBaseApplicationBundle.php

@@ -8,10 +8,25 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle;
+namespace Sonata\BaseApplicationBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class SonataBaseApplicationBundle extends Bundle {
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getNamespace()
+    {
+        return __NAMESPACE__;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPath()
+    {
+        return strtr(__DIR__, '\\', '/');
+    }
 }

Tool/Datagrid.php

@@ -9,18 +9,18 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Tool;
+namespace Sonata\BaseApplicationBundle\Tool;
 
-use Bundle\Sonata\BaseApplicationBundle\Tool\DoctrinePager as Pager;
+use Sonata\BaseApplicationBundle\Tool\DoctrinePager as Pager;
 
-use Bundle\Sonata\BaseApplicationBundle\Filter\StringFilter;
-use Bundle\Sonata\BaseApplicationBundle\Filter\BooleanFilter;
-use Bundle\Sonata\BaseApplicationBundle\Filter\IntegerFilter;
-use Bundle\Sonata\BaseApplicationBundle\Filter\CallbackFilter;
-use Bundle\Sonata\BaseApplicationBundle\Filter\ChoiceFilter;
+use Sonata\BaseApplicationBundle\Filter\StringFilter;
+use Sonata\BaseApplicationBundle\Filter\BooleanFilter;
+use Sonata\BaseApplicationBundle\Filter\IntegerFilter;
+use Sonata\BaseApplicationBundle\Filter\CallbackFilter;
+use Sonata\BaseApplicationBundle\Filter\ChoiceFilter;
 
-use Bundle\Sonata\BaseApplicationBundle\Admin\EntityAdmin;
-use Bundle\Sonata\BaseApplicationBundle\Admin\FieldDescription;
+use Sonata\BaseApplicationBundle\Admin\EntityAdmin;
+use Sonata\BaseApplicationBundle\Admin\FieldDescription;
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 

Tool/DoctrinePager.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Tool;
+namespace Sonata\BaseApplicationBundle\Tool;
 
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;

Tool/Pager.php

@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Tool;
+namespace Sonata\BaseApplicationBundle\Tool;
 
 /**
  * sfPager class.

Twig/Extension/BaseApplicationExtension.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Bundle\Sonata\BaseApplicationBundle\Twig\Extension;
+namespace Sonata\BaseApplicationBundle\Twig\Extension;
 
 
-use Bundle\Sonata\BaseApplicationBundle\Admin\FieldDescription;
-use Bundle\Sonata\BaseApplicationBundle\Filter\Filter;
+use Sonata\BaseApplicationBundle\Admin\FieldDescription;
+use Sonata\BaseApplicationBundle\Filter\Filter;
 
 class BaseApplicationExtension extends \Twig_Extension
 {