Sync with symfony/symfony#960

Author: dunglas

app/AppKernel.php

@@ -19,8 +19,8 @@ public function registerBundles()
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Dunglas\ActionBundle\DunglasActionBundle(),
+            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
             new CodeExplorerBundle\CodeExplorerBundle(),
             new AppBundle\AppBundle(),

app/config/routing.yml

@@ -5,8 +5,8 @@
 # the routes in YAML, XML or PHP files.
 # See http://symfony.com/doc/current/book/routing.html
 app:
-    resource: '@AppBundle/Action/'
-    type:     action-annotation
+    resource: '@AppBundle/Controller/'
+    type:     annotation
     prefix:   /{_locale}
     requirements:
         _locale: %app_locales%

composer.json

@@ -33,7 +33,7 @@
         "symfony/swiftmailer-bundle"           : "~2.3",
         "symfony/symfony"                      : "dev-action as 3.1.0",
         "twig/extensions"                      : "~1.2",
-        "dunglas/action-bundle"                : "dev-master"
+        "dunglas/action-bundle"                : "~1.0@dev"
     },
     "require-dev": {
         "sensio/generator-bundle": "~3.0"
@@ -57,7 +57,10 @@
         ]
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "platform": {
+            "php": "5.5.9"
+        }
     },
     "extra": {
         "symfony-app-dir": "app",

composer.lock

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace AppBundle\Console;
+namespace AppBundle\Command;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Symfony\Component\Console\Command\Command;

src/AppBundle/Console/AddUserCommand.php renamed to src/AppBundle/Command/AddUserCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace AppBundle\Console;
+namespace AppBundle\Command;
 
 use AppBundle\Entity\User;
 use Doctrine\Common\Persistence\ManagerRegistry;

src/AppBundle/Console/DeleteUserCommand.php renamed to src/AppBundle/Command/DeleteUserCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace AppBundle\Action\Admin;
+namespace AppBundle\Controller\Admin;
 
 use AppBundle\Utils\Slugger;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;

src/AppBundle/Action/Admin/BlogController.php renamed to src/AppBundle/Controller/Admin/BlogController.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace AppBundle\Action;
+namespace AppBundle\Controller;
 
 use AppBundle\Entity\Comment;
 use AppBundle\Entity\Post;

src/AppBundle/Action/BlogController.php renamed to src/AppBundle/Controller/BlogController.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace AppBundle\Action;
+namespace AppBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;