Merge pull request #26746 from rails/deprecations

Remove all deprecations from Action Pack

6 files changed, 19 insertions, 118 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
index 9b44c4483e..99dc37c568 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -6,19 +6,19 @@ module ActionDispatch
     cattr_accessor :rescue_responses
     @@rescue_responses = Hash.new(:internal_server_error)
     @@rescue_responses.merge!(
-      "ActionController::RoutingError"                => :not_found,
-      "AbstractController::ActionNotFound"            => :not_found,
-      "ActionController::MethodNotAllowed"            => :method_not_allowed,
-      "ActionController::UnknownHttpMethod"           => :method_not_allowed,
-      "ActionController::NotImplemented"              => :not_implemented,
-      "ActionController::UnknownFormat"               => :not_acceptable,
-      "ActionController::InvalidAuthenticityToken"    => :unprocessable_entity,
-      "ActionController::InvalidCrossOriginRequest"   => :unprocessable_entity,
-      "ActionDispatch::ParamsParser::ParseError"      => :bad_request,
-      "ActionController::BadRequest"                  => :bad_request,
-      "ActionController::ParameterMissing"            => :bad_request,
-      "Rack::QueryParser::ParameterTypeError"         => :bad_request,
-      "Rack::QueryParser::InvalidParameterError"      => :bad_request
+      "ActionController::RoutingError"               => :not_found,
+      "AbstractController::ActionNotFound"           => :not_found,
+      "ActionController::MethodNotAllowed"           => :method_not_allowed,
+      "ActionController::UnknownHttpMethod"          => :method_not_allowed,
+      "ActionController::NotImplemented"             => :not_implemented,
+      "ActionController::UnknownFormat"              => :not_acceptable,
+      "ActionController::InvalidAuthenticityToken"   => :unprocessable_entity,
+      "ActionController::InvalidCrossOriginRequest"  => :unprocessable_entity,
+      "ActionDispatch::Http::Parameters::ParseError" => :bad_request,
+      "ActionController::BadRequest"                 => :bad_request,
+      "ActionController::ParameterMissing"           => :bad_request,
+      "Rack::QueryParser::ParameterTypeError"        => :bad_request,
+      "Rack::QueryParser::InvalidParameterError"     => :bad_request
     )
 
     cattr_accessor :rescue_templates
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
deleted file mode 100644
index 5f96b80e87..0000000000
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require "action_dispatch/http/request"
-
-module ActionDispatch
-  # ActionDispatch::ParamsParser works for all the requests having any Content-Length
-  # (like POST). It takes raw data from the request and puts it through the parser
-  # that is picked based on Content-Type header.
-  #
-  # In case of any error while parsing data ParamsParser::ParseError is raised.
-  class ParamsParser
-    # Raised when raw data from the request cannot be parsed by the parser
-    # defined for request's content mime type.
-    class ParseError < StandardError
-      def initialize(message = nil, original_exception = nil)
-        if message
-          ActiveSupport::Deprecation.warn("Passing #message is deprecated and has no effect. " \
-                                          "#{self.class} will automatically capture the message " \
-                                          "of the original exception.", caller)
-        end
-
-        if original_exception
-          ActiveSupport::Deprecation.warn("Passing #original_exception is deprecated and has no effect. " \
-                                          "Exceptions will automatically capture the original exception.", caller)
-        end
-
-        super($!.message)
-      end
-
-      def original_exception
-        ActiveSupport::Deprecation.warn("#original_exception is deprecated. Use #cause instead.", caller)
-        cause
-      end
-    end
-
-    # Create a new +ParamsParser+ middleware instance.
-    #
-    # The +parsers+ argument can take Hash of parsers where key is identifying
-    # content mime type, and value is a lambda that is going to process data.
-    def self.new(app, parsers = {})
-      ActiveSupport::Deprecation.warn("ActionDispatch::ParamsParser is deprecated and will be removed in Rails 5.1. Configure the parameter parsing in ActionDispatch::Request.parameter_parsers.")
-      parsers = parsers.transform_keys { |key| key.respond_to?(:symbol) ? key.symbol : key }
-      ActionDispatch::Request.parameter_parsers = ActionDispatch::Request::DEFAULT_PARSERS.merge(parsers)
-      app
-    end
-  end
-end
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 60920ea6c8..49b82e7128 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -7,22 +7,12 @@ require "action_dispatch/request/session"
 module ActionDispatch
   module Session
     class SessionRestoreError < StandardError #:nodoc:
-      def initialize(const_error = nil)
-        if const_error
-          ActiveSupport::Deprecation.warn("Passing #original_exception is deprecated and has no effect. " \
-                                          "Exceptions will automatically capture the original exception.", caller)
-        end
-
+      def initialize
         super("Session contains objects whose class definition isn't available.\n" +
           "Remember to require the classes for all objects kept in the session.\n" +
           "(Original exception: #{$!.message} [#{$!.class}])\n")
         set_backtrace $!.backtrace
       end
-
-      def original_exception
-        ActiveSupport::Deprecation.warn("#original_exception is deprecated. Use #cause instead.", caller)
-        cause
-      end
     end
 
     module Compatibility
diff --git a/actionpack/lib/action_dispatch/middleware/ssl.rb b/actionpack/lib/action_dispatch/middleware/ssl.rb
index 992daab3aa..c9bd417aa2 100644
--- a/actionpack/lib/action_dispatch/middleware/ssl.rb
+++ b/actionpack/lib/action_dispatch/middleware/ssl.rb
@@ -45,35 +45,17 @@ module ActionDispatch
     HSTS_EXPIRES_IN = 15552000
 
     def self.default_hsts_options
-      { expires: HSTS_EXPIRES_IN, subdomains: false, preload: false }
+      { expires: HSTS_EXPIRES_IN, subdomains: true, preload: false }
     end
 
-    def initialize(app, redirect: {}, hsts: {}, secure_cookies: true, **options)
+    def initialize(app, redirect: {}, hsts: {}, secure_cookies: true)
       @app = app
 
-      if options[:host] || options[:port]
-        ActiveSupport::Deprecation.warn <<-end_warning.strip_heredoc
-          The `:host` and `:port` options are moving within `:redirect`:
-          `config.ssl_options = { redirect: { host: …, port: … } }`.
-        end_warning
-        @redirect = options.slice(:host, :port)
-      else
-        @redirect = redirect
-      end
+      @redirect = redirect
 
       @exclude = @redirect && @redirect[:exclude] || proc { !@redirect }
       @secure_cookies = secure_cookies
 
-      if hsts != true && hsts != false && hsts[:subdomains].nil?
-        hsts[:subdomains] = false
-
-        ActiveSupport::Deprecation.warn <<-end_warning.strip_heredoc
-          In Rails 5.1, The `:subdomains` option of HSTS config will be treated as true if
-          unspecified. Set `config.ssl_options = { hsts: { subdomains: false } }` to opt out
-          of this behavior.
-        end_warning
-      end
-
       @hsts_header = build_hsts_header(normalize_hsts_options(hsts))
     end
 
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 466eb8b3f1..6949b31e75 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -88,7 +88,6 @@ module ActionDispatch
     end
 
     def delete(target)
-      target = get_class target
       middlewares.delete_if { |m| m.klass == target }
     end
 
@@ -103,31 +102,13 @@ module ActionDispatch
     private
 
       def assert_index(index, where)
-        index = get_class index
         i = index.is_a?(Integer) ? index : middlewares.index { |m| m.klass == index }
         raise "No such middleware to insert #{where}: #{index.inspect}" unless i
         i
       end
 
-      def get_class(klass)
-        if klass.is_a?(String) || klass.is_a?(Symbol)
-          classcache = ActiveSupport::Dependencies::Reference
-          converted_klass = classcache[klass.to_s]
-          ActiveSupport::Deprecation.warn <<-eowarn
-Passing strings or symbols to the middleware builder is deprecated, please change
-them to actual class references.  For example:
-
-  "#{klass}" => #{converted_klass}
-
-          eowarn
-          converted_klass
-        else
-          klass
-        end
-      end
-
       def build_middleware(klass, args, block)
-        Middleware.new(get_class(klass), args, block)
+        Middleware.new(klass, args, block)
       end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index fbf2a5fd0b..5c71f0fc48 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -106,14 +106,7 @@ module ActionDispatch
   # produce a directory traversal using this middleware. Only 'GET' and 'HEAD'
   # requests will result in a file being returned.
   class Static
-    def initialize(app, path, deprecated_cache_control = :not_set, index: "index", headers: {})
-      if deprecated_cache_control != :not_set
-        ActiveSupport::Deprecation.warn("The `cache_control` argument is deprecated," \
-                                        "replaced by `headers: { 'Cache-Control' => #{deprecated_cache_control} }`, " \
-                                        " and will be removed in Rails 5.1.")
-        headers["Cache-Control".freeze] = deprecated_cache_control
-      end
-
+    def initialize(app, path, index: "index", headers: {})
       @app = app
       @file_handler = FileHandler.new(path, index: index, headers: headers)
     end