Revert "Issue #2855428 by Sam152, jhedstrom, timmillwood: Workflow state and...

Revert "Issue #2855428 by Sam152, jhedstrom, timmillwood: Workflow state and transition add/edit form IDs have a '-' in them"

This reverts commit 973e6b4f.

core/lib/Drupal/Core/Entity/EntityForm.php

@@ -90,7 +90,7 @@ public function getFormId() {
       $form_id .= '_' . $this->entity->bundle();
     }
     if ($this->operation != 'default') {
-      $form_id = $form_id . '_' . str_replace('-', '_', $this->operation);
+      $form_id = $form_id . '_' . $this->operation;
     }
     return $form_id . '_form';
   }

core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php

@@ -97,11 +97,6 @@ public function providerTestFormIds() {
         'bundle' => '',
         'operation' => 'delete',
       )),
-      array('workflow_edit_state_form', array(
-        'entity_type' => 'workflow',
-        'bundle' => '',
-        'operation' => 'edit-state',
-      )),
     );
   }