stop referencing `env` in url_for

encapsulate env in the request so that we can eventually move away from
the env hash

2 files changed, 5 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 847f08c25d..572d1770f7 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -31,7 +31,7 @@ module ActionController
       }.merge!(super).freeze
 
       if (same_origin = _routes.equal?(request.routes)) ||
-         (script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) ||
+         (script_name = request.engine_script_name(_routes)) ||
          (original_script_name = request.original_script_name)
 
         options = @_url_options.dup
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index b15f37d7f2..d211ea2b77 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -113,6 +113,10 @@ module ActionDispatch
       env['ORIGINAL_SCRIPT_NAME'.freeze]
     end
 
+    def engine_script_name(_routes) # :nodoc:
+      env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]
+    end
+
     def request_method=(request_method) #:nodoc:
       if check_method(request_method)
         @request_method = env["REQUEST_METHOD"] = request_method