Merge branch '3.3' into 3.4

xabbuh · xabbuh · commit 556be4da5a09 · 2017-08-29T09:38:26.000+02:00
* 3.3: (31 commits) Update resources.rst Update events.rst Improved a help note about authentication providers [#8280] add missing trailing comma [#8282] fix regex delimiters Add missing comment Update parameters.rst validateValue() is deprecated in 3.0 prefer getObject as getEntity is deprecated Fix non-existing Ldap::find() method Fix encore versioning config for SF 4 structure Update serializer.rst [#8308] fix commands order Update NotIdenticalTo.rst Correct psr/log package name Fixed typo Update debugging.rst Update group_service_resolver.rst Update remember_me.rst Update expression_language.rst ...
diff --git a/components/console/logger.rst b/components/console/logger.rst
@@ -9,7 +9,7 @@ The Console component comes with a standalone logger complying with the
 be sent to the :class:`Symfony\\Component\\Console\\Output\\OutputInterface`
 instance passed as a parameter to the constructor.
 
-The logger does not have any external dependency except ``php-fig/log``.
+The logger does not have any external dependency except ``psr/log``.
 This is useful for console applications and commands needing a lightweight
 PSR-3 compliant logger::
 
diff --git a/components/ldap.rst b/components/ldap.rst
@@ -37,15 +37,11 @@ using the following options:
 ``version``
     The version of the LDAP protocol to use
 
-``useSsl``
-    Whether or not to secure the connection using SSL
+``encryption``
+    The encryption protocol : ``ssl``, ``tls`` or ``none`` (default)
 
-``useStartTls``
-    Whether or not to secure the connection using StartTLS
-
-``optReferrals``
-    Specifies whether to automatically follow referrals
-    returned by the LDAP server
+``options``
+    LDAP server's options as defined in :class:`ConnectionOptions <Symfony\\Component\\Ldap\\Adapter\\ExtLdap\\ConnectionOptions>`
 
 For example, to connect to a start-TLS secured LDAP server::
 
@@ -73,10 +69,10 @@ distinguished name (DN) and the password of a user::
 
 Once bound (or if you enabled anonymous authentication on your
 LDAP server), you may query the LDAP server using the
-:method:`Symfony\\Component\\Ldap\\Ldap::find` method::
+:method:`Symfony\\Component\\Ldap\\Ldap::query` method::
 
     // ...
 
-    $ldap->find('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
+    $ldap->query('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
 
 .. _Packagist: https://packagist.org/packages/symfony/ldap
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -405,7 +405,7 @@ class extending :class:`Symfony\\Component\\Serializer\\Normalizer\\AbstractNorm
 including :class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`
 and :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`::
 
-    use Symfony\Component\Serializer\Encoder\JsonEncoder
+    use Symfony\Component\Serializer\Encoder\JsonEncoder;
     use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
     use Symfony\Component\Serializer\Serializer;
 
diff --git a/components/validator/resources.rst b/components/validator/resources.rst
@@ -173,14 +173,14 @@ Using a Custom MetadataFactory
 ------------------------------
 
 All the loaders and the cache are passed to an instance of
-:class:`Symfony\\Component\\Validator\\Mapping\\ClassMetadataFactory`. This
-class is responsible for creating a ``ClassMetadata`` instance from all the
+:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\LazyLoadingMetadataFactory`. 
+This class is responsible for creating a ``ClassMetadata`` instance from all the
 configured resources.
 
 You can also use a custom metadata factory implementation by creating a class
 which implements
-:class:`Symfony\\Component\\Validator\\MetadataFactoryInterface`. You can set
-this custom implementation using
+:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\MetadataFactoryInterface`. 
+You can set this custom implementation using
 :method:`Symfony\\Component\\Validator\\ValidatorBuilder::setMetadataFactory`::
 
     use Acme\Validation\CustomMetadataFactory;
diff --git a/components/var_dumper.rst b/components/var_dumper.rst
@@ -101,7 +101,7 @@ Choosing between both is mostly a matter of personal taste, still:
   be suited to your use case (e.g. you shouldn't use it in an HTML
   attribute or a ``<script>`` tag).
 
-This behavior can be changed by configuring the ``dump.dump_destination``
+This behavior can be changed by configuring the ``debug.dump_destination``
 option. Read more about this and other options in
 :doc:`the DebugBundle configuration reference </reference/configuration/debug>`.
 
diff --git a/debug/debugging.rst b/debug/debugging.rst
@@ -75,6 +75,9 @@ that can help you visualize and find the information.
 ``debug:config``
     Shows all configured bundles, their class and their alias.
 
+``debug:event-dispatcher``
+    Displays information about all the registered listeners in the event dispatcher.
+
 ``debug:router``
     Displays information about all configured routes in the application as a
     table with the name, method, scheme, host and path for each route.
diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst
@@ -165,7 +165,7 @@ interface and have an event method for each event it subscribes to::
 
         public function index(LifecycleEventArgs $args)
         {
-            $entity = $args->getEntity();
+            $entity = $args->getObject();
 
             // perhaps you only want to act on some "Product" entity
             if ($entity instanceof Product) {
diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst
@@ -412,7 +412,6 @@ sport like this::
                         'class' => 'AppBundle:Position',
                         'placeholder' => '',
                         'choices' => $positions,
-                        'choices_as_values' => true,
                     ));
                 }
             );
@@ -469,7 +468,6 @@ The type would now look like::
                     'class' => 'AppBundle:Position',
                     'placeholder' => '',
                     'choices' => $positions,
-                    'choices_as_values' => true,
                 ));
             };
 
diff --git a/form/events.rst b/form/events.rst
@@ -84,8 +84,8 @@ View data        ``null``
 
 .. sidebar:: ``FormEvents::PRE_SET_DATA`` in the Form component
 
-    The ``collection`` form type relies on the
-    ``Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener``
+    The ``Symfony\Component\Form\Extension\Core\Type\CollectionType`` form type relies
+    on the ``Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener``
     subscriber, listening to the ``FormEvents::PRE_SET_DATA`` event in order
     to reorder the form's fields depending on the data from the pre-populated
     object, by removing and adding all form rows.
diff --git a/form/form_collections.rst b/form/form_collections.rst
@@ -130,7 +130,8 @@ Notice that you embed a collection of ``TagType`` forms using the
             $builder->add('description');
 
             $builder->add('tags', CollectionType::class, array(
-                'entry_type' => TagType::class
+                'entry_type' => TagType::class,
+                'entry_options' => array('label' => false),
             ));
         }
 
@@ -285,8 +286,9 @@ add the ``allow_add`` option to your collection field::
         $builder->add('description');
 
         $builder->add('tags', CollectionType::class, array(
-            'entry_type'   => TagType::class,
-            'allow_add'    => true,
+            'entry_type' => TagType::class,
+            'entry_options' => array('label' => false),
+            'allow_add' => true,
         ));
     }
 
@@ -392,9 +394,15 @@ one example:
         // get the new index
         var index = $collectionHolder.data('index');
 
+        var newForm = prototype;
+        // You need this only if you didn't set 'label' => false in your tags field in TaskType
+        // Replace '__name__label__' in the prototype's HTML to
+        // instead be a number based on how many items we have
+        // newForm = newForm.replace(/__name__label__/g, index);
+        
         // Replace '__name__' in the prototype's HTML to
         // instead be a number based on how many items we have
-        var newForm = prototype.replace(/__name__/g, index);
+        newForm = newForm.replace(/__name__/g, index);
 
         // increase the index with one for the next item
         $collectionHolder.data('index', index + 1);
diff --git a/forms.rst b/forms.rst
@@ -639,6 +639,7 @@ the choice is ultimately up to you.
     good idea to explicitly specify the ``data_class`` option by adding the
     following to your form type class::
 
+        // src/AppBundle/Form/TaskType.php
         use AppBundle\Entity\Task;
         use Symfony\Component\OptionsResolver\OptionsResolver;
 
diff --git a/frontend/encore/babel.rst b/frontend/encore/babel.rst
@@ -23,7 +23,7 @@ Need to extend the Babel configuration further? The easiest way is via
             babelConfig.presets.push('es2017');
 
             // no plugins are added by default, but you can add some
-            // babelConfig.plugins = ['styled-jsx/babel'];
+            // babelConfig.plugins.push('styled-jsx/babel');
         })
     ;
 
diff --git a/frontend/encore/css-preprocessors.rst b/frontend/encore/css-preprocessors.rst
@@ -59,4 +59,19 @@ And enable it in ``webpack.config.js``:
         .enableLessLoader()
     ;
 
-That's it! All files ending in ``.less`` will be pre-processed.
+That's it! All files ending in ``.less`` will be pre-processed. You can also pass
+options to ``less-loader``:
+
+.. code-block:: javascript
+
+    // webpack.config.js
+    // ...
+
+    Encore
+        // ...
+        .enableLessLoader(function(options) {
+            // https://github.com/webpack-contrib/less-loader#examples
+            // http://lesscss.org/usage/#command-line-usage-options
+            // options.relativeUrls = false;
+        });
+    ;
diff --git a/frontend/encore/dev-server.rst b/frontend/encore/dev-server.rst
@@ -24,6 +24,19 @@ by the normal `webpack-dev-server`_. For example:
 
 This will start a server at ``https://localhost:9000``.
 
+Using dev-server inside a VM
+----------------------------
+
+If you're using ``dev-server`` from inside a virtual machine, then you'll need
+to bind to all IP addresses and allow any host to access the server:
+
+.. code-block:: terminal
+
+    $ ./node_modules/.bin/encore dev-server --host 0.0.0.0 --disable-host-check
+
+You can now access the dev-server using the IP address to your virtual machine on
+port 8080 - e.g. http://192.168.1.1:8080.
+
 Hot Module Replacement HMR
 --------------------------
 
diff --git a/frontend/encore/postcss.rst b/frontend/encore/postcss.rst
@@ -36,6 +36,20 @@ Then, Enable the loader in Encore!
     ;
 
 That's it! The ``postcss-loader`` will now be used for all CSS, Sass, etc files.
+You can also pass options to the `postcss-loader`_ by passing a callback:
+
+.. code-block:: diff
+
+    // webpack.config.js
+
+    Encore
+        // ...
+    +     .enablePostCssLoader((options) => {
+    +         options.config = {
+    +             path: 'app/config/postcss.config.js'
+    +         };
+    +     })
+    ;
 
 Adding browserslist to package.json
 -----------------------------------
@@ -62,4 +76,5 @@ See `browserslist`_ for more details on the syntax.
 .. _`autoprefixing`: https://github.com/postcss/autoprefixer
 .. _`linting`: https://stylelint.io/
 .. _`browserslist`: https://github.com/ai/browserslist
-.. _`babel-preset-env`: https://github.com/babel/babel-preset-env
+.. _`babel-preset-env`: https://github.com/babel/babel-preset-env
+.. _`postcss-loader`: https://github.com/postcss/postcss-loader
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -70,6 +70,11 @@ To build the assets, use the ``encore`` executable:
     # compile assets, but also minify & optimize them
     $ ./node_modules/.bin/encore production
 
+    # shorter version of the above 3 commands
+    $ yarn run encore dev
+    $ yarn run encore dev -- --watch
+    $ yarn run encore production
+
 .. note::
 
     Re-run ``encore`` each time you update your ``webpack.config.js`` file.
diff --git a/frontend/encore/typescript.rst b/frontend/encore/typescript.rst
@@ -34,13 +34,33 @@ also configure the `ts-loader options`_ via a callback:
 If React assets are enabled (``.enableReactPreset()``), any ``.tsx`` file will be
 processed as well by ``ts-loader``.
 
-Loader usage can be checked better in its `README`_ documentation.
+More information about the ``ts-loader`` can be found in its `README`_.
 
-    "Use webpack like normal, including ``webpack --watch`` and ``webpack-dev-server``,
-    or through another build system using the Node.js API."
+Faster Builds with fork-ts-checker-webpack-plugin
+-------------------------------------------------
 
-    -- Running section of ts-loader documentation
+By using `fork-ts-checker-webpack-plugin`_, you can run type checking in a separate
+process, which can speedup compile time. To enable it, install the plugin:
+
+.. code-block:: terminal
+
+    $ yarn add --dev fork-ts-checker-webpack-plugin
+
+Then enable it by calling:
+
+.. code-block:: diff
+
+    // webpack.config.js
+
+    Encore
+        // ...
+        enableForkedTypeScriptTypesChecking()
+    ;
+
+This plugin requires that you have a `tsconfig.json`_ file that is setup correctly.
 
 .. _`TypeScript`: https://www.typescriptlang.org/
 .. _`ts-loader options`: https://github.com/TypeStrong/ts-loader#options
 .. _`README`: https://github.com/TypeStrong/ts-loader#typescript-loader-for-webpack
+.. _`fork-ts-checker-webpack-plugin`: https://www.npmjs.com/package/fork-ts-checker-webpack-plugin
+.. _`tsconfig.json`: https://www.npmjs.com/package/fork-ts-checker-webpack-plugin#modules-resolution
diff --git a/frontend/encore/versioning.rst b/frontend/encore/versioning.rst
@@ -16,7 +16,7 @@ ignoring any existing cache:
     // ...
 
     Encore
-        .setOutputPath('web/build/')
+        .setOutputPath('public/build/')
         // ...
     +     .enableVersioning()
 
@@ -49,7 +49,7 @@ in your ``script`` and ``link`` tags. If you're using Symfony, just activate the
         # ...
         assets:
             # feature is supported in Symfony 3.3 and higher
-            json_manifest_path: '%kernel.project_dir%/web/build/manifest.json'
+            json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
 
 That's it! Just be sure to wrap each path in the Twig ``asset()`` function
 like normal:
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -24,7 +24,7 @@ Full Default Configuration
                         commented:            true
                 # If defined, all the tables whose names match this regular expression are ignored
                 # by the schema tool (in this example, any table name starting with `wp_`)
-                #schema_filter:               "/^wp_/"
+                #schema_filter:               '/^(?!wp_)/'
 
                 connections:
                     # A collection of different named connections (e.g. default, conn2, etc)
@@ -299,9 +299,10 @@ certain classes, but those are for very advanced use-cases only.
 Caching Drivers
 ~~~~~~~~~~~~~~~
 
-For the caching drivers you can specify the values ``array``, ``apc``, ``apcu``,
-``memcache``, ``memcached``, ``redis``, ``wincache``, ``zenddata``, ``xcache``
-or ``service``.
+The built-in types of caching drivers are: ``array``, ``apc``, ``apcu``,
+``memcache``, ``memcached``, ``redis``, ``wincache``, ``zenddata`` and ``xcache``.
+There is a special type called ``service`` which lets you define the ID of your
+own caching service.
 
 The following example shows an overview of the caching configurations:
 
@@ -310,15 +311,17 @@ The following example shows an overview of the caching configurations:
     doctrine:
         orm:
             auto_mapping: true
+            # each caching driver type defines its own config options
             metadata_cache_driver: apc
-            query_cache_driver:
-                type: service
-                id: my_doctrine_common_cache_service
             result_cache_driver:
                 type: memcache
                 host: localhost
                 port: 11211
                 instance_class: Memcache
+            # the 'service' type requires to define the 'id' option too
+            query_cache_driver:
+                type: service
+                id: my_doctrine_common_cache_service
 
 Mapping Configuration
 ~~~~~~~~~~~~~~~~~~~~~
diff --git a/reference/constraints/NotIdenticalTo.rst b/reference/constraints/NotIdenticalTo.rst
@@ -118,6 +118,6 @@ message
 
 **type**: ``string`` **default**: ``This value should not be identical to {{ compared_value_type }} {{ compared_value }}.``
 
-This is the message that will be shown if the value is not equal.
+This is the message that will be shown if the value is identical.
 
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/routing/scheme.rst b/routing/scheme.rst
@@ -10,6 +10,25 @@ the URI scheme via schemes:
 
 .. configuration-block::
 
+    .. code-block:: php-annotations
+
+        // src/AppBundle/Controller/MainController.php
+        namespace AppBundle\Controller;
+
+        use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+
+        class MainController extends Controller
+        {
+            /**
+             * @Route("/secure", name="secure", schemes={"https"})
+             */
+            public function secureAction()
+            {
+                // ...
+            }
+        }
+
     .. code-block:: yaml
 
         # app/config/routing.yml
diff --git a/security/api_key_authentication.rst b/security/api_key_authentication.rst
diff --git a/security/ldap.rst b/security/ldap.rst
diff --git a/security/remember_me.rst b/security/remember_me.rst
diff --git a/service_container.rst b/service_container.rst
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
diff --git a/service_container/expression_language.rst b/service_container/expression_language.rst
diff --git a/service_container/parameters.rst b/service_container/parameters.rst
diff --git a/validation/group_service_resolver.rst b/validation/group_service_resolver.rst
diff --git a/validation/raw_values.rst b/validation/raw_values.rst
diff --git a/workflow/usage.rst b/workflow/usage.rst

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ interface and have an event method for each event it subscribes to::`
`165`	`165`
`166`	`166`	`public function index(LifecycleEventArgs $args)`
`167`	`167`	`{`
`168`		`- $entity = $args->getEntity();`
	`168`	`+ $entity = $args->getObject();`
`169`	`169`
`170`	`170`	`// perhaps you only want to act on some "Product" entity`
`171`	`171`	`if ($entity instanceof Product) {`