Merge branch '2.6' into 2.7

* 2.6: fixed CS fixed CS Conflicts: src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
symfony · May 15, 2015 · a645601 · a645601
2 parents 08cd138 + d667b6a
commit a645601
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/Constraints/False.php b/Constraints/False.php
@@ -21,4 +21,6 @@
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsFalse instead.
  */
-class False extends IsFalse {}
+class False extends IsFalse
+{
+}
diff --git a/Constraints/FalseValidator.php b/Constraints/FalseValidator.php
@@ -18,4 +18,6 @@
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsFalseValidator instead.
  */
-class FalseValidator extends IsFalseValidator {}
+class FalseValidator extends IsFalseValidator
+{
+}
diff --git a/Constraints/Null.php b/Constraints/Null.php
@@ -21,4 +21,6 @@
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsNull instead.
  */
-class Null extends IsNull {}
+class Null extends IsNull
+{
+}
diff --git a/Constraints/NullValidator.php b/Constraints/NullValidator.php
@@ -18,4 +18,6 @@
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsNullValidator instead.
  */
-class NullValidator extends IsNullValidator {}
+class NullValidator extends IsNullValidator
+{
+}
diff --git a/Constraints/True.php b/Constraints/True.php
@@ -21,4 +21,6 @@
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsTrue instead.
  */
-class True extends IsTrue {}
+class True extends IsTrue
+{
+}
diff --git a/Constraints/TrueValidator.php b/Constraints/TrueValidator.php
@@ -18,4 +18,6 @@
  *
  * @deprecated since version 2.7, to be removed in 3.0. Use IsTrueValidator instead.
  */
-class TrueValidator extends IsTrueValidator {}
+class TrueValidator extends IsTrueValidator
+{
+}