Lots of automated migrations to Symfony Flex structure

Author: wouterj

bundles.rst

@@ -151,14 +151,14 @@ of the most common elements of a bundle:
     necessary).
 
 ``Resources/config/``
-    Houses configuration, including routing configuration (e.g. ``routing.yml``).
+    Houses configuration, including routing configuration (e.g. ``routes.yaml``).
 
 ``Resources/views/``
     Holds templates organized by controller name (e.g. ``Random/index.html.twig``).
 
 ``Resources/public/``
     Contains web assets (images, stylesheets, etc) and is copied or symbolically
-    linked into the project ``web/`` directory via the ``assets:install`` console
+    linked into the project ``public/`` directory via the ``assets:install`` console
     command.
 
 ``Tests/``

bundles/extension.rst

@@ -116,7 +116,7 @@ Other available loaders are the ``YamlFileLoader``, ``PhpFileLoader`` and
 .. caution::
 
     If you removed the default file with service definitions (i.e.
-    ``app/config/services.yml``), make sure to also remove it from the
+    ``app/config/services.yaml``), make sure to also remove it from the
     ``imports`` key in ``app/config/config.yml``.
 
 Using Configuration to Change the Services
@@ -146,8 +146,8 @@ work in the same way, but the second one is for classes that contain PHP
 annotations). Define the classes to compile as an array of their fully qualified
 class names::
 
-    use AppBundle\Manager\UserManager;
-    use AppBundle\Utils\Slugger;
+    use App\Manager\UserManager;
+    use App\Utils\Slugger;
 
     // ...
     public function load(array $configs, ContainerBuilder $container)
@@ -163,7 +163,7 @@ class names::
 
         // add here only classes that contain PHP annotations
         $this->addAnnotatedClassesToCompile(array(
-            'AppBundle\\Controller\\DefaultController',
+            'App\\Controller\\DefaultController',
             // ...
         ));
     }

bundles/override.rst

@@ -26,7 +26,7 @@ Routing
 
 Routing is never automatically imported in Symfony. If you want to include
 the routes from any bundle, then they must be manually imported from somewhere
-in your application (e.g. ``app/config/routing.yml``).
+in your application (e.g. ``app/config/routes.yaml``).
 
 The easiest way to "override" a bundle's routing is to never import it at
 all. Instead of importing a third-party bundle's routing, simply copy

bundles/remove.rst

@@ -42,8 +42,8 @@ that refers to the bundle.
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 *Some* bundles require you to import routing configuration. Check for references
-to the bundle in ``app/config/routing.yml`` and ``app/config/routing_dev.yml``.
-If you find any references, remove them completely.
+to the bundle in the routing configuration (inside ``config/routes/``).  If you
+find any references, remove them completely.
 
 2.2 Remove Bundle Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -74,8 +74,8 @@ directory, and any parent directories that are now empty (e.g. ``src/Acme/``).
 3.1 Remove Bundle Assets
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Remove the assets of the bundle in the web/ directory (e.g.
-``web/bundles/acmedemo`` for the AcmeDemoBundle).
+Remove the assets of the bundle in the public/ directory (e.g.
+``public/bundles/acmedemo`` for the AcmeDemoBundle).
 
 4. Remove Integration in other Bundles
 --------------------------------------

components/dependency_injection.rst

@@ -210,7 +210,7 @@ Loading a YAML config file::
 
     $container = new ContainerBuilder();
     $loader = new YamlFileLoader($container, new FileLocator(__DIR__));
-    $loader->load('services.yml');
+    $loader->load('services.yaml');
 
 .. note::
 

components/http_foundation.rst

@@ -285,7 +285,7 @@ represents an HTTP message. But when moving from a legacy system, adding
 methods or changing some default behavior might help. In that case, register a
 PHP callable that is able to create an instance of your ``Request`` class::
 
-    use AppBundle\Http\SpecialRequest;
+    use App\Http\SpecialRequest;
     use Symfony\Component\HttpFoundation\Request;
 
     Request::setFactory(function (

components/routing.rst

@@ -364,8 +364,7 @@ routes with UTF-8 characters:
 
     .. code-block:: php-annotations
 
-        // src/AppBundle/Controller/DefaultController.php
-        namespace AppBundle\Controller;
+        namespace App\Controller;
 
         use Symfony\Bundle\FrameworkBundle\Controller\Controller;
         use Symfony\Component\Routing\Annotation\Route;
@@ -375,45 +374,42 @@ routes with UTF-8 characters:
             /**
              * @Route("/category/{name}", name="route1", options={"utf8": true})
              */
-            public function categoryAction()
+            public function category()
             {
                 // ...
             }
 
     .. code-block:: yaml
 
-        # app/config/routing.yml
         route1:
             path:     /category/{name}
-            defaults: { _controller: 'AppBundle:Default:category' }
+            defaults: { _controller: 'App\Controller\DefaultController::category' }
             options:
                 utf8: true
 
     .. code-block:: xml
 
-        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="route1" path="/category/{name}">
-                <default key="_controller">AppBundle:Default:category</default>
+                <default key="_controller">App\Controller\DefaultController::category</default>
                 <option key="utf8">true</option>
             </route>
         </routes>
 
     .. code-block:: php
 
-        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
         $collection = new RouteCollection();
         $collection->add('route1', new Route('/category/{name}',
             array(
-                '_controller' => 'AppBundle:Default:category',
+                '_controller' => 'App\Controller\DefaultController::category',
             ),
             array(),
             array(
@@ -438,8 +434,7 @@ You can also include UTF-8 strings as routing requirements:
 
     .. code-block:: php-annotations
 
-        // src/AppBundle/Controller/DefaultController.php
-        namespace AppBundle\Controller;
+        namespace App\Controller;
 
         use Symfony\Bundle\FrameworkBundle\Controller\Controller;
         use Symfony\Component\Routing\Annotation\Route;
@@ -454,48 +449,45 @@ You can also include UTF-8 strings as routing requirements:
              *     options={"utf8": true}
              * )
              */
-            public function defaultAction()
+            public function default()
             {
                 // ...
             }
 
     .. code-block:: yaml
 
-        # app/config/routing.yml
         route2:
             path:     /default/{default}
-            defaults: { _controller: 'AppBundle:Default:default' }
+            defaults: { _controller: 'App\Controller\DefaultController::default' }
             requirements:
                 default: "한국어"
             options:
                 utf8: true
 
     .. code-block:: xml
 
-        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="route2" path="/default/{default}">
-                <default key="_controller">AppBundle:Default:default</default>
+                <default key="_controller">App\Controller\DefaultController::default</default>
                 <requirement key="default">한국어</requirement>
                 <option key="utf8">true</option>
             </route>
         </routes>
 
     .. code-block:: php
 
-        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
         $collection = new RouteCollection();
         $collection->add('route2', new Route('/default/{default}',
             array(
-                '_controller' => 'AppBundle:Default:default',
+                '_controller' => 'App\Controller\DefaultController::default',
             ),
             array(
                 'default' => '한국어',

configuration/front_controllers_and_kernel.rst

@@ -30,9 +30,9 @@ The Front Controller
 The `front controller`_ is a well-known design pattern; it is a section of
 code that *all* requests served by an application run through.
 
-In the `Symfony Standard Edition`_, this role is taken by the `app.php`_
-and `app_dev.php`_ files in the ``web/`` directory. These are the very
-first PHP scripts executed when a request is processed.
+In the `Symfony Standard Edition`_, this role is taken by the `index.php`_ file
+in the ``public/`` directory. This is the very first PHP script executed when a
+request is processed.
 
 The main purpose of the front controller is to create an instance of the
 ``AppKernel`` (more on that in a second), make it handle the request

console.rst

@@ -12,14 +12,12 @@ use it to create your own commands.
 Creating a Command
 ------------------
 
-Commands are defined in classes which should be created in the ``Command`` namespace
-of your bundle (e.g. ``AppBundle\Command``) and their names should end with the
-``Command`` suffix.
+Commands are defined in classes extending
+:class:`Symfony\\Component\\Console\\Command\\Command`. For example, you may
+want a command to create a user::
 
-For example, you may want a command to create a user::
-
-    // src/AppBundle/Command/CreateUserCommand.php
-    namespace AppBundle\Command;
+    // src/Command/CreateUserCommand.php
+    namespace App\Command;
 
     use Symfony\Component\Console\Command\Command;
     use Symfony\Component\Console\Input\InputInterface;
@@ -74,7 +72,7 @@ terminal:
 
 .. note::
 
-    If you're using the :ref:`default services.yml configuration <service-container-services-load-example>`,
+    If you're using the :ref:`default services.yaml configuration <service-container-services-load-example>`,
     your command classes are automatically registered as services.
 
     You can also manually register your command as a service by configuring the service
@@ -229,9 +227,9 @@ class. It uses special input and output classes to ease testing without a real
 console::
 
     // tests/AppBundle/Command/CreateUserCommandTest.php
-    namespace Tests\AppBundle\Command;
+    namespace Tests\App\Command;
 
-    use AppBundle\Command\CreateUserCommand;
+    use App\Command\CreateUserCommand;
     use Symfony\Bundle\FrameworkBundle\Console\Application;
     use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
     use Symfony\Component\Console\Tester\CommandTester;

console/command_in_controller.rst

@@ -24,8 +24,8 @@ Imagine you want to send spooled Swift Mailer messages by
 :doc:`using the swiftmailer:spool:send command </email/spool>`.
 Run this command from inside your controller via::
 
-    // src/AppBundle/Controller/SpoolController.php
-    namespace AppBundle\Controller;
+    // src/Controller/SpoolController.php
+    namespace App\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Console\Application;
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -76,8 +76,8 @@ First, require the package:
 
 Now, use it in your controller::
 
-    // src/AppBundle/Controller/SpoolController.php
-    namespace AppBundle\Controller;
+    // src/Controller/SpoolController.php
+    namespace App\Controller;
 
     use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
     use Symfony\Component\Console\Output\BufferedOutput;