Merge branch 'master' into php5

* master:
  CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
This commit is contained in:
Andreas Fischer 2013-12-10 22:29:11 +01:00
commit 3729ba3e44
22 changed files with 131 additions and 132 deletions

View File

@ -17,7 +17,6 @@
<rule ref="PEAR.Commenting.ClassComment.WrongTagOrder"><severity>0</severity></rule> <rule ref="PEAR.Commenting.ClassComment.WrongTagOrder"><severity>0</severity></rule>
<rule ref="PEAR.Commenting.FileComment.EmptyCopyright"><severity>0</severity></rule> <rule ref="PEAR.Commenting.FileComment.EmptyCopyright"><severity>0</severity></rule>
<rule ref="PEAR.Commenting.FileComment.InvalidVersion"><severity>0</severity></rule> <rule ref="PEAR.Commenting.FileComment.InvalidVersion"><severity>0</severity></rule>
<rule ref="PEAR.Commenting.FileComment.TagIndent"><severity>0</severity></rule>
<rule ref="PEAR.Commenting.FunctionComment.ExtraParamComment"><severity>0</severity></rule> <rule ref="PEAR.Commenting.FunctionComment.ExtraParamComment"><severity>0</severity></rule>
<rule ref="PEAR.Commenting.FunctionComment.MissingReturn"><severity>0</severity></rule> <rule ref="PEAR.Commenting.FunctionComment.MissingReturn"><severity>0</severity></rule>
<rule ref="PEAR.Commenting.FunctionComment.MissingParamComment"><severity>0</severity></rule> <rule ref="PEAR.Commenting.FunctionComment.MissingParamComment"><severity>0</severity></rule>