Rename rapsysair:calendar2 command to rapsysair:calendar

[airbundle] / Resources / config / packages / rapsysair.yaml

diff --git a/Resources/config/packages/rapsysair.yaml b/Resources/config/packages/rapsysair.yaml
index fad52c86c81bdf82d19e0e096e78d4e2316a5abb..151ec25263b853b816075b4f4e55bf29e0bcf8d8 100644 (file)
--- a/Resources/config/packages/rapsysair.yaml
+++ b/Resources/config/packages/rapsysair.yaml
@@ -89,7 +89,7 @@ rapsysuser:
                 title:
                     page: 'Recover'
         mail:
-            subject: 'Welcome back %%recipient_name%% to %%site.title%%'
+            subject: 'Welcome back %%recipient_name%% to %%title.site%%'
             html: '@RapsysAir/mail/recover.html.twig'
             text: '@RapsysAir/mail/recover.text.twig'
             context:
@@ -111,7 +111,7 @@ rapsysuser:
                 title:
                     page: 'Register'
         mail:
-            subject: 'Welcome %%recipient_name%% to %%site.title%%'
+            subject: 'Welcome %%recipient_name%% to %%title.site%%'
             html: '@RapsysAir/mail/register.html.twig'
             text: '@RapsysAir/mail/register.text.twig'
             context:
@@ -127,6 +127,11 @@ doctrine:
 
     # Orm configuration
     orm:
+        # Controller resolver
+        controller_resolver:
+            # Disable auto mapping
+            auto_mapping: false
+
         # Replace repository factory
         repository_factory: 'Rapsys\AirBundle\Factory'
 
@@ -137,6 +142,7 @@ doctrine:
             Rapsys\UserBundle\Entity\Civility: 'Rapsys\AirBundle\Entity\Civility'
             Rapsys\UserBundle\Entity\User: 'Rapsys\AirBundle\Entity\User'
 
+        # Force mappings
         mappings:
             # Map entities
             # XXX: Entity short syntax was removed
@@ -343,7 +349,7 @@ services:
         tags: [ 'form.type' ]
     # Register register form
     Rapsys\AirBundle\Form\RegisterType:
-        arguments: [ '@doctrine.orm.entity_manager' ]
+        arguments: [ '@doctrine.orm.entity_manager', '@rapsyspack.image_util', '@rapsyspack.slugger_util', '@translator' ]
         tags: [ 'form.type' ]
     # Register attribute command
     Rapsys\AirBundle\Command\AttributeCommand:
@@ -351,11 +357,7 @@ services:
         tags: [ 'console.command' ]
     # Register calendar command
     Rapsys\AirBundle\Command\CalendarCommand:
-        arguments: [ '@doctrine', '%kernel.default_locale%', '@router', '@rapsyspack.slugger_util', '@translator', 'airlibre', 0, '%kernel.project_dir%/var/cache' ]
-        tags: [ 'console.command' ]
-    # Register calendar2 command
-    Rapsys\AirBundle\Command\Calendar2Command:
-        arguments: [ '@doctrine', '%kernel.default_locale%', '@router', '@rapsyspack.slugger_util', '@translator', '@google.client', '@twig.markdown.default' ]
+        arguments: [ '@doctrine', '%kernel.default_locale%', '@router', '@rapsyspack.slugger_util', '@translator', '@user.cache', '@google.client', '@twig.markdown.default' ]
         tags: [ 'console.command' ]
     # Register rekey command
     Rapsys\AirBundle\Command\RekeyCommand: