From 39071d5816dd3cb1848171cc88b38aecb9752029 Mon Sep 17 00:00:00 2001
From: Rylan Polster <rslpolster@gmail.com>
Date: Wed, 10 Aug 2022 15:31:02 -0400
Subject: [PATCH] Remove `arch` from cask stanza ordering temporarily

---
 Library/Homebrew/rubocops/cask/constants/stanza.rb          | 2 +-
 .../test/support/fixtures/cask/Casks/arch-arm-only.rb       | 3 ++-
 .../support/fixtures/cask/Casks/invalid/invalid-two-arch.rb | 5 +++--
 .../test/support/fixtures/cask/Casks/multiple-versions.rb   | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Library/Homebrew/rubocops/cask/constants/stanza.rb b/Library/Homebrew/rubocops/cask/constants/stanza.rb
index 959beda606..93a9b67d55 100644
--- a/Library/Homebrew/rubocops/cask/constants/stanza.rb
+++ b/Library/Homebrew/rubocops/cask/constants/stanza.rb
@@ -6,7 +6,7 @@ module RuboCop
     # Constants available globally for use in all cask cops.
     module Constants
       STANZA_GROUPS = [
-        [:version, :sha256, :arch],
+        [:version, :sha256],
         [:language],
         [:url, :appcast, :name, :desc, :homepage],
         [:livecheck],
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/arch-arm-only.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/arch-arm-only.rb
index c40235d15d..d6bc73d35e 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/arch-arm-only.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/arch-arm-only.rb
@@ -1,7 +1,8 @@
 cask "arch-arm-only" do
+  arch arm: "-arm"
+
   version "1.2.3"
   sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
-  arch arm: "-arm"
 
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine#{arch}.zip"
   homepage "https://brew.sh/"
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-arch.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-arch.rb
index 15112831e6..117e59c3bc 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-arch.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/invalid/invalid-two-arch.rb
@@ -1,9 +1,10 @@
 cask "invalid-two-arch" do
-  version "1.2.3"
-  sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
   arch arm: "arm", intel: "intel"
   arch arm: "amd64", intel: "x86_64"
 
+  version "1.2.3"
+  sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
+
   url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
   homepage "https://brew.sh/"
 
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/multiple-versions.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/multiple-versions.rb
index f4e112f956..05a29fd20f 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/multiple-versions.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/multiple-versions.rb
@@ -1,9 +1,9 @@
 cask "multiple-versions" do
+  arch arm: "arm", intel: "intel"
+  platform = on_arch_conditional arm: "darwin-arm64", intel: "darwin"
+
   version "1.2.3"
   sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
-  arch arm: "arm", intel: "intel"
-
-  platform = on_arch_conditional arm: "darwin-arm64", intel: "darwin"
 
   on_big_sur do
     version "1.2.0"