Issue #3515981: Apply new orderby key to configuration schema for WorkflowState - undo

config/schema/workflow.state.schema.yml

@@ -3,7 +3,6 @@
 workflow.state.*:
   type: config_entity
   label: 'Workflow State'
-  orderby: weight
   mapping:
     id:
       type: string

src/Entity/WorkflowState.php

@@ -242,8 +242,9 @@ class WorkflowState extends ConfigEntityBase implements WorkflowStateInterface {
    * @_deprecated WorkflowState::getStates() ==> WorkflowState::loadMultiple()
    */
   public static function loadMultiple(array $ids = NULL, $wid = '', $reset = FALSE) {
-    // Loaded States are already sorted via 'orderby: weight' in schema file.
+    // @todo Loaded States are sorted via 'orderby: weight' in schema file.
     $states = parent::loadMultiple();
+    usort($states, ['Drupal\workflow\Entity\WorkflowState', 'sort']);
 
     // Filter on Wid, if requested, E.g., by Workflow->getStates().
     // Set the ID as array key.
@@ -257,6 +258,22 @@ class WorkflowState extends ConfigEntityBase implements WorkflowStateInterface {
     return $result;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) {
+    /** @var \Drupal\workflow\Entity\WorkflowState $a */
+    /** @var \Drupal\workflow\Entity\WorkflowState $b */
+    $a_wid = $a->getWorkflowId();
+    $b_wid = $b->getWorkflowId();
+    if ($a_wid == $b_wid) {
+      $a_weight = $a->getWeight();
+      $b_weight = $b->getWeight();
+      return ($a_weight < $b_weight) ? -1 : 1;
+    }
+    return ($a_wid < $b_wid) ? -1 : 1;
+  }
+
   /**
    * Deactivate a Workflow State, moving existing content to a given State.
    *