Merge remote-tracking branch 'upstream/3.3' into 3.3

javiereguiluz · javiereguiluz · commit 9437ff7095a1 · 2017-11-13T20:50:07.000+01:00
diff --git a/_build/redirection_map b/_build/redirection_map
@@ -290,6 +290,7 @@
 /components/config/introduction /components/config
 /components/config/index /components/config
 /components/console/helpers/tablehelper /components/console/helpers/table
+/components/console/helpers/progresshelper /components/console/helpers/progressbar
 /components/console/introduction /components/console
 /components/console/index /components/console
 /components/debug/class_loader /components/debug
diff --git a/best_practices/templates.rst b/best_practices/templates.rst
@@ -53,6 +53,15 @@ scattered through lots of bundles.
 
     Use lowercased snake_case for directory and template names.
 
+.. best-practice::
+
+    Use a prefixed underscore for partial templates in template names.
+
+You often want to reuse template code using the ``include`` function to avoid
+redundant code. To determine those partials easily in the filesystem you should
+prefix partials and any other template without HTML body or ``extends`` tag
+with a single underscore.
+
 Twig Extensions
 ---------------
 
diff --git a/bundles.rst b/bundles.rst
@@ -181,4 +181,4 @@ Learn more
 
     bundles/*
 
-_`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
+.. _`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
diff --git a/components/asset.rst b/components/asset.rst
@@ -63,8 +63,13 @@ any versioning::
 
     $package = new Package(new EmptyVersionStrategy());
 
+    // Absolute path
     echo $package->getUrl('/image.png');
     // result: /image.png
+    
+    // Relative path
+    echo $package->getUrl('image.png');
+    // result: image.png
 
 Packages implement :class:`Symfony\\Component\\Asset\\PackageInterface`,
 which defines the following two methods:
@@ -105,8 +110,13 @@ suffix to any asset path::
 
     $package = new Package(new StaticVersionStrategy('v1'));
 
+    // Absolute path
     echo $package->getUrl('/image.png');
     // result: /image.png?v1
+    
+    // Relative path
+    echo $package->getUrl('image.png');
+    // result: image.png?v1
 
 In case you want to modify the version format, pass a sprintf-compatible format
 string as the second argument of the ``StaticVersionStrategy`` constructor::
@@ -122,6 +132,9 @@ string as the second argument of the ``StaticVersionStrategy`` constructor::
 
     echo $package->getUrl('/image.png');
     // result: /v1/image.png
+    
+    echo $package->getUrl('image.png');
+    // result: v1/image.png
 
 Custom Version Strategies
 .........................
@@ -168,8 +181,12 @@ that path over and over again::
 
     $package = new PathPackage('/static/images', new StaticVersionStrategy('v1'));
 
-    echo $package->getUrl('/logo.png');
+    echo $package->getUrl('logo.png');
     // result: /static/images/logo.png?v1
+    
+    // Base path is ignored when using absolute paths
+    echo $package->getUrl('/logo.png');
+    // result: /logo.png?v1
 
 Request Context Aware Assets
 ............................
diff --git a/components/browser_kit.rst b/components/browser_kit.rst
@@ -233,4 +233,4 @@ Learn more
 * :doc:`/components/dom_crawler`
 
 .. _`Packagist`: https://packagist.org/packages/symfony/browser-kit
-.. _`Goutte`: https://github.com/fabpot/Goutte
+.. _`Goutte`: https://github.com/FriendsOfPHP/Goutte
diff --git a/components/console/helpers/index.rst b/components/console/helpers/index.rst
@@ -11,7 +11,6 @@ The Console Helpers
     formatterhelper
     processhelper
     progressbar
-    progresshelper
     questionhelper
     table
     debug_formatter
diff --git a/components/console/helpers/progresshelper.rst b/components/console/helpers/progresshelper.rst
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -21,9 +21,8 @@ the middle. This way, Encoders will only deal with turning specific
 **formats** into **arrays** and vice versa. The same way, Normalizers
 will deal with turning specific **objects** into **arrays** and vice versa.
 
-Serialization is a complicated topic, and while this component may not work
-in all cases, it can be a useful tool while developing tools to serialize
-and deserialize your objects.
+Serialization is a complex topic. This component may not cover all your use cases out of the box, 
+but it can be useful for developing tools to serialize and deserialize your objects.
 
 Installation
 ------------
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
@@ -190,9 +190,10 @@ Naming Conventions
 
 * Use namespaces for all classes;
 
-* Prefix abstract classes with ``Abstract``. Please note some early Symfony classes
-  do not follow this convention and have not been renamed for backward compatibility
-  reasons. However all new abstract classes must follow this naming convention;
+* Prefix all abstract classes with ``Abstract`` except PHPUnit ``*TestCase``.
+  Please note some early Symfony classes do not follow this convention and
+  have not been renamed for backward compatibility reasons. However all new
+  abstract classes must follow this naming convention;
 
 * Suffix interfaces with ``Interface``;
 
diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst
@@ -2,9 +2,10 @@
    single: Doctrine; Event listeners and subscribers
 
 .. _doctrine-event-config:
+.. _how-to-register-event-listeners-and-subscribers:
 
-How to Register Event Listeners and Subscribers
-===============================================
+Doctrine Event Listeners and Subscribers
+========================================
 
 Doctrine packages have a rich event system that fires events when almost anything
 happens inside the system. For you, this means that you can create arbitrary
@@ -188,15 +189,15 @@ For a full reference, see chapter `The Event System`_ in the Doctrine documentat
 Lazy loading for Event Listeners
 --------------------------------
 
-One subtle difference between listeners and subscribers is that Symfony can load 
+One subtle difference between listeners and subscribers is that Symfony can load
 entity listeners lazily. This means that your listener class will only be fetched
 from the service container (and thus be instantiated) once the event it is linked
 to actually fires.
 
-Lazy loading might give you a slight performance improvement when your listener 
-runs for events that rarely fire. Also, it can help you when you run into 
+Lazy loading might give you a slight performance improvement when your listener
+runs for events that rarely fire. Also, it can help you when you run into
 *circular dependency issues* that may occur when your listener service in turn
-depends on the DBAL connection. 
+depends on the DBAL connection.
 
 To mark a listener service as lazily loaded, just add the ``lazy`` attribute
 to the tag like so:
diff --git a/event_dispatcher.rst b/event_dispatcher.rst
@@ -9,10 +9,10 @@ During the execution of a Symfony application, lots of event notifications are
 triggered. Your application can listen to these notifications and respond to
 them by executing any piece of code.
 
-Internal events provided by Symfony itself are defined in the
-:class:`Symfony\\Component\\HttpKernel\\KernelEvents` class. Third-party bundles
-and libraries also trigger lots of events and your own application can trigger
-:doc:`custom events </components/event_dispatcher>`.
+Symfony triggers several :doc:`events related to the kernel </reference/events>`
+while processing the HTTP Request. Third-party bundles may also dispatch events, and
+you can even dispatch :doc:`custom events </components/event_dispatcher>` from your
+own code.
 
 All the examples shown in this article use the same ``KernelEvents::EXCEPTION``
 event for consistency purposes. In your own application, you can use any event
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -22,9 +22,7 @@ Full Default Configuration
                     some_custom_type:
                         class:                Acme\HelloBundle\MyCustomType
                         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_)/'
+                
 
                 connections:
                     # A collection of different named connections (e.g. default, conn2, etc)
@@ -77,6 +75,11 @@ Full Default Configuration
                         mapping_types:
                             # an array of mapping types
                             name:                 []
+                            
+                        # If defined, only the tables whose names match this regular expression are managed
+                        # by the schema tool (in this example, any table name not starting with `wp_`)
+                        #schema_filter:               '/^(?!wp_)/'
+                        
                         slaves:
 
                             # a collection of named slave connections (e.g. slave1, slave2)
diff --git a/security/acl_advanced.rst b/security/acl_advanced.rst
@@ -174,7 +174,7 @@ After invocation providers also allow to modify, or filter the domain object
 before it is returned.
 
 Due to current limitations of the PHP language, there are no
-post-authorization capabilities build into the core Security component.
+post-authorization capabilities built into the core Security component.
 However, there is an experimental JMSSecurityExtraBundle_ which adds these
 capabilities. See its documentation for further information on how this is
 accomplished.
diff --git a/security/form_login.rst b/security/form_login.rst
@@ -34,7 +34,7 @@ several ways.
 Changing the default Page
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Define the ``default_security_target`` option to change the page where the user
+Define the ``default_target_path`` option to change the page where the user
 is redirected to if no previous page was stored in the session. The value can be
 a relative/absolute URL or a Symfony route name:
 
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -488,7 +488,7 @@ and add the following logic::
 
     use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
     use Symfony\Component\Security\Csrf\CsrfToken;
-    use Symfony\Component\Security\Core\Exception\InvalidCsrfTokenExceptionl
+    use Symfony\Component\Security\Core\Exception\InvalidCsrfTokenException;
 
     class ExampleFormAuthenticator extends AbstractFormLoginAuthenticator
     {
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
@@ -4,11 +4,11 @@
 Defining Services Dependencies Automatically (Autowiring)
 =========================================================
 
-Autowiring allows you to manage services in the container with minimal configuration.
-It reads the type-hints on your constructor (or other methods) and automatically
-passes you the correct services. Symfony's autowiring is designed to be predictable:
-if it is not absolutely clear which dependency should be passed, you'll see an
-actionable exception.
+Autowiring allows you to manage services in the container with minimal
+configuration. It reads the type-hints on your constructor (or other methods)
+and automatically passes the correct services to each method. Symfony's
+autowiring is designed to be predictable: if it is not absolutely clear which
+dependency should be passed, you'll see an actionable exception.
 
 .. tip::
 
diff --git a/testing/bootstrap.rst b/testing/bootstrap.rst
@@ -6,40 +6,47 @@ running those tests. For example, if you're running a functional test and
 have introduced a new translation resource, then you will need to clear your
 cache before running those tests.
 
-To do this, first add the following file::
+To do this, first add a file that executes your bootstrap work::
 
-    // app/tests.bootstrap.php
+    // tests/bootstrap.php
     if (isset($_ENV['BOOTSTRAP_CLEAR_CACHE_ENV'])) {
+        // executes the "php bin/console cache:clear" command
         passthru(sprintf(
-            'php "%s/console" cache:clear --env=%s --no-warmup',
+            'php "%s/../bin/console" cache:clear --env=%s --no-warmup',
             __DIR__,
             $_ENV['BOOTSTRAP_CLEAR_CACHE_ENV']
         ));
     }
 
-    require __DIR__.'/autoload.php';
+    require __DIR__.'/../vendor/autoload.php';
 
-Replace the test bootstrap file ``autoload.php`` in ``phpunit.xml.dist``
-with ``tests.bootstrap.php``:
+Then, configure ``phpunit.xml.dist`` to execute this ``bootstra.php`` file
+before running the tests:
 
 .. code-block:: xml
 
     <!-- phpunit.xml.dist -->
-
-    <!-- ... -->
+    <?xml version="1.0" encoding="UTF-8"?>
     <phpunit
-        bootstrap = "tests.bootstrap.php"
+        bootstrap="tests/bootstrap.php"
     >
+        <!-- ... -->
+    </phpunit>
 
 Now, you can define in your ``phpunit.xml.dist`` file which environment you want the
 cache to be cleared:
 
 .. code-block:: xml
 
     <!-- phpunit.xml.dist -->
-    <php>
-        <env name="BOOTSTRAP_CLEAR_CACHE_ENV" value="test"/>
-    </php>
+    <?xml version="1.0" encoding="UTF-8"?>
+    <phpunit>
+        <!-- ... -->
+
+        <php>
+            <env name="BOOTSTRAP_CLEAR_CACHE_ENV" value="test" />
+        </php>
+    </phpunit>
 
 This now becomes an environment variable (i.e. ``$_ENV``) that's available
 in the custom bootstrap file (``tests.bootstrap.php``).

Original file line number	Diff line number	Diff line change
`@@ -181,4 +181,4 @@ Learn more`
`181`	`181`
`182`	`182`	`bundles/*`
`183`	`183`
`184`		-_`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
	`184`	+.. _`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories