Merge pull request #3387 from acrobat/yaml-routing-type-fix

[AllBundles] Set correct routing yaml attribute type

src/Kunstmaan/AdminBundle/Resources/config/routing.yml

@@ -1,34 +1,34 @@
 KunstmaanAdminBundle_default:
     resource: '@KunstmaanAdminBundle/Controller/DefaultController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%
 
 KunstmaanAdminBundle_modules:
     resource: '@KunstmaanAdminBundle/Controller/ModulesController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/modules
 
 KunstmaanAdminBundle_settings:
     resource: '@KunstmaanAdminBundle/Controller/SettingsController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/settings
 
 KunstmaanAdminBundle_settings_exception:
     resource: '@KunstmaanAdminBundle/Controller/ExceptionController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/settings/exception
 
 KunstmaanAdminBundle_security:
     resource: '@KunstmaanAdminBundle/Controller/Authentication/SecurityController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%
 
 KunstmaanAdminBundle_resetting:
     resource: '@KunstmaanAdminBundle/Controller/Authentication/PasswordResetController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%
 
 KunstmaanAdminBundle_change_password:
     resource: '@KunstmaanAdminBundle/Controller/Authentication/ForcedChangePasswordController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%

src/Kunstmaan/AdminListBundle/Resources/config/routing.yml

@@ -1,4 +1,4 @@
 kunstmaan_entity_lock_check:
     resource: '@KunstmaanAdminListBundle/Controller/EntityLockCheckController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/entity/lock

src/Kunstmaan/AdminListBundle/Resources/doc/AdminListBundle.md

@@ -275,7 +275,7 @@ Add the following lines to your routing.yml.
 ```YAML
 YourBundle_documents:
     resource: "@YourBundle/Controller/DocumentAdminController.php"
-    type: annotation
+    type: attribute
     prefix: /{_locale}/%kunstmaan_admin.admin_prefix%/documents
     requirements:
         _locale: "%requiredlocales%"

src/Kunstmaan/AdminListBundle/Resources/doc/PageAdminListBundle.md

@@ -107,7 +107,7 @@ Add the following lines to your routing.yml.
 ```YAML
 YourBundle_documents:
     resource: '@YourBundle/Controller/ProjectPageAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /{_locale}/admin/projectpage/
     requirements:
          _locale: "%requiredlocales%"

src/Kunstmaan/CacheBundle/Resources/config/routing.yml

@@ -1,5 +1,5 @@
 ################ VARNISH ################
 kunstmaancachebundle_varnish:
     resource: "@KunstmaanCacheBundle/Controller/VarnishController.php"
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%

src/Kunstmaan/CookieBundle/Resources/config/routing.yml

@@ -1,19 +1,19 @@
 kunstmaancookiebundle_cookies_menu:
     resource: "@KunstmaanCookieBundle/Controller/CookieMenuController.php"
-    type:     annotation
+    type: attribute
     prefix:   /cookies-menu/
 
 kunstmaancookiebundle_legal:
     resource: "@KunstmaanCookieBundle/Controller/LegalController.php"
-    type:     annotation
+    type: attribute
     prefix:   /legal/
 
 kunstmaancookiebundle_cookietype_admin_list:
     resource: '@KunstmaanCookieBundle/Controller/CookieTypeAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /admin/cookietype/
 
 kunstmaancookiebundle_cookie_admin_list:
     resource: '@KunstmaanCookieBundle/Controller/CookieAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /admin/cookie/

src/Kunstmaan/DashboardBundle/Resources/config/routing.yml

@@ -1,14 +1,14 @@
 kunstmaan_dashboard:
     resource: '@KunstmaanDashboardBundle/Controller/DashboardController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/dashboard
 
 kunstmaan_dashboard_googleanalytics:
     resource: '@KunstmaanDashboardBundle/Controller/GoogleAnalyticsController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/dashboard/widget/googleanalytics
 
 kunstmaan_dashboard_googleanalytics_AJAX:
     resource: '@KunstmaanDashboardBundle/Controller/GoogleAnalyticsAJAXController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/dashboard/ajax/

src/Kunstmaan/FormBundle/Resources/config/routing.yml

@@ -1,4 +1,4 @@
 KunstmaanFormBundle_formsubmissions:
     resource: '@KunstmaanFormBundle/Controller/FormSubmissionsController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/formsubmissions

src/Kunstmaan/GeneratorBundle/Command/GenerateAdminListCommand.php

@@ -158,7 +158,7 @@ protected function updateRouting(
 
         $code = sprintf("%s:\n", strtolower($bundle->getName()) . '_' . strtolower($entityClass) . '_admin_list');
         $code .= sprintf("    resource: '@%s/Controller/%sAdminListController.php'\n", $bundle->getName(), $entityClass);
-        $code .= "    type:     annotation\n";
+        $code .= "    type: attribute\n";
         $code .= sprintf("    prefix:   %s/%s/%s/\n", $prefix, $adminKey, strtolower($entityClass));
         if ($multilang) {
             $code .= "    requirements:\n";

src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/article/Resources/config/routing_multilanguage.yml

@@ -2,7 +2,7 @@
 
 {{ bundle.getName()|lower }}_{{ entity_class|lower }}page_admin_list:
     resource: '@{{ bundle.getName() }}/Controller/{{ entity_class }}PageAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /{_locale}/%kunstmaan_admin.admin_prefix%/{{ entity_class|lower }}page/
     requirements:
          _locale: "%requiredlocales%"

src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/article/Resources/config/routing_partial.yml

@@ -1,7 +1,7 @@
 
 {{ bundle.getName()|lower }}_{{ entity_class|lower }}{{ type|lower }}_admin_list:
     resource: '@{{ bundle.getName() }}/Controller/{{ entity_class }}{{ type }}AdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /{_locale}/%kunstmaan_admin.admin_prefix%/{{ entity_class|lower }}{{ type|lower }}/
     requirements:
          _locale: "%requiredlocales%"

src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/article/Resources/config/routing_singlelanguage.yml

@@ -2,6 +2,6 @@
 
 {{ bundle.getName()|lower }}_{{ entity_class|lower }}page_admin_list:
     resource: '@{{ bundle.getName() }}/Controller/{{ entity_class }}PageAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/{{ entity_class|lower }}page/
 

src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/defaultsite/Resources/config/routing.yml

@@ -1,12 +1,12 @@
 {{ bundle.name|lower }}_default:
     resource: '@{{ bundle.name }}/Controller/DefaultController.php'
-    type:     annotation
+    type: attribute
     prefix:   /
 
 {% if demosite %}
 {{ bundle.name|lower }}_bike_admin_list:
     resource: '@{{ bundle.name }}/Controller/BikeAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /{_locale}/%kunstmaan_admin.admin_prefix%/bike/
     requirements:
          _locale: "%requiredlocales%"

src/Kunstmaan/LeadGenerationBundle/Resources/config/routing.yml

@@ -1,13 +1,13 @@
 kunstmaanleadgenerationbundle_popups_admin_list:
     resource: '@KunstmaanLeadGenerationBundle/Controller/PopupsAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/popups/
     requirements:
          _locale: '%requiredlocales%'
 
 kunstmaanleadgenerationbundle_rules_admin_list:
     resource: '@KunstmaanLeadGenerationBundle/Controller/RulesAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/popups/
     requirements:
          _locale: '%requiredlocales%'

src/Kunstmaan/MediaBundle/Resources/config/routing.yml

@@ -1,19 +1,19 @@
 KunstmaanMediaBundle_media:
     resource: '@KunstmaanMediaBundle/Controller/MediaController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/media
 
 KunstmaanMediaBundle_media_chooser:
     resource: '@KunstmaanMediaBundle/Controller/ChooserController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/media
 
 KunstmaanMediaBundle_media_folder:
     resource: '@KunstmaanMediaBundle/Controller/FolderController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/media/folder
 
 KunstmaanMediaBundle_icon_font:
     resource: '@KunstmaanMediaBundle/Controller/IconFontController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/media/icon-font

src/Kunstmaan/MenuBundle/Resources/config/routing.yml

@@ -1,9 +1,9 @@
 kunstmaanmenubundle_menu_admin_list:
     resource: '@KunstmaanMenuBundle/Controller/MenuAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/menu/
 
 kunstmaanmenubundle_menuitem_admin_list:
     resource: '@KunstmaanMenuBundle/Controller/MenuItemAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/menu/

src/Kunstmaan/MultiDomainBundle/Resources/config/routing.yml

@@ -1,4 +1,4 @@
 kunstmaanmultidomainbundle_site_switch:
     resource: '@KunstmaanMultiDomainBundle/Controller/SiteSwitchController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/multi-domain

src/Kunstmaan/NodeBundle/Resources/config/routing.yml

@@ -1,11 +1,11 @@
 KunstmaanNodeBundle_widgets:
     resource: '@KunstmaanNodeBundle/Controller/WidgetsController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/nodewidgets
 
 KunstmaanNodeBundle_nodes:
     resource: '@KunstmaanNodeBundle/Controller/NodeAdminController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/nodes
 
 KunstmaanNodeBundle_urlchooser_replace:

src/Kunstmaan/PagePartBundle/Resources/config/routing.yml

@@ -1,5 +1,5 @@
 KunstmaanMediaBundle_pagepartadmin:
     resource: '@KunstmaanPagePartBundle/Controller/PagePartAdminController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%
 

src/Kunstmaan/RedirectBundle/Resources/config/routing.yml

@@ -1,4 +1,4 @@
 KunstmaanRedirectBundle_redirect_adminlist:
     resource: '@KunstmaanRedirectBundle/Controller/RedirectAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/settings/redirect/

src/Kunstmaan/SeoBundle/Resources/config/routing.yml

@@ -1,4 +1,4 @@
 KunstmaanSeoBundle_settings:
     resource: '@KunstmaanSeoBundle/Controller/Admin/SettingsController.php'
     prefix:   /%kunstmaan_admin.admin_prefix%/settings/robots
-    type:     annotation
+    type: attribute

src/Kunstmaan/SitemapBundle/Resources/config/routing.yml

@@ -1,4 +1,4 @@
 KunstmaanSitemapBundle_sitemap:
     resource: '@KunstmaanSitemapBundle/Controller/SitemapController.php'
-    type:     annotation
+    type: attribute
     prefix:   /

src/Kunstmaan/TaggingBundle/Resources/config/routing.yml

@@ -1,4 +1,4 @@
 KunstmaanTaggingBundle_admin_tag:
     resource: '@KunstmaanTaggingBundle/Controller/TagAdminListController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/tags/

src/Kunstmaan/TranslatorBundle/Resources/config/routing.yml

@@ -1,11 +1,11 @@
 KunstmaanTranslatorBundle_translations:
     resource: '@KunstmaanTranslatorBundle/Controller/TranslatorController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/settings/translations
 
 KunstmaanTranslatorBundle_translations_commands:
     resource: '@KunstmaanTranslatorBundle/Controller/TranslatorCommandController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/settings/translations
 
 #KunstmaanTranslatorBundle_settings_translations_add:

src/Kunstmaan/UserManagementBundle/Resources/config/routing.yml

@@ -1,14 +1,14 @@
 KunstmaanUserManagementBundle_user_settings:
     resource: '@KunstmaanUserManagementBundle/Controller/UsersController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/settings/users
 
 KunstmaanUserManagementBundle_group_settings:
     resource: '@KunstmaanUserManagementBundle/Controller/GroupsController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/settings/groups
 
 KunstmaanUserManagementBundle_role_settings:
     resource: '@KunstmaanUserManagementBundle/Controller/RolesController.php'
-    type:     annotation
+    type: attribute
     prefix:   /%kunstmaan_admin.admin_prefix%/settings/roles

src/Kunstmaan/VotingBundle/Resources/config/routing.yml

@@ -1,4 +1,4 @@
 KunstmaanVotingBundle_default:
     resource: '@KunstmaanVotingBundle/Controller/VotingController.php'
-    type:     annotation
+    type: attribute
     prefix:   /