Merge branch '2.2'

keradus · keradus · commit f268941998c3 · 2017-05-02T17:09:24.000+02:00
diff --git a/README.rst b/README.rst
@@ -453,8 +453,8 @@ Choose from the list of available rules:
 
   Configuration options:
 
-  - ``annotations`` (``array``): list of annotations to remove, e.g.
-    ``["@author"]``; defaults to ``[]``
+  - ``annotations`` (``array``): list of annotations to remove, e.g. ``["author"]``;
+    defaults to ``[]``
 
 * **hash_to_slash_comment** [@Symfony]
 
diff --git a/src/Fixer/Phpdoc/GeneralPhpdocAnnotationRemoveFixer.php b/src/Fixer/Phpdoc/GeneralPhpdocAnnotationRemoveFixer.php
@@ -101,7 +101,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
      */
     protected function createConfigurationDefinition()
     {
-        $annotations = new FixerOptionBuilder('annotations', 'List of annotations to remove, e.g. `["@author"]`.');
+        $annotations = new FixerOptionBuilder('annotations', 'List of annotations to remove, e.g. `["author"]`.');
         $annotations = $annotations
             ->setAllowedTypes(['array'])
             ->setDefault([])

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)`
`101`	`101`	`*/`
`102`	`102`	`protected function createConfigurationDefinition()`
`103`	`103`	`{`
`104`		- $annotations = new FixerOptionBuilder('annotations', 'List of annotations to remove, e.g. `["@author"]`.');
	`104`	+ $annotations = new FixerOptionBuilder('annotations', 'List of annotations to remove, e.g. `["author"]`.');
`105`	`105`	`$annotations = $annotations`
`106`	`106`	`->setAllowedTypes(['array'])`
`107`	`107`	`->setDefault([])`