Merge branch 'hotfix/539' into release-3.0.0

weierophinney · weierophinney · commit a944eaddb403 · 2018-01-17T11:49:14.000-06:00
Forward port #539 Conflicts: docs/book/cookbook/setting-locale-without-routing-parameter.md
diff --git a/docs/book/cookbook/setting-locale-without-routing-parameter.md b/docs/book/cookbook/setting-locale-without-routing-parameter.md
@@ -76,7 +76,7 @@ class SetLocaleMiddleware implements MiddlewareInterface
 
         // Expressive 2.X:
         return $handler->process($request->withUri(
-            $uri->withPath(substr($path, 3))
+            $uri->withPath(substr($path, strlen($locale)+1))
         ));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class SetLocaleMiddleware implements MiddlewareInterface`
`76`	`76`
`77`	`77`	`// Expressive 2.X:`
`78`	`78`	`return $handler->process($request->withUri(`
`79`		`- $uri->withPath(substr($path, 3))`
	`79`	`+ $uri->withPath(substr($path, strlen($locale)+1))`
`80`	`80`	`));`
`81`	`81`	`}`
`82`	`82`	`}`