Merge 2.x into master

sonata-project · Oct 15, 2016 · 0784d21 · 0784d21
2 parents 0f9df38 + 2c8cecc
commit 0784d21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -7,6 +7,7 @@
 preset: symfony
 
 enabled:
+  - class_keyword_remove
   - combine_consecutive_unsets
   - long_array_syntax
   - newline_after_open_tag

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -181,9 +181,9 @@ namespace Foo;
 
 interface BarInterface
 {
-
-  // NEXT_MAJOR: Uncomment this method
   /**
+   * NEXT_MAJOR: Uncomment this method
+   *
    * This method does useful stuff.
    */
   // public function usefulMethod();