Merge branch '4.0'

weaverryan · weaverryan · commit 7c2ff240e344 · 2017-12-05T11:46:47.000-05:00
* 4.0: doc(http_foundation.rst): Fix code error which used create() instead of constructor method. [#8806] minor reword Minor changes Update article block from pull request feedback. Forgot a apostrophe. Improvements on the apache section. Added the Flex node for Apache. add back the trailing comma remove "choices_as_values" mention Fixed configuration block rendering in routing docs Update entity.rst Removing more AppBundle Follow the same code style in docblock annotations
diff --git a/best_practices/business-logic.rst b/best_practices/business-logic.rst
@@ -206,7 +206,7 @@ looking for mapping information:
          *      mappedBy="post",
          *      orphanRemoval=true
          * )
-         * @ORM\OrderBy({"publishedAt" = "ASC"})
+         * @ORM\OrderBy({"publishedAt"="ASC"})
          */
         private $comments;
 
diff --git a/best_practices/controllers.rst b/best_practices/controllers.rst
@@ -192,7 +192,7 @@ the entity manually. In our application, we have this situation in
 .. code-block:: php
 
     /**
-     * @Route("/comment/{postSlug}/new", name = "comment_new")
+     * @Route("/comment/{postSlug}/new", name="comment_new")
      */
     public function new(Request $request, $postSlug)
     {
@@ -218,8 +218,8 @@ flexible:
     use Symfony\Component\Routing\Annotation\Route;
 
     /**
-     * @Route("/comment/{postSlug}/new", name = "comment_new")
-     * @ParamConverter("post", options={"mapping": {"postSlug": "slug"}})
+     * @Route("/comment/{postSlug}/new", name="comment_new")
+     * @ParamConverter("post", options={"mapping"={"postSlug"="slug"}})
      */
     public function new(Request $request, Post $post)
     {
diff --git a/bundles/best_practices.rst b/bundles/best_practices.rst
@@ -454,15 +454,15 @@ Resources
 
 If the bundle references any resources (config files, translation files, etc.),
 don't use physical paths (e.g. ``__DIR__/config/services.xml``) but logical
-paths (e.g. ``@AppBundle/Resources/config/services.xml``).
+paths (e.g. ``@FooBundle/Resources/config/services.xml``).
 
 The logical paths are required because of the bundle overriding mechanism that
 lets you override any resource/file of any bundle. See :ref:`http-kernel-resource-locator`
 for more details about transforming physical paths into logical paths.
 
 Beware that templates use a simplified version of the logical path shown above.
 For example, an ``index.html.twig`` template located in the ``Resources/views/Default/``
-directory of the AppBundle, is referenced as ``@App/Default/index.html.twig``.
+directory of the FooBundle, is referenced as ``@Foo/Default/index.html.twig``.
 
 Learn more
 ----------
diff --git a/bundles/override.rst b/bundles/override.rst
@@ -12,7 +12,7 @@ features of a bundle.
 
     The bundle overriding mechanism means that you cannot use physical paths to
     refer to bundle's resources (e.g. ``__DIR__/config/services.xml``). Always
-    use logical paths in your bundles (e.g. ``@AppBundle/Resources/config/services.xml``)
+    use logical paths in your bundles (e.g. ``@FooBundle/Resources/config/services.xml``)
     and call the :ref:`locateResource() method <http-kernel-resource-locator>`
     to turn them into physical paths when needed.
 
diff --git a/components/console/helpers/questionhelper.rst b/components/console/helpers/questionhelper.rst
@@ -247,7 +247,7 @@ method::
         // ...
         $helper = $this->getHelper('question');
 
-        $question = new Question('Please enter the name of the bundle', 'AppBundle');
+        $question = new Question('Please enter the name of the bundle', 'AcmeDemoBundle');
         $question->setNormalizer(function ($value) {
             // $value can be null here
             return $value ? trim($value) : '';
diff --git a/components/http_foundation.rst b/components/http_foundation.rst
@@ -297,7 +297,7 @@ PHP callable that is able to create an instance of your ``Request`` class::
         array $server = array(),
         $content = null
     ) {
-        return SpecialRequest::create(
+        return new SpecialRequest(
             $query,
             $request,
             $attributes,
diff --git a/components/http_kernel.rst b/components/http_kernel.rst
@@ -258,8 +258,8 @@ on the request's information.
 
     a) If the ``_controller`` key doesn't follow the recommended PHP namespace
        format (e.g. ``App\Controller\DefaultController::index``) its format is
-       transformed into it. For example, the legacy ``AppBundle:Default:index``
-       format would be changed to ``Acme\AppBundle\Controller\DefaultController::indexAction``.
+       transformed into it. For example, the legacy ``FooBundle:Default:index``
+       format would be changed to ``Acme\FooBundle\Controller\DefaultController::indexAction``.
        This transformation is specific to the :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver`
        sub-class used by the Symfony Framework.
 
@@ -742,10 +742,10 @@ translation files, etc.)
 
 This overriding mechanism works because resources are referenced not by their
 physical path but by their logical path. For example, the ``services.xml`` file
-stored in the ``Resources/config/`` directory of a bundle called AppBundle is
-referenced as ``@AppBundle/Resources/config/services.xml``. This logical path
+stored in the ``Resources/config/`` directory of a bundle called FooBundle is
+referenced as ``@FooBundle/Resources/config/services.xml``. This logical path
 will work when the application overrides that file and even if you change the
-directory of AppBundle.
+directory of FooBundle.
 
 The HttpKernel component provides a method called :method:`Symfony\\Component\\HttpKernel\\Kernel::locateResource`
 which can be used to transform logical paths into physical paths::
@@ -754,7 +754,7 @@ which can be used to transform logical paths into physical paths::
 
     // ...
     $kernel = new HttpKernel($dispatcher, $resolver);
-    $path = $kernel->locateResource('@AppBundle/Resources/config/services.xml');
+    $path = $kernel->locateResource('@FooBundle/Resources/config/services.xml');
 
 Learn more
 ----------
diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst
@@ -54,8 +54,6 @@ Code Examples
 * The code examples should look real for a web application context. Avoid abstract
   or trivial examples (``foo``, ``bar``, ``demo``, etc.);
 * The code should follow the :doc:`Symfony Best Practices </best_practices/introduction>`.
-  Unless the example requires a custom bundle, make sure to always use the
-  ``AppBundle`` bundle to store your code;
 * Use ``Acme`` when the code requires a vendor name;
 * Use ``example.com`` as the domain of sample URLs and ``example.org`` and
   ``example.net`` when additional domains are required. All of these domains are
diff --git a/doctrine/multiple_entity_managers.rst b/doctrine/multiple_entity_managers.rst
@@ -50,12 +50,21 @@ The following configuration code shows how you can configure two entity managers
                     default:
                         connection: default
                         mappings:
-                            AppBundle:  ~
-                            AcmeStoreBundle: ~
+                            Main:
+                                is_bundle: false
+                                type: annotation
+                                dir: '%kernel.project_dir%/src/Entity/Main'
+                                prefix: 'App\Entity\Main'
+                                alias: Main
                     customer:
                         connection: customer
                         mappings:
-                            AcmeCustomerBundle: ~
+                            Customer:
+                                is_bundle: false
+                                type: annotation
+                                dir: '%kernel.project_dir%/src/Entity/Customer'
+                                prefix: 'App\Entity\Customer'
+                                alias: Customer
 
     .. code-block:: xml
 
@@ -94,12 +103,25 @@ The following configuration code shows how you can configure two entity managers
 
                 <doctrine:orm default-entity-manager="default">
                     <doctrine:entity-manager name="default" connection="default">
-                        <doctrine:mapping name="AppBundle" />
-                        <doctrine:mapping name="AcmeStoreBundle" />
+                        <doctrine:mapping
+                            name="Main"
+                            is_bundle="false"
+                            type="annotation"
+                            dir="%kernel.project_dir%/src/Entity/Main"
+                            prefix="App\Entity\Main"
+                            alias="Main"
+                        />
                     </doctrine:entity-manager>
 
                     <doctrine:entity-manager name="customer" connection="customer">
-                        <doctrine:mapping name="AcmeCustomerBundle" />
+                        <doctrine:mapping
+                            name="Customer"
+                            is_bundle="false"
+                            type="annotation"
+                            dir="%kernel.project_dir%/src/Entity/Customer"
+                            prefix="App\Entity\Customer"
+                            alias="Customer"
+                        />
                     </doctrine:entity-manager>
                 </doctrine:orm>
             </doctrine:config>
@@ -139,14 +161,25 @@ The following configuration code shows how you can configure two entity managers
                     'default' => array(
                         'connection' => 'default',
                         'mappings'   => array(
-                            'AppBundle'  => null,
-                            'AcmeStoreBundle' => null,
+                            'Main'  => array(
+                                is_bundle => false,
+                                type => 'annotation',
+                                dir => '%kernel.project_dir%/src/Entity/Main',
+                                prefix => 'App\Entity\Main',
+                                alias => 'Main',
+                            )
                         ),
                     ),
                     'customer' => array(
                         'connection' => 'customer',
                         'mappings'   => array(
-                            'AcmeCustomerBundle' => null,
+                            'Customer'  => array(
+                                is_bundle => false,
+                                type => 'annotation',
+                                dir => '%kernel.project_dir%/src/Entity/Customer',
+                                prefix => 'App\Entity\Customer',
+                                alias => 'Customer',
+                            )
                         ),
                     ),
                 ),
@@ -155,8 +188,8 @@ The following configuration code shows how you can configure two entity managers
 
 In this case, you've defined two entity managers and called them ``default``
 and ``customer``. The ``default`` entity manager manages entities in the
-AppBundle and AcmeStoreBundle, while the ``customer`` entity manager manages
-entities in the AcmeCustomerBundle. You've also defined two connections, one
+``src/Entity/Main`` directory, while the ``customer`` entity manager manages
+entities in ``src/Entity/Customer``. You've also defined two connections, one
 for each entity manager.
 
 .. note::
diff --git a/form/create_custom_field_type.rst b/form/create_custom_field_type.rst
@@ -36,7 +36,6 @@ for form fields, which is ``<BundleName>\Form\Type``. Make sure the field extend
                     'Expedited Shipping' => 'expedited',
                     'Priority Shipping' => 'priority',
                 ),
-                'choices_as_values' => true,
             ));
         }
 
diff --git a/reference/constraints/All.rst b/reference/constraints/All.rst
@@ -35,7 +35,7 @@ entry in that array:
             /**
              * @Assert\All({
              *     @Assert\NotBlank,
-             *     @Assert\Length(min = 5)
+             *     @Assert\Length(min=5)
              * })
              */
              protected $favoriteColors = array();
diff --git a/reference/constraints/Choice.rst b/reference/constraints/Choice.rst
@@ -52,7 +52,7 @@ If your valid choice list is simple, you can pass them in directly via the
             protected $city;
 
             /**
-             * @Assert\Choice(choices = {"fiction", "non-fiction"}, message = "Choose a valid genre.")
+             * @Assert\Choice(choices={"fiction", "non-fiction"}, message="Choose a valid genre.")
              */
             protected $genre;
         }
@@ -159,7 +159,7 @@ constraint.
         class Author
         {
             /**
-             * @Assert\Choice(callback = "getGenres")
+             * @Assert\Choice(callback="getGenres")
              */
             protected $genre;
         }
@@ -224,7 +224,7 @@ you can pass the class name and the method as an array.
         class Author
         {
             /**
-             * @Assert\Choice(callback = {"Util", "getGenres"})
+             * @Assert\Choice(callback={"Util", "getGenres"})
              */
             protected $genre;
         }
diff --git a/reference/constraints/IsTrue.rst b/reference/constraints/IsTrue.rst
@@ -55,7 +55,7 @@ Then you can constrain this method with ``IsTrue``.
             protected $token;
 
             /**
-             * @Assert\IsTrue(message = "The token is invalid")
+             * @Assert\IsTrue(message="The token is invalid")
              */
             public function isTokenValid()
             {
diff --git a/reference/constraints/Luhn.rst b/reference/constraints/Luhn.rst
@@ -34,7 +34,7 @@ will contain a credit card number.
         class Transaction
         {
             /**
-             * @Assert\Luhn(message = "Please check your credit card number.")
+             * @Assert\Luhn(message="Please check your credit card number.")
              */
             protected $cardNumber;
         }
diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst
@@ -64,7 +64,7 @@ stores an ``Address`` instance in the ``$address`` property.
 
             /**
              * @Assert\NotBlank
-             * @Assert\Length(max = 5)
+             * @Assert\Length(max=5)
              */
             protected $zipCode;
         }
@@ -78,7 +78,7 @@ stores an ``Address`` instance in the ``$address`` property.
         {
             /**
              * @Assert\NotBlank
-             * @Assert\Length(min = 4)
+             * @Assert\Length(min=4)
              */
             protected $firstName;
 
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
@@ -63,7 +63,7 @@ be listed inside the choice field::
 
     $builder->add('users', EntityType::class, array(
         // query choices from this entity
-        'class' => User:class,
+        'class' => User::class,
 
         // use the User.username property as the visible option string
         'choice_label' => 'username',
diff --git a/routing.rst b/routing.rst
@@ -22,7 +22,7 @@ Creating Routes
 
 A *route* is a map from a URL path to a controller. Suppose you want one route that
 matches ``/blog`` exactly and another more dynamic route that can match *any* URL
-like ``/blog/my-post`` or ``/blog/all-about-symfony``::
+like ``/blog/my-post`` or ``/blog/all-about-symfony``:
 
 .. configuration-block::
 
@@ -161,7 +161,7 @@ To fix this, add a *requirement* that the ``{page}`` wildcard can *only* match n
         class BlogController extends Controller
         {
             /**
-             * @Route("/blog/{page}", name="blog_list", requirements={"page": "\d+"})
+             * @Route("/blog/{page}", name="blog_list", requirements={"page"="\d+"})
              */
             public function list($page)
             {
@@ -260,7 +260,7 @@ So how can you make ``blog_list`` once again match when the user visits
         class BlogController extends Controller
         {
             /**
-             * @Route("/blog/{page}", name="blog_list", requirements={"page": "\d+"})
+             * @Route("/blog/{page}", name="blog_list", requirements={"page"="\d+"})
              */
             public function list($page = 1)
             {
diff --git a/routing/optional_placeholders.rst b/routing/optional_placeholders.rst
@@ -135,7 +135,7 @@ This is done by including it in the ``defaults`` collection:
         // ...
 
         /**
-         * @Route("/blog/{page}", defaults={"page" = 1})
+         * @Route("/blog/{page}", defaults={"page"=1})
          */
         public function index($page)
         {
diff --git a/routing/requirements.rst b/routing/requirements.rst
@@ -21,7 +21,7 @@ a routing ``{wildcard}`` to only match some regular expression:
         class BlogController extends Controller
         {
             /**
-             * @Route("/blog/{page}", name="blog_list", requirements={"page": "\d+"})
+             * @Route("/blog/{page}", name="blog_list", requirements={"page"="\d+"})
              */
             public function list($page)
             {
@@ -97,8 +97,8 @@ URL:
         class MainController extends Controller
         {
             /**
-             * @Route("/{_locale}", defaults={"_locale": "en"}, requirements={
-             *     "_locale": "en|fr"
+             * @Route("/{_locale}", defaults={"_locale"="en"}, requirements={
+             *     "_locale"="en|fr"
              * })
              */
             public function homepage($_locale)
diff --git a/security/entity_provider.rst b/security/entity_provider.rst
@@ -42,8 +42,8 @@ Before you begin, first make sure you install the Security component:
 
     $ composer require security
     
-For this entry, suppose that you already have a ``User`` entity inside an
-``AppBundle`` with the following fields: ``id``, ``username``, ``password``,
+For this entry, suppose that you already have a ``User`` entity
+with the following fields: ``id``, ``username``, ``password``,
 ``email`` and ``isActive``::
 
     // src/Entity/User.php
diff --git a/service_container/tags.rst b/service_container/tags.rst
@@ -479,7 +479,7 @@ application handlers.
 .. code-block:: php
 
     // src/HandlerCollection.php
-    namespace AppBundle;
+    namespace App;
 
     class HandlerCollection
     {
diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst
diff --git a/templating/formats.rst b/templating/formats.rst
diff --git a/validation.rst b/validation.rst
diff --git a/validation/severity.rst b/validation/severity.rst
diff --git a/validation/translations.rst b/validation/translations.rst

Original file line number	Diff line number	Diff line change
@@ -36,7 +36,6 @@ for form fields, which is ``<BundleName>\Form\Type``. Make sure the field extend
`36`	`36`	`'Expedited Shipping' => 'expedited',`
`37`	`37`	`'Priority Shipping' => 'priority',`
`38`	`38`	`),`
`39`		`- 'choices_as_values' => true,`
`40`	`39`	`));`
`41`	`40`	`}`
`42`	`41`