Merge pull request #4894 from solidusio/backport/v3.2/pr-4875

[v3.2] Fix publishing events responding to #to_hash on Ruby 2.7

core/lib/spree/bus.rb

@@ -9,12 +9,12 @@ module Spree
   # It has some modifications to support internal usage of the legacy event
   # system {see Spree::AppConfiguration#use_legacy_events}.
   Bus = Omnes::Bus.new
-  Bus.define_singleton_method(:publish) do |*args, **kwargs, &block|
+  def Bus.publish(event, **kwargs)
     if Spree::Config.use_legacy_events
-      Spree::Event.fire(*args, **kwargs, &block)
+      Spree::Event.fire(event, **kwargs)
     else
       # Override caller_location to point to the actual event publisher
-      super(*args, **kwargs, caller_location: caller_locations(1)[0], &block)
+      super(event, **kwargs, caller_location: caller_locations(1)[0])
     end
   end
 end

core/spec/lib/spree/bus_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Spree::Bus do
+  describe '.publish' do
+    it "doesn't coerce events responding to #to_hash",
+      if: (Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")) && !Spree::Config.use_legacy_events do
+      described_class.register(:foo)
+      event = Class.new do
+        def omnes_event_name
+          :foo
+        end
+
+        def to_hash
+          { foo: 'bar' }
+        end
+      end.new
+
+      expect { described_class.publish(event) }.not_to raise_error
+    ensure
+      described_class.registry.unregister(:foo)
+    end
+  end
+end