Merge pull request #18325 from rafaelfranca/rm-remove-deprecations

Remove all deprecation code

3 files changed, 5 insertions, 28 deletions

diff --git a/actionview/lib/action_view/template/handlers.rb b/actionview/lib/action_view/template/handlers.rb
index 9e61ea4225..0105e88a49 100644
--- a/actionview/lib/action_view/template/handlers.rb
+++ b/actionview/lib/action_view/template/handlers.rb
@@ -7,9 +7,9 @@ module ActionView #:nodoc:
       autoload :Raw, 'action_view/template/handlers/raw'
 
       def self.extended(base)
-        base.register_default_template_handler :erb, ERB.new
+        base.register_default_template_handler :raw, Raw.new
+        base.register_template_handler :erb, ERB.new
         base.register_template_handler :builder, Builder.new
-        base.register_template_handler :raw, Raw.new
         base.register_template_handler :ruby, :source.to_proc
       end
 
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb
index 29d2e9ca90..7fc14b89ee 100644
--- a/actionview/lib/action_view/template/resolver.rb
+++ b/actionview/lib/action_view/template/resolver.rb
@@ -1,7 +1,6 @@
 require "pathname"
 require "active_support/core_ext/class"
 require "active_support/core_ext/module/attribute_accessors"
-require 'active_support/core_ext/string/filters'
 require "action_view/template"
 require "thread"
 require "thread_safe"
@@ -251,12 +250,6 @@ module ActionView
       pieces.shift
 
       extension = pieces.pop
-      unless extension
-        ActiveSupport::Deprecation.warn(<<-MSG.squish)
-          The file #{path} did not specify a template handler. The default is
-          currently ERB, but will change to RAW in the future.
-        MSG
-      end
 
       handler = Template.handler_for_extension(extension)
       format, variant = pieces.last.split(EXTENSIONS[:variants], 2) if pieces.last
diff --git a/actionview/lib/action_view/view_paths.rb b/actionview/lib/action_view/view_paths.rb
index 2e203a7590..492f67f45d 100644
--- a/actionview/lib/action_view/view_paths.rb
+++ b/actionview/lib/action_view/view_paths.rb
@@ -16,14 +16,9 @@ module ActionView
     module ClassMethods
       def _prefixes # :nodoc:
         @_prefixes ||= begin
-          deprecated_prefixes = handle_deprecated_parent_prefixes
-          if deprecated_prefixes
-            deprecated_prefixes
-          else
-            return local_prefixes if superclass.abstract?
-
-            local_prefixes + superclass._prefixes
-          end
+          return local_prefixes if superclass.abstract?
+
+          local_prefixes + superclass._prefixes
         end
       end
 
@@ -34,17 +29,6 @@ module ActionView
       def local_prefixes
         [controller_path]
       end
-
-      def handle_deprecated_parent_prefixes # TODO: remove in 4.3/5.0.
-        return unless respond_to?(:parent_prefixes)
-
-        ActiveSupport::Deprecation.warn(<<-MSG.squish)
-          Overriding `ActionController::Base::parent_prefixes` is deprecated,
-          override `.local_prefixes` instead.
-        MSG
-
-        local_prefixes + parent_prefixes
-      end
     end
 
     # The prefixes used in render "foo" shortcuts.