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

Author: javiereguiluz

components/browser_kit.rst

@@ -8,6 +8,12 @@ The BrowserKit Component
     The BrowserKit component simulates the behavior of a web browser, allowing
     you to make requests, click on links and submit forms programmatically.
 
+.. note::
+
+    The BrowserKit component can only make internal requests to your application.
+    If you need to make requests to external sites and applications, consider
+    using `Goutte`_, a simple web scraper based on Symfony Components.
+
 Installation
 ------------
 
@@ -60,7 +66,7 @@ URL::
     use Acme\Client;
 
     $client = new Client();
-    $crawler = $client->request('GET', 'http://symfony.com');
+    $crawler = $client->request('GET', '/');
 
 The value returned by the ``request()`` method is an instance of the
 :class:`Symfony\\Component\\DomCrawler\\Crawler` class, provided by the
@@ -78,7 +84,7 @@ performs the needed HTTP GET request to simulate the link click::
     use Acme\Client;
 
     $client = new Client();
-    $crawler = $client->request('GET', 'http://symfony.com');
+    $crawler = $client->request('GET', '/product/123');
     $link = $crawler->selectLink('Go elsewhere...')->link();
     $client->click($link);
 
@@ -120,7 +126,7 @@ retrieve any cookie while making requests with the client::
 
     // Make a request
     $client = new Client();
-    $crawler = $client->request('GET', 'http://symfony.com');
+    $crawler = $client->request('GET', '/');
 
     // Get the cookie Jar
     $cookieJar = $client->getCookieJar();
@@ -153,7 +159,7 @@ Looping Through Cookies
 
     // Make a request
     $client = new Client();
-    $crawler = $client->request('GET', 'http://symfony.com');
+    $crawler = $client->request('GET', '/');
 
     // Get the cookie Jar
     $cookieJar = $client->getCookieJar();
@@ -199,9 +205,8 @@ history::
 
     use Acme\Client;
 
-    // make a real request to an external site
     $client = new Client();
-    $client->request('GET', 'http://symfony.com');
+    $client->request('GET', '/');
 
     // select and click on a link
     $link = $crawler->selectLink('Documentation')->link();
@@ -218,9 +223,8 @@ also delete all the cookies::
 
     use Acme\Client;
 
-    // make a real request to an external site
     $client = new Client();
-    $client->request('GET', 'http://symfony.com');
+    $client->request('GET', '/');
 
     // delete history
     $client->restart();

components/serializer.rst

@@ -11,17 +11,14 @@ The Serializer Component
 In order to do so, the Serializer component follows the following
 simple schema.
 
-.. _component-serializer-encoders:
-.. _component-serializer-normalizers:
-
 .. image:: /_images/components/serializer/serializer_workflow.png
 
 As you can see in the picture above, an array is used as a man in
 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 complex topic. This component may not cover all your use cases out of the box, 
+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
@@ -333,6 +330,46 @@ You are now able to serialize only attributes in the groups you want::
 
 .. _ignoring-attributes-when-serializing:
 
+Selecting Specific Attributes
+-----------------------------
+
+It is also possible to serialize only a set of specific attributes::
+
+    use Symfony\Component\Serializer\Serializer;
+    use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+
+    class User
+    {
+        public $familyName;
+        public $givenName;
+        public $company;
+    }
+
+    class Company
+    {
+        public $name;
+        public $address;
+    }
+
+    $company = new Company();
+    $company->name = 'Les-Tilleuls.coop';
+    $company->address = 'Lille, France';
+
+    $user = new User();
+    $user->familyName = 'Dunglas';
+    $user->givenName = 'Kévin';
+    $user->company = $company;
+
+    $serializer = new Serializer(array(new ObjectNormalizer()));
+
+    $data = $serializer->normalize($user, null, array('attributes' => array('familyName', 'company' => ['name'])));
+    // $data = array('familyName' => 'Dunglas', 'company' => array('name' => 'Les-Tilleuls.coop'));
+
+Only attributes that are not ignored (see below) are available.
+If some serialization groups are set, only attributes allowed by those groups can be used.
+
+As for groups, attributes can be selected during both the serialization and deserialization process.
+
 Ignoring Attributes
 -------------------
 
@@ -503,6 +540,8 @@ When serializing, you can set a callback to format a specific object property::
     $serializer->serialize($person, 'json');
     // Output: {"name":"cordoval", "age": 34, "createdAt": "2014-03-22T09:43:12-0500"}
 
+.. _component-serializer-normalizers:
+
 Normalizers
 -----------
 
@@ -562,6 +601,8 @@ There are several types of normalizers available:
     This normalizer converts :phpclass:`SplFileInfo` objects into a data URI
     string (``data:...``) such that files can be embedded into serialized data.
 
+.. _component-serializer-encoders:
+
 Encoders
 --------
 

frontend/encore/typescript.rst

@@ -54,7 +54,7 @@ Then enable it by calling:
 
     Encore
         // ...
-        enableForkedTypeScriptTypesChecking()
+        .enableForkedTypeScriptTypesChecking()
     ;
 
 This plugin requires that you have a `tsconfig.json`_ file that is setup correctly.

reference/configuration/doctrine.rst

@@ -300,6 +300,8 @@ The following block shows all possible configuration keys:
                 user:                 user
                 password:             secret
                 driver:               pdo_mysql
+                # if the url option is specified, it will override the above config
+                url:                  mysql://db_user:db_password@127.0.0.1:3306/db_name 
                 # the DBAL driverClass option
                 driver_class:         MyNamespace\MyDriverImpl
                 # the DBAL driverOptions option

testing/database.rst

@@ -6,7 +6,7 @@ How to Test Code that Interacts with the Database
 
 If your code interacts with the database, e.g. reads data from or stores data
 into it, you need to adjust your tests to take this into account. There are
-many ways how to deal with this. In a unit test, you can create a mock for
+many ways to deal with this. In a unit test, you can create a mock for
 a ``Repository`` and use it to return expected objects. In a functional test,
 you may need to prepare a test database with predefined values to ensure that
 your test always has the same data to work with.