Merge branch '2.3' into 2.4

fabpot · fabpot · commit 36f6e92eff70 · 2013-12-28T09:12:03.000+01:00
* 2.3:
  fixed a typo
  fixed CS for lambdas
  [Yaml] fixed some license headers
  Fixes message value for objects
  Check for hour, minute &amp; second validity
  fixed various typos
  [Filesystem] Fixed mirror for symlinks
  [Validator] Removed duplicated test for IBAN in data provider

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
diff --git a/RememberMe/TokenBasedRememberMeServices.php b/RememberMe/TokenBasedRememberMeServices.php
@@ -116,7 +116,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
      *
      * @param string  $class
      * @param string  $username The username
-     * @param integer $expires  The unixtime when the cookie expires
+     * @param integer $expires  The Unix timestamp when the cookie expires
      * @param string  $password The encoded password
      *
      * @throws \RuntimeException if username contains invalid chars
@@ -138,7 +138,7 @@ protected function generateCookieValue($class, $username, $expires, $password)
      *
      * @param string  $class
      * @param string  $username The username
-     * @param integer $expires  The unixtime when the cookie expires
+     * @param integer $expires  The Unix timestamp when the cookie expires
      * @param string  $password The encoded password
      *
      * @throws \RuntimeException when the private key is empty

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt`
`116`	`116`	`*`
`117`	`117`	`* @param string $class`
`118`	`118`	`* @param string $username The username`
`119`		`- * @param integer $expires The unixtime when the cookie expires`
	`119`	`+ * @param integer $expires The Unix timestamp when the cookie expires`
`120`	`120`	`* @param string $password The encoded password`
`121`	`121`	`*`
`122`	`122`	`* @throws \RuntimeException if username contains invalid chars`
`@@ -138,7 +138,7 @@ protected function generateCookieValue($class, $username, $expires, $password)`
`138`	`138`	`*`
`139`	`139`	`* @param string $class`
`140`	`140`	`* @param string $username The username`
`141`		`- * @param integer $expires The unixtime when the cookie expires`
	`141`	`+ * @param integer $expires The Unix timestamp when the cookie expires`
`142`	`142`	`* @param string $password The encoded password`
`143`	`143`	`*`
`144`	`144`	`* @throws \RuntimeException when the private key is empty`