Merge pull request #8 from GrandLTU/master

Fix issue with load order and remove duplicated resource.

src/Command/SetupCommand.php

@@ -107,7 +107,7 @@ private function setupAdministratorUser(InputInterface $input, OutputInterface $
 
         $this->userManager->persist($user);
         $this->userManager->flush();
-        
+
         $outputStyle->writeln('<info>Administrator account successfully registered.</info>');
         $outputStyle->newLine();
     }
@@ -123,7 +123,7 @@ private function configureNewUser(AdminUserInterface $user, InputInterface $inpu
     {
         if ($input->getOption('no-interaction')) {
             Assert::null($this->userRepository->findOneByEmail(self::DEFAULT_USER_EMAIL));
-            
+
             $user->setEmail(self::DEFAULT_USER_EMAIL);
             $user->setPlainPassword(self::DEFAULT_USER_PASSWORD);
 
@@ -136,7 +136,7 @@ private function configureNewUser(AdminUserInterface $user, InputInterface $inpu
             $question = $this->createEmailQuestion($output);
             $email = $questionHelper->ask($input, $output, $question);
             $exists = null !== $this->userRepository->findOneByEmail($email);
-            
+
             if ($exists) {
                 $output->writeln('<error>E-Mail is already in use!</error>');
             }
@@ -185,7 +185,7 @@ private function getAdministratorPassword(InputInterface $input, OutputInterface
             $confirmPasswordQuestion = $this->createPasswordQuestion('Confirm password:', $validator);
             $password = $questionHelper->ask($input, $output, $passwordQuestion);
             $repeatedPassword = $questionHelper->ask($input, $output, $confirmPasswordQuestion);
-            
+
             if ($repeatedPassword !== $password) {
                 $output->writeln('<error>Passwords do not match!</error>');
             }
@@ -211,6 +211,7 @@ private function getPasswordQuestionValidator(OutputInterface $output)
             return $value;
         };
     }
+
     /**
      * @param string $message
      * @param \Closure $validator

src/Controller/DashboardController.php

@@ -16,7 +16,7 @@ class DashboardController
 
     /**
      * DashboardController constructor.
-     * 
+     *
      * @param EngineInterface $templating
      */
     public function __construct(EngineInterface $templating)

src/DependencyInjection/PlatformAdminExtension.php

@@ -2,25 +2,20 @@
 
 namespace Platform\Bundle\AdminBundle\DependencyInjection;
 
-use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
 
-class PlatformAdminExtension extends AbstractResourceExtension
+class PlatformAdminExtension extends Extension
 {
     /**
      * {@inheritdoc}
      */
-    public function load(array $config, ContainerBuilder $container)
+    public function load(array $config, ContainerBuilder $container): void
     {
-        $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
 
-        $this->registerResources('admin_platform', $config['driver'], $config['resources'], $container);
-
         $loader->load('services.xml');
-
-        $container->setParameter('admin_platform.driver', $config['driver']);
     }
 }

src/Menu/MainMenuBuilder.php

@@ -63,7 +63,7 @@ private function addConfigurationSubMenu(ItemInterface $menu)
         ;
 
         $configuration
-            ->addChild('admin_users', ['route' => 'admin_platform_admin_admin_user_index'])
+            ->addChild('admin_users', ['route' => 'sylius_admin_admin_user_index'])
             ->setLabel('admin_platform.menu.main.configuration.admin_users')
             ->setLabelAttribute('icon', 'lock')
         ;

src/Model/AdminUserInterface.php

@@ -34,7 +34,7 @@ public function setLastName(?string $lastName): void;
      * @return string
      */
     public function getLocaleCode(): ?string;
-    
+
     /**
      * @param string $code
      */

src/PlatformAdminBundle.php

@@ -2,26 +2,8 @@
 
 namespace Platform\Bundle\AdminBundle;
 
-use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
-use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class PlatformAdminBundle extends AbstractResourceBundle
+class PlatformAdminBundle extends Bundle
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getSupportedDrivers(): array
-    {
-        return [
-            SyliusResourceBundle::DRIVER_DOCTRINE_ORM,
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getModelNamespace(): ?string
-    {
-        return 'Platform\Bundle\AdminBundle\Model';
-    }
 }

src/Resources/config/app/config.yml

@@ -1,5 +1,4 @@
 imports:
     - { resource: "@PlatformAdminBundle/Resources/config/app/sylius/grid.yml" }
     - { resource: "@PlatformAdminBundle/Resources/config/app/sylius/locale.yml" }
-    - { resource: "@PlatformAdminBundle/Resources/config/app/sylius/resource.yml" }
     - { resource: "@PlatformAdminBundle/Resources/config/app/sylius/user.yml" }

src/Resources/config/app/doctrine_driver.yml

@@ -0,0 +1,12 @@
+parameters:
+    admin_platform.driver: doctrine/orm
+
+doctrine:
+    orm:
+        mappings:
+            admin_platform:
+                is_bundle: false
+                type: xml
+                dir: '%kernel.project_dir%/vendor/admin-platform/admin-bundle/src/Resources/config/doctrine/model'
+                prefix: 'Platform\Bundle\AdminBundle\Model'
+                alias: PlatformAdminBundle

src/Resources/config/app/sylius/grid.yml

@@ -1,6 +1,4 @@
 sylius_grid:
-    drivers:
-        - "%admin_platform.driver%"
     templates:
         action:
             default: "@SyliusUi/Grid/Action/default.html.twig"

src/Resources/config/app/sylius/user.yml

@@ -7,7 +7,9 @@ sylius_user:
             user:
                 classes:
                     model: Platform\Bundle\AdminBundle\Model\AdminUser
+                    controller: Sylius\Bundle\ResourceBundle\Controller\ResourceController
                     repository: Sylius\Bundle\UserBundle\Doctrine\ORM\UserRepository
+                    factory: Sylius\Component\Resource\Factory\Factory
                     form: Platform\Bundle\AdminBundle\Form\Type\AdminUserType
         admin_oauth:
             user:

src/Resources/config/doctrine/model/AdminUser.orm.xml

@@ -15,4 +15,4 @@
 
     </mapped-superclass>
 
-</doctrine-mapping>
+</doctrine-mapping>

src/Resources/config/grids/admin_user.yml

@@ -2,9 +2,9 @@ sylius_grid:
     grids:
         admin_platform_admin_user:
             driver:
-                name: doctrine/orm
+                name: '%admin_platform.driver%'
                 options:
-                    class: "%admin_platform.model.admin_user.class%"
+                    class: "%sylius.model.admin_user.class%"
             sorting:
                 createdAt: desc
             fields:

src/Resources/config/grids/locale.yml

@@ -2,7 +2,7 @@ sylius_grid:
     grids:
         admin_platform_locale:
             driver:
-                name: doctrine/orm
+                name: '%admin_platform.driver%'
                 options:
                     class: "%sylius.model.locale.class%"
             sorting:

src/Resources/config/routing/admin_user.yml

@@ -1,6 +1,6 @@
 admin_platform_admin_user:
     resource: |
-        alias: admin_platform.admin_user
+        alias: sylius.admin_user
         section: admin
         path: users
         templates: PlatformAdminBundle:Crud

src/Resources/config/services/form.xml

@@ -13,7 +13,7 @@
     <services>
 
         <service id="admin_platform.form.type.admin_user" class="Platform\Bundle\AdminBundle\Form\Type\AdminUserType">
-            <argument>%admin_platform.model.admin_user.class%</argument>
+            <argument>%sylius.model.admin_user.class%</argument>
             <argument>%admin_platform.form.type.admin_user.validation_groups%</argument>
             <tag name="form.type" />
         </service>

src/Resources/views/_security.html.twig

@@ -2,7 +2,7 @@
     {{ app.user.firstName|default(app.user.email) }}
     <i class="dropdown icon"></i>
     <div class="menu">
-        <a href="{{ path('admin_platform_admin_admin_user_update', {'id': app.user.id}) }}" class="item">
+        <a href="{{ path('sylius_admin_admin_user_update', {'id': app.user.id}) }}" class="item">
             <i class="user icon"></i>
             {{ 'sylius.ui.my_account'|trans }}
         </a>

src/Twig/Extension/CurrencyExtension.php

@@ -18,7 +18,7 @@ public function getFilters()
 
     /**
      * @param string $code
-     * 
+     *
      * @return null|string
      */
     public function convertCurrencyCodeToSymbol($code)