Fixed routing config as per Symfony 5 & fixed routing path in output …

…message (#5) * Fixed routing config as per Symfony 5 & fixed routing path in output message * Fixed routing config as per Symfony 5 & fixed routing path in output message
pimcore · Jun 21, 2021 · 5d24efa · 5d24efa
1 parent 3990c63
commit 5d24efa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Command/BaseGenerateBundleCommand.php b/src/Command/BaseGenerateBundleCommand.php
@@ -286,7 +286,7 @@ protected function updateRouting(Bundle $bundle)
         if ('annotation' === $bundle->getConfigurationFormat()) {
             $help = sprintf("        <comment>resource: \"@%s/Controller/\"</comment>\n        <comment>type:     annotation</comment>\n", $bundle->getName());
         } else {
-            $help = sprintf("        <comment>resource: \"@%s/Resources/config/routing.%s\"</comment>\n", $bundle->getName(), $bundle->getConfigurationFormat());
+            $help = sprintf("        <comment>resource: \"@%s/Resources/config/pimcore/routing.%s\"</comment>\n", $bundle->getName(), $bundle->getConfigurationFormat());
         }
         $help .= "        <comment>prefix:   /</comment>\n";
 

diff --git a/src/Generator/BundleGenerator.php b/src/Generator/BundleGenerator.php
@@ -36,7 +36,7 @@ public function generateBundle(Bundle $bundle)
             'extension_alias' => $bundle->getExtensionAlias(),
         ];
 
-        $routingFilename = $bundle->getRoutingConfigurationFilename() ?: 'routes.yml';
+        $routingFilename = $bundle->getRoutingConfigurationFilename() ?: 'routing.yml';
         $routingTarget = $dir . '/Resources/config/pimcore/' . $routingFilename;
 
         // create routing file for default annotation

diff --git a/src/Resources/skeleton/bundle/routing.php.twig b/src/Resources/skeleton/bundle/routing.php.twig
@@ -11,7 +11,7 @@ $collection = new RouteCollection();
 
 {% block body %}
 $collection->add('{{ extension_alias }}_homepage', new Route('/{{ extension_alias }}', array(
-    '_controller' => '{{ bundle }}:Default:index',
+    '_controller' => '{{ bundle }}\Controller\DefaultController:indexAction',
 )));
 {% endblock body %}
 

diff --git a/src/Resources/skeleton/bundle/routing.xml.twig b/src/Resources/skeleton/bundle/routing.xml.twig
@@ -6,7 +6,7 @@
 
 {% block body %}
     <route id="{{ extension_alias }}_homepage" path="/{{ extension_alias }}">
-        <default key="_controller">{{ bundle }}:Default:index</default>
+        <default key="_controller">{{ bundle }}\Controller\DefaultController:indexAction</default>
     </route>
 {% endblock body %}
 </routes>
diff --git a/src/Resources/skeleton/bundle/routing.yml.twig b/src/Resources/skeleton/bundle/routing.yml.twig
@@ -1,3 +1,3 @@
 {{ extension_alias }}_homepage:
     path:     /{{ extension_alias }}
-    defaults: { _controller: {{ bundle }}:Default:index }
+    defaults: { _controller: {{ bundle }}\Controller\DefaultController:indexAction }