Merge branch '2.7' into 2.8

symfony · Jul 15, 2015 · 571ed5b · 571ed5b
2 parents dc173b6 + 9755846
commit 571ed5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cookbook/security/voters_data_permission.rst b/cookbook/security/voters_data_permission.rst
@@ -111,7 +111,8 @@ edit a particular object. Here's an example implementation:
                     }
 
                     break;
-
+            }
+            
             return false;
         }
     }

diff --git a/cookbook/serializer.rst b/cookbook/serializer.rst
@@ -169,7 +169,7 @@ to your class and choose which groups to use when serializing::
     $serializer = $this->get('serializer');
     $json = $serializer->serialize(
         $someObject,
-        'json', array('groups' => array('group1')
+        'json', array('groups' => array('group1'))
     );
 
 .. _cookbook-serializer-enabling-metadata-cache: