Browse Source

Merge branch 'master' into 3.0

* master:
  Add gitlab as output format in the README/help doc.
SpacePossum 6 years ago
parent
commit
3839243fb5
2 changed files with 2 additions and 2 deletions
  1. 1 1
      README.rst
  2. 1 1
      src/Console/Command/HelpCommand.php

+ 1 - 1
README.rst

@@ -159,7 +159,7 @@ to merge paths from the config file and from the argument:
 
     $ php php-cs-fixer.phar fix --path-mode=intersection /path/to/dir
 
-The ``--format`` option for the output format. Supported formats are ``txt`` (default one), ``json``, ``xml``, ``checkstyle`` and ``junit``.
+The ``--format`` option for the output format. Supported formats are ``txt`` (default one), ``json``, ``xml``, ``checkstyle``, ``junit`` and ``gitlab``.
 
 NOTE: the output for the following formats are generated in accordance with XML schemas
 

+ 1 - 1
src/Console/Command/HelpCommand.php

@@ -62,7 +62,7 @@ to merge paths from the config file and from the argument:
 
     <info>$ php %command.full_name% --path-mode=intersection /path/to/dir</info>
 
-The <comment>--format</comment> option for the output format. Supported formats are ``txt`` (default one), ``json``, ``xml``, ``checkstyle`` and ``junit``.
+The <comment>--format</comment> option for the output format. Supported formats are ``txt`` (default one), ``json``, ``xml``, ``checkstyle``, ``junit`` and ``gitlab``.
 
 NOTE: the output for the following formats are generated in accordance with XML schemas