PropertyTypeHandlingTest: split data provider

The `PropertyTypeHandlingTest` class tests the setting of property values from the ruleset as well as via inline `// phpcs:set ...`  annotations.

As both ways of setting the property value should be supported in the same manner, the tests used one data provider for both tests and the fixtures (`PropertyTypeHandlingTest.xml` ruleset and the `Fixtures/PropertyTypeHandlingInline.inc` file containing the inline annotations) mirrored the exact same test cases.

There is one feature, however, which is only supported when setting properties via the ruleset, not when setting them via inline annotations: array property extending.

Until now, the tests for that were also mirrored in the inline annotation tests, even though the feature isn't supported for inline annotations.

This commit now splits the data provider in two:
* One data provider for the tests which apply for both (= most tests).
* One specifically for extending array properties.

That second data provider will now only be used by the `testTypeHandlingWhenSetViaRuleset()` test method.

This should make it more straight-forward to add additional tests for property extending in the future.

---

In case anyone is wondering: As `phpcs:set` is only supposed to be used in tests, I don't think adding support for the `extend` option to inline properties is necessary.

Author: jrfnl

tests/Core/Ruleset/Fixtures/PropertyTypeHandlingInline.inc

@@ -22,14 +22,10 @@
 
 // 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 expectsArrayWithExtendedValues[] string, 15, another string
-// phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsArrayWithExtendedKeysAndValues[] 10=>10,string=>string,15=>15,another string=>another string
 // phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsEmptyArray[]
 
 // phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsOldSchoolArrayWithOnlyValues[] string, 10, 1.5, null, true, false
 // phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsOldSchoolArrayWithKeysAndValues[] string=>string,10=>10,float=>1.5,null=>null,true=>true,false=>false
-// phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsOldSchoolArrayWithExtendedValues[] string, 15, another string
-// phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsOldSchoolArrayWithExtendedKeysAndValues[] 10=>10,string=>string,15=>15,another string=>another string
 // phpcs:set TestStandard.SetProperty.PropertyTypeHandling expectsOldSchoolEmptyArray[]
 
 echo 'hello!';

tests/Core/Ruleset/PropertyTypeHandlingTest.php

@@ -45,6 +45,7 @@ final class PropertyTypeHandlingTest extends TestCase
      * @param mixed  $expected     Expected property value.
      *
      * @dataProvider dataTypeHandling
+     * @dataProvider dataArrayPropertyExtending
      *
      * @return void
      */
@@ -80,6 +81,7 @@ public function testTypeHandlingWhenSetInline($propertyName, $expected)
      * Data provider.
      *
      * @see self::testTypeHandlingWhenSetViaRuleset()
+     * @see self::testTypeHandlingWhenSetInline()
      *
      * @return array<string, array<string, mixed>>
      */
@@ -102,18 +104,6 @@ public static function dataTypeHandling()
             'false'  => 'false',
         ];
 
-        $expectedArrayOnlyValuesExtended    = [
-            'string',
-            '15',
-            'another string',
-        ];
-        $expectedArrayKeysAndValuesExtended = [
-            10               => '10',
-            'string'         => 'string',
-            15               => '15',
-            'another string' => 'another string',
-        ];
-
         return [
             'String value (default)'                          => [
                 'propertyName' => 'expectsString',
@@ -175,14 +165,6 @@ public static function dataTypeHandling()
                 'propertyName' => 'expectsArrayWithKeysAndValues',
                 'expected'     => $expectedArrayKeysAndValues,
             ],
-            'Array with only values extended (new style)'     => [
-                'propertyName' => 'expectsArrayWithExtendedValues',
-                'expected'     => $expectedArrayOnlyValuesExtended,
-            ],
-            'Array with keys and values extended (new style)' => [
-                'propertyName' => 'expectsArrayWithExtendedKeysAndValues',
-                'expected'     => $expectedArrayKeysAndValuesExtended,
-            ],
             'Empty array (new style)'                         => [
                 'propertyName' => 'expectsEmptyArray',
                 'expected'     => [],
@@ -195,6 +177,47 @@ public static function dataTypeHandling()
                 'propertyName' => 'expectsOldSchoolArrayWithKeysAndValues',
                 'expected'     => $expectedArrayKeysAndValues,
             ],
+            'Empty array (old style)'                         => [
+                'propertyName' => 'expectsOldSchoolEmptyArray',
+                'expected'     => [],
+            ],
+        ];
+
+    }//end dataTypeHandling()
+
+
+    /**
+     * Data provider.
+     *
+     * Array property extending is a feature which is only supported from a ruleset, not for inline property setting.
+     *
+     * @see self::testTypeHandlingWhenSetViaRuleset()
+     *
+     * @return array<string, array<string, mixed>>
+     */
+    public static function dataArrayPropertyExtending()
+    {
+        $expectedArrayOnlyValuesExtended    = [
+            'string',
+            '15',
+            'another string',
+        ];
+        $expectedArrayKeysAndValuesExtended = [
+            10               => '10',
+            'string'         => 'string',
+            15               => '15',
+            'another string' => 'another string',
+        ];
+
+        return [
+            'Array with only values extended (new style)'     => [
+                'propertyName' => 'expectsArrayWithExtendedValues',
+                'expected'     => $expectedArrayOnlyValuesExtended,
+            ],
+            'Array with keys and values extended (new style)' => [
+                'propertyName' => 'expectsArrayWithExtendedKeysAndValues',
+                'expected'     => $expectedArrayKeysAndValuesExtended,
+            ],
             'Array with only values extended (old style)'     => [
                 'propertyName' => 'expectsOldSchoolArrayWithExtendedValues',
                 'expected'     => $expectedArrayOnlyValuesExtended,
@@ -203,13 +226,9 @@ public static function dataTypeHandling()
                 'propertyName' => 'expectsOldSchoolArrayWithExtendedKeysAndValues',
                 'expected'     => $expectedArrayKeysAndValuesExtended,
             ],
-            'Empty array (old style)'                         => [
-                'propertyName' => 'expectsOldSchoolEmptyArray',
-                'expected'     => [],
-            ],
         ];
 
-    }//end dataTypeHandling()
+    }//end dataArrayPropertyExtending()
 
 
     /**