bug #6124 [cookbook] Add annotations block and fix regex (peterkokot)

wouterj · wouterj · commit d340a6a41af7 · 2016-02-06T14:10:10.000+01:00
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #6124). Discussion ---------- [cookbook] Add annotations block and fix regex | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | N/A Commits ------- 10e6b30 Add annotations block and fix regex for redirecting URLs with trailing slash
diff --git a/cookbook/routing/redirect_trailing_slash.rst b/cookbook/routing/redirect_trailing_slash.rst
@@ -37,13 +37,38 @@ system, as explained below:
 
 .. configuration-block::
 
+    .. code-block:: php-annotations
+
+        // src/AppBundle/Controller/RedirectingController.php
+        namespace AppBundle\Controller;
+
+        use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+        use Symfony\Component\HttpFoundation\Request;
+
+        class RedirectingController extends Controller
+        {
+            /**
+             * @Route("/{url}", name="remove_trailing_slash",
+             *     requirements={"url" = ".*\/$"}, methods={"GET"})
+             */
+            public function removeTrailingSlashAction(Request $request)
+            {
+                $pathInfo = $request->getPathInfo();
+                $requestUri = $request->getRequestUri();
+
+                $url = str_replace($pathInfo, rtrim($pathInfo, ' /'), $requestUri);
+
+                return $this->redirect($url, 301);
+            }
+        }
+
     .. code-block:: yaml
 
         remove_trailing_slash:
             path: /{url}
             defaults: { _controller: AppBundle:Redirecting:removeTrailingSlash }
             requirements:
-                url: .*/$
+                url: .*\/$
             methods: [GET]
 
     .. code-block:: xml
@@ -52,7 +77,7 @@ system, as explained below:
         <routes xmlns="http://symfony.com/schema/routing">
             <route id="remove_trailing_slash" path="/{url}" methods="GET">
                 <default key="_controller">AppBundle:Redirecting:removeTrailingSlash</default>
-                <requirement key="url">.*/$</requirement>
+                <requirement key="url">.*\/$</requirement>
             </route>
         </routes>
 
@@ -70,7 +95,7 @@ system, as explained below:
                     '_controller' => 'AppBundle:Redirecting:removeTrailingSlash',
                 ),
                 array(
-                    'url' => '.*/$',
+                    'url' => '.*\/$',
                 ),
                 array(),
                 '',
