Rename the option from dash to hyphen

abrain · Mar 21, 2021 · 7d448a6 · 7d448a6
1 parent 292dc1f
commit 7d448a6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/ReportNumberController.php b/src/ReportNumberController.php
@@ -87,7 +87,7 @@ public function formatEinsatznummer(string $jahr, int $nummer): string
             case 'slash':
                 $separator = '/';
                 break;
-            case 'dash':
+            case 'hyphen':
                 $separator = '-';
                 break;
             default:
@@ -151,7 +151,7 @@ public static function sanitizeNumberOfDigits($input): int
      */
     public static function sanitizeSeparator(string $input): string
     {
-        if (in_array($input, ['none', 'slash', 'dash'])) {
+        if (in_array($input, ['none', 'slash', 'hyphen'])) {
             return $input;
         }
 

diff --git a/src/Settings/Pages/Numbers.php b/src/Settings/Pages/Numbers.php
@@ -106,7 +106,7 @@ public function echoFieldSeparator()
         $this->echoRadioButtons('einsatzvw_numbers_separator', [
             'none' => ['label' => _x('None', 'number separator selection', 'einsatzverwaltung')],
             'slash' => ['label' => __('Slash', 'einsatzverwaltung'), 'code' => '/'],
-            'dash' => ['label' => __('Dash', 'einsatzverwaltung'), 'code' => '-'],
+            'hyphen' => ['label' => __('Hyphen', 'einsatzverwaltung'), 'code' => '-'],
         ], ReportNumberController::DEFAULT_SEPARATOR);
         echo '</fieldset>';
         printf(

diff --git a/tests/unit/ReportNumberControllerTest.php b/tests/unit/ReportNumberControllerTest.php
@@ -30,7 +30,7 @@ public function testSanitizeSeparator()
         $fallback = ReportNumberController::DEFAULT_SEPARATOR;
         self::assertEquals('none', ReportNumberController::sanitizeSeparator('none'));
         self::assertEquals('slash', ReportNumberController::sanitizeSeparator('slash'));
-        self::assertEquals('dash', ReportNumberController::sanitizeSeparator('dash'));
+        self::assertEquals('hyphen', ReportNumberController::sanitizeSeparator('hyphen'));
         self::assertEquals($fallback, ReportNumberController::sanitizeSeparator(''));
         self::assertEquals($fallback, ReportNumberController::sanitizeSeparator('something'));
     }
@@ -95,7 +95,7 @@ public function testFormatEinsatznummer()
 
         expect('get_option')->once()->with('einsatzvw_einsatznummer_stellen')->andReturn('2');
         expect('get_option')->once()->with('einsatzvw_einsatznummer_lfdvorne', false)->andReturn('0');
-        expect('get_option')->once()->with('einsatzvw_numbers_separator', 'none')->andReturn('dash');
+        expect('get_option')->once()->with('einsatzvw_numbers_separator', 'none')->andReturn('hyphen');
         self::assertEquals('2019-623', $controller->formatEinsatznummer('2019', 623));
     }
 }