Merge branch 'master' into 4.x

Author: jrfnl

src/Ruleset.php

@@ -1651,15 +1651,13 @@ public function setSniffProperty($sniffClass, $name, $settings)
  // Handle properties set inline via phpcs:set.
  if (substr($name, -2) === '[]') {
  $values = [];
- if (is_string($value) === true) {
- if (trim($value) !== '') {
- foreach (explode(',', $value) as $val) {
- list($k, $v) = explode('=>', $val.'=>');
- if ($v !== '') {
- $values[trim($k)] = $v;
- } else {
- $values[] = $k;
- }
+ if (is_string($value) === true && trim($value) !== '') {
+ foreach (explode(',', $value) as $val) {
+ if (strpos($val, '=>') === false) {
+ $values[] = $val;
+ } else {
+ list($k, $v) = explode('=>', $val);
+ $values[trim($k)] = $v;
  }
  }
  }

tests/Core/Ruleset/Fixtures/PropertyTypeHandlingInline.inc

@@ -21,8 +21,8 @@
 // phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsBooleanFalseCase fALSe
 // phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsBooleanFalseTrimmed false
 
-// phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsArrayWithOnlyValues[] string, 10, 1.5, null, true, false
-// phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsArrayWithKeysAndValues[] string=>string,10=>10,float=>1.5,null=>null,true=>true,false=>false
+// phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsArrayWithOnlyValues[] string, 10, 1.5, , null, true, false
+// phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsArrayWithKeysAndValues[] string=>string,10=>10,float=>1.5,=>,null=>null,true=>true,false=>false
 // phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsEmptyArray[]
 
 // phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsArrayWithJustValueTrue[] true

tests/Core/Ruleset/PropertyTypeHandlingTest.php

@@ -93,13 +93,15 @@ public static function dataTypeHandling()
  '10',
  '1.5',
  null,
+ null,
  true,
  false,
  ];
  $expectedArrayKeysAndValues = [
  'string' => 'string',
  10 => '10',
  'float' => '1.5',
+ '' => null,
  'null' => null,
  'true' => true,
  'false' => false,

tests/Core/Ruleset/PropertyTypeHandlingTest.xml

@@ -26,6 +26,7 @@
  <element value="string"/>
  <element value="10"/>
  <element value="1.5"/>
+ <element value=""/>
  <element value="null"/>
  <element value="true"/>
  <element value="false"/>
@@ -35,6 +36,7 @@
  <element key="string" value="string"/>
  <element key="10" value="10"/>
  <element key="float" value="1.5"/>
+ <element key="" value=""/>
  <element key="null" value="null"/>
  <element key="true" value="true"/>
  <element key="false" value="false"/>