Permalink
Browse files

deprecate `halt_callback_chains_on_return_false` instead of `halt_and…

…_display_warning_on_return_false`

`halt_and_display_warning_on_return_false` is not a public API and
application is using `halt_callback_chains_on_return_false`.

https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt#L29
https://github.com/rails/rails/blob/5-0-stable/activesupport/lib/active_support.rb#L86..L88

Therefore, deprecate messages should be issued for
`halt_callback_chains_on_return_false` instead of
`halt_and_display_warning_on_return_false`.
  • Loading branch information...
y-yagi committed Feb 8, 2017
1 parent 25c6f4c commit 4e63ce53fc25c3bc15c5ebf54bab54fa847ee02a
@@ -1,4 +1,4 @@
* Deprecate `.halt_and_display_warning_on_return_false`.
* Deprecate `.halt_callback_chains_on_return_false`.
*Rafael Mendonça França*
@@ -80,11 +80,15 @@ def self.eager_load!
cattr_accessor :test_order # :nodoc:
def self.halt_callback_chains_on_return_false
Callbacks.halt_and_display_warning_on_return_false
ActiveSupport::Deprecation.warn(<<-MSG.squish)
ActiveSupport.halt_callback_chains_on_return_false is deprecated and will be removed in Rails 5.2.
MSG
end
def self.halt_callback_chains_on_return_false=(value)
Callbacks.halt_and_display_warning_on_return_false = value
ActiveSupport::Deprecation.warn(<<-MSG.squish)
ActiveSupport.halt_callback_chains_on_return_false= is deprecated and will be removed in Rails 5.2.
MSG
end
def self.to_time_preserves_timezone
@@ -69,19 +69,6 @@ module Callbacks
CALLBACK_FILTER_TYPES = [:before, :after, :around]
def self.halt_and_display_warning_on_return_false=(value)
ActiveSupport::Deprecation.warn(<<-MSG.squish)
.halt_and_display_warning_on_return_false= is deprecated and will be removed in Rails 5.2.
MSG
end
def self.halt_and_display_warning_on_return_false
ActiveSupport::Deprecation.warn(<<-MSG.squish)
.halt_and_display_warning_on_return_false is deprecated and will be removed in Rails 5.2.
MSG
end
# Runs the callbacks for the given event.
#
# Calls the before and around callbacks in the order they were set, yields

0 comments on commit 4e63ce5

Please sign in to comment.