Do not raise when Rails.error.report receives context: nil

Author: kmcphillips

activesupport/lib/active_support/error_reporter.rb

@@ -217,7 +217,7 @@ def report(error, handled: true, severity: handled ? :warning : :error, context:
         raise ArgumentError, "severity must be one of #{SEVERITIES.map(&:inspect).join(", ")}, got: #{severity.inspect}"
       end
 
-      full_context = ActiveSupport::ExecutionContext.to_h.merge(context)
+      full_context = ActiveSupport::ExecutionContext.to_h.merge(context || {})
       disabled_subscribers = ActiveSupport::IsolatedExecutionState[self]
       @subscribers.each do |subscriber|
         unless disabled_subscribers&.any? { |s| s === subscriber }

activesupport/test/error_reporter_test.rb

@@ -284,6 +284,11 @@ class ErrorReporterTest < ActiveSupport::TestCase
     assert_includes error.message, "Reported error must be an Exception"
   end
 
+  test "report accepts context as nil" do
+    @reporter.report(@error, context: nil)
+    assert_equal({}, @subscriber.events.last[4])
+  end
+
   test "report errors only once" do
     assert_difference -> { @subscriber.events.size }, +1 do
       @reporter.report(@error, handled: false)