Merge branch '4.0'

* 4.0: (31 commits)
  Use "setAttribute" method
  Use the proper path of version 2.x
  Added some minor explanation about 308 code
  Use 308 to ensure http method is preserved
  suggest(Controller): suggestion about naming habits
  Mentioned the new FirewallConfig class
  [Fix] Custom FormType namespace
  Fixed a minor error in form collections example
  fix(Extractor): ExtractorInterface called
  Fix in line numbering
  Mention that argon2i doesn't need a salt either
  Update finder.rst
  Fix "RequestExceptionInterface" link
  ...

Author: javiereguiluz

best_practices/business-logic.rst

@@ -275,6 +275,6 @@ Next: :doc:`/best_practices/controllers`
 .. _`full definition`: https://en.wikipedia.org/wiki/Business_logic
 .. _`Doctrine project`: http://www.doctrine-project.org/
 .. _`fixture class`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html#writing-simple-fixtures
-.. _`PSR-1`: http://www.php-fig.org/psr/psr-1/
-.. _`PSR-2`: http://www.php-fig.org/psr/psr-2/
+.. _`PSR-1`: https://www.php-fig.org/psr/psr-1/
+.. _`PSR-2`: https://www.php-fig.org/psr/psr-2/
 .. _`PHP-CS-Fixer`: https://github.com/FriendsOfPHP/PHP-CS-Fixer

bundles/best_practices.rst

@@ -546,11 +546,11 @@ Learn more
 * :doc:`/bundles/extension`
 * :doc:`/bundles/configuration`
 
-.. _`PSR-4`: http://www.php-fig.org/psr/psr-4/
+.. _`PSR-4`: https://www.php-fig.org/psr/psr-4/
 .. _`Symfony Flex recipe`: https://github.com/symfony/recipes
-.. _`Semantic Versioning Standard`: http://semver.org/
+.. _`Semantic Versioning Standard`: https://semver.org/
 .. _`Packagist`: https://packagist.org/
-.. _`choose any license`: http://choosealicense.com/
+.. _`choose any license`: https://choosealicense.com/
 .. _`valid license identifier`: https://spdx.org/licenses/
 .. _`Travis CI`: https://travis-ci.org/
 .. _`Travis Cron`: https://docs.travis-ci.com/user/cron-jobs/

components/console/logger.rst

@@ -111,4 +111,4 @@ soon as any error message has been logged during the execution of the command.
 This is useful to decide which status code to return as the result of executing
 the command.
 
-.. _PSR-3: http://www.php-fig.org/psr/psr-3/
+.. _PSR-3: https://www.php-fig.org/psr/psr-3/

components/event_dispatcher.rst

@@ -513,6 +513,6 @@ Learn More
 * :ref:`The kernel.event_subscriber tag <dic-tags-kernel-event-subscriber>`
 
 .. _Mediator: https://en.wikipedia.org/wiki/Mediator_pattern
-.. _Closures: http://php.net/manual/en/functions.anonymous.php
-.. _PHP callable: http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback
+.. _Closures: https://php.net/manual/en/functions.anonymous.php
+.. _PHP callable: https://php.net/manual/en/language.pseudo-types.php#language.types.callback
 .. _Packagist: https://packagist.org/packages/symfony/event-dispatcher

components/finder.rst

@@ -115,6 +115,10 @@ It's also possible to ignore directories that you don't have permission to read:
 As the Finder uses PHP iterators, you can pass any URL with a supported
 `protocol`_::
 
+    // always add a trailing slash when looking for in the FTP root dir
+    $finder->in('ftp://example.com/');
+
+    // you can also look for in a FTP directory
     $finder->in('ftp://example.com/pub/');
 
 And it also works with user-defined streams::
@@ -318,8 +322,8 @@ The contents of returned files can be read with
         // ...
     }
 
-.. _strtotime:    http://www.php.net/manual/en/datetime.formats.php
-.. _protocol:     http://www.php.net/manual/en/wrappers.php
-.. _Streams:      http://www.php.net/streams
-.. _IEC standard: http://physics.nist.gov/cuu/Units/binary.html
+.. _strtotime:    https://php.net/manual/en/datetime.formats.php
+.. _protocol:     https://php.net/manual/en/wrappers.php
+.. _Streams:      https://php.net/streams
+.. _IEC standard: https://physics.nist.gov/cuu/Units/binary.html
 .. _Packagist:    https://packagist.org/packages/symfony/finder

components/http_foundation/session_configuration.rst

@@ -262,6 +262,6 @@ particular cookie by reading the ``getLifetime()`` method::
 The expiry time of the cookie can be determined by adding the created
 timestamp and the lifetime.
 
-.. _`php.net/session.customhandler`: http://php.net/session.customhandler
-.. _`php.net/session.configuration`: http://php.net/session.configuration
-.. _`php.net/memcached.setoption`: http://php.net/memcached.setoption
+.. _`php.net/session.customhandler`: https://php.net/session.customhandler
+.. _`php.net/session.configuration`: https://php.net/session.configuration
+.. _`php.net/memcached.setoption`: https://php.net/memcached.setoption

components/http_kernel.rst

@@ -561,7 +561,7 @@ below for more details).
        :class:`Symfony\\Component\\HttpKernel\\Exception\\HttpException` class.
 
     3) If the original exception implements
-       :class:`Symfony\\Component\\HttpKernel\\Exception\\RequestExceptionInterface`,
+       :class:`Symfony\\Component\\HttpFoundation\\Exception\\RequestExceptionInterface`,
        then the status code of the ``FlattenException`` object is populated with
        ``400`` and no other headers are modified.
 
@@ -749,10 +749,10 @@ Learn more
    /reference/events
 
 .. _Packagist: https://packagist.org/packages/symfony/http-kernel
-.. _reflection: http://php.net/manual/en/book.reflection.php
+.. _reflection: https://php.net/manual/en/book.reflection.php
 .. _FOSRestBundle: https://github.com/friendsofsymfony/FOSRestBundle
 .. _`Create your own framework... on top of the Symfony2 Components`: http://fabien.potencier.org/article/50/create-your-own-framework-on-top-of-the-symfony2-components-part-1
-.. _`PHP FPM`: http://php.net/manual/en/install.fpm.php
+.. _`PHP FPM`: https://php.net/manual/en/install.fpm.php
 .. _`SensioFrameworkExtraBundle`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
 .. _`@ParamConverter`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
 .. _`@Template`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/view.html

components/intl.rst

@@ -347,6 +347,6 @@ Learn more
 
 .. _Packagist: https://packagist.org/packages/symfony/intl
 .. _Icu component: https://packagist.org/packages/symfony/icu
-.. _intl extension: http://www.php.net/manual/en/book.intl.php
-.. _install the intl extension: http://www.php.net/manual/en/intl.setup.php
+.. _intl extension: https://php.net/manual/en/book.intl.php
+.. _install the intl extension: https://php.net/manual/en/intl.setup.php
 .. _ICU library: http://site.icu-project.org/

components/ldap.rst

@@ -126,7 +126,7 @@ delete existing ones::
     $query = $ldap->query('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
     $result = $query->execute();
     $entry = $result[0];
-    $entry->addAttribute('email', array('fabpot@symfony.com'));
+    $entry->setAttribute('email', array('fabpot@symfony.com'));
     $em->update($entry);
 
     // Removing an existing entry

components/phpunit_bridge.rst

@@ -572,11 +572,11 @@ not find the SUT:
 .. _PHPUnit: https://phpunit.de
 .. _`PHPUnit event listener`: https://phpunit.de/manual/current/en/extending-phpunit.html#extending-phpunit.PHPUnit_Framework_TestListener
 .. _`PHPUnit's assertStringMatchesFormat()`: https://phpunit.de/manual/current/en/appendixes.assertions.html#appendixes.assertions.assertStringMatchesFormat
-.. _`PHP error handler`: http://php.net/manual/en/book.errorfunc.php
+.. _`PHP error handler`: https://php.net/manual/en/book.errorfunc.php
 .. _`environment variable`: https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.php-ini-constants-variables
 .. _Packagist: https://packagist.org/packages/symfony/phpunit-bridge
-.. _`@-silencing operator`: http://php.net/manual/en/language.operators.errorcontrol.php
-.. _`@-silenced`: http://php.net/manual/en/language.operators.errorcontrol.php
+.. _`@-silencing operator`: https://php.net/manual/en/language.operators.errorcontrol.php
+.. _`@-silenced`: https://php.net/manual/en/language.operators.errorcontrol.php
 .. _`Travis CI`: https://travis-ci.org/
 .. _`test listener`: https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.test-listeners
 .. _`@covers`: https://phpunit.de/manual/current/en/appendixes.annotations.html#appendixes.annotations.covers

components/process.rst

@@ -428,6 +428,6 @@ absolute path of the executable PHP binary available on your server::
 .. _`PHP Bug#39992`: https://bugs.php.net/bug.php?id=39992
 .. _`exec`: https://en.wikipedia.org/wiki/Exec_(operating_system)
 .. _`pid`: https://en.wikipedia.org/wiki/Process_identifier
-.. _`PHP Documentation`: http://php.net/manual/en/pcntl.constants.php
+.. _`PHP Documentation`: https://php.net/manual/en/pcntl.constants.php
 .. _Packagist: https://packagist.org/packages/symfony/process
 .. _`PHP streams`: http://www.php.net/manual/en/book.stream.php

components/psr7.rst

@@ -85,6 +85,6 @@ to a :class:`Symfony\\Component\\HttpFoundation\\Response` instance::
     $httpFoundationFactory = new HttpFoundationFactory();
     $symfonyResponse = $httpFoundationFactory->createResponse($psrResponse);
 
-.. _`PSR-7`: http://www.php-fig.org/psr/psr-7/
+.. _`PSR-7`: https://www.php-fig.org/psr/psr-7/
 .. _`Zend Diactoros`: https://github.com/zendframework/zend-diactoros
 .. _`symfony/psr-http-message-bridge on Packagist`: https://packagist.org/packages/symfony/psr-http-message-bridge

components/security/firewall.rst

@@ -88,6 +88,21 @@ will be dispatched by the HttpKernel at the beginning of each request
 it processes. This way, the firewall may prevent the user from going any
 further than allowed.
 
+Firewall Config
+~~~~~~~~~~~~~~~
+
+.. versionadded:: 3.2
+    The ``FirewallConfig`` class was introduced in Symfony 3.2.
+
+The information about a given firewall, such as its name, provider, context,
+entry point and access denied URL, is provided by instances of the
+:class:`Symfony\\Bundle\\SecurityBundle\\Security\\FirewallConfig` class.
+
+This object can be accessed through the ``getFirewallConfig(Request $request)``
+method of the :class:`Symfony\\Component\\Security\\Http\\FirewallMap` class and
+through the ``getConfig()``  method of the
+:class:`Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext` class.
+
 .. _firewall_listeners:
 
 Firewall Listeners

components/serializer.rst

@@ -885,6 +885,18 @@ The array keys beginning with ``@`` are considered XML attributes::
     //     <foo bar="value" />
     // </response>
 
+Use the special ``#`` key to define the data of a node::
+
+    array('foo' => array('@bar' => 'value', '#' => 'baz'));
+
+    // is encoded as follows:
+    // <?xml version="1.0"?>
+    // <response>
+    //     <foo bar="value">
+    //        baz
+    //     </foo>
+    // </response>
+
 Context
 ~~~~~~~
 
@@ -1085,7 +1097,7 @@ Learn more
     A popular alternative to the Symfony Serializer Component is the third-party
     library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).
 
-.. _`PSR-1 standard`: http://www.php-fig.org/psr/psr-1/
+.. _`PSR-1 standard`: https://www.php-fig.org/psr/psr-1/
 .. _`JMS serializer`: https://github.com/schmittjoh/serializer
 .. _Packagist: https://packagist.org/packages/symfony/serializer
 .. _RFC3339: https://tools.ietf.org/html/rfc3339#section-5.8

contributing/code/bc.rst

@@ -300,9 +300,9 @@ Change value of a constant                          Yes [1]_ [5]_
        Changing an argument type is only possible with a parent type.
        Changing a return type is only possible with a child type.
 
-.. _Semantic Versioning: http://semver.org/
-.. _scalar type: http://php.net/manual/en/function.is-scalar.php
-.. _boolean values: http://php.net/manual/en/function.boolval.php
-.. _string values: http://www.php.net/manual/en/function.strval.php
-.. _integer values: http://www.php.net/manual/en/function.intval.php
-.. _float values: http://www.php.net/manual/en/function.floatval.php
+.. _Semantic Versioning: https://semver.org/
+.. _scalar type: https://php.net/manual/en/function.is-scalar.php
+.. _boolean values: https://php.net/manual/en/function.boolval.php
+.. _string values: https://php.net/manual/en/function.strval.php
+.. _integer values: https://php.net/manual/en/function.intval.php
+.. _float values: https://php.net/manual/en/function.floatval.php

contributing/code/bugs.rst

@@ -44,7 +44,7 @@ If your problem definitely looks like a bug, report it using the official bug
 
 * *(optional)* Attach a :doc:`patch <patches>`.
 
-.. _`Stack Overflow`: http://stackoverflow.com/questions/tagged/symfony2
+.. _`Stack Overflow`: https://stackoverflow.com/questions/tagged/symfony2
 .. _IRC channel: https://symfony.com/irc
 .. _the Symfony Slack: https://symfony.com/slack-invite
 .. _tracker: https://github.com/symfony/symfony/issues

contributing/code/patches.rst

@@ -368,15 +368,15 @@ convert many commits to one commit. This is no longer necessary today, because
 Symfony project uses a proprietary tool which automatically squashes all commits
 before merging.
 
-.. _ProGit: http://git-scm.com/book
+.. _ProGit: https://git-scm.com/book
 .. _GitHub: https://github.com/join
 .. _`GitHub's Documentation`: https://help.github.com/articles/ignoring-files
 .. _Symfony repository: https://github.com/symfony/symfony
-.. _dev mailing-list: http://groups.google.com/group/symfony-devs
+.. _dev mailing-list: https://groups.google.com/group/symfony-devs
 .. _travis-ci.org: https://travis-ci.org/
-.. _`travis-ci.org status icon`: http://about.travis-ci.org/docs/user/status-images/
-.. _`travis-ci.org Getting Started Guide`: http://about.travis-ci.org/docs/user/getting-started/
+.. _`travis-ci.org status icon`: https://about.travis-ci.com/docs/user/status-images/
+.. _`travis-ci.org Getting Started Guide`: https://about.travis-ci.com/docs/user/getting-started/
 .. _`documentation repository`: https://github.com/symfony/symfony-docs
-.. _`fabbot`: http://fabbot.io
-.. _`PSR-1`: http://www.php-fig.org/psr/psr-1/
-.. _`PSR-2`: http://www.php-fig.org/psr/psr-2/
+.. _`fabbot`: https://fabbot.io
+.. _`PSR-1`: https://www.php-fig.org/psr/psr-1/
+.. _`PSR-2`: https://www.php-fig.org/psr/psr-2/

contributing/code/standards.rst

@@ -267,9 +267,9 @@ License
   present at the top of every PHP file, before the namespace.
 
 .. _`PHP CS Fixer tool`: http://cs.sensiolabs.org/
-.. _`PSR-0`: http://www.php-fig.org/psr/psr-0/
-.. _`PSR-1`: http://www.php-fig.org/psr/psr-1/
-.. _`PSR-2`: http://www.php-fig.org/psr/psr-2/
-.. _`PSR-4`: http://www.php-fig.org/psr/psr-4/
-.. _`identical comparison`: http://php.net/manual/en/language.operators.comparison.php
+.. _`PSR-0`: https://www.php-fig.org/psr/psr-0/
+.. _`PSR-1`: https://www.php-fig.org/psr/psr-1/
+.. _`PSR-2`: https://www.php-fig.org/psr/psr-2/
+.. _`PSR-4`: https://www.php-fig.org/psr/psr-4/
+.. _`identical comparison`: https://php.net/manual/en/language.operators.comparison.php
 .. _`Yoda conditions`: https://en.wikipedia.org/wiki/Yoda_conditions

contributing/community/releases.rst

@@ -192,7 +192,7 @@ version: a new version is published every six months, and there is a two months
 period to upgrade. Companies wanting more stability use the LTS versions: a new
 version is published every two years and there is a year to upgrade.
 
-.. _Semantic Versioning: http://semver.org/
+.. _Semantic Versioning: https://semver.org/
 .. _Git repository: https://github.com/symfony/symfony
 .. _SensioLabs:     http://sensiolabs.com/
 .. _roadmap notification: https://symfony.com/roadmap

controller.rst

@@ -58,8 +58,8 @@ This controller is pretty straightforward:
   the ``use`` keyword imports the ``Response`` class, which the controller
   must return.
 
-* *line 7*: The class can technically be called anything - but should end in the
-  word ``Controller``
+* *line 7*: The class can technically be called anything, but it's suffixed
+  with ``Controller`` by convention.
 
 * *line 12*: The action method is allowed to have a ``$max`` argument thanks to the
   ``{max}`` :doc:`wildcard in the route </routing>`.

controller/soap_web_service.rst

@@ -165,7 +165,7 @@ An example WSDL is below.
         </service>
     </definitions>
 
-.. _`PHP SOAP`: http://php.net/manual/en/book.soap.php
+.. _`PHP SOAP`: https://php.net/manual/en/book.soap.php
 .. _`NuSOAP`: http://sourceforge.net/projects/nusoap
-.. _`output buffering`: http://php.net/manual/en/book.outcontrol.php
+.. _`output buffering`: https://php.net/manual/en/book.outcontrol.php
 .. _`Zend SOAP`: http://framework.zend.com/manual/current/en/modules/zend.soap.server.html

create_framework/http_foundation.rst

@@ -289,16 +289,16 @@ applications using it (like `Symfony`_, `Drupal 8`_, `phpBB 3`_, `ezPublish
 5`_, `Laravel`_, `Silex`_ and `more`_).
 
 .. _`Twig`: http://twig.sensiolabs.org/
-.. _`HTTP specification`: http://tools.ietf.org/wg/httpbis/
+.. _`HTTP specification`: https://tools.ietf.org/wg/httpbis/
 .. _`audited`: https://symfony.com/blog/symfony2-security-audit
 .. _`Symfony`: https://symfony.com/
 .. _`Drupal 8`: https://drupal.org/
 .. _`phpBB 3`: https://www.phpbb.com/
-.. _`ezPublish 5`: http://ez.no/
-.. _`Laravel`: http://laravel.com/
-.. _`Silex`: http://silex.sensiolabs.org/
+.. _`ezPublish 5`: https://ez.no/
+.. _`Laravel`: https://laravel.com/
+.. _`Silex`: https://silex.sensiolabs.org/
 .. _`Midgard CMS`: http://www.midgard-project.org/
-.. _`Zikula`: http://zikula.org/
-.. _`autoloaded`: http://php.net/autoload
-.. _`PSR-4`: http://www.php-fig.org/psr/psr-4/
+.. _`Zikula`: https://zikula.org/
+.. _`autoloaded`: https://php.net/autoload
+.. _`PSR-4`: https://www.php-fig.org/psr/psr-4/
 .. _`more`: https://symfony.com/components/HttpFoundation

create_framework/http_kernel_controller_resolver.rst

@@ -202,5 +202,5 @@ Let's conclude with the new version of our framework::
 Think about it once more: our framework is more robust and more flexible than
 ever and it still has less than 50 lines of code.
 
-.. _`reflection`: http://php.net/reflection
+.. _`reflection`: https://php.net/reflection
 .. _`FrameworkExtraBundle`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html

create_framework/templating.rst

@@ -177,5 +177,5 @@ As always, you can decide to stop here and use the framework as is; it's
 probably all you need to create simple websites like those fancy one-page
 `websites`_ and hopefully a few others.
 
-.. _`callbacks`: http://php.net/callback#language.types.callback
-.. _`websites`: http://kottke.org/08/02/single-serving-sites
+.. _`callbacks`: https://php.net/callback#language.types.callback
+.. _`websites`: https://kottke.org/08/02/single-serving-sites

create_framework/unit_testing.rst

@@ -219,4 +219,4 @@ safely think about the next batch of features we want to add to our framework.
 
 .. _`PHPUnit`: https://phpunit.de/manual/current/en/index.html
 .. _`test doubles`: https://phpunit.de/manual/current/en/test-doubles.html
-.. _`XDebug`: http://xdebug.org/
+.. _`XDebug`: https://xdebug.org/

doctrine.rst

@@ -384,17 +384,17 @@ Take a look at the previous example in more detail:
 
 .. _doctrine-entity-manager:
 
-* **line 17** The ``$this->getDoctrine()->getManager()`` method gets Doctrine's
+* **line 16** The ``$this->getDoctrine()->getManager()`` method gets Doctrine's
   *entity manager* object, which is the most important object in Doctrine. It's
   responsible for saving objects to, and fetching objects from, the database.
 
-* **lines 19-22** In this section, you instantiate and work with the ``$product``
+* **lines 18-21** In this section, you instantiate and work with the ``$product``
   object like any other normal PHP object.
 
-* **line 25** The ``persist($product)`` call tells Doctrine to "manage" the
+* **line 24** The ``persist($product)`` call tells Doctrine to "manage" the
   ``$product`` object. This does **not** cause a query to be made to the database.
 
-* **line 28** When the ``flush()`` method is called, Doctrine looks through
+* **line 27** When the ``flush()`` method is called, Doctrine looks through
   all of the objects that it's managing to see if they need to be persisted
   to the database. In this example, the ``$product`` object's data doesn't
   exist in the database, so the entity manager executes an ``INSERT`` query,

doctrine/dbal.rst

@@ -152,7 +152,7 @@ mapping type:
             ),
         ));
 
-.. _`PDO`:           http://www.php.net/pdo
+.. _`PDO`:           https://php.net/pdo
 .. _`Doctrine`:      http://www.doctrine-project.org
 .. _`DBAL Documentation`: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/index.html
 .. _`Custom Mapping Types`: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html#custom-mapping-types

form/create_custom_field_type.rst

@@ -16,7 +16,7 @@ Defining the Field Type
 In order to create the custom field type, first you have to create the class
 representing the field. In this situation the class holding the field type
 will be called ``ShippingType`` and the file will be stored in the default location
-for form fields, which is ``<BundleName>\Form\Type``. Make sure the field extends
+for form fields, which is ``App\Form\Type``. Make sure the field extends
 :class:`Symfony\\Component\\Form\\AbstractType`::
 
     // src/Form/Type/ShippingType.php

forms.rst

@@ -729,4 +729,4 @@ Learn more
 * :doc:`/http_cache/form_csrf_caching`
 
 .. _`Symfony Form component`: https://github.com/symfony/form
-.. _`DateTime`: http://php.net/manual/en/class.datetime.php
+.. _`DateTime`: https://php.net/manual/en/class.datetime.php