Merge branch '2.7'

fabpot · fabpot · commit 08278c0cefaa · 2014-12-30T14:35:28.000+01:00
* 2.7:
  [Debug] track and report deprecated classes and interfaces
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows

Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
	src/Symfony/Component/Security/Core/Util/SecureRandom.php
diff --git a/OptionsResolverInterface.php b/OptionsResolverInterface.php
@@ -20,7 +20,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @deprecated Deprecated since Symfony 2.6, to be removed in Symfony 3.0.
+ * @deprecated since version 2.6, to be removed in Symfony 3.0.
  *             Use {@link OptionsResolver} instead.
  */
 interface OptionsResolverInterface

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`/**`
`21`	`21`	`* @author Bernhard Schussek <[email protected]>`
`22`	`22`	`*`
`23`		`- * @deprecated Deprecated since Symfony 2.6, to be removed in Symfony 3.0.`
	`23`	`+ * @deprecated since version 2.6, to be removed in Symfony 3.0.`
`24`	`24`	`* Use {@link OptionsResolver} instead.`
`25`	`25`	`*/`
`26`	`26`	`interface OptionsResolverInterface`