Merge branch '2.3' into 2.8

* 2.3:
  Use different placeholders in mailer config
  Fixed array and trailing spaces
  [Form] fixed CollectionType needless option
  updated the core team
  Fixed grammatical error
  Comment updates
  Updated Heroku instructions

cookbook/deployment/fortrabbit.rst

@@ -20,13 +20,13 @@ Before getting started, you should have done a few things on the fortrabbit side
 Preparing your Application
 --------------------------
 
-You don't need to change any code to deploy a Symfony application to fortrabbit. 
+You don't need to change any code to deploy a Symfony application to fortrabbit.
 But it requires some minor tweaks to its configuration.
 
 Configure Logging
 ~~~~~~~~~~~~~~~~~
 
-Per default Symfony logs to a file. Modify the ``app/config/config_prod.yml`` file 
+Per default Symfony logs to a file. Modify the ``app/config/config_prod.yml`` file
 to redirect it to :phpfunction:`error_log`:
 
 .. configuration-block::
@@ -73,7 +73,7 @@ to redirect it to :phpfunction:`error_log`:
 Configuring Database Access & Session Handler
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can use the fortrabbit App Secrets to attain your database credentials. 
+You can use the fortrabbit App Secrets to attain your database credentials.
 Create the file ``app/config/config_prod_secrets.php`` with the following
 contents::
 
@@ -98,7 +98,7 @@ contents::
     // check if the Memcache component is present
     if (isset($secrets['MEMCACHE'])) {
         $memcache = $secrets['MEMCACHE'];
-        $handlers = [];
+        $handlers = array();
 
         foreach (range(1, $memcache['COUNT']) as $num) {
             $handlers[] = $memcache['HOST'.$num].':'.$memcache['PORT'.$num];
@@ -175,19 +175,19 @@ Configuring the Environment in the Dashboard
 PHP Settings
 ~~~~~~~~~~~~
 
-The PHP version and enabled extensions are configuable under the PHP settings 
+The PHP version and enabled extensions are configuable under the PHP settings
 of your App within the fortrabbit Dashboard.
 
 Environment Variables
 ~~~~~~~~~~~~~~~~~~~~~
 
-Set the ``SYMFONY_ENV`` environment variable to ``prod`` to make sure the right 
+Set the ``SYMFONY_ENV`` environment variable to ``prod`` to make sure the right
 config files get loaded. ENV vars are configuable in fortrabbit Dashboard as well.
 
 Document Root
 ~~~~~~~~~~~~~
 
-The document root is configuable for every custom domain you setup for your App. 
+The document root is configuable for every custom domain you setup for your App.
 The default is ``/htdocs``, but for Symfony you probably want to change it to
 ``/htdocs/web``. You also do so in the fortrabbit Dashboard under ``Domain`` settings.
 
@@ -197,8 +197,8 @@ Deploying to fortrabbit
 It is assumed that your codebase is under version-control with Git and dependencies
 are managed with Composer (locally).
 
-Every time you push to fortrabbit composer install runs before your code gets 
-deployed. To finetune the deployment behavior put a `fortrabbit.yml`_. deployment 
+Every time you push to fortrabbit composer install runs before your code gets
+deployed. To finetune the deployment behavior put a `fortrabbit.yml`_. deployment
 file (optional) in the project root.
 
 Add fortrabbit as a (additional) Git remote and add your configuration changes:
@@ -221,11 +221,11 @@ Commit and push
     Replace ``<your-app>`` with the name of your fortrabbit App.
 
 .. code-block:: bash
-    
+
    Commit received, starting build of branch master
 
    –––––––––––––––––––––––  ∙ƒ  –––––––––––––––––––––––
-   
+
    B U I L D
 
    Checksum:
@@ -244,7 +244,7 @@ Commit and push
    Installing dependencies (including require-dev) from lock file
    Nothing to install or update
    Generating autoload files
-  
+
    - - -
    172ms
 
@@ -271,11 +271,11 @@ Commit and push
 
 .. note::
 
-   The first ``git push`` takes much longer as all composer dependencies get 
-   downloaded. All subsequent deploys are done within seconds. 
+   The first ``git push`` takes much longer as all composer dependencies get
+   downloaded. All subsequent deploys are done within seconds.
 
-That's it! Your application is being deployed on fortrabbit. More information 
-about `database migrations and tunneling`_ can be found in the fortrabbit 
+That's it! Your application is being deployed on fortrabbit. More information
+about `database migrations and tunneling`_ can be found in the fortrabbit
 documentation.
 
 .. _`fortrabbit`: https://www.fortrabbit.com

cookbook/deployment/heroku.rst

@@ -305,20 +305,20 @@ This is also very useful to build assets on the production system, e.g. with Ass
 
     With the next deploy, Heroku compiles your app using the Node.js buildpack and
     your npm packages become installed. On the other hand, your ``composer.json`` is
-    now ignored. To compile your app with both buildpacks, Node.js *and* PHP, you can
-    use a special `multiple buildpack`_. To override buildpack auto-detection, you
-    need to explicitly set the buildpack URL:
+    now ignored. To compile your app with both buildpacks, Node.js *and* PHP, you need
+    to use both buildpacks. To override buildpack auto-detection, you
+    need to explicitly set the buildpack:
 
     .. code-block:: bash
 
-        $ heroku buildpacks:set https://github.com/ddollar/heroku-buildpack-multi.git
-
-    Next, add a ``.buildpacks`` file to your project, listing the buildpacks you need:
-
-    .. code-block:: text
-
-        https://github.com/heroku/heroku-buildpack-nodejs.git
-        https://github.com/heroku/heroku-buildpack-php.git
+        $ heroku buildpacks:set heroku/nodejs
+        Buildpack set. Next release on your-application will use heroku/nodejs.
+        Run git push heroku master to create a new release using this buildpack.
+        $ heroku buildpacks:set heroku/php --index 2
+        Buildpack set. Next release on your-application will use:
+          1. heroku/nodejs
+          2. heroku/php
+        Run git push heroku master to create a new release using these buildpacks.
 
     With the next deploy, you can benefit from both buildpacks. This setup also enables
     your Heroku environment to make use of node based automatic build tools like
@@ -336,7 +336,6 @@ This is also very useful to build assets on the production system, e.g. with Ass
 .. _`custom compile steps`: https://devcenter.heroku.com/articles/php-support#custom-compile-step
 .. _`custom Composer command`: https://getcomposer.org/doc/articles/scripts.md#writing-custom-commands
 .. _`Heroku buildpacks`: https://devcenter.heroku.com/articles/buildpacks
-.. _`multiple buildpack`: https://github.com/ddollar/heroku-buildpack-multi
 .. _`Grunt`: http://gruntjs.com
 .. _`gulp`: http://gulpjs.com
 .. _`Heroku documentation`: https://devcenter.heroku.com/articles/custom-php-settings#nginx

cookbook/email/cloud.rst

@@ -36,8 +36,8 @@ and complete the configuration with the provided ``username`` and ``password``:
             host:       email-smtp.us-east-1.amazonaws.com
             port:       465 # different ports are available, see SES console
             encryption: tls # TLS encryption is required
-            username:   AWS_ACCESS_KEY  # to be created in the SES console
-            password:   AWS_SECRET_KEY  # to be created in the SES console
+            username:   AWS_SES_SMTP_USERNAME  # to be created in the SES console
+            password:   AWS_SES_SMTP_PASSWORD  # to be created in the SES console
 
     .. code-block:: xml
 
@@ -57,8 +57,8 @@ and complete the configuration with the provided ``username`` and ``password``:
                 host="email-smtp.us-east-1.amazonaws.com"
                 port="465"
                 encryption="tls"
-                username="AWS_ACCESS_KEY"
-                password="AWS_SECRET_KEY"
+                username="AWS_SES_SMTP_USERNAME"
+                password="AWS_SES_SMTP_PASSWORD"
             />
         </container>
 
@@ -70,8 +70,8 @@ and complete the configuration with the provided ``username`` and ``password``:
             'host'       => 'email-smtp.us-east-1.amazonaws.com',
             'port'       => 465,
             'encryption' => 'tls',
-            'username'   => 'AWS_ACCESS_KEY',
-            'password'   => 'AWS_SECRET_KEY',
+            'username'   => 'AWS_SES_SMTP_USERNAME',
+            'password'   => 'AWS_SES_SMTP_PASSWORD',
         ));
 
 The ``port`` and ``encryption`` keys are not present in the Symfony Standard
@@ -96,8 +96,8 @@ And that's it, you're ready to start sending emails through the cloud!
             mailer_host:       email-smtp.us-east-1.amazonaws.com
             mailer_port:       465 # different ports are available, see SES console
             mailer_encryption: tls # TLS encryption is required
-            mailer_user:       AWS_ACCESS_KEY # to be created in the SES console
-            mailer_password:   AWS_SECRET_KEY # to be created in the SES console
+            mailer_user:       AWS_SES_SMTP_USERNAME # to be created in the SES console
+            mailer_password:   AWS_SES_SMTP_PASSWORD # to be created in the SES console
 
 .. note::
 

reference/forms/types/collection.rst

@@ -62,7 +62,6 @@ address as its own input text box::
         'entry_type'   => EmailType::class,
         // these options are passed to each "email" type
         'entry_options'  => array(
-            'required'  => false,
             'attr'      => array('class' => 'email-box')
         ),
     ));