deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'phpcs-extend-options'

Browse source
This commit is contained in:
Dmitry Khomutov 2017-03-25 09:22:01 +07:00
parent 99a7044a3f 980a1e1614
commit af0b7d6994
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
2 changed files with 51 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/en/plugins/php_code_sniffer.md
View file

@ -16,6 +16,9 @@ Configuration
* **encoding** [string, optional] - The file encoding you wish to check for. * **encoding** [string, optional] - The file encoding you wish to check for.
* **path** [string, optional] - Path in which to run PHP Code Sniffer. * **path** [string, optional] - Path in which to run PHP Code Sniffer.
* **ignore** [array, optional] - A list of files / paths to ignore, defaults to the build_settings ignore list. * **ignore** [array, optional] - A list of files / paths to ignore, defaults to the build_settings ignore list.
* **severity** [int, optional] - Allows to set the minimum severity level
* **error_severity** [int, optional] - Allows to set the minimum errors severity level
* **warning_severity** [int, optional] - Allows to set the minimum warnings severity level
### Examples ### Examples

52
src/PHPCensor/Plugin/PhpCodeSniffer.php
View file

@ -61,6 +61,20 @@ class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface
*/ */
protected $ignore; protected $ignore;
/**
* @var int
*/
protected $severity = null;
/**
* @var null|int
*/
protected $error_severity = null;
/**
* @var null|int
*/
protected $warning_severity = null;
/** /**
* @return string * @return string
*/ */
@ -118,6 +132,18 @@ class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface
if (!empty($options['standard'])) { if (!empty($options['standard'])) {
$this->standard = $options['standard']; $this->standard = $options['standard'];
} }
if (isset($options['severity']) && is_int($options['severity'])) {
$this->severity = $options['severity'];
}
if (isset($options['error_severity']) && is_int($options['error_severity'])) {
$this->error_severity = $options['error_severity'];
}
if (isset($options['warning_severity']) && is_int($options['warning_severity'])) {
$this->warning_severity = $options['warning_severity'];
}
} }
/** /**
@ -143,13 +169,13 @@ class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface
*/ */
public function execute() public function execute()
{ {
list($ignore, $standard, $suffixes) = $this->getFlags(); list($ignore, $standard, $suffixes, $severity, $errorSeverity, $warningSeverity) = $this->getFlags();
$phpcs = $this->builder->findBinary('phpcs'); $phpcs = $this->builder->findBinary('phpcs');
$this->builder->logExecOutput(false); $this->builder->logExecOutput(false);
$cmd = $phpcs . ' --report=json %s %s %s %s %s "%s"'; $cmd = $phpcs . ' --report=json %s %s %s %s %s "%s" %s %s %s';
$this->builder->executeCommand( $this->builder->executeCommand(
$cmd, $cmd,
$standard, $standard,
@ -157,7 +183,10 @@ class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface
$ignore, $ignore,
$this->tab_width, $this->tab_width,
$this->encoding, $this->encoding,
$this->builder->buildPath . $this->path $this->builder->buildPath . $this->path,
$severity,
$errorSeverity,
$warningSeverity
); );
$output = $this->builder->getLastOutput(); $output = $this->builder->getLastOutput();
@ -202,7 +231,22 @@ class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface
$suffixes = ' --extensions=' . implode(',', $this->suffixes); $suffixes = ' --extensions=' . implode(',', $this->suffixes);
} }
return [$ignore, $standard, $suffixes]; $severity = '';
if ($this->severity !== null) {
$severity = ' --severity=' . $this->severity;
}
$errorSeverity = '';
if ($this->error_severity !== null) {
$errorSeverity = ' --error-severity=' . $this->error_severity;
}
$warningSeverity = '';
if ($this->warning_severity !== null) {
$warningSeverity = ' --warning-severity=' . $this->warning_severity;
}
return [$ignore, $standard, $suffixes, $severity, $errorSeverity, $warningSeverity];
} }
/** /**