diff --git a/Gemfile.lock b/Gemfile.lock
index 083f7ae0f..cb8c945f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -526,8 +526,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.4)
-      strscan
+    rexml (3.3.7)
     rgeo (3.0.1)
     rgeo-activerecord (7.0.1)
       activerecord (>= 5.0)
@@ -673,7 +672,6 @@ GEM
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
     stringio (3.1.1)
-    strscan (3.1.0)
     tailwindcss-rails (2.6.5-aarch64-linux)
       railties (>= 7.0.0)
     tailwindcss-rails (2.6.5-arm64-darwin)
diff --git a/sorbet/rbi/gems/rexml@3.3.4.rbi b/sorbet/rbi/gems/rexml@3.3.7.rbi
similarity index 93%
rename from sorbet/rbi/gems/rexml@3.3.4.rbi
rename to sorbet/rbi/gems/rexml@3.3.7.rbi
index 99c4052b0..f81537a5e 100644
--- a/sorbet/rbi/gems/rexml@3.3.4.rbi
+++ b/sorbet/rbi/gems/rexml@3.3.7.rbi
@@ -113,7 +113,7 @@ class REXML::Attribute
 
   # Returns a copy of this attribute
   #
-  # source://rexml//lib/rexml/attribute.rb#163
+  # source://rexml//lib/rexml/attribute.rb#164
   def clone; end
 
   # source://rexml//lib/rexml/attribute.rb#132
@@ -129,7 +129,7 @@ class REXML::Attribute
   #
   # Returns this attribute
   #
-  # source://rexml//lib/rexml/attribute.rb#171
+  # source://rexml//lib/rexml/attribute.rb#172
   def element=(element); end
 
   # Creates (and returns) a hash from both the name and value
@@ -137,7 +137,7 @@ class REXML::Attribute
   # source://rexml//lib/rexml/attribute.rb#111
   def hash; end
 
-  # source://rexml//lib/rexml/attribute.rb#197
+  # source://rexml//lib/rexml/attribute.rb#198
   def inspect; end
 
   # Returns the namespace URL, if defined, or nil otherwise
@@ -165,13 +165,13 @@ class REXML::Attribute
   # source://rexml//lib/rexml/attribute.rb#95
   def namespace(arg = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/attribute.rb#193
+  # source://rexml//lib/rexml/attribute.rb#194
   def node_type; end
 
   # The normalized value of this attribute.  That is, the attribute with
   # entities intact.
   #
-  # source://rexml//lib/rexml/attribute.rb#157
+  # source://rexml//lib/rexml/attribute.rb#158
   def normalized=(new_normalized); end
 
   # Returns the namespace of the attribute.
@@ -191,7 +191,7 @@ class REXML::Attribute
   #
   # This method is usually not called directly.
   #
-  # source://rexml//lib/rexml/attribute.rb#184
+  # source://rexml//lib/rexml/attribute.rb#185
   def remove; end
 
   # Returns the attribute value, with entities replaced
@@ -217,17 +217,17 @@ class REXML::Attribute
 
   # Writes this attribute (EG, puts 'key="value"' to the output)
   #
-  # source://rexml//lib/rexml/attribute.rb#189
+  # source://rexml//lib/rexml/attribute.rb#190
   def write(output, indent = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/attribute.rb#203
+  # source://rexml//lib/rexml/attribute.rb#204
   def xpath; end
 end
 
 # A class that defines the set of Attributes of an Element and provides
 # operations for accessing elements in that set.
 #
-# source://rexml//lib/rexml/element.rb#2128
+# source://rexml//lib/rexml/element.rb#2137
 class REXML::Attributes < ::Hash
   # :call-seq:
   #   new(element)
@@ -248,7 +248,7 @@ class REXML::Attributes < ::Hash
   #
   # @return [Attributes] a new instance of Attributes
   #
-  # source://rexml//lib/rexml/element.rb#2147
+  # source://rexml//lib/rexml/element.rb#2156
   def initialize(element); end
 
   # :call-seq:
@@ -271,7 +271,7 @@ class REXML::Attributes < ::Hash
   #   attrs.add(REXML::Attribute.new('baz', '3')) # => baz='3'
   #   attrs.include?('baz') # => true
   #
-  # source://rexml//lib/rexml/element.rb#2524
+  # source://rexml//lib/rexml/element.rb#2522
   def <<(attribute); end
 
   # :call-seq:
@@ -295,7 +295,7 @@ class REXML::Attributes < ::Hash
   #
   # Related: get_attribute (returns an \Attribute object).
   #
-  # source://rexml//lib/rexml/element.rb#2172
+  # source://rexml//lib/rexml/element.rb#2181
   def [](name); end
 
   # :call-seq:
@@ -321,7 +321,7 @@ class REXML::Attributes < ::Hash
   #   attrs['baz:att'] = nil
   #   attrs.include?('baz:att') # => false
   #
-  # source://rexml//lib/rexml/element.rb#2356
+  # source://rexml//lib/rexml/element.rb#2365
   def []=(name, value); end
 
   # :call-seq:
@@ -344,7 +344,7 @@ class REXML::Attributes < ::Hash
   #   attrs.add(REXML::Attribute.new('baz', '3')) # => baz='3'
   #   attrs.include?('baz') # => true
   #
-  # source://rexml//lib/rexml/element.rb#2524
+  # source://rexml//lib/rexml/element.rb#2522
   def add(attribute); end
 
   # :call-seq:
@@ -375,7 +375,7 @@ class REXML::Attributes < ::Hash
   #   attrs.delete(attr) # => <ele att='&lt;'/> # => <ele att='&lt;'/>
   #   attrs.delete(attr) # => <ele att='&lt;'/> # => <ele/>
   #
-  # source://rexml//lib/rexml/element.rb#2477
+  # source://rexml//lib/rexml/element.rb#2475
   def delete(attribute); end
 
   # :call-seq:
@@ -394,7 +394,7 @@ class REXML::Attributes < ::Hash
   #   attrs = ele.attributes
   #   attrs.delete_all('att') # => [att='&lt;']
   #
-  # source://rexml//lib/rexml/element.rb#2546
+  # source://rexml//lib/rexml/element.rb#2544
   def delete_all(name); end
 
   # :call-seq:
@@ -419,7 +419,7 @@ class REXML::Attributes < ::Hash
   #   ["bar:att", "2"]
   #   ["att", "<"]
   #
-  # source://rexml//lib/rexml/element.rb#2274
+  # source://rexml//lib/rexml/element.rb#2283
   def each; end
 
   # :call-seq:
@@ -444,7 +444,7 @@ class REXML::Attributes < ::Hash
   #   [REXML::Attribute, bar:att='2']
   #   [REXML::Attribute, att='&lt;']
   #
-  # source://rexml//lib/rexml/element.rb#2241
+  # source://rexml//lib/rexml/element.rb#2250
   def each_attribute; end
 
   # :call-seq:
@@ -466,7 +466,7 @@ class REXML::Attributes < ::Hash
   #   attrs.get_attribute('att')           # => att='&lt;'
   #   attrs.get_attribute('nosuch')        # => nil
   #
-  # source://rexml//lib/rexml/element.rb#2300
+  # source://rexml//lib/rexml/element.rb#2309
   def get_attribute(name); end
 
   # :call-seq:
@@ -486,7 +486,7 @@ class REXML::Attributes < ::Hash
   #   attrs.get_attribute_ns('http://foo', 'att')    # => foo:att='1'
   #   attrs.get_attribute_ns('http://foo', 'nosuch') # => nil
   #
-  # source://rexml//lib/rexml/element.rb#2572
+  # source://rexml//lib/rexml/element.rb#2570
   def get_attribute_ns(namespace, name); end
 
   # :call-seq:
@@ -503,7 +503,7 @@ class REXML::Attributes < ::Hash
   #   ele = d.root.elements['//ele']   # => <a foo:att='1' bar:att='2' att='&lt;'/>
   #   ele.attributes.length # => 3
   #
-  # source://rexml//lib/rexml/element.rb#2212
+  # source://rexml//lib/rexml/element.rb#2221
   def length; end
 
   # :call-seq:
@@ -515,7 +515,7 @@ class REXML::Attributes < ::Hash
   #   d = REXML::Document.new(xml_string)
   #   d.root.attributes.namespaces # => {"xmlns"=>"foo", "x"=>"bar", "y"=>"twee"}
   #
-  # source://rexml//lib/rexml/element.rb#2433
+  # source://rexml//lib/rexml/element.rb#2431
   def namespaces; end
 
   # :call-seq:
@@ -529,7 +529,7 @@ class REXML::Attributes < ::Hash
   #   d = REXML::Document.new(xml_string)
   #   d.root.attributes.prefixes # => ["x", "y"]
   #
-  # source://rexml//lib/rexml/element.rb#2408
+  # source://rexml//lib/rexml/element.rb#2406
   def prefixes; end
 
   # :call-seq:
@@ -546,7 +546,7 @@ class REXML::Attributes < ::Hash
   #   ele = d.root.elements['//ele']   # => <a foo:att='1' bar:att='2' att='&lt;'/>
   #   ele.attributes.length # => 3
   #
-  # source://rexml//lib/rexml/element.rb#2212
+  # source://rexml//lib/rexml/element.rb#2221
   def size; end
 
   # :call-seq:
@@ -565,7 +565,7 @@ class REXML::Attributes < ::Hash
   #   attrs = ele.attributes.to_a      # => [foo:att='1', bar:att='2', att='&lt;']
   #   attrs.first.class                # => REXML::Attribute
   #
-  # source://rexml//lib/rexml/element.rb#2194
+  # source://rexml//lib/rexml/element.rb#2203
   def to_a; end
 end
 
@@ -1038,7 +1038,7 @@ class REXML::Document < ::REXML::Element
   #   d.add(REXML::Element.new('foo'))
   #   d.to_s # => "<foo/>"
   #
-  # source://rexml//lib/rexml/document.rb#170
+  # source://rexml//lib/rexml/document.rb#172
   def <<(child); end
 
   # :call-seq:
@@ -1075,7 +1075,7 @@ class REXML::Document < ::REXML::Element
   #   d.add(REXML::Element.new('foo'))
   #   d.to_s # => "<foo/>"
   #
-  # source://rexml//lib/rexml/document.rb#170
+  # source://rexml//lib/rexml/document.rb#172
   def add(child); end
 
   # :call-seq:
@@ -1085,7 +1085,7 @@ class REXML::Document < ::REXML::Element
   #
   #   REXML::Element.add_element(name_or_element, attributes)
   #
-  # source://rexml//lib/rexml/document.rb#209
+  # source://rexml//lib/rexml/document.rb#211
   def add_element(arg = T.unsafe(nil), arg2 = T.unsafe(nil)); end
 
   # :call-seq:
@@ -1094,7 +1094,7 @@ class REXML::Document < ::REXML::Element
   # Returns the new document resulting from executing
   # <tt>Document.new(self)</tt>.  See Document.new.
   #
-  # source://rexml//lib/rexml/document.rb#120
+  # source://rexml//lib/rexml/document.rb#122
   def clone; end
 
   # :call-seq:
@@ -1107,10 +1107,10 @@ class REXML::Document < ::REXML::Element
   #   d = REXML::Document.new('')
   #   d.doctype.class # => nil
   #
-  # source://rexml//lib/rexml/document.rb#241
+  # source://rexml//lib/rexml/document.rb#243
   def doctype; end
 
-  # source://rexml//lib/rexml/document.rb#442
+  # source://rexml//lib/rexml/document.rb#446
   def document; end
 
   # :call-seq:
@@ -1123,20 +1123,39 @@ class REXML::Document < ::REXML::Element
   #   d = REXML::Document.new('')
   #   d.encoding # => "UTF-8"
   #
-  # source://rexml//lib/rexml/document.rb#290
+  # source://rexml//lib/rexml/document.rb#292
   def encoding; end
 
   # Returns the value of attribute entity_expansion_count.
   #
-  # source://rexml//lib/rexml/document.rb#433
+  # source://rexml//lib/rexml/document.rb#435
   def entity_expansion_count; end
 
+  # Sets the attribute entity_expansion_limit
+  #
+  # @param value the value to set the attribute entity_expansion_limit to.
+  #
+  # source://rexml//lib/rexml/document.rb#436
+  def entity_expansion_limit=(_arg0); end
+
+  # Returns the value of attribute entity_expansion_text_limit.
+  #
+  # source://rexml//lib/rexml/document.rb#437
+  def entity_expansion_text_limit; end
+
+  # Sets the attribute entity_expansion_text_limit
+  #
+  # @param value the value to set the attribute entity_expansion_text_limit to.
+  #
+  # source://rexml//lib/rexml/document.rb#437
+  def entity_expansion_text_limit=(_arg0); end
+
   # :call-seq:
   #   expanded_name -> empty_string
   #
   # Returns an empty string.
   #
-  # source://rexml//lib/rexml/document.rb#129
+  # source://rexml//lib/rexml/document.rb#131
   def expanded_name; end
 
   # :call-seq:
@@ -1146,7 +1165,7 @@ class REXML::Document < ::REXML::Element
   # d = doc_type
   # d ? d.name : "UNDEFINED"
   #
-  # source://rexml//lib/rexml/document.rb#129
+  # source://rexml//lib/rexml/document.rb#131
   def name; end
 
   # :call-seq:
@@ -1154,10 +1173,10 @@ class REXML::Document < ::REXML::Element
   #
   # Returns the symbol +:document+.
   #
-  # source://rexml//lib/rexml/document.rb#110
+  # source://rexml//lib/rexml/document.rb#112
   def node_type; end
 
-  # source://rexml//lib/rexml/document.rb#435
+  # source://rexml//lib/rexml/document.rb#439
   def record_entity_expansion; end
 
   # :call-seq:
@@ -1170,7 +1189,7 @@ class REXML::Document < ::REXML::Element
   #   d = REXML::Document.new('')
   #   d.root # => nil
   #
-  # source://rexml//lib/rexml/document.rb#225
+  # source://rexml//lib/rexml/document.rb#227
   def root; end
 
   # :call-seq:
@@ -1186,7 +1205,7 @@ class REXML::Document < ::REXML::Element
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/document.rb#305
+  # source://rexml//lib/rexml/document.rb#307
   def stand_alone?; end
 
   # :call-seq:
@@ -1200,7 +1219,7 @@ class REXML::Document < ::REXML::Element
   #   d = REXML::Document.new('')
   #   d.version # => "1.0"
   #
-  # source://rexml//lib/rexml/document.rb#275
+  # source://rexml//lib/rexml/document.rb#277
   def version; end
 
   # :call-seq:
@@ -1259,7 +1278,7 @@ class REXML::Document < ::REXML::Element
   #   instead of encoding in XML declaration.
   #   Defaults to nil. It means encoding in XML declaration is used.
   #
-  # source://rexml//lib/rexml/document.rb#365
+  # source://rexml//lib/rexml/document.rb#367
   def write(*arguments); end
 
   # :call-seq:
@@ -1275,12 +1294,12 @@ class REXML::Document < ::REXML::Element
   #   d.xml_decl.class # => REXML::XMLDecl
   #   d.xml_decl.to_s  # => ""
   #
-  # source://rexml//lib/rexml/document.rb#258
+  # source://rexml//lib/rexml/document.rb#260
   def xml_decl; end
 
   private
 
-  # source://rexml//lib/rexml/document.rb#447
+  # source://rexml//lib/rexml/document.rb#451
   def build(source); end
 
   class << self
@@ -1288,31 +1307,31 @@ class REXML::Document < ::REXML::Element
     #
     # Deprecated. Use REXML::Security.entity_expansion_limit= instead.
     #
-    # source://rexml//lib/rexml/document.rb#415
+    # source://rexml//lib/rexml/document.rb#417
     def entity_expansion_limit; end
 
     # Set the entity expansion limit. By default the limit is set to 10000.
     #
     # Deprecated. Use REXML::Security.entity_expansion_limit= instead.
     #
-    # source://rexml//lib/rexml/document.rb#408
+    # source://rexml//lib/rexml/document.rb#410
     def entity_expansion_limit=(val); end
 
     # Get the entity expansion limit. By default the limit is set to 10240.
     #
     # Deprecated. Use REXML::Security.entity_expansion_text_limit instead.
     #
-    # source://rexml//lib/rexml/document.rb#429
+    # source://rexml//lib/rexml/document.rb#431
     def entity_expansion_text_limit; end
 
     # Set the entity expansion limit. By default the limit is set to 10240.
     #
     # Deprecated. Use REXML::Security.entity_expansion_text_limit= instead.
     #
-    # source://rexml//lib/rexml/document.rb#422
+    # source://rexml//lib/rexml/document.rb#424
     def entity_expansion_text_limit=(val); end
 
-    # source://rexml//lib/rexml/document.rb#401
+    # source://rexml//lib/rexml/document.rb#403
     def parse_stream(source, listener); end
   end
 end
@@ -1663,7 +1682,7 @@ class REXML::Element < ::REXML::Parent
   #   root[:attr]   # => "value"
   #   root[:nosuch] # => nil
   #
-  # source://rexml//lib/rexml/element.rb#1237
+  # source://rexml//lib/rexml/element.rb#1246
   def [](name_or_index); end
 
   # :call-seq:
@@ -1692,7 +1711,7 @@ class REXML::Element < ::REXML::Parent
   #   e.add_attribute(a) # => attr='VALUE'
   #   e['attr'] # => "VALUE"
   #
-  # source://rexml//lib/rexml/element.rb#1336
+  # source://rexml//lib/rexml/element.rb#1345
   def add_attribute(key, value = T.unsafe(nil)); end
 
   # :call-seq:
@@ -1718,7 +1737,7 @@ class REXML::Element < ::REXML::Parent
   #   a = [['foo' => 'bar'], ['baz' => 'bat']]
   #   e.add_attributes(a)
   #
-  # source://rexml//lib/rexml/element.rb#1367
+  # source://rexml//lib/rexml/element.rb#1376
   def add_attributes(hash); end
 
   # :call-seq:
@@ -1755,7 +1774,7 @@ class REXML::Element < ::REXML::Parent
   #   e0.add_element(e1, {'bat' => '0', 'bam' => '1'})
   #   e0[1] # => <bar bat='0' bam='1'/>
   #
-  # source://rexml//lib/rexml/element.rb#723
+  # source://rexml//lib/rexml/element.rb#732
   def add_element(element, attrs = T.unsafe(nil)); end
 
   # :call-seq:
@@ -1776,7 +1795,7 @@ class REXML::Element < ::REXML::Parent
   #   e.add_namespace('baz', 'bat')
   #   e.namespaces # => {"xmlns"=>"bar", "baz"=>"bat"}
   #
-  # source://rexml//lib/rexml/element.rb#646
+  # source://rexml//lib/rexml/element.rb#655
   def add_namespace(prefix, uri = T.unsafe(nil)); end
 
   # :call-seq:
@@ -1818,7 +1837,7 @@ class REXML::Element < ::REXML::Parent
   #   a.add_text(REXML::Text.new('baz'))
   #   a.to_a # => ["foo", <b/>, "bar", "baz", "baz"]
   #
-  # source://rexml//lib/rexml/element.rb#1138
+  # source://rexml//lib/rexml/element.rb#1147
   def add_text(text); end
 
   # :call-seq:
@@ -1850,7 +1869,7 @@ class REXML::Element < ::REXML::Parent
   #   document.root.attribute("x")      # => x='x'
   #   document.root.attribute("x", "a") # => a:x='a:x'
   #
-  # source://rexml//lib/rexml/element.rb#1278
+  # source://rexml//lib/rexml/element.rb#1287
   def attribute(name, namespace = T.unsafe(nil)); end
 
   # Mechanisms for accessing attributes and child elements of this
@@ -1875,7 +1894,7 @@ class REXML::Element < ::REXML::Parent
   #   cds.frozen?              # => true
   #   cds.map {|cd| cd.class } # => [REXML::CData, REXML::CData]
   #
-  # source://rexml//lib/rexml/element.rb#1411
+  # source://rexml//lib/rexml/element.rb#1420
   def cdatas; end
 
   # :call-seq:
@@ -1908,7 +1927,7 @@ class REXML::Element < ::REXML::Parent
   #   cs.map {|c| c.class } # => [REXML::Comment, REXML::Comment]
   #   cs.map {|c| c.to_s }  # => ["foo", "bar"]
   #
-  # source://rexml//lib/rexml/element.rb#1432
+  # source://rexml//lib/rexml/element.rb#1441
   def comments; end
 
   # The context holds information about the processing environment, such as
@@ -1934,7 +1953,7 @@ class REXML::Element < ::REXML::Parent
   #   e.delete_attribute('bar') # => <bar/>
   #   e.delete_attribute('bar') # => nil
   #
-  # source://rexml//lib/rexml/element.rb#1386
+  # source://rexml//lib/rexml/element.rb#1395
   def delete_attribute(key); end
 
   # :call-seq:
@@ -1974,7 +1993,7 @@ class REXML::Element < ::REXML::Parent
   #   a.delete_element('//c') # => <c/>
   #   a.delete_element('//c') # => nil
   #
-  # source://rexml//lib/rexml/element.rb#769
+  # source://rexml//lib/rexml/element.rb#778
   def delete_element(element); end
 
   # :call-seq:
@@ -1999,7 +2018,7 @@ class REXML::Element < ::REXML::Parent
   #   d.root.delete_namespace('nosuch')
   #   d.to_s # => "<a/>"
   #
-  # source://rexml//lib/rexml/element.rb#678
+  # source://rexml//lib/rexml/element.rb#687
   def delete_namespace(namespace = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2023,7 +2042,7 @@ class REXML::Element < ::REXML::Parent
   #
   # Related: #root, #root_node.
   #
-  # source://rexml//lib/rexml/element.rb#470
+  # source://rexml//lib/rexml/element.rb#475
   def document; end
 
   # :call-seq:
@@ -2042,7 +2061,7 @@ class REXML::Element < ::REXML::Parent
   #   <d> ... </>
   #   <e/>
   #
-  # source://rexml//lib/rexml/element.rb#921
+  # source://rexml//lib/rexml/element.rb#930
   def each_element(xpath = T.unsafe(nil), &block); end
 
   # :call-seq:
@@ -2094,7 +2113,7 @@ class REXML::Element < ::REXML::Parent
   #
   #   <d id='1'/>
   #
-  # source://rexml//lib/rexml/element.rb#838
+  # source://rexml//lib/rexml/element.rb#847
   def each_element_with_attribute(key, value = T.unsafe(nil), max = T.unsafe(nil), name = T.unsafe(nil), &block); end
 
   # :call-seq:
@@ -2144,7 +2163,7 @@ class REXML::Element < ::REXML::Parent
   #
   #   <c> ... </>
   #
-  # source://rexml//lib/rexml/element.rb#895
+  # source://rexml//lib/rexml/element.rb#904
   def each_element_with_text(text = T.unsafe(nil), max = T.unsafe(nil), name = T.unsafe(nil), &block); end
 
   # Mechanisms for accessing attributes and child elements of this
@@ -2168,7 +2187,7 @@ class REXML::Element < ::REXML::Parent
   #   d = REXML::Document.new(xml_string)
   #   d.root.get_elements('//a') # => [<a level='1'> ... </>, <a level='2'/>]
   #
-  # source://rexml//lib/rexml/element.rb#940
+  # source://rexml//lib/rexml/element.rb#949
   def get_elements(xpath); end
 
   # :call-seq:
@@ -2188,7 +2207,7 @@ class REXML::Element < ::REXML::Parent
   #
   #   d.root.get_text(1) # => "this is bold!"
   #
-  # source://rexml//lib/rexml/element.rb#1044
+  # source://rexml//lib/rexml/element.rb#1053
   def get_text(path = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2203,7 +2222,7 @@ class REXML::Element < ::REXML::Parent
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/element.rb#1306
+  # source://rexml//lib/rexml/element.rb#1315
   def has_attributes?; end
 
   # :call-seq:
@@ -2220,7 +2239,7 @@ class REXML::Element < ::REXML::Parent
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/element.rb#785
+  # source://rexml//lib/rexml/element.rb#794
   def has_elements?; end
 
   # :call-seq:
@@ -2237,7 +2256,7 @@ class REXML::Element < ::REXML::Parent
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/element.rb#993
+  # source://rexml//lib/rexml/element.rb#1002
   def has_text?; end
 
   # :call-seq:
@@ -2247,7 +2266,7 @@ class REXML::Element < ::REXML::Parent
   #
   # See {Element Context}[../doc/rexml/context_rdoc.html].
   #
-  # source://rexml//lib/rexml/element.rb#508
+  # source://rexml//lib/rexml/element.rb#513
   def ignore_whitespace_nodes; end
 
   # :call-seq:
@@ -2291,7 +2310,7 @@ class REXML::Element < ::REXML::Parent
   #   is.map {|i| i.class } # => [REXML::Instruction, REXML::Instruction]
   #   is.map {|i| i.to_s }  # => ["<?target0 foo?>", "<?target1 bar?>"]
   #
-  # source://rexml//lib/rexml/element.rb#1453
+  # source://rexml//lib/rexml/element.rb#1462
   def instructions; end
 
   # :call-seq:
@@ -2314,7 +2333,7 @@ class REXML::Element < ::REXML::Parent
   #   b.namespace('y') # => "2"
   #   b.namespace('nosuch') # => nil
   #
-  # source://rexml//lib/rexml/element.rb#613
+  # source://rexml//lib/rexml/element.rb#618
   def namespace(prefix = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2336,7 +2355,7 @@ class REXML::Element < ::REXML::Parent
   #   d.elements['//b'].namespaces # => {"x"=>"1", "y"=>"2"}
   #   d.elements['//c'].namespaces # => {"x"=>"1", "y"=>"2", "z"=>"3"}
   #
-  # source://rexml//lib/rexml/element.rb#586
+  # source://rexml//lib/rexml/element.rb#591
   def namespaces; end
 
   # :call-seq:
@@ -2349,7 +2368,7 @@ class REXML::Element < ::REXML::Parent
   #   d.root.elements['b'].next_element #-> <c/>
   #   d.root.elements['c'].next_element #-> nil
   #
-  # source://rexml//lib/rexml/element.rb#954
+  # source://rexml//lib/rexml/element.rb#963
   def next_element; end
 
   # :call-seq:
@@ -2361,7 +2380,7 @@ class REXML::Element < ::REXML::Parent
   #   a = d.root  # => <a/>
   #   a.node_type # => :element
   #
-  # source://rexml//lib/rexml/element.rb#1159
+  # source://rexml//lib/rexml/element.rb#1168
   def node_type; end
 
   # :call-seq:
@@ -2383,7 +2402,7 @@ class REXML::Element < ::REXML::Parent
   #   d.elements['//b'].prefixes # => ["x", "y"]
   #   d.elements['//c'].prefixes # => ["x", "y", "z"]
   #
-  # source://rexml//lib/rexml/element.rb#560
+  # source://rexml//lib/rexml/element.rb#565
   def prefixes; end
 
   # :call-seq:
@@ -2396,7 +2415,7 @@ class REXML::Element < ::REXML::Parent
   #   d.root.elements['c'].previous_element #-> <b/>
   #   d.root.elements['b'].previous_element #-> nil
   #
-  # source://rexml//lib/rexml/element.rb#970
+  # source://rexml//lib/rexml/element.rb#979
   def previous_element; end
 
   # :call-seq:
@@ -2409,7 +2428,7 @@ class REXML::Element < ::REXML::Parent
   # The evaluation is tested against +expanded_name+, and so is namespace
   # sensitive.
   #
-  # source://rexml//lib/rexml/element.rb#528
+  # source://rexml//lib/rexml/element.rb#533
   def raw; end
 
   # :call-seq:
@@ -2494,7 +2513,7 @@ class REXML::Element < ::REXML::Parent
   # Note also that the text note is retrieved by method get_text,
   # and so is always normalized text.
   #
-  # source://rexml//lib/rexml/element.rb#1021
+  # source://rexml//lib/rexml/element.rb#1030
   def text(path = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2522,7 +2541,7 @@ class REXML::Element < ::REXML::Parent
   #
   #   d.root.text = nil   #-> '<a><b/><c/></a>'
   #
-  # source://rexml//lib/rexml/element.rb#1080
+  # source://rexml//lib/rexml/element.rb#1089
   def text=(text); end
 
   # :call-seq:
@@ -2537,7 +2556,7 @@ class REXML::Element < ::REXML::Parent
   #   ts.map {|t| t.class } # => [REXML::Text, REXML::Text]
   #   ts.map {|t| t.to_s }  # => ["text", "more"]
   #
-  # source://rexml//lib/rexml/element.rb#1469
+  # source://rexml//lib/rexml/element.rb#1478
   def texts; end
 
   # :call-seq:
@@ -2551,7 +2570,7 @@ class REXML::Element < ::REXML::Parent
   # The evaluation is tested against the element's +expanded_name+,
   # and so is namespace-sensitive.
   #
-  # source://rexml//lib/rexml/element.rb#485
+  # source://rexml//lib/rexml/element.rb#490
   def whitespace; end
 
   # == DEPRECATED
@@ -2577,7 +2596,7 @@ class REXML::Element < ::REXML::Parent
   #  doc.write( out )     #-> doc is written to the string 'out'
   #  doc.write( $stdout ) #-> doc written to the console
   #
-  # source://rexml//lib/rexml/element.rb#1495
+  # source://rexml//lib/rexml/element.rb#1504
   def write(output = T.unsafe(nil), indent = T.unsafe(nil), transitive = T.unsafe(nil), ie_hack = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2600,17 +2619,17 @@ class REXML::Element < ::REXML::Parent
   #   e = REXML::Element.new('foo')
   #   e.xpath    # => "foo"
   #
-  # source://rexml//lib/rexml/element.rb#1183
+  # source://rexml//lib/rexml/element.rb#1192
   def xpath; end
 
   private
 
-  # source://rexml//lib/rexml/element.rb#1512
+  # source://rexml//lib/rexml/element.rb#1521
   def __to_xpath_helper(node); end
 
   # A private helper method
   #
-  # source://rexml//lib/rexml/element.rb#1527
+  # source://rexml//lib/rexml/element.rb#1536
   def each_with_something(test, max = T.unsafe(nil), name = T.unsafe(nil)); end
 end
 
@@ -2664,7 +2683,7 @@ end
 #   elements = d.root.elements
 #   elements # => #<REXML::Elements @element=<bookstore> ... </>>
 #
-# source://rexml//lib/rexml/element.rb#1582
+# source://rexml//lib/rexml/element.rb#1591
 class REXML::Elements
   include ::Enumerable
 
@@ -2681,7 +2700,7 @@ class REXML::Elements
   #
   # @return [Elements] a new instance of Elements
   #
-  # source://rexml//lib/rexml/element.rb#1595
+  # source://rexml//lib/rexml/element.rb#1604
   def initialize(parent); end
 
   # :call-seq:
@@ -2746,7 +2765,7 @@ class REXML::Elements
   #   element.parent                # => <bookstore> ... </>
   #   element.context               # => {:raw=>:all}
   #
-  # source://rexml//lib/rexml/element.rb#1912
+  # source://rexml//lib/rexml/element.rb#1921
   def <<(element = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2802,7 +2821,7 @@ class REXML::Elements
   #   eles[4, 'book'] # => <book category='web' cover='paperback'> ... </>
   #   eles[5, 'book'] # => nil
   #
-  # source://rexml//lib/rexml/element.rb#1667
+  # source://rexml//lib/rexml/element.rb#1676
   def [](index, name = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2841,7 +2860,7 @@ class REXML::Elements
   #   eles[50] = REXML::Text.new('bar') # => "bar"
   #   eles.size # => 5
   #
-  # source://rexml//lib/rexml/element.rb#1722
+  # source://rexml//lib/rexml/element.rb#1731
   def []=(index, element); end
 
   # :call-seq:
@@ -2906,7 +2925,7 @@ class REXML::Elements
   #   element.parent                # => <bookstore> ... </>
   #   element.context               # => {:raw=>:all}
   #
-  # source://rexml//lib/rexml/element.rb#1912
+  # source://rexml//lib/rexml/element.rb#1921
   def add(element = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2926,7 +2945,7 @@ class REXML::Elements
   #   xpath = '//book [@category="web"]'
   #   elements.collect(xpath) {|element| element.size } # => [17, 9]
   #
-  # source://rexml//lib/rexml/element.rb#1975
+  # source://rexml//lib/rexml/element.rb#1984
   def collect(xpath = T.unsafe(nil)); end
 
   # :call-seq:
@@ -2970,7 +2989,7 @@ class REXML::Elements
   #   elements.delete('//book [@category="children"]') # => <book category='children'> ... </>
   #   elements.delete('//nosuch') # => nil
   #
-  # source://rexml//lib/rexml/element.rb#1812
+  # source://rexml//lib/rexml/element.rb#1821
   def delete(element); end
 
   # :call-seq:
@@ -2990,7 +3009,7 @@ class REXML::Elements
   #   elements.size # => 0
   #   elements.delete_all('//book') # => []
   #
-  # source://rexml//lib/rexml/element.rb#1838
+  # source://rexml//lib/rexml/element.rb#1847
   def delete_all(xpath); end
 
   # :call-seq:
@@ -3021,7 +3040,7 @@ class REXML::Elements
   #   <book category='web'> ... </>
   #   <book category='web' cover='paperback'> ... </>
   #
-  # source://rexml//lib/rexml/element.rb#1954
+  # source://rexml//lib/rexml/element.rb#1963
   def each(xpath = T.unsafe(nil)); end
 
   # :call-seq:
@@ -3036,7 +3055,7 @@ class REXML::Elements
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/element.rb#1742
+  # source://rexml//lib/rexml/element.rb#1751
   def empty?; end
 
   # :call-seq:
@@ -3053,7 +3072,7 @@ class REXML::Elements
   #   elements.index(ele_4) # => 3
   #   elements.index(ele_3) # => -1
   #
-  # source://rexml//lib/rexml/element.rb#1760
+  # source://rexml//lib/rexml/element.rb#1769
   def index(element); end
 
   # :call-seq:
@@ -3133,7 +3152,7 @@ class REXML::Elements
   #     total += element.size
   #   end # => 26
   #
-  # source://rexml//lib/rexml/element.rb#2060
+  # source://rexml//lib/rexml/element.rb#2069
   def inject(xpath = T.unsafe(nil), initial = T.unsafe(nil)); end
 
   # :call-seq:
@@ -3147,7 +3166,7 @@ class REXML::Elements
   #   elements = REXML::Elements.new(d.root)
   #   elements.parent == d.root # => true
   #
-  # source://rexml//lib/rexml/element.rb#1610
+  # source://rexml//lib/rexml/element.rb#1619
   def parent; end
 
   # :call-seq:
@@ -3159,7 +3178,7 @@ class REXML::Elements
   #   d.root.elements.size # => 3 # Three elements.
   #   d.root.size          # => 6 # Three elements plus three text nodes..
   #
-  # source://rexml//lib/rexml/element.rb#2084
+  # source://rexml//lib/rexml/element.rb#2093
   def size; end
 
   # :call-seq:
@@ -3180,14 +3199,14 @@ class REXML::Elements
   #
   #   elements.to_a('//c') # => [<c/>]
   #
-  # source://rexml//lib/rexml/element.rb#2108
+  # source://rexml//lib/rexml/element.rb#2117
   def to_a(xpath = T.unsafe(nil)); end
 
   private
 
   # Private helper class.  Removes quotes from quoted strings
   #
-  # source://rexml//lib/rexml/element.rb#2116
+  # source://rexml//lib/rexml/element.rb#2125
   def literalize(name); end
 end
 
@@ -3229,65 +3248,54 @@ class REXML::Entity < ::REXML::Child
   #
   # @return [Entity] a new instance of Entity
   #
-  # source://rexml//lib/rexml/entity.rb#33
+  # source://rexml//lib/rexml/entity.rb#34
   def initialize(stream, value = T.unsafe(nil), parent = T.unsafe(nil), reference = T.unsafe(nil)); end
 
   # Returns the value of attribute external.
   #
-  # source://rexml//lib/rexml/entity.rb#22
+  # source://rexml//lib/rexml/entity.rb#23
   def external; end
 
   # Returns the value of attribute name.
   #
-  # source://rexml//lib/rexml/entity.rb#22
+  # source://rexml//lib/rexml/entity.rb#23
   def name; end
 
   # Returns the value of attribute ndata.
   #
-  # source://rexml//lib/rexml/entity.rb#22
+  # source://rexml//lib/rexml/entity.rb#23
   def ndata; end
 
   # Returns the value of this entity unprocessed -- raw.  This is the
   # normalized value; that is, with all %ent; and &ent; entities intact
   #
-  # source://rexml//lib/rexml/entity.rb#85
+  # source://rexml//lib/rexml/entity.rb#86
   def normalized; end
 
-  # source://rexml//lib/rexml/entity.rb#138
-  def parent=(other); end
-
   # Returns the value of attribute pubid.
   #
-  # source://rexml//lib/rexml/entity.rb#22
+  # source://rexml//lib/rexml/entity.rb#23
   def pubid; end
 
   # Returns the value of attribute ref.
   #
-  # source://rexml//lib/rexml/entity.rb#22
+  # source://rexml//lib/rexml/entity.rb#23
   def ref; end
 
   # Returns this entity as a string.  See write().
   #
-  # source://rexml//lib/rexml/entity.rb#119
+  # source://rexml//lib/rexml/entity.rb#120
   def to_s; end
 
   # Evaluates to the unnormalized value of this entity; that is, replacing
-  # all entities -- both %ent; and &ent; entities.  This differs from
-  # +value()+ in that +value+ only replaces %ent; entities.
+  # &ent; entities.
   #
   # source://rexml//lib/rexml/entity.rb#73
   def unnormalized; end
 
-  # Returns the value of this entity.  At the moment, only internal entities
-  # are processed.  If the value contains internal references (IE,
-  # %blah;), those are replaced with their values.  IE, if the doctype
-  # contains:
-  #  <!ENTITY % foo "bar">
-  #  <!ENTITY yada "nanoo %foo; nanoo>
-  # then:
-  #  doctype.entity('yada').value   #-> "nanoo bar nanoo"
+  # Returns the value of attribute value.
   #
-  # source://rexml//lib/rexml/entity.rb#134
+  # source://rexml//lib/rexml/entity.rb#23
   def value; end
 
   # Write out a fully formed, correct entity definition (assuming the Entity
@@ -3299,21 +3307,16 @@ class REXML::Entity < ::REXML::Child
   # indent::
   #   *DEPRECATED* and ignored
   #
-  # source://rexml//lib/rexml/entity.rb#97
+  # source://rexml//lib/rexml/entity.rb#98
   def write(out, indent = T.unsafe(nil)); end
 
-  private
-
-  # source://rexml//lib/rexml/entity.rb#144
-  def resolve_value; end
-
   class << self
     # Evaluates whether the given string matches an entity definition,
     # returning true if so, and false otherwise.
     #
     # @return [Boolean]
     #
-    # source://rexml//lib/rexml/entity.rb#66
+    # source://rexml//lib/rexml/entity.rb#67
     def matches?(string); end
   end
 end
@@ -3989,41 +3992,55 @@ end
 #
 # Nat Price gave me some good ideas for the API.
 #
-# source://rexml//lib/rexml/parsers/baseparser.rb#41
+# source://rexml//lib/rexml/parsers/baseparser.rb#57
 class REXML::Parsers::BaseParser
   # @return [BaseParser] a new instance of BaseParser
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#145
+  # source://rexml//lib/rexml/parsers/baseparser.rb#162
   def initialize(source); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#152
+  # source://rexml//lib/rexml/parsers/baseparser.rb#171
   def add_listener(listener); end
 
   # Returns true if there are no more events
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#180
+  # source://rexml//lib/rexml/parsers/baseparser.rb#202
   def empty?; end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#507
+  # source://rexml//lib/rexml/parsers/baseparser.rb#534
   def entity(reference, entities); end
 
   # Returns the value of attribute entity_expansion_count.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#157
+  # source://rexml//lib/rexml/parsers/baseparser.rb#176
   def entity_expansion_count; end
 
+  # Sets the attribute entity_expansion_limit
+  #
+  # @param value the value to set the attribute entity_expansion_limit to.
+  #
+  # source://rexml//lib/rexml/parsers/baseparser.rb#177
+  def entity_expansion_limit=(_arg0); end
+
+  # Sets the attribute entity_expansion_text_limit
+  #
+  # @param value the value to set the attribute entity_expansion_text_limit to.
+  #
+  # source://rexml//lib/rexml/parsers/baseparser.rb#178
+  def entity_expansion_text_limit=(_arg0); end
+
   # Returns true if there are more events.  Synonymous with !empty?
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#185
+  # source://rexml//lib/rexml/parsers/baseparser.rb#207
   def has_next?; end
 
   # Escapes all possible entities
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#520
+  # source://rexml//lib/rexml/parsers/baseparser.rb#545
   def normalize(input, entities = T.unsafe(nil), entity_filter = T.unsafe(nil)); end
 
   # Peek at the +depth+ event in the stack.  The first element on the stack
@@ -4033,111 +4050,123 @@ class REXML::Parsers::BaseParser
   # event, so you can effectively pre-parse the entire document (pull the
   # entire thing into memory) using this method.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#201
+  # source://rexml//lib/rexml/parsers/baseparser.rb#223
   def peek(depth = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#170
+  # source://rexml//lib/rexml/parsers/baseparser.rb#192
   def position; end
 
   # Returns the next event.  This is a +PullEvent+ object.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#216
+  # source://rexml//lib/rexml/parsers/baseparser.rb#238
   def pull; end
 
   # Returns the value of attribute source.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#156
+  # source://rexml//lib/rexml/parsers/baseparser.rb#175
   def source; end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#159
+  # source://rexml//lib/rexml/parsers/baseparser.rb#180
   def stream=(source); end
 
   # Unescapes all possible entities
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#536
+  # source://rexml//lib/rexml/parsers/baseparser.rb#561
   def unnormalize(string, entities = T.unsafe(nil), filter = T.unsafe(nil)); end
 
   # Push an event back on the head of the stream.  This method
   # has (theoretically) infinite depth.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#191
+  # source://rexml//lib/rexml/parsers/baseparser.rb#213
   def unshift(token); end
 
   private
 
+  # source://rexml//lib/rexml/parsers/baseparser.rb#606
+  def add_namespace(prefix, uri); end
+
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#582
+  # source://rexml//lib/rexml/parsers/baseparser.rb#639
   def need_source_encoding_update?(xml_declaration_encoding); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#702
-  def parse_attributes(prefixes, curr_ns); end
+  # source://rexml//lib/rexml/parsers/baseparser.rb#759
+  def parse_attributes(prefixes); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#601
+  # source://rexml//lib/rexml/parsers/baseparser.rb#658
   def parse_id(base_error_message, accept_external_id:, accept_public_id:); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#629
+  # source://rexml//lib/rexml/parsers/baseparser.rb#686
   def parse_id_invalid_details(accept_external_id:, accept_public_id:); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#588
+  # source://rexml//lib/rexml/parsers/baseparser.rb#645
   def parse_name(base_error_message); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#667
+  # source://rexml//lib/rexml/parsers/baseparser.rb#621
+  def pop_namespaces_restore; end
+
+  # source://rexml//lib/rexml/parsers/baseparser.rb#724
   def process_instruction; end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#226
+  # source://rexml//lib/rexml/parsers/baseparser.rb#248
   def pull_event; end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#575
-  def record_entity_expansion; end
+  # source://rexml//lib/rexml/parsers/baseparser.rb#615
+  def push_namespaces_restore; end
+
+  # source://rexml//lib/rexml/parsers/baseparser.rb#632
+  def record_entity_expansion(delta = T.unsafe(nil)); end
 end
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#114
+# source://rexml//lib/rexml/parsers/baseparser.rb#130
 REXML::Parsers::BaseParser::EXTERNAL_ID_PUBLIC = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#115
+# source://rexml//lib/rexml/parsers/baseparser.rb#131
 REXML::Parsers::BaseParser::EXTERNAL_ID_SYSTEM = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#116
+# source://rexml//lib/rexml/parsers/baseparser.rb#132
 REXML::Parsers::BaseParser::PUBLIC_ID = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#127
+# source://rexml//lib/rexml/parsers/baseparser.rb#143
 module REXML::Parsers::BaseParser::Private; end
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#130
+# source://rexml//lib/rexml/parsers/baseparser.rb#147
 REXML::Parsers::BaseParser::Private::ATTLISTDECL_END = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#135
+# source://rexml//lib/rexml/parsers/baseparser.rb#152
 REXML::Parsers::BaseParser::Private::CARRIAGE_RETURN_NEWLINE_PATTERN = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#136
+# source://rexml//lib/rexml/parsers/baseparser.rb#153
 REXML::Parsers::BaseParser::Private::CHARACTER_REFERENCES = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#129
+# source://rexml//lib/rexml/parsers/baseparser.rb#146
 REXML::Parsers::BaseParser::Private::CLOSE_PATTERN = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#137
+# source://rexml//lib/rexml/parsers/baseparser.rb#154
 REXML::Parsers::BaseParser::Private::DEFAULT_ENTITIES_PATTERNS = T.let(T.unsafe(nil), Hash)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#134
+# source://rexml//lib/rexml/parsers/baseparser.rb#151
 REXML::Parsers::BaseParser::Private::ENTITYDECL_PATTERN = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#132
+# source://rexml//lib/rexml/parsers/baseparser.rb#149
 REXML::Parsers::BaseParser::Private::GEDECL_PATTERN = T.let(T.unsafe(nil), String)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#131
+# source://rexml//lib/rexml/parsers/baseparser.rb#148
 REXML::Parsers::BaseParser::Private::NAME_PATTERN = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#133
+# source://rexml//lib/rexml/parsers/baseparser.rb#150
 REXML::Parsers::BaseParser::Private::PEDECL_PATTERN = T.let(T.unsafe(nil), String)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#128
+# source://rexml//lib/rexml/parsers/baseparser.rb#144
+REXML::Parsers::BaseParser::Private::PEREFERENCE_PATTERN = T.let(T.unsafe(nil), Regexp)
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#145
 REXML::Parsers::BaseParser::Private::TAG_PATTERN = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#50
+# source://rexml//lib/rexml/parsers/baseparser.rb#66
 REXML::Parsers::BaseParser::QNAME = T.let(T.unsafe(nil), Regexp)
 
-# source://rexml//lib/rexml/parsers/baseparser.rb#49
+# source://rexml//lib/rexml/parsers/baseparser.rb#65
 REXML::Parsers::BaseParser::QNAME_STR = T.let(T.unsafe(nil), String)
 
 # source://rexml//lib/rexml/parsers/streamparser.rb#6
@@ -4151,6 +4180,15 @@ class REXML::Parsers::StreamParser
   def add_listener(listener); end
 
   # source://rexml//lib/rexml/parsers/streamparser.rb#17
+  def entity_expansion_count; end
+
+  # source://rexml//lib/rexml/parsers/streamparser.rb#21
+  def entity_expansion_limit=(limit); end
+
+  # source://rexml//lib/rexml/parsers/streamparser.rb#25
+  def entity_expansion_text_limit=(limit); end
+
+  # source://rexml//lib/rexml/parsers/streamparser.rb#29
   def parse; end
 end
 
@@ -4493,7 +4531,7 @@ class REXML::Text < ::REXML::Child
   # source://rexml//lib/rexml/text.rb#199
   def empty?; end
 
-  # source://rexml//lib/rexml/text.rb#298
+  # source://rexml//lib/rexml/text.rb#299
   def indent_text(string, level = T.unsafe(nil), style = T.unsafe(nil), indentfirstline = T.unsafe(nil)); end
 
   # source://rexml//lib/rexml/text.rb#253
@@ -4557,16 +4595,16 @@ class REXML::Text < ::REXML::Child
   #   e[0].value = "bar"    # <a>bar</a>
   #   e[0].value = "<a>"    # <a>&lt;a&gt;</a>
   #
-  # source://rexml//lib/rexml/text.rb#281
+  # source://rexml//lib/rexml/text.rb#282
   def value=(val); end
 
-  # source://rexml//lib/rexml/text.rb#287
+  # source://rexml//lib/rexml/text.rb#288
   def wrap(string, width, addnewline = T.unsafe(nil)); end
 
   # == DEPRECATED
   # See REXML::Formatters
   #
-  # source://rexml//lib/rexml/text.rb#313
+  # source://rexml//lib/rexml/text.rb#314
   def write(writer, indent = T.unsafe(nil), transitive = T.unsafe(nil), ie_hack = T.unsafe(nil)); end
 
   # Writes out text, substituting special characters beforehand.
@@ -4584,18 +4622,18 @@ class REXML::Text < ::REXML::Child
   #   }
   #   puts ascOut
   #
-  # source://rexml//lib/rexml/text.rb#345
+  # source://rexml//lib/rexml/text.rb#346
   def write_with_substitution(out, input); end
 
   # FIXME
   # This probably won't work properly
   #
-  # source://rexml//lib/rexml/text.rb#325
+  # source://rexml//lib/rexml/text.rb#326
   def xpath; end
 
   private
 
-  # source://rexml//lib/rexml/text.rb#358
+  # source://rexml//lib/rexml/text.rb#359
   def clear_cache; end
 
   class << self
@@ -4604,23 +4642,23 @@ class REXML::Text < ::REXML::Child
     # source://rexml//lib/rexml/text.rb#131
     def check(string, pattern, doctype); end
 
-    # source://rexml//lib/rexml/text.rb#427
+    # source://rexml//lib/rexml/text.rb#429
     def expand(ref, doctype, filter); end
 
     # Escapes all possible entities
     #
-    # source://rexml//lib/rexml/text.rb#390
+    # source://rexml//lib/rexml/text.rb#391
     def normalize(input, doctype = T.unsafe(nil), entity_filter = T.unsafe(nil)); end
 
     # Reads text, substituting entities
     #
-    # source://rexml//lib/rexml/text.rb#364
+    # source://rexml//lib/rexml/text.rb#365
     def read_with_substitution(input, illegal = T.unsafe(nil)); end
 
     # Unescapes all possible entities
     #
-    # source://rexml//lib/rexml/text.rb#414
-    def unnormalize(string, doctype = T.unsafe(nil), filter = T.unsafe(nil), illegal = T.unsafe(nil)); end
+    # source://rexml//lib/rexml/text.rb#415
+    def unnormalize(string, doctype = T.unsafe(nil), filter = T.unsafe(nil), illegal = T.unsafe(nil), entity_expansion_text_limit: T.unsafe(nil)); end
   end
 end
 
diff --git a/sorbet/rbi/gems/strscan@3.1.0.rbi b/sorbet/rbi/gems/strscan@3.1.0.rbi
deleted file mode 100644
index 1f754d979..000000000
--- a/sorbet/rbi/gems/strscan@3.1.0.rbi
+++ /dev/null
@@ -1,9 +0,0 @@
-# typed: true
-
-# DO NOT EDIT MANUALLY
-# This is an autogenerated file for types exported from the `strscan` gem.
-# Please instead update this file by running `bin/tapioca gem strscan`.
-
-
-# THIS IS AN EMPTY RBI FILE.
-# see https://github.com/Shopify/tapioca#manually-requiring-parts-of-a-gem