Merge remote-tracking branch 'upstream/master'

Author: javiereguiluz

_build/conf.py

@@ -112,8 +112,11 @@
 lexers['terminal'] = TerminalLexer()
 
 config_block = {
+    'apache': 'Apache',
     'markdown': 'Markdown',
+    'nginx': 'Nginx',
     'rst': 'reStructuredText',
+    'terminal': 'Terminal',
     'varnish3': 'Varnish 3',
     'varnish4': 'Varnish 4'
 }

_includes/service_container/_my_mailer.rst.inc

@@ -27,9 +27,10 @@
     .. code-block:: php
 
         // app/config/services.php
+        use AppBundle\Mailer;
         use Symfony\Component\DependencyInjection\Definition;
 
         $container->setDefinition('app.mailer', new Definition(
-            'AppBundle\Mailer',
+            Mailer::class,
             array('sendmail')
         ));

best_practices/configuration.rst

@@ -175,8 +175,20 @@ Moving Sensitive Options Outside of Symfony Entirely
 
 When dealing with sensitive options, like database credentials, we also recommend
 that you store them outside the Symfony project and make them available
-through environment variables. Learn how to do it in the following article:
-:doc:`/configuration/external_parameters`.
+through environment variables:
+
+.. code-block:: yaml
+
+    # app/config/config.yml
+    doctrine:
+        dbal:
+            # ...
+            password: "%env(DB_PASSWORD)%"
+
+.. versionadded:: 3.2
+    Support for runtime environment variables via the ``%env(...)%`` syntax
+    was added in Symfony 3.2. Prior to version 3.2, you needed to use the
+    :doc:`special SYMFONY__ variables </configuration/external_parameters>`.
 
 .. _`feature toggles`: https://en.wikipedia.org/wiki/Feature_toggle
 .. _`constant() function`: http://twig.sensiolabs.org/doc/functions/constant.html

best_practices/forms.rst

@@ -19,6 +19,7 @@ form in its own PHP class::
 
     namespace AppBundle\Form;
 
+    use AppBundle\Entity\Post;
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
     use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -42,7 +43,7 @@ form in its own PHP class::
         public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
-                'data_class' => 'AppBundle\Entity\Post'
+                'data_class' => Post::class,
             ));
         }
     }

best_practices/security.rst

@@ -216,7 +216,7 @@ Checking Permissions without @Security
 
 The above example with ``@Security`` only works because we're using the
 :ref:`ParamConverter <best-practices-paramconverter>`, which gives the expression
-access to the a ``post`` variable. If you don't use this, or have some other
+access to the ``post`` variable. If you don't use this, or have some other
 more advanced use-case, you can always do the same security check in PHP:
 
 .. code-block:: php

bundles/extension.rst

@@ -137,14 +137,17 @@ Your bundles can also add their own classes into this file thanks to the
 ``addClassesToCompile()`` method. Define the classes to compile as an array of
 their fully qualified class names::
 
+    use AppBundle\Manager\UserManager;
+    use AppBundle\Utils\Slugger;
+
     // ...
     public function load(array $configs, ContainerBuilder $container)
     {
         // ...
 
         $this->addClassesToCompile(array(
-            'AppBundle\\Manager\\UserManager',
-            'AppBundle\\Utils\\Slugger',
+            UserManager::class,
+            Slugger::class,
             // ...
         ));
     }

bundles/override.rst

@@ -45,6 +45,7 @@ example, the implementing class for the ``original-service-id`` is changed to
     // src/Acme/DemoBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
     namespace Acme\DemoBundle\DependencyInjection\Compiler;
 
+    use Acme\DemoBundle\YourService;
     use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
     use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -53,7 +54,7 @@ example, the implementing class for the ``original-service-id`` is changed to
         public function process(ContainerBuilder $container)
         {
             $definition = $container->getDefinition('original-service-id');
-            $definition->setClass('Acme\DemoBundle\YourService');
+            $definition->setClass(YourService::class);
         }
     }
 

bundles/prepend_extension.rst

@@ -56,6 +56,7 @@ The following example illustrates how to prepend
 a configuration setting in multiple bundles as well as disable a flag in multiple bundles
 in case a specific other bundle is not registered::
 
+    // src/Acme/HelloBundle/DependencyInjection/AcmeHelloExtension.php
     public function prepend(ContainerBuilder $container)
     {
         // get all bundles
@@ -69,8 +70,10 @@ in case a specific other bundle is not registered::
                     case 'acme_something':
                     case 'acme_other':
                         // set use_acme_goodbye to false in the config of
-                        // acme_something and acme_other note that if the user manually
-                        // configured use_acme_goodbye to true in the app/config/config.yml
+                        // acme_something and acme_other
+                        //
+                        // note that if the user manually configured
+                        // use_acme_goodbye to true in app/config/config.yml
                         // then the setting would in the end be true and not false
                         $container->prependExtensionConfig($name, $config);
                         break;

components/browser_kit.rst

@@ -138,6 +138,7 @@ retrieve any cookie while making requests with the client::
     $expires    = $cookie->getExpiresTime();
     $path       = $cookie->getPath();
     $domain     = $cookie->getDomain();
+    $sameSite   = $cookie->getSameSite();
 
 .. note::
 

components/class_loader.rst

@@ -52,7 +52,15 @@ Learn More
     :maxdepth: 1
 
     class_loader/class_loader
-    class_loader/*
+    class_loader/class_map_generator.rst
+    class_loader/debug_class_loader.rst
+    class_loader/map_class_loader.rst
+    class_loader/psr4_class_loader.rst
+
+.. toctree::
+    :hidden:
+
+    class_loader/cache_class_loader
 
 .. _PSR-0: http://www.php-fig.org/psr/psr-0/
 .. _PSR-4: http://www.php-fig.org/psr/psr-4/