diff options
author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-02-08 17:13:33 +0900 |
---|---|---|
committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-02-08 17:18:55 +0900 |
commit | 4e63ce53fc25c3bc15c5ebf54bab54fa847ee02a (patch) | |
tree | 880fce0e0193931546870d16590a2b3ded25d1e3 | |
parent | 25c6f4c947450c75c5a43ded19d7b6ca8b7c95b6 (diff) | |
download | rails-4e63ce53fc25c3bc15c5ebf54bab54fa847ee02a.tar.gz rails-4e63ce53fc25c3bc15c5ebf54bab54fa847ee02a.tar.bz2 rails-4e63ce53fc25c3bc15c5ebf54bab54fa847ee02a.zip |
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`.
-rw-r--r-- | activesupport/CHANGELOG.md | 2 | ||||
-rw-r--r-- | activesupport/lib/active_support.rb | 8 | ||||
-rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 13 |
3 files changed, 7 insertions, 16 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 37585b8c46..2fb7f29d73 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,4 +1,4 @@ -* Deprecate `.halt_and_display_warning_on_return_false`. +* Deprecate `.halt_callback_chains_on_return_false`. *Rafael Mendonça França* diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 267fa755c6..03e3ce821a 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -80,11 +80,15 @@ module ActiveSupport 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 diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 480291c346..0bee35135b 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -69,19 +69,6 @@ module ActiveSupport 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 |