Merge branch '2.7' into 2.8

symfony · Jul 6, 2015 · 2c1328e · 2c1328e
2 parents cb482dc + 4df1ea8
commit 2c1328e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cookbook/security/voters_data_permission.rst b/cookbook/security/voters_data_permission.rst
@@ -169,7 +169,7 @@ and tag it with ``security.voter``:
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
             <services>
-                <service id="security.access.post_document_voter"
+                <service id="security.access.post_voter"
                     class="AppBundle\Security\Authorization\Voter\PostVoter"
                     public="false">
                     <tag name="security.voter" />
@@ -182,9 +182,10 @@ and tag it with ``security.voter``:
         // src/AppBundle/Resources/config/services.php
         $container
             ->register(
-                    'security.access.post_document_voter',
+                    'security.access.post_voter',
                     'AppBundle\Security\Authorization\Voter\PostVoter'
             )
+            ->setPublic(false)
             ->addTag('security.voter')
         ;
 

diff --git a/create_framework/unit-testing.rst b/create_framework/unit-testing.rst
@@ -185,6 +185,6 @@ Symfony code.
 Now that we are confident (again) about the code we have written, we can
 safely think about the next batch of features we want to add to our framework.
 
-.. _`PHPUnit`: http://www.phpunit.de/manual/current/en/index.html
-.. _`test doubles`: http://www.phpunit.de/manual/current/en/test-doubles.html
+.. _`PHPUnit`: http://phpunit.de/manual/current/en/index.html
+.. _`test doubles`: http://phpunit.de/manual/current/en/test-doubles.html
 .. _`XDebug`: http://xdebug.org/