From 88244675460dae766f074003d2f9efa195a4a4ee Mon Sep 17 00:00:00 2001
From: Bob Olde Hampsink <b.oldehampsink@nerds.company>
Date: Wed, 13 Jun 2018 14:32:22 +0200
Subject: [PATCH] Sort fields secondarily by handle to fix order flakiness

---
 src/services/Fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/Fields.php b/src/services/Fields.php
index 77e99fd3ad2..b683f8de4be 100644
--- a/src/services/Fields.php
+++ b/src/services/Fields.php
@@ -1394,7 +1394,7 @@ private function _createFieldQuery(): Query
                 'fields.settings'
             ])
             ->from(['{{%fields}} fields'])
-            ->orderBy(['fields.name' => SORT_ASC]);
+            ->orderBy(['fields.name' => SORT_ASC, 'fields.handle' => SORT_ASC]);
     }
 
     /**