Revert "Merge pull request #25811 from oss92/to_sentence_fallback_string"

This reverts commit bad3a120f1690f393d8f6204b3ceee60f0ce707b, reversing
changes made to 2384317465ccb1dfca456a2b7798714b99f32711.

Reason: Adding a new option in the API for something that can be done
with a `#presence` check could do.

3 files changed, 3 insertions, 20 deletions

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index fac91c31da..7cbe92259d 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -145,12 +145,6 @@
 
     *Genadi Samokovarov*
 
-*   Add `:fallback_string` option to `Array#to_sentence`. If an empty array
-    calls the function and a fallback string option is set then it returns the
-    fallback string other than an empty string.
-
-    *Mohamed Osama*
-
 *   Fix `ActiveSupport::TimeZone#strptime`. Now raises `ArgumentError` when the
     given time doesn't match the format. The error is the same as the one given
     by Ruby's `Date.strptime`. Previously it raised
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 1d4c83ae52..cac15e1100 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -40,12 +40,6 @@ class Array
   #   ['one', 'two', 'three'].to_sentence(words_connector: ' or ', last_word_connector: ' or at least ')
   #   # => "one or two or at least three"
   #
-  #   [].to_sentence(fallback_string: 'none')
-  #   # => "none"
-  #
-  #   ['one', 'two'].to_sentence(fallback_string: 'none')
-  #   # => "one and two"
-  #
   # Using <tt>:locale</tt> option:
   #
   #   # Given this locale dictionary:
@@ -63,7 +57,7 @@ class Array
   #   ['uno', 'dos', 'tres'].to_sentence(locale: :es)
   #   # => "uno o dos o al menos tres"
   def to_sentence(options = {})
-    options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale, :fallback_string)
+    options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale)
 
     default_connectors = {
       words_connector: ", ",
@@ -78,7 +72,7 @@ class Array
 
     case length
     when 0
-      "#{options[:fallback_string] || ''}"
+      ""
     when 1
       "#{self[0]}"
     when 2
diff --git a/activesupport/test/core_ext/array/conversions_test.rb b/activesupport/test/core_ext/array/conversions_test.rb
index 469efcd934..29e661a99b 100644
--- a/activesupport/test/core_ext/array/conversions_test.rb
+++ b/activesupport/test/core_ext/array/conversions_test.rb
@@ -25,11 +25,6 @@ class ToSentenceTest < ActiveSupport::TestCase
     assert_equal "one, two and three", ["one", "two", "three"].to_sentence(last_word_connector: " and ")
   end
 
-  def test_to_sentence_with_fallback_string
-    assert_equal "none", [].to_sentence(fallback_string: "none")
-    assert_equal "one, two, and three", ["one", "two", "three"].to_sentence(fallback_string: "none")
-  end
-
   def test_two_elements
     assert_equal "one and two", ["one", "two"].to_sentence
     assert_equal "one two", ["one", "two"].to_sentence(two_words_connector: " ")
@@ -63,7 +58,7 @@ class ToSentenceTest < ActiveSupport::TestCase
       ["one", "two"].to_sentence(passing: "invalid option")
     end
 
-    assert_equal exception.message, "Unknown key: :passing. Valid keys are: :words_connector, :two_words_connector, :last_word_connector, :locale, :fallback_string"
+    assert_equal exception.message, "Unknown key: :passing. Valid keys are: :words_connector, :two_words_connector, :last_word_connector, :locale"
   end
 
   def test_always_returns_string