Merge branch '2.2' into 2.3

fabpot · fabpot · commit 10fc90b27370 · 2013-10-18T17:00:23.000+02:00
* 2.2:
  [DoctrineBridge] Added type check to prevent calling clear() on arrays
  [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
  Fix docblock typo

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
diff --git a/RememberMe/AbstractRememberMeServices.php b/RememberMe/AbstractRememberMeServices.php
@@ -291,7 +291,7 @@ protected function cancelCookie(Request $request)
     }
 
     /**
-     * Checks whether remember-me capabilities where requested
+     * Checks whether remember-me capabilities were requested
      *
      * @param Request $request
      *

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ protected function cancelCookie(Request $request)`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`/**`
`294`		`- * Checks whether remember-me capabilities where requested`
	`294`	`+ * Checks whether remember-me capabilities were requested`
`295`	`295`	`*`
`296`	`296`	`* @param Request $request`
`297`	`297`	`*`