Remove :error_mode

Author: charlespwd

Rakefile

@@ -33,14 +33,12 @@ task :rubocop do
   end
 end
 
-desc('runs test suite with strict2 parser')
+desc('runs test suite')
 task :test do
-  ENV['LIQUID_PARSER_MODE'] = 'strict2'
   Rake::Task['base_test'].reenable
   Rake::Task['base_test'].invoke
 
   if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'truffleruby'
-    ENV['LIQUID_PARSER_MODE'] = 'strict2'
     Rake::Task['integration_test'].reenable
     Rake::Task['integration_test'].invoke
   end
@@ -63,13 +61,10 @@ task release: :build do
 end
 
 namespace :benchmark do
-  desc "Run the liquid benchmark with strict2 parsing"
-  task :strict2 do
-    ruby "./performance/benchmark.rb strict2"
-  end
-
   desc "Run the liquid benchmark"
-  task run: [:strict2]
+  task :run do
+    ruby "./performance/benchmark.rb"
+  end
 
   desc "Run unit benchmarks"
   namespace :unit do
@@ -101,11 +96,6 @@ namespace :profile do
   task :run do
     ruby "./performance/profile.rb"
   end
-
-  desc "Run the liquid profile/performance coverage with strict2 parsing"
-  task :strict2 do
-    ruby "./performance/profile.rb strict2"
-  end
 end
 
 namespace :memory_profile do

lib/liquid/environment.rb

@@ -4,10 +4,6 @@ module Liquid
   # The Environment is the container for all configuration options of Liquid, such as
   # the registered tags, filters, and the default error mode.
   class Environment
-    # The default error mode for all templates. This can be overridden on a
-    # per-template basis.
-    attr_accessor :error_mode
-
     # The tags that are available to use in the template.
     attr_accessor :tags
 
@@ -33,17 +29,14 @@ class << self
       #  the template.
       # @param file_system The default file system that is used
       #  to load templates from.
-      # @param error_mode [Symbol] The default error mode for all templates
-      #  (:strict2).
       # @param exception_renderer [Proc] The exception renderer that is used to
       #   render exceptions.
       # @yieldparam environment [Environment] The environment instance that is being built.
       # @return [Environment] The new environment instance.
-      def build(tags: nil, file_system: nil, error_mode: nil, exception_renderer: nil)
+      def build(tags: nil, file_system: nil, exception_renderer: nil)
         ret = new
         ret.tags = tags if tags
         ret.file_system = file_system if file_system
-        ret.error_mode = error_mode if error_mode
         ret.exception_renderer = exception_renderer if exception_renderer
         yield ret if block_given?
         ret.freeze
@@ -75,7 +68,6 @@ def dangerously_override(environment)
     # @api private
     def initialize
       @tags = Tags::STANDARD_TAGS.dup
-      @error_mode = :strict2
       @strainer_template = Class.new(StrainerTemplate).tap do |klass|
         klass.add_filter(StandardFilters)
       end

lib/liquid/parse_context.rb

@@ -3,7 +3,7 @@
 module Liquid
   class ParseContext
     attr_accessor :locale, :line_number, :trim_whitespace, :depth
-    attr_reader :partial, :warnings, :error_mode, :environment
+    attr_reader :partial, :warnings, :environment
 
     def initialize(options = Const::EMPTY_HASH)
       @environment = options.fetch(:environment, Environment.default)
@@ -55,25 +55,19 @@ def safe_parse_expression(parser)
     end
 
     def parse_expression(markup, safe: false)
-      if !safe && @error_mode == :strict2
-        # parse_expression is a widely used API. To maintain backward
-        # compatibility while raising awareness about strict2 parser standards,
-        # the safe flag supports API users make a deliberate decision.
-        #
-        # In strict2 mode, markup MUST come from a string returned by the parser
-        # (e.g., parser.expression). We're not calling the parser here to
-        # prevent redundant parser overhead.
-        raise Liquid::InternalError, "unsafe parse_expression cannot be used in strict2 mode"
-      end
+      # markup MUST come from a string returned by the parser
+      # (e.g., parser.expression). We're not calling the parser here to
+      # prevent redundant parser overhead. The `safe` opt-in
+      # exists to ensure it is not accidentally still called with
+      # the result of a regex.
+      raise Liquid::InternalError, "unsafe parse_expression cannot be used" unless safe
 
       Expression.parse(markup, @string_scanner, @expression_cache)
     end
 
     def partial=(value)
       @partial = value
       @options = value ? partial_options : @template_options
-
-      @error_mode = @options[:error_mode] || @environment.error_mode
     end
 
     def partial_options

lib/liquid/partial_cache.rb

@@ -4,7 +4,7 @@ module Liquid
   class PartialCache
     def self.load(template_name, context:, parse_context:)
       cached_partials = context.registers[:cached_partials]
-      cache_key = "#{template_name}:#{parse_context.error_mode}"
+      cache_key = template_name.to_s
       cached = cached_partials[cache_key]
       return cached if cached
 

lib/liquid/template.rb

@@ -21,17 +21,6 @@ class Template
     attr_reader :profiler
 
     class << self
-      # Sets how strict the parser should be.
-      # :strict2 enforces correct syntax for all tags
-      def error_mode=(mode)
-        Deprecations.warn("Template.error_mode=", "Environment#error_mode=")
-        Environment.default.error_mode = mode
-      end
-
-      def error_mode
-        Environment.default.error_mode
-      end
-
       def default_exception_renderer=(renderer)
         Deprecations.warn("Template.default_exception_renderer=", "Environment#exception_renderer=")
         Environment.default.exception_renderer = renderer

performance/benchmark.rb

@@ -4,7 +4,6 @@
 require_relative 'theme_runner'
 
 RubyVM::YJIT.enable if defined?(RubyVM::YJIT)
-Liquid::Environment.default.error_mode = ARGV.first.to_sym if ARGV.first
 
 profiler = ThemeRunner.new
 

performance/memory_profile.rb

@@ -53,8 +53,6 @@ def sanitize(string)
   end
 end
 
-Liquid::Template.error_mode = ARGV.first.to_sym if ARGV.first
-
 runner = ThemeRunner.new
 Profiler.run do |x|
   x.profile('parse') { runner.compile }

performance/profile.rb

@@ -3,7 +3,6 @@
 require 'stackprof'
 require_relative 'theme_runner'
 
-Liquid::Template.error_mode = ARGV.first.to_sym if ARGV.first
 profiler = ThemeRunner.new
 profiler.run
 

test/integration/assign_test.rb

@@ -39,11 +39,10 @@ def test_assign_syntax_error
     assert_match_syntax_error(/assign/, '{% assign foo not values %}.')
   end
 
-  def test_assign_uses_error_mode
+  def test_assign_throws_on_unsupported_syntax
     assert_match_syntax_error(
       "Expected dotdot but found pipe",
       "{% assign foo = ('X' | downcase) %}",
-      error_mode: :rigid,
     )
   end
 

test/integration/context_test.rb

@@ -632,11 +632,9 @@ def notice(output)
   end
 
   def test_has_key_will_not_add_an_error_for_missing_keys
-    with_error_modes(:rigid) do
-      context = Context.new
-      context.key?('unknown')
-      assert_empty(context.errors)
-    end
+    context = Context.new
+    context.key?('unknown')
+    assert_empty(context.errors)
   end
 
   def test_key_lookup_will_raise_for_missing_keys_when_strict_variables_is_enabled