Skip to content

Commit ceaa3ce

Browse files
committed
Changelog + coding standards
1 parent e81e99e commit ceaa3ce

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CodeSniffer/CLI.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,8 @@ public function process($values=array())
500500
if (empty($values) === true) {
501501
$values = $this->getCommandLineValues();
502502
} else {
503-
$this->values = $values = array_merge($this->getDefaults(), $values);
503+
$values = array_merge($this->getDefaults(), $values);
504+
$this->values = $values;
504505
}
505506

506507
if ($values['generator'] !== '') {

package.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
3636
-- Thanks to Nik Sun for the patch
3737
- Exit statements are now recognised as valid closers for CASE and DEFAULT blocks
3838
-- Thanks to Maksim Kochkin for the patch
39+
- PHP_CodeSniffer_CLI::process() can now be passed an incomplete array of CLI values
40+
-- Missing values will be set to the CLI defaults
41+
-- Thanks to Maksim Kochkin for the patch
3942
- Fixed bug #20097 : CLI.php throws error in php 5.2
4043
- Fixed bug #20100 : incorrect Function mysql() has been deprecated report
4144
- Fixed bug #20123 : PSR2 complains about an empty second statement in for-loop

0 commit comments

Comments
 (0)