Merge branch '3.4' into 4.0

* 3.4:
  Minor rewords
  Fix broken link to `vue-loader` documentation.
  Simplify Apache config with FallbackResource
  Made the code of a validation example more robust
  Tell about controllers in doc about service subscribers

Author: javiereguiluz

frontend/encore/vuejs.rst

@@ -27,7 +27,7 @@ also configure the `vue-loader options`_ via a callback:
 .. code-block:: javascript
 
     .enableVueLoader(function(options) {
-        // https://vue-loader.vuejs.org/en/configurations/advanced.html
+        // https://vue-loader.vuejs.org/options.html
 
         options.preLoaders = {
             js: '/path/to/custom/loader'
@@ -53,4 +53,4 @@ See :doc:`/frontend/encore/dev-server` for more details.
 
 .. _`babel-preset-react`: https://babeljs.io/docs/plugins/preset-react/
 .. _`Vue.js`: https://vuejs.org/
-.. _`vue-loader options`: https://vue-loader.vuejs.org/en/configurations/advanced.html
+.. _`vue-loader options`: https://vue-loader.vuejs.org/options.html

service_container/service_subscribers_locators.rst

@@ -13,7 +13,9 @@ instantiation of the services to be lazy. However, that's not possible using
 the explicit dependency injection since services are not all meant to
 be ``lazy`` (see :doc:`/service_container/lazy_services`).
 
-A real-world example are applications that implement the `Command pattern`_
+This can typically be the case in your controllers, where you may inject several
+services in the constructor, but the action executed only uses some of them.
+Another example are applications that implement the `Command pattern`_
 using a CommandBus to map command handlers by Command class names and use them
 to handle their respective command when it is asked for::
 
@@ -50,35 +52,12 @@ to handle their respective command when it is asked for::
 
 Considering that only one command is handled at a time, instantiating all the
 other command handlers is unnecessary. A possible solution to lazy-load the
-handlers could be to inject the whole dependency injection container::
-
-    // ...
-    use Symfony\Component\DependencyInjection\ContainerInterface;
-
-    class CommandBus
-    {
-        private $container;
-
-        public function __construct(ContainerInterface $container)
-        {
-            $this->container = $container;
-        }
-
-        public function handle(Command $command)
-        {
-            $commandClass = get_class($command);
-
-            if ($this->container->has($commandClass)) {
-                $handler = $this->container->get($commandClass);
-
-                return $handler->handle($command);
-            }
-        }
-    }
+handlers could be to inject the main dependency injection container.
 
 However, injecting the entire container is discouraged because it gives too
 broad access to existing services and it hides the actual dependencies of the
-services.
+services. Doing so also requires services to be made public, which isn't the
+case by default in Symfony applications.
 
 **Service Subscribers** are intended to solve this problem by giving access to a
 set of predefined services while instantiating them only when actually needed
@@ -139,8 +118,7 @@ The injected service is an instance of :class:`Symfony\\Component\\DependencyInj
 which implements the PSR-11 ``ContainerInterface``, but it is also a callable::
 
     // ...
-    $locateHandler = $this->locator;
-    $handler = $locateHandler($commandClass);
+    $handler = ($this->locator)($commandClass);
 
     return $handler->handle($command);
 
@@ -173,6 +151,24 @@ Service types can also be keyed by a service name for internal use::
         ];
     }
 
+When extending a class that also implements ``ServiceSubscriberInterface``,
+it's your responsibility to call the parent when overriding the method. This
+typically happens when extending ``AbstractController``::
+
+    use Psr\Log\LoggerInterface;
+    use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+    class MyController extends AbstractController
+    {
+        public static function getSubscribedServices()
+        {
+            return array_merge(parent::getSubscribedServices(), [
+                // ...
+                'logger' => LoggerInterface::class,
+            ]);
+        }
+    }
+
 Optional Services
 ~~~~~~~~~~~~~~~~~
 

setup/web_server_configuration.rst

@@ -97,12 +97,7 @@ and increase web server performance:
             Order Allow,Deny
             Allow from All
 
-            <IfModule mod_rewrite.c>
-                Options -MultiViews
-                RewriteEngine On
-                RewriteCond %{REQUEST_FILENAME} !-f
-                RewriteRule ^(.*)$ index.php [QSA,L]
-            </IfModule>
+            FallbackResource /index.php
         </Directory>
 
         # uncomment the following lines if you install assets as symlinks
@@ -111,13 +106,11 @@ and increase web server performance:
         #     Options FollowSymlinks
         # </Directory>
 
-        # optionally disable the RewriteEngine for the asset directories
-        # which will allow apache to simply reply with a 404 when files are
-        # not found instead of passing the request into the full symfony stack
+        # optionally disable the fallback resource for the asset directories
+        # which will allow Apache to return a 404 error when files are
+        # not found instead of passing the request to Symfony
         <Directory /var/www/project/public/bundles>
-            <IfModule mod_rewrite.c>
-                RewriteEngine Off
-            </IfModule>
+            FallbackResource disabled
         </Directory>
         ErrorLog /var/log/apache2/project_error.log
         CustomLog /var/log/apache2/project_access.log combined

validation/custom_constraint.rst

@@ -59,11 +59,22 @@ The validator class is also simple, and only has one required method ``validate(
 
     use Symfony\Component\Validator\Constraint;
     use Symfony\Component\Validator\ConstraintValidator;
+    use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
     class ContainsAlphanumericValidator extends ConstraintValidator
     {
         public function validate($value, Constraint $constraint)
         {
+            // custom constraints should ignore null and empty values to allow
+            // other constraints (NotBlank, NotNull, etc.) take care of that
+            if (null === $value || '' === $value) {
+                return;
+            }
+
+            if (!is_string($value)) {
+                throw new UnexpectedTypeException($value, 'string');
+            }
+
             if (!preg_match('/^[a-zA-Z0-9]+$/', $value, $matches)) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ string }}', $value)