Remove configuration from recipe

Set configuration from package

diff --git a/rapsys/airbundle/master/config/packages/rapsys_air.yaml b/rapsys/airbundle/master/config/packages/rapsys_air.yaml
deleted file mode 100644 (file)
index 500b0ab..0000000
--- a/rapsys/airbundle/master/config/packages/rapsys_air.yaml
+++ /dev/null
@@ -1,188 +0,0 @@
-#RapsysAir configuration
-rapsys_air:
-    #Contact
-    contact:
-        name: 'Raphaël Gertz'
-        mail: 'airlibre@rapsys.eu'
-    #Copyright
-    copy:
-        long: 'Raphaël Gertz all rights reserved'
-        short: 'Copyright 2019'
-
-#RapsysUser configuration
-rapsys_user:
-    #Class replacement
-    class:
-        group: 'Rapsys\AirBundle\Entity\Group'
-        title: 'Rapsys\AirBundle\Entity\Title'
-        user: 'Rapsys\AirBundle\Entity\User'
-    #Route replacement
-    route:
-        homepage:
-            name: 'rapsys_air_homepage'
-    #Contact replacement
-    contact:
-        name: '%rapsys_air.contact.name%'
-        mail: '%rapsys_air.contact.mail%'
-    #Login replacement
-    login:
-        view:
-            name: '@RapsysAir/form/login.html.twig'
-            context:
-                title: 'Login'
-    #Recover replacement
-    recover:
-        view:
-            name: '@RapsysAir/form/recover.html.twig'
-            context:
-                title: 'Recover'
-        mail:
-            subject: '%%recipient_name%% welcome back to %%site_title%%'
-            html: '@RapsysAir/mail/recover.html.twig'
-            text: '@RapsysAir/mail/recover.text.twig'
-            route:
-                homepage: 'site_url'
-                recover_mail: 'recover_url'
-            context:
-                copy_long: '%rapsys_air.copy.long%'
-                copy_short: '%rapsys_air.copy.short%'
-                site_logo: '%rapsys_air.site.logo%'
-                site_title: '%rapsys_air.site.title%'
-    #Mail recover replacement
-    recover_mail:
-        view:
-            name: '@RapsysAir/form/recover_mail.html.twig'
-            context:
-                title: 'Mail recover'
-        mail:
-            subject: '%%recipient_name%% welcome back to %%site_title%%'
-            html: '@RapsysAir/mail/recover_mail.html.twig'
-            text: '@RapsysAir/mail/recover_mail.text.twig'
-            route:
-                homepage: 'site_url'
-                recover_mail: 'recover_url'
-            context:
-                copy_long: '%rapsys_air.copy.long%'
-                copy_short: '%rapsys_air.copy.short%'
-                site_logo: '%rapsys_air.site.logo%'
-                site_title: '%rapsys_air.site.title%'
-    #Register replacement
-    register:
-        view:
-            form: 'Rapsys\AirBundle\Form\RegisterType'
-            name: '@RapsysAir/form/register.html.twig'
-            context:
-                title: 'Register'
-        mail:
-            subject: '%%recipient_name%% welcome to %%site_title%%'
-            html: '@RapsysAir/mail/register.html.twig'
-            text: '@RapsysAir/mail/register.text.twig'
-            route:
-                homepage: 'site_url'
-            context:
-                copy_long: '%rapsys_air.copy.long%'
-                copy_short: '%rapsys_air.copy.short%'
-                site_logo: '%rapsys_air.site.logo%'
-                site_title: '%rapsys_air.site.title%'
-
-#Doctrine configuration
-doctrine:
-    #Orm configuration
-    orm:
-        #Force resolution of UserBundle entities to AirBundle one
-        #XXX: without these lines, relations are lookup in parent namespace ignoring AirBundle extension
-        resolve_target_entities:
-            Rapsys\UserBundle\Entity\Group: Rapsys\AirBundle\Entity\Group
-            Rapsys\UserBundle\Entity\Title: Rapsys\AirBundle\Entity\Title
-            Rapsys\UserBundle\Entity\User: Rapsys\AirBundle\Entity\User
-
-#Security configuration
-security:
-    #Set encoders
-    encoders:
-        #Rapsys\AirBundle\Entity\User: plaintext
-        Rapsys\AirBundle\Entity\User:
-            algorithm: 'bcrypt'
-
-    #Set providers
-    providers:
-        database:
-            entity:
-                class: Rapsys\AirBundle\Entity\User
-                property: mail
-
-    #Set firewall
-    firewalls:
-        #Disables authentication for assets and the profiler, adapt it according to your needs
-        dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
-            security: false
-
-        main:
-            #Allow anonymous access
-            anonymous: ~
-
-            #Disable logout on user change
-            logout_on_user_change: true
-
-            #Activate database provider
-            provider: database
-
-            #XXX: https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate
-            #http_basic: ~
-
-            #Set form login
-            #XXX: https://symfony.com/doc/current/security/form_login_setup.html
-            form_login:
-                use_referer: false
-                login_path: rapsys_user_login
-                check_path: rapsys_user_login
-                username_parameter: 'login[mail]'
-                password_parameter: 'login[password]'
-
-            #Set logout route
-            logout:
-                path: /logout
-                target: /
-
-            #Set custom access denied handler
-            access_denied_handler: Rapsys\AirBundle\Security\AccessDeniedHandler
-
-    #Set role hierarchy
-    role_hierarchy:
-        ROLE_GUEST: [ 'ROLE_USER' ]
-        ROLE_REGULAR: [ 'ROLE_USER', 'ROLE_GUEST' ]
-        ROLE_SENIOR: [ 'ROLE_USER', 'ROLE_GUEST', 'ROLE_REGULAR' ]
-        ROLE_ADMIN: [ 'ROLE_USER', 'ROLE_GUEST', 'ROLE_REGULAR', 'ROLE_SENIOR' ]
-
-#Service configuration
-services:
-    #Register twig file_get_contents extension
-    #XXX: obsolete by email.image twig filter in "twig/extensions" or "twig/html-extra"
-    rapsys_air.twig.file_get_contents:
-        class: Rapsys\AirBundle\Twig\FileGetContentsExtension
-        tags: [ 'twig.extension' ]
-    #Register twig base64 extension
-    rapsys_air.twig.base64:
-        class: Rapsys\AirBundle\Twig\Base64Extension
-        tags: [ 'twig.extension' ]
-    #Register twig bb2html extension
-    rapsys_air.twig.bb2html:
-        class: Rapsys\AirBundle\Twig\Bb2htmlExtension
-        tags: [ 'twig.extension' ]
-    #Register default controller
-    Rapsys\AirBundle\Controller\DefaultController:
-        arguments: [ '@service_container', '@translator' ]
-        autowire: true
-        tags: [ 'controller.service_arguments' ]
-    #Register access denied handler
-    Rapsys\AirBundle\Security\AccessDeniedHandler:
-        arguments: [ '@service_container', '@translator', '@twig' ]
-    #Register air fixtures
-    Rapsys\AirBundle\DataFixtures\AirFixtures:
-        tags: [ 'doctrine.fixture.orm' ]
-
-#Twig Configuration
-twig:
-    #Fix form layout for css
-    form_theme: [ '@RapsysAir/form/form_div_layout.html.twig' ]

diff --git a/rapsys/airbundle/master/config/routes/rapsys_air.yaml b/rapsys/airbundle/master/config/routes/rapsys_air.yaml
deleted file mode 100644 (file)
index 615b709..0000000
--- a/rapsys/airbundle/master/config/routes/rapsys_air.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-rapsys_air_homepage:
-    path: /
-    controller: Rapsys\AirBundle\Controller\DefaultController::index
-    methods: GET
-
-rapsys_air_contact:
-    path: /contact
-    controller: Rapsys\AirBundle\Controller\DefaultController::contact
-    methods: GET|POST
-
-rapsys_air_admin:
-    path: /admin
-    controller: Rapsys\AirBundle\Controller\DefaultController::admin
-    methods: GET
-
-rapsys_air_session:
-    path:     /admin/session/{id}
-    controller: Rapsys\AirBundle\Controller\DefaultController::session
-    requirements:
-        id: '\d+'
-    methods: GET

diff --git a/rapsys/airbundle/master/manifest.json b/rapsys/airbundle/master/manifest.json
index b3b51d4594db4c1d5427e6c0ac6d758f545d7930..fb769c7d8f0bb99b6822eb908cc8ae189df29df5 100644 (file)
--- a/rapsys/airbundle/master/manifest.json
+++ b/rapsys/airbundle/master/manifest.json
@@ -1,11 +1,11 @@
 {
-    "bundles": {
-        "Rapsys\\AirBundle\\RapsysAirBundle": ["all"]
-    },
-    "container": {
-        "locale": "en"
-    },
-    "copy-from-recipe": {
-        "config/": "%CONFIG_DIR%/"
-    }
+       "bundles": {
+               "Rapsys\\AirBundle\\RapsysAirBundle": ["all"]
+       },
+       "container": {
+               "locale": "en"
+       },
+       "copy-from-package": {
+               "Resources/config/": "%CONFIG_DIR%/"
+       }
 }

diff --git a/rapsys/userbundle/master/config/packages/rapsys_user.yaml b/rapsys/userbundle/master/config/packages/rapsys_user.yaml
deleted file mode 100644 (file)
index cc7322d..0000000
--- a/rapsys/userbundle/master/config/packages/rapsys_user.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-#Service configuration
-services:
-    #Register default controller
-    Rapsys\UserBundle\Controller\DefaultController:
-        arguments: [ '@service_container', '@translator' ]
-        autowire: true
-        tags: [ 'controller.service_arguments' ]
-    #Register slugger utils service
-    Rapsys\UserBundle\Utils\Slugger:
-        arguments: [ '@service_container' ]

diff --git a/rapsys/userbundle/master/config/routes/rapsys_user.yaml b/rapsys/userbundle/master/config/routes/rapsys_user.yaml
deleted file mode 100644 (file)
index 26a7cad..0000000
--- a/rapsys/userbundle/master/config/routes/rapsys_user.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-rapsys_user_login:
-    path: /login
-    controller: Rapsys\UserBundle\Controller\DefaultController::login
-    methods: GET|POST
-
-rapsys_user_recover:
-    path: /recover
-    controller: Rapsys\UserBundle\Controller\DefaultController::recover
-    methods: GET|POST
-
-rapsys_user_recover_mail:
-    path:     /recover/{recipient}/{hash}
-    controller: Rapsys\UserBundle\Controller\DefaultController::recoverMail
-    requirements:
-        recipient: '[a-zA-Z0-9=_-]+'
-        hash: '[a-zA-Z0-9=_-]+'
-    methods: GET|POST
-
-rapsys_user_register:
-    path: /register
-    controller: Rapsys\UserBundle\Controller\DefaultController::register
-    methods: GET|POST
-
-rapsys_user_logout:
-    path: /logout
-    methods: GET
-
-rapsys_user_homepage:
-    path: /
-    methods: GET

diff --git a/rapsys/userbundle/master/manifest.json b/rapsys/userbundle/master/manifest.json
index 2f33039d242c3242fb0c1f00e284f9fd46993722..7f488e809a56b59adc81fd61e504bb8d78f41345 100644 (file)
--- a/rapsys/userbundle/master/manifest.json
+++ b/rapsys/userbundle/master/manifest.json
@@ -2,7 +2,7 @@
        "bundles": {
                "Rapsys\\UserBundle\\RapsysUserBundle": ["all"]
        },
-       "copy-from-recipe": {
-               "config/": "%CONFIG_DIR%/"
+       "copy-from-package": {
+               "Resources/config/": "%CONFIG_DIR%/"
        }
 }