Merge branch '4.0'

* 4.0:
  Corrected Bootstrap 4 custom forms example code
  Added a triling slash
  Fix "payload" usage
  Update custom_authentication_provider.rst
  Add a note about correct cfg value server_version for MariaDB
  Fixes year in license
  Update property_info.rst
  Fixed a minor RST syntax issue
  Use CacheItemPoolInterface
  Fixed the location of the web_profiler config file
  Add the true default location
  fix entry manager variable name
  fix YAML code block indentation

Author: javiereguiluz

best_practices/business-logic.rst

@@ -38,7 +38,7 @@ Services: Naming and Configuration
 by Symfony's Service Container to manage services with minimal configuration. It
 reads the type-hints on your constructor (or other methods) and automatically
 passes the correct services to each method. It can also add
-:doc:`service tags </service_container/tags>` to the services needed them, such
+:doc:`service tags </service_container/tags>` to the services needing them, such
 as Twig extensions, event subscribers, etc.
 
 The blog application needs a utility that can transform a post title (e.g.

components/expression_language/extending.rst

@@ -120,12 +120,12 @@ or by using the second argument of the constructor::
     It is recommended to create your own ``ExpressionLanguage`` class in your
     library. Now you can add the extension by overriding the constructor::
 
+        use Psr\Cache\CacheItemPoolInterface;
         use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
-        use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface;
 
         class ExpressionLanguage extends BaseExpressionLanguage
         {
-            public function __construct(ParserCacheInterface $parser = null, array $providers = array())
+            public function __construct(CacheItemPoolInterface $parser = null, array $providers = array())
             {
                 // prepends the default provider to let users override it easily
                 array_unshift($providers, new StringExpressionLanguageProvider());

components/ldap.rst

@@ -118,24 +118,24 @@ delete existing ones::
         'objectClass' => array('inetOrgPerson'),
     ));
 
-    $entityManager = $ldap->getEntryManager();
+    $entryManager = $ldap->getEntryManager();
 
     // Creating a new entry
-    $entityManager->add($entry);
+    $entryManager->add($entry);
 
     // Finding and updating an existing entry
     $query = $ldap->query('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
     $result = $query->execute();
     $entry = $result[0];
     $entry->setAttribute('email', array('fabpot@symfony.com'));
     $entityManager->update($entry);
-    
+
     // Adding or removing values to a multi-valued attribute is more efficient than using update()
     $entityManager->addAttributeValues($entry, 'telephoneNumber', array('+1.111.222.3333', '+1.222.333.4444'));
     $entityManager->removeAttributeValues($entry, 'telephoneNumber', array('+1.111.222.3333', '+1.222.333.4444'));
 
     // Removing an existing entry
-    $entityManager->remove(new Entry('cn=Test User,dc=symfony,dc=com'));
+    $entryManager->remove(new Entry('cn=Test User,dc=symfony,dc=com'));
 
 .. versionadded:: 4.1
     The ``addAttributeValues()`` and ``removeAttributeValues()`` methods

components/property_info.rst

@@ -284,9 +284,9 @@ Type::getBuiltInType()
 ~~~~~~~~~~~~~~~~~~~~~~
 
 The :method:`Type::getBuiltinType() <Symfony\\Component\\PropertyInfo\\Type::getBuiltinType>`
-method will return the built-in PHP data type, which can be one of 9 possible
-string values: ``array``, ``bool``, ``callable``, ``float``, ``int``, ``null``,
-``object``, ``resource`` or ``string``.
+method returns the built-in PHP data type, which can be one of these
+string values: ``array``, ``bool``, ``callable``, ``float``, ``int``,
+``iterable``, ``null``, ``object``, ``resource`` or ``string``.
 
 Constants inside the :class:`Symfony\\Component\\PropertyInfo\\Type`
 class, in the form ``Type::BUILTIN_TYPE_*``, are provided for convenience.

contributing/code/core_team.rst

@@ -124,8 +124,8 @@ Former Core Members
 They are no longer part of the Core Team, but we are very grateful for all their
 Symfony contributions:
 
-  * **Bernhard Schussek** (`webmozart`_);
-  * **Abdellatif AitBoudad** (`aitboudad`_).
+* **Bernhard Schussek** (`webmozart`_);
+* **Abdellatif AitBoudad** (`aitboudad`_).
 
 Core Membership Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~

contributing/code/license.rst

@@ -16,7 +16,7 @@ According to `Wikipedia`_:
 The License
 -----------
 
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-2018 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

email/dev_environment.rst

@@ -207,13 +207,13 @@ the report with details of the sent emails.
 
     .. code-block:: yaml
 
-        # config/packages/dev/swiftmailer.yaml
+        # config/packages/dev/web_profiler.yaml
         web_profiler:
             intercept_redirects: true
 
     .. code-block:: xml
 
-        <!-- config/packages/dev/swiftmailer.xml -->
+        <!-- config/packages/dev/web_profiler.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -230,7 +230,7 @@ the report with details of the sent emails.
 
     .. code-block:: php
 
-        // config/packages/dev/swiftmailer.php
+        // config/packages/dev/web_profiler.php
         $container->loadFromExtension('web_profiler', array(
             'intercept_redirects' => 'true',
         ));

form/bootstrap4.rst

@@ -97,8 +97,8 @@ and ``checkbox-custom`` respectively.
 
 .. code-block:: html+twig
 
-    {{ form_row(form.myRadio, {attr: {class: 'radio-custom'} }) }}
-    {{ form_row(form.myCheckbox, {attr: {class: 'checkbox-custom'} }) }}
+    {{ form_row(form.myRadio, {label_attr: {class: 'radio-custom'} }) }}
+    {{ form_row(form.myCheckbox, {label_attr: {class: 'checkbox-custom'} }) }}
 
 Labels and Errors
 -----------------

reference/configuration/doctrine.rst

@@ -372,7 +372,10 @@ The following block shows all possible configuration keys:
     to find your PostgreSQL version and ``mysql -V`` to get your MySQL
     version).
 
-    Always wrap the server version number with quotes to parse it as a string
+    If you are running a MariaDB database, you must prefix the ``server_version``
+    value with ``mariadb-`` (e.g. ``server_version: mariadb-10.2.12``).
+
+    Always wrap the server version number with quotes to parse it as a string
     instead of a float number. Otherwise, the floating-point representation
     issues can make your version be considered a different number (e.g. ``5.6``
     will be rounded as ``5.5999999999999996447286321199499070644378662109375``).

security/custom_authentication_provider.rst

@@ -131,17 +131,17 @@ set an authenticated token in the token storage if successful::
         {
             $request = $event->getRequest();
 
-            $wsseRegex = '/UsernameToken Username="([^"]+)", PasswordDigest="([^"]+)", Nonce="([a-zA-Z0-9+\/]+={0,2})", Created="([^"]+)"/';
+            $wsseRegex = '/UsernameToken Username="(?P<username>[^"]+)", PasswordDigest="(?P<digest>[^"]+)", Nonce="(?P<nonce>[a-zA-Z0-9+\/]+={0,2})", Created="(?P<created>[^"]+)"/';
             if (!$request->headers->has('x-wsse') || 1 !== preg_match($wsseRegex, $request->headers->get('x-wsse'), $matches)) {
                 return;
             }
 
             $token = new WsseUserToken();
-            $token->setUser($matches[1]);
+            $token->setUser($matches['username']);
 
-            $token->digest  = $matches[2];
-            $token->nonce   = $matches[3];
-            $token->created = $matches[4];
+            $token->digest  = $matches['digest'];
+            $token->nonce   = $matches['nonce'];
+            $token->created = $matches['created'];
 
             try {
                 $authToken = $this->authenticationManager->authenticate($token);