Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/phoenix/controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,7 @@ defmodule Phoenix.Controller do
%{"info" => "Welcome Back!"}

"""
@deprecated "get_flash/1 is deprecated. Use the @flash assign provided by the :fetch_flash plug"
@deprecated "Use the @flash assign provided by the :fetch_flash plug"
def get_flash(conn) do
Map.get(conn.assigns, :flash) ||
raise ArgumentError, message: "flash not fetched, call fetch_flash/2"
Expand All @@ -1730,7 +1730,7 @@ defmodule Phoenix.Controller do
"Welcome Back!"

"""
@deprecated "get_flash/2 is deprecated. Use Phoenix.Flash.get(@flash, key) instead"
@deprecated "Use Phoenix.Flash.get/2 instead"
def get_flash(conn, key) do
get_flash(conn)[flash_key(key)]
end
Expand Down
4 changes: 2 additions & 2 deletions lib/phoenix/test/conn_test.ex
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,14 @@ defmodule Phoenix.ConnTest do
Gets the whole flash storage.
"""
@spec get_flash(Conn.t) :: map
@deprecated "get_flash/1 is deprecated. Use conn.assigns.flash instead"
@deprecated "Use conn.assigns.flash instead"
def get_flash(conn), do: conn.assigns.flash

@doc """
Gets the given key from the flash storage.
"""
@spec get_flash(Conn.t, term) :: term
@deprecated "get_flash/2 is deprecated. Use Phoenix.Flash.get/2 instead"
@deprecated "Use Phoenix.Flash.get/2 instead"
def get_flash(conn, key) do
Phoenix.Flash.get(conn.assigns.flash, key)
end
Expand Down
Loading