Merge branch '2.3'

weaverryan · weaverryan · commit 84d569d56478 · 2013-07-18T21:41:29.000-05:00
diff --git a/book/forms.rst b/book/forms.rst
@@ -368,7 +368,7 @@ object.
                     <constraint name="Type">\DateTime</constraint>
                 </property>
             </class>
-        <constraint-mapping>
+        </constraint-mapping>
 
     .. code-block:: php
 
diff --git a/book/validation.rst b/book/validation.rst
@@ -812,7 +812,7 @@ and then the groups in the group sequence are validated in order.
 .. tip::
 
     Group sequences cannot contain the group ``Default``, as this would create
-    a loop. Instead, use the group ``{ClassName}`` (e.g. ``User``) instead.
+    a loop. Instead, use the group ``{ClassName}`` (e.g. ``User``).
 
 For example, suppose you have a ``User`` class and want to validate that the
 username and the password are different only if all other validation passes
diff --git a/components/dependency_injection/definitions.rst b/components/dependency_injection/definitions.rst
@@ -66,7 +66,7 @@ To get an array of the constructor arguments for a definition you can use::
 or to get a single argument by its position::
 
     $definition->getArgument($index);
-    //e.g. $definition->getArguments(0) for the first argument
+    //e.g. $definition->getArgument(0) for the first argument
 
 You can add a new argument to the end of the arguments array using::
 
diff --git a/components/dependency_injection/lazy_services.rst b/components/dependency_injection/lazy_services.rst
@@ -34,9 +34,17 @@ the `ProxyManager bridge`_:
 
 .. note::
 
-    If you're using the full-stack framework, this package is not included
-    and needs to be added to ``composer.json`` and installed (which is what
-    the above command does).
+    If you're using the full-stack framework, the proxy manager bridge is already
+    included but the actual proxy manager needs to be included. Therefore add
+    
+    .. code-block:: json
+
+        "require": {
+            "ocramius/proxy-manager": "0.4.*"
+        }
+    
+    to your ``composer.json``. Afterwards compile your container and check
+    to make sure that you get a proxy for your lazy services.
 
 Configuration
 -------------
@@ -71,6 +79,16 @@ the same signature of the class representing the service. You can also inject
 the service just like normal into other services. The object that's actually
 injected will be the proxy.
 
+To check if your proxy works you can simply check the interface of the 
+received object.
+
+.. code-block:: php
+
+    var_dump(class_implements($service));
+    
+If the class implements the "ProxyManager\Proxy\LazyLoadingInterface" your lazy
+loaded services are working.
+
 .. note::
 
     If you don't install the `ProxyManager bridge`_, the container will just
@@ -89,4 +107,4 @@ in the `documentation of ProxyManager`_.
 
 .. _`ProxyManager bridge`: https://github.com/symfony/symfony/tree/master/src/Symfony/Bridge/ProxyManager
 .. _`proxy`: http://en.wikipedia.org/wiki/Proxy_pattern
-.. _`documentation of ProxyManager`: https://github.com/Ocramius/ProxyManager/blob/master/docs/lazy-loading-value-holder.md
+.. _`documentation of ProxyManager`: https://github.com/Ocramius/ProxyManager/blob/master/docs/lazy-loading-value-holder.md
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -251,7 +251,7 @@ If you need to get full access to parsed data from ``Accept``, ``Accept-Language
 
     $accept = AcceptHeader::fromString($request->headers->get('Accept'));
     if ($accept->has('text/html')) {
-        $item = $accept->get('html');
+        $item = $accept->get('text/html');
         $charset = $item->getAttribute('charset', 'utf-8');
         $quality = $item->getQuality();
     }
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
@@ -134,6 +134,16 @@ Naming Conventions
 * Don't forget to look at the more verbose :doc:`conventions` document for
   more subjective naming considerations.
 
+Service Naming Conventions
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* A service name contains groups, separated by dots;
+* The DI alias of the bundle is the first group (e.g. ``fos_user``);
+* Use lowercase letters for service and parameter names;
+* A group name uses the underscore notation;
+* Each service has a corresponding parameter containing the class name,
+  following the ``SERVICE NAME.class`` convention.
+
 Documentation
 -------------
 
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -57,11 +57,9 @@ Creating a Pull Request
 Following the example, the pull request will default to be between your
 ``improving_foo_and_bar`` branch and the ``symfony-docs`` ``master`` branch.
 
-.. image:: /images/docs-pull-request.png
-   :align: center
-
 If you have made your changes based on the 2.2 branch then you need to change
-the base branch to be 2.2 on the preview page:
+the base branch to be 2.2 on the preview page by clicking the ``edit`` button
+on the top left:
 
 .. image:: /images/docs-pull-request-change-base.png
    :align: center
diff --git a/contributing/documentation/translations.rst b/contributing/documentation/translations.rst
@@ -20,7 +20,7 @@ for. Here is the list of the official *master* repositories:
 * *French*:   https://github.com/symfony-fr/symfony-docs-fr
 * *Italian*:  https://github.com/garak/symfony-docs-it
 * *Japanese*: https://github.com/symfony-japan/symfony-docs-ja
-* *Polish*:   https://github.com/ampluso/symfony-docs-pl
+* *Polish*:   https://github.com/symfony-docs-pl/symfony-docs-pl
 * *Portuguese (Brazilian)*:  https://github.com/andreia/symfony-docs-pt-BR
 * *Spanish*:  https://github.com/gitnacho/symfony-docs-es
 
diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst
@@ -9,8 +9,8 @@ as you'll see here, files that have a specific extension. To show you how
 to handle each option, let's suppose that you want to use Assetic's CoffeeScript
 filter, which compiles CoffeeScript files into Javascript.
 
-The main configuration is just the paths to coffee and node. These default
-respectively to ``/usr/bin/coffee`` and ``/usr/bin/node``:
+The main configuration is just the paths to coffee, node and node_modules.
+An example configuration might look like this:
 
 .. configuration-block::
 
@@ -22,15 +22,18 @@ respectively to ``/usr/bin/coffee`` and ``/usr/bin/node``:
                 coffee:
                     bin: /usr/bin/coffee
                     node: /usr/bin/node
+                    node_paths: [ /usr/lib/node_modules/ ]
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <assetic:config>
-            <assetic:filter
+            <assetic:filter 
                 name="coffee"
-                bin="/usr/bin/coffee"
-                node="/usr/bin/node" />
+                bin="/usr/bin/coffee/"
+                node="/usr/bin/node/">
+                <assetic:node-paths>/usr/lib/node_modules/</assetic:node-path>
+            </assetic:filter>
         </assetic:config>
 
     .. code-block:: php
@@ -41,6 +44,7 @@ respectively to ``/usr/bin/coffee`` and ``/usr/bin/node``:
                 'coffee' => array(
                     'bin'  => '/usr/bin/coffee',
                     'node' => '/usr/bin/node',
+                    'node_paths' => array('/usr/lib/node_modules/'),
                 ),
             ),
         ));
@@ -128,6 +132,7 @@ applied to all ``.coffee`` files:
                 coffee:
                     bin: /usr/bin/coffee
                     node: /usr/bin/node
+                    node_paths: [ /usr/lib/node_modules/ ]
                     apply_to: "\.coffee$"
 
     .. code-block:: xml
@@ -139,8 +144,9 @@ applied to all ``.coffee`` files:
                 bin="/usr/bin/coffee"
                 node="/usr/bin/node"
                 apply_to="\.coffee$" />
+                <assetic:node-paths>/usr/lib/node_modules/</assetic:node-path>
         </assetic:config>
-
+        
     .. code-block:: php
 
         // app/config/config.php
@@ -149,6 +155,7 @@ applied to all ``.coffee`` files:
                 'coffee' => array(
                     'bin'      => '/usr/bin/coffee',
                     'node'     => '/usr/bin/node',
+                    'node_paths' => array('/usr/lib/node_modules/'),
                     'apply_to' => '\.coffee$',
                 ),
             ),
diff --git a/cookbook/console/console_command.rst b/cookbook/console/console_command.rst
@@ -104,14 +104,25 @@ instead of
 
             $command = $application->find('demo:greet');
             $commandTester = new CommandTester($command);
-            $commandTester->execute(array('command' => $command->getName()));
+            $commandTester->execute(
+               array(
+                  'name'    => 'Fabien',
+                  '--yell'  => true,
+               )
+            );
 
             $this->assertRegExp('/.../', $commandTester->getDisplay());
 
             // ...
         }
     }
 
+.. note::
+
+    In the specific case above, the ``name`` parameter and the ``--yell`` option
+    are not mandatory for the command to work, but are shown so you can see
+    how to customize them when calling the command.
+
 To be able to use the fully set up service container for your console tests
 you can extend your test from
 :class:`Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase`::
@@ -133,7 +144,12 @@ you can extend your test from
 
             $command = $application->find('demo:greet');
             $commandTester = new CommandTester($command);
-            $commandTester->execute(array('command' => $command->getName()));
+            $commandTester->execute(
+               array(
+                  'name'    => 'Fabien',
+                  '--yell'  => true,
+               )
+            );
 
             $this->assertRegExp('/.../', $commandTester->getDisplay());
 
diff --git a/cookbook/controller/service.rst b/cookbook/controller/service.rst
@@ -257,12 +257,12 @@ inject *only* the exact service(s) that you need directly into the controller.
 
    This does not mean that you cannot extend these controllers from your own
    base controller. The move away from the standard base controller is because
-   its helper method rely on having the container available which is not
+   its helper methods rely on having the container available which is not
    the case for controllers that are defined as services. It may be a good
    idea to extract common code into a service that's injected rather than
    place that code into a base controller that you extend. Both approaches
    are valid, exactly how you want to organize your reusable code is up to
    you.
 
 .. _`Controller class source code`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
-.. _`base Controller class`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+.. _`base Controller class`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst
@@ -419,7 +419,7 @@ sport like this::
 
             $builder->addEventListener(
                 FormEvents::PRE_SET_DATA,
-                function(FormEvent $event) use($user, $factory){
+                function(FormEvent $event) use($factory){
                     $form = $event->getForm();
 
                     // this would be your entity, i.e. SportMeetup
diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst
@@ -23,7 +23,7 @@ test the core types and you can use it to test your types too.
 .. versionadded:: 2.3
     The ``TypeTestCase`` has moved to the ``Symfony\Component\Form\Test``
     namespace in 2.3. Previously, the class was located in
-    ``Symfony\Component\Form\Tests\Core\Extension\Type``.
+    ``Symfony\Component\Form\Tests\Extension\Core\Type``.
 
 The Basics
 ----------
diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
@@ -108,10 +108,6 @@
   * :doc:`/cookbook/request/mime_type`
   * (session) :doc:`/cookbook/session/locale_sticky_session`
 
-* :doc:`/cookbook/session/index`
-
-  * :doc:`/cookbook/session/php_bridge`
-
 * :doc:`/cookbook/routing/index`
 
   * :doc:`/cookbook/routing/scheme`
@@ -150,6 +146,7 @@
   * :doc:`/cookbook/session/proxy_examples`
   * :doc:`/cookbook/session/locale_sticky_session`
   * :doc:`/cookbook/session/sessions_directory`
+  * :doc:`/cookbook/session/php_bridge`
 
 * **symfony1**
 
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -185,21 +185,6 @@ interface forces the class to implement the five following methods:
 
 For more details on each of these, see :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface`.
 
-.. code-block:: php
-
-    // src/Acme/UserBundle/Entity/User.php
-
-    namespace Acme\UserBundle\Entity;
-
-    use Symfony\Component\Security\Core\User\EquatableInterface;
-
-    // ...
-
-    public function isEqualTo(UserInterface $user)
-    {
-        return $this->id === $user->getId();
-    }
-
 .. note::
 
     The :phpclass:`Serializable` interface and its ``serialize`` and ``unserialize``
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
@@ -25,9 +25,9 @@ which requires the following three methods:
 
     interface VoterInterface
     {
-        function supportsAttribute($attribute);
-        function supportsClass($class);
-        function vote(TokenInterface $token, $object, array $attributes);
+        public function supportsAttribute($attribute);
+        public function supportsClass($class);
+        public function vote(TokenInterface $token, $object, array $attributes);
     }
 
 The ``supportsAttribute()`` method is used to check if the voter supports
@@ -85,7 +85,7 @@ and compare the IP address against a set of blacklisted IP addresses:
             return true;
         }
 
-        function vote(TokenInterface $token, $object, array $attributes)
+        public function vote(TokenInterface $token, $object, array $attributes)
         {
             $request = $this->container->get('request');
             if (in_array($request->getClientIp(), $this->blacklistedIp)) {
diff --git a/cookbook/service_container/scopes.rst b/cookbook/service_container/scopes.rst
@@ -157,10 +157,11 @@ your code. This should also be taken into account when declaring your service:
         <services>
             <service id="greeting_card_manager"
                 class="Acme\HelloBundle\Mail\GreetingCardManager"
-            />
-            <call method="setRequest">
-                <argument type="service" id="request" on-invalid="null" strict="false" />
-            </call>
+            >
+                <call method="setRequest">
+                    <argument type="service" id="request" on-invalid="null" strict="false" />
+                </call>
+            </service>
         </services>
 
     .. code-block:: php
diff --git a/cookbook/session/index.rst b/cookbook/session/index.rst
@@ -4,7 +4,7 @@ Sessions
 .. toctree::
     :maxdepth: 2
 
-    php_bridge
     proxy_examples
     locale_sticky_session
     sessions_directory
+    php_bridge
diff --git a/cookbook/session/php_bridge.rst b/cookbook/session/php_bridge.rst
@@ -2,7 +2,7 @@
    single: Sessions
 
 Bridge a legacy application with Symfony Sessions
--------------------------------------------------
+=================================================
 
 .. versionadded:: 2.3
     The ability to integrate with a legacy PHP session was added in Symfony 2.3.
diff --git a/images/docs-pull-request-change-base.png b/images/docs-pull-request-change-base.png
diff --git a/images/docs-pull-request.png b/images/docs-pull-request.png
diff --git a/reference/constraints/All.rst b/reference/constraints/All.rst
@@ -44,8 +44,8 @@ entry in that array:
         {
             /**
              * @Assert\All({
-             *     @Assert\NotBlank
-             *     @Assert\Length(min = "5"),
+             *     @Assert\NotBlank,
+             *     @Assert\Length(min = "5")
              * })
              */
              protected $favoriteColors = array();
diff --git a/reference/constraints/UniqueEntity.rst b/reference/constraints/UniqueEntity.rst
@@ -99,7 +99,7 @@ table:
                     'message' => 'This email already exists.',
                 )));
 
-                $metadata->addPropertyConstraint(new Assert\Email());
+                $metadata->addPropertyConstraint('email', new Assert\Email());
             }
         }
 
diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst
@@ -50,8 +50,8 @@ choices
 
 **default**: ``Symfony\Component\Intl\Intl::getRegionBundle()->getCountryNames()``
 
-The country type defaults the ``choices`` option to the all locales.
-It uses the default locale to determine the language.
+The country type defaults the ``choices`` option to the whole list of countries.
+The locale is used to translate the countries names.
 
 Inherited options
 -----------------
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst

Original file line number	Diff line number	Diff line change
@@ -251,7 +251,7 @@ If you need to get full access to parsed data from ``Accept``, ``Accept-Language
`251`	`251`
`252`	`252`	`$accept = AcceptHeader::fromString($request->headers->get('Accept'));`
`253`	`253`	`if ($accept->has('text/html')) {`
`254`		`- $item = $accept->get('html');`
	`254`	`+ $item = $accept->get('text/html');`
`255`	`255`	`$charset = $item->getAttribute('charset', 'utf-8');`
`256`	`256`	`$quality = $item->getQuality();`
`257`	`257`	`}`