Merge pull request #1044 from Victoire/fix/1043-allow-more-versions-o…

…f-sensio/framework-extra-bundle Fix issues with sensio/framework-extra-bundle 4.0+
Victoire · Feb 16, 2018 · 4e07993 · 4e07993
2 parents 9807f20 + f55326f
commit 4e07993
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 8 deletions.
diff --git a/...ndle/Resources/views/UI/confirm.html.twig → ...ndle/Resources/views/ui/confirm.html.twig b/...ndle/Resources/views/UI/confirm.html.twig → ...ndle/Resources/views/ui/confirm.html.twig
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Change Log
 
-## [2.3.x]
+## [2.3.32](https://github.com/Victoire/victoire/tree/2.3.32)
+
+- BC break: Require `sensio/framework-extra-bundle:^5.0` that introduce a BC break (from 4.0):
+
+> [BC BREAK] changed template name generation from camelCase to under_score for both files and directories
+
+Solution is to rename Twig directories and files with `under_score` naming convention. 
+
+## [2.3.29](https://github.com/Victoire/victoire/tree/2.3.29)
 
 - BC break: Remove asynchronous mode
 

diff --git a/Tests/App/src/Acme/AppBundle/Controller/JediController.php b/Tests/App/src/Acme/AppBundle/Controller/JediController.php
@@ -42,7 +42,7 @@ public function indexAction()
      *
      * @Route("/", name="acme_app_jedi_create")
      * @Method("POST")
-     * @Template("AcmeAppBundle:Jedi:new.html.twig")
+     * @Template("AcmeAppBundle:jedi:new.html.twig")
      */
     public function createAction(Request $request)
     {
@@ -177,7 +177,7 @@ private function createEditForm(Jedi $entity)
      *
      * @Route("/{id}", name="acme_app_jedi_update")
      * @Method("PUT")
-     * @Template("AcmeAppBundle:Jedi:edit.html.twig")
+     * @Template("AcmeAppBundle:jedi:edit.html.twig")
      */
     public function updateAction(Request $request, $id)
     {

diff --git a/Tests/App/src/Acme/AppBundle/Controller/SpaceShipController.php b/Tests/App/src/Acme/AppBundle/Controller/SpaceShipController.php
@@ -42,7 +42,7 @@ public function indexAction()
      *
      * @Route("/", name="acme_app_spaceship_create")
      * @Method("POST")
-     * @Template("AcmeAppBundle:SpaceShip:new.html.twig")
+     * @Template("AcmeAppBundle:space_ship:new.html.twig")
      */
     public function createAction(Request $request)
     {
@@ -177,7 +177,7 @@ private function createEditForm(SpaceShip $entity)
      *
      * @Route("/{id}", name="acme_app_spaceship_update")
      * @Method("PUT")
-     * @Template("AcmeAppBundle:SpaceShip:edit.html.twig")
+     * @Template("AcmeAppBundle:space_ship:edit.html.twig")
      */
     public function updateAction(Request $request, $id)
     {

diff --git a/...undle/Resources/views/Jedi/edit.html.twig → ...undle/Resources/views/jedi/edit.html.twig b/...undle/Resources/views/Jedi/edit.html.twig → ...undle/Resources/views/jedi/edit.html.twig
diff --git a/...ndle/Resources/views/Jedi/index.html.twig → ...ndle/Resources/views/jedi/index.html.twig b/...ndle/Resources/views/Jedi/index.html.twig → ...ndle/Resources/views/jedi/index.html.twig
diff --git a/...Resources/views/Jedi/indexFront.html.twig → ...Resources/views/jedi/indexFront.html.twig b/...Resources/views/Jedi/indexFront.html.twig → ...Resources/views/jedi/indexFront.html.twig
diff --git a/...Bundle/Resources/views/Jedi/new.html.twig → ...Bundle/Resources/views/jedi/new.html.twig b/...Bundle/Resources/views/Jedi/new.html.twig → ...Bundle/Resources/views/jedi/new.html.twig
diff --git a/.../Resources/views/Jedi/showFront.html.twig → .../Resources/views/jedi/showFront.html.twig b/.../Resources/views/Jedi/showFront.html.twig → .../Resources/views/jedi/showFront.html.twig
diff --git a/.../Resources/views/SpaceShip/edit.html.twig → ...Resources/views/space_ship/edit.html.twig b/.../Resources/views/SpaceShip/edit.html.twig → ...Resources/views/space_ship/edit.html.twig
diff --git a/...Resources/views/SpaceShip/index.html.twig → ...esources/views/space_ship/index.html.twig b/...Resources/views/SpaceShip/index.html.twig → ...esources/views/space_ship/index.html.twig
diff --git a/...e/Resources/views/SpaceShip/new.html.twig → .../Resources/views/space_ship/new.html.twig b/...e/Resources/views/SpaceShip/new.html.twig → .../Resources/views/space_ship/new.html.twig
diff --git a/composer.json b/composer.json
@@ -46,14 +46,14 @@
         "liip/imagine-bundle": "^1.4",
         "predis/predis": "^1.1",
         "sensio/distribution-bundle": "^5.0",
-        "sensio/framework-extra-bundle": "^3.0.2",
+        "sensio/framework-extra-bundle": "^5.0",
         "snc/redis-bundle": "~2.0",
         "stof/doctrine-extensions-bundle": "~1.2",
         "symfony/assetic-bundle": "~2.3",
-        "symfony/monolog-bundle": "~2.4|~3.0",
+        "symfony/monolog-bundle": "^3.1.0",
         "symfony/polyfill-apcu": "^1.0",
         "symfony/symfony": "^3.4",
-        "symfony/swiftmailer-bundle": "^2.3",
+        "symfony/swiftmailer-bundle": "^2.6.4",
         "symfony/twig-bundle": "~3.0",
         "troopers/alertify-bundle": "^3.0",
         "troopers/assetic-injector-bundle": "^1.1",