Merge branch '2.1' into 2.2

weaverryan · weaverryan · commit 042b61e79205 · 2013-05-26T12:13:36.000-05:00
diff --git a/book/controller.rst b/book/controller.rst
@@ -686,23 +686,19 @@ the ``notice`` message:
 
     .. code-block:: html+jinja
 
-        {% if app.session.started %}
-            {% for flashMessage in app.session.flashbag.get('notice') %}
-                <div class="flash-notice">
-                    {{ flashMessage }}
-                </div>
-            {% endfor %}
-        {% endif %}
+        {% for flashMessage in app.session.flashbag.get('notice') %}
+            <div class="flash-notice">
+                {{ flashMessage }}
+            </div>
+        {% endfor %}
 
     .. code-block:: html+php
 
-        <?php if ($view['session']->isStarted()): ?>
-            <?php foreach ($view['session']->getFlashBag()->get('notice') as $message): ?>
-                <div class="flash-notice">
-                    <?php echo "<div class='flash-error'>$message</div>" ?>
-                </div>
-            <?php endforeach; ?>
-        <?php endif; ?>
+        <?php foreach ($view['session']->getFlashBag()->get('notice') as $message): ?>
+            <div class="flash-notice">
+                <?php echo "<div class='flash-error'>$message</div>" ?>
+            </div>
+        <?php endforeach; ?>
 
 By design, flash messages are meant to live for exactly one request (they're
 "gone in a flash"). They're designed to be used across redirects exactly as
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -1462,7 +1462,7 @@ and ``nullable``. Take a few examples:
         <!--
             A string field length 255 that cannot be null
             (reflecting the default values for the "length" and *nullable* options)
-            type attribute is necessary in yaml definitions
+            type attribute is necessary in xml definitions
         -->
         <field name="name" type="string" />
         <field name="email"
diff --git a/book/templating.rst b/book/templating.rst
@@ -1384,43 +1384,9 @@ in a JavaScript string, use the ``js`` context:
 Debugging
 ---------
 
-.. versionadded:: 2.0.9
-    This feature is available as of Twig ``1.5.x``, which was first shipped
-    with Symfony 2.0.9.
-
 When using PHP, you can use ``var_dump()`` if you need to quickly find the
 value of a variable passed. This is useful, for example, inside your controller.
-The same can be achieved when using Twig by using the debug extension. This
-needs to be enabled in the config:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # app/config/config.yml
-        services:
-            acme_hello.twig.extension.debug:
-                class:        Twig_Extension_Debug
-                tags:
-                     - { name: 'twig.extension' }
-
-    .. code-block:: xml
-
-        <!-- app/config/config.xml -->
-        <services>
-            <service id="acme_hello.twig.extension.debug" class="Twig_Extension_Debug">
-                <tag name="twig.extension" />
-            </service>
-        </services>
-
-    .. code-block:: php
-
-        // app/config/config.php
-        use Symfony\Component\DependencyInjection\Definition;
-
-        $definition = new Definition('Twig_Extension_Debug');
-        $definition->addTag('twig.extension');
-        $container->setDefinition('acme_hello.twig.extension.debug', $definition);
+The same can be achieved when using Twig thanks to the the debug extension.
 
 Template parameters can then be dumped using the ``dump`` function:
 
diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -443,7 +443,7 @@ and sometimes only:
 
 By default ``connection`` would be an array in the first case and a string
 in the second making it difficult to validate. You can ensure it is always
-an array with with ``fixXmlConfig``.
+an array with ``fixXmlConfig``.
 
 You can further control the normalization process if you need to. For example,
 you may want to allow a string to be set and used as a particular key or several
diff --git a/components/event_dispatcher/container_aware_dispatcher.rst b/components/event_dispatcher/container_aware_dispatcher.rst
@@ -59,7 +59,7 @@ Adding Subscriber Services
 ``EventSubscribers`` can be added using the
 :method:`Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher::addSubscriberService`
 method where the first argument is the service ID of the subscriber service,
-and the second argument is the the service's class name (which must implement
+and the second argument is the service's class name (which must implement
 :class:`Symfony\\Component\\EventDispatcher\\EventSubscriberInterface`) as follows::
 
     $dispatcher->addSubscriberService(
diff --git a/components/http_foundation/session_configuration.rst b/components/http_foundation/session_configuration.rst
@@ -79,7 +79,7 @@ examples if you wish to write your own.
 Example usage::
 
     use Symfony\Component\HttpFoundation\Session\Session;
-    use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
+    use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
     use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
 
     $storage = new NativeSessionStorage(array(), new PdoSessionHandler());
diff --git a/components/http_foundation/sessions.rst b/components/http_foundation/sessions.rst
@@ -333,16 +333,3 @@ Compact method to process display all flashes at once::
             echo "<div class='flash-$type'>$message</div>\n";
         }
     }
-
-.. caution::
-
-    As flash messages use a session to store the messages from one request to
-    the next one, a session will be automatically started when you read the
-    flash messages even if none already exists. To avoid that default
-    behavior, test if there is an existing session first::
-
-        if ($session->isStarted()) {
-            foreach ($session->getFlashBag()->get('warning', array()) as $message) {
-                echo "<div class='flash-warning'>$message</div>";
-            }
-        }
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst
@@ -35,6 +35,7 @@ application:
 .. code-block:: text
 
     sub vcl_recv {
+        // Add a Surrogate-Capability header to announce ESI support.
         set req.http.Surrogate-Capability = "abc=ESI/1.0";
     }
 
@@ -45,12 +46,16 @@ Symfony2 adds automatically:
 .. code-block:: text
 
     sub vcl_fetch {
+        /* 
+        Check for ESI acknowledgement 
+        and remove Surrogate-Control header
+        */
         if (beresp.http.Surrogate-Control ~ "ESI/1.0") {
             unset beresp.http.Surrogate-Control;
 
-            // for Varnish >= 3.0
+            // For Varnish >= 3.0
             set beresp.do_esi = true;
-            // for Varnish < 3.0
+            // For Varnish < 3.0
             // esi;
         }
     }
@@ -75,14 +80,43 @@ that will invalidate the cache for a given resource:
 
 .. code-block:: text
 
+    /* 
+     Connect to the backend server 
+     on the local machine on port 8080
+     */
+    backend default {
+        .host = "127.0.0.1";
+        .port = "8080";
+    }
+
+    sub vcl_recv {
+        /* 
+        Varnish default behaviour doesn't support PURGE.
+        Match the PURGE request and immediately do a cache lookup, 
+        otherwise Varnish will directly pipe the request to the backend
+        and bypass the cache        
+        */
+        if (req.request == "PURGE") {
+            return(lookup);
+        }
+    }
+
     sub vcl_hit {
+        // Match PURGE request
         if (req.request == "PURGE") {
+            // Force object expiration for Varnish < 3.0
             set obj.ttl = 0s;
+            // Do an actual purge for Varnish >= 3.0
+            // purge;
             error 200 "Purged";
         }
     }
 
     sub vcl_miss {
+        /*
+        Match the PURGE request and
+        indicate the request wasn't stored in cache.
+        */
         if (req.request == "PURGE") {
             error 404 "Not purged";
         }
@@ -91,7 +125,56 @@ that will invalidate the cache for a given resource:
 .. caution::
 
     You must protect the ``PURGE`` HTTP method somehow to avoid random people
-    purging your cached data.
+    purging your cached data. You can do this by setting up an access list: 
+
+.. code-block:: text
+    /* 
+     Connect to the backend server 
+     on the local machine on port 8080
+     */
+    backend default {
+        .host = "127.0.0.1";
+        .port = "8080";
+    }
+
+	// Acl's can contain IP's, subnets and hostnames
+    acl purge {
+        "localhost";
+        "192.168.55.0"/24;
+    }
+
+    sub vcl_recv {
+        // Match PURGE request to avoid cache bypassing
+        if (req.request == "PURGE") {
+            // Match client IP to the acl
+            if (!client.ip ~ purge) {
+                // Deny access
+                error 405 "Not allowed.";
+            }
+            // Perform a cache lookup
+            return(lookup);
+        }
+    }
+	
+    sub vcl_hit {
+        // Match PURGE request
+        if (req.request == "PURGE") {
+            // Force object expiration for Varnish < 3.0
+            set obj.ttl = 0s;
+            // Do an actual purge for Varnish >= 3.0
+            // purge;
+            error 200 "Purged";
+        }
+    }	
+
+    sub vcl_miss {
+        // Match PURGE request    
+        if (req.request == "PURGE") {
+            // Indicate that the object isn't stored in cache
+            error 404 "Not purged";
+        }
+    }	
+
 
 .. _`Edge Architecture`: http://www.w3.org/TR/edge-arch
 .. _`GZIP and Varnish`: https://www.varnish-cache.org/docs/3.0/phk/gzip.html
diff --git a/cookbook/console/sending_emails.rst b/cookbook/console/sending_emails.rst
@@ -6,7 +6,7 @@ How to generate URLs and send Emails from the Console
 =====================================================
 
 Unfortunately, the command line context does not know about your VirtualHost
-or domain name. This means that if if you generate absolute URLs within a
+or domain name. This means that if you generate absolute URLs within a
 Console Command you'll probably end up with something like ``http://localhost/foo/bar``
 which is not very useful.
 
diff --git a/cookbook/deployment-tools.rst b/cookbook/deployment-tools.rst
@@ -23,7 +23,7 @@ The typical steps taken while deploying a Symfony2 application include:
 
 A deployment may also include other things, such as:
 
-* Tagging a particular version of of your code as a release in your source control repository;
+* Tagging a particular version of your code as a release in your source control repository;
 * Creating a temporary staging area to build your updated setup "offline";
 * Running any tests available to ensure code and/or server stability;
 * Removal of any unnecessary files from ``web`` to keep your production environment clean;
diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst
@@ -141,11 +141,9 @@ next request::
 
     // display any messages back in the next request (in a template)
 
-    {% if app.session.started %}
-        {% for flashMessage in app.session.flashbag.get('notice') %}
-            <div>{{ flashMessage }}</div>
-        {% endfor %}
-    {% endif %}
+    {% for flashMessage in app.session.flashbag.get('notice') %}
+        <div>{{ flashMessage }}</div>
+    {% endfor %}
 
 This is useful when you need to set a success message before redirecting
 the user to another page (which will then show the message). Please note that
diff --git a/reference/constraints/Collection.rst b/reference/constraints/Collection.rst
@@ -226,7 +226,7 @@ field is optional but must be a valid email if supplied, you can do the followin
 
 Even without ``allowMissingFields`` set to true, you can now omit the ``alternate_email``
 property completely from the ``profileData`` array, since it is ``Optional``.
-However, if the the ``personal_email`` field does not exist in the array,
+However, if the ``personal_email`` field does not exist in the array,
 the ``NotBlank`` constraint will still be applied (since it is wrapped in
 ``Required``) and you will receive a constraint violation.
 
diff --git a/reference/constraints/Length.rst b/reference/constraints/Length.rst
@@ -39,7 +39,7 @@ To verify that the ``firstName`` field length of a class is between "2" and
                         min: 2
                         max: 50
                         minMessage: "Your first name must be at least {{ limit }} characters length"
-                        maxMessage: "Your first name cannot be longer than than {{ limit }} characters length"
+                        maxMessage: "Your first name cannot be longer than {{ limit }} characters length"
 
     .. code-block:: php-annotations
 
@@ -55,7 +55,7 @@ To verify that the ``firstName`` field length of a class is between "2" and
              *      min = "2",
              *      max = "50",
              *      minMessage = "Your first name must be at least {{ limit }} characters length",
-             *      maxMessage = "Your first name cannot be longer than than {{ limit }} characters length"
+             *      maxMessage = "Your first name cannot be longer than {{ limit }} characters length"
              * )
              */
              protected $firstName;
@@ -70,7 +70,7 @@ To verify that the ``firstName`` field length of a class is between "2" and
                     <option name="min">2</option>
                     <option name="max">50</option>
                     <option name="minMessage">Your first name must be at least {{ limit }} characters length</option>
-                    <option name="maxMessage">Your first name cannot be longer than than {{ limit }} characters length</option>
+                    <option name="maxMessage">Your first name cannot be longer than {{ limit }} characters length</option>
                 </constraint>
             </property>
         </class>
@@ -91,7 +91,7 @@ To verify that the ``firstName`` field length of a class is between "2" and
                     'min'        => 2,
                     'max'        => 50,
                     'minMessage' => 'Your first name must be at least {{ limit }} characters length',
-                    'maxMessage' => 'Your first name cannot be longer than than {{ limit }} characters length',
+                    'maxMessage' => 'Your first name cannot be longer than {{ limit }} characters length',
                 )));
             }
         }
@@ -121,7 +121,7 @@ charset
 **type**: ``string``  **default**: ``UTF-8``
 
 The charset to be used when computing value's length. The :phpfunction:`grapheme_strlen` PHP
-function is used if available. If not, the the :phpfunction:`mb_strlen` PHP function
+function is used if available. If not, the :phpfunction:`mb_strlen` PHP function
 is used if available. If neither are available, the :phpfunction:`strlen` PHP function
 is used.
 
diff --git a/reference/forms/types/options/property_path.rst.inc b/reference/forms/types/options/property_path.rst.inc
@@ -12,8 +12,8 @@ name.
 
 If you wish the field to be ignored when reading or writing to the object 
 you can set the ``property_path`` option to ``false``, but using
-``property_path`` for this purpose is deprecated, you should do it the way
-described below:
+``property_path`` for this purpose is deprecated, you should use the
+``mapped`` option.
 
 .. versionadded:: 2.1
     Since 2.1, the ``mapped`` option has been added for this use-case.
