Merge pull request #24552 from yui-knk/raise_argument_error

Raise `ArgumentError` when an invalid form is passed to `Date#to_time`

activesupport/lib/active_support/core_ext/date/conversions.rb

@@ -80,6 +80,7 @@ def readable_inspect
   #
   #   date.to_time(:utc)             # => 2007-11-10 00:00:00 UTC
   def to_time(form = :local)
+    raise ArgumentError, "Expected :local or :utc, got #{form.inspect}." unless [:local, :utc].include?(form)
     ::Time.send(form, year, month, day)
   end
 

activesupport/test/core_ext/date_ext_test.rb

@@ -49,6 +49,10 @@ def test_to_time
         end
       end
     end
+
+    assert_raise(ArgumentError) do
+      Date.new(2005, 2, 21).to_time(:tokyo)
+    end
   end
 
   def test_compare_to_time