Fix #65: Remove label field from the Sort class

roxblnfk · web-flow · commit ced24714c253 · 2021-01-26T18:32:25.000+03:00
diff --git a/src/Reader/Sort.php b/src/Reader/Sort.php
@@ -13,7 +13,7 @@
  * Sort represents information relevant to sorting according to one or multiple item fields.
  *
  * @template TSortFieldItem as array<string, int>
- * @template TConfigItem as array{asc: TSortFieldItem, desc: TSortFieldItem, default: string, label: string}
+ * @template TConfigItem as array{asc: TSortFieldItem, desc: TSortFieldItem, default: string}
  * @template TConfig as array<string, TConfigItem>
  * @psalm-immutable
  */
@@ -38,7 +38,6 @@ final class Sort
      *         'asc' => ['first_name' => SORT_ASC, 'last_name' => SORT_ASC],
      *         'desc' => ['first_name' => SORT_DESC, 'last_name' => SORT_DESC],
      *         'default' => 'desc',
-     *         'label' => 'Name',
      *     ],
      * ]
      * ```
@@ -51,7 +50,6 @@ final class Sort
      *     'asc' => ['age' => SORT_ASC],
      *     'desc' => ['age' => SORT_DESC],
      *     'default' => 'asc',
-     *     'label' => Inflector::camel2words('age'),
      * ]
      * ```
      *
@@ -63,7 +61,6 @@ final class Sort
      * - `asc` - criteria for ascending sorting.
      * - `desc` - criteria for descending sorting.
      * - `default` - default sorting. Could be either `asc` or `desc`. If not specified, `asc` is used.
-     * - `label` -
      * @psalm-var array<int, string>|array<string, array<string, int|string>> $config
      */
     public function __construct(array $config)
@@ -84,7 +81,6 @@ public function __construct(array $config)
                 'asc' => [$fieldName => SORT_ASC],
                 'desc' => [$fieldName => SORT_DESC],
                 'default' => 'asc',
-                'label' => $fieldName,
             ], $fieldConfig);
         }
 
diff --git a/tests/Reader/SortTest.php b/tests/Reader/SortTest.php
@@ -36,7 +36,6 @@ public function testConfig(): void
                 'asc' => ['first_name' => SORT_ASC, 'last_name' => SORT_ASC],
                 'desc' => ['first_name' => SORT_DESC, 'last_name' => SORT_DESC],
                 'default' => 'desc',
-                'label' => 'Name',
             ],
         ]);
 
@@ -49,7 +48,6 @@ public function testConfig(): void
                     'a' => SORT_DESC,
                 ],
                 'default' => 'asc',
-                'label' => 'a',
             ],
             'b' => [
                 'asc' => [
@@ -59,13 +57,11 @@ public function testConfig(): void
                     'b' => SORT_DESC,
                 ],
                 'default' => 'desc',
-                'label' => 'b',
             ],
             'name' => [
                 'asc' => ['first_name' => SORT_ASC, 'last_name' => SORT_ASC],
                 'desc' => ['first_name' => SORT_DESC, 'last_name' => SORT_DESC],
                 'default' => 'desc',
-                'label' => 'Name',
             ],
         ];
         $this->assertSame($expected, $this->getInaccessibleProperty($sort, 'config'));
@@ -123,7 +119,6 @@ public function testGetCriteria(): void
                 'asc' => ['bee' => SORT_ASC],
                 'desc' => ['bee' => SORT_DESC],
                 'default' => 'asc',
-                'label' => 'B',
             ],
         ]))
             ->withOrder([
@@ -143,7 +138,6 @@ public function testGetCriteriaDefaults(): void
                 'asc' => ['bee' => SORT_ASC],
                 'desc' => ['bee' => SORT_DESC],
                 'default' => 'desc',
-                'label' => 'B',
             ],
         ]))
             ->withOrder([]);
