Merge pull request Shopify#171 from Shopify/remove-yaml-warning

Remove YAML.safe_load warning
jetthoughts · May 21, 2020 · 73da79d · 73da79d
2 parents daf34bb + 822d468
commit 73da79d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -50,7 +50,7 @@ GEM
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.7.0.2)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)

diff --git a/lib/erb_lint/file_loader.rb b/lib/erb_lint/file_loader.rb
@@ -9,8 +9,14 @@ def initialize(base_path)
       @base_path = base_path
     end
 
-    def yaml(filename)
-      YAML.safe_load(read_content(filename), [Regexp, Symbol], [], false, filename) || {}
+    if RUBY_VERSION >= "2.6"
+      def yaml(filename)
+        YAML.safe_load(read_content(filename), permitted_classes: [Regexp, Symbol], filename: filename) || {}
+      end
+    else
+      def yaml(filename)
+        YAML.safe_load(read_content(filename), [Regexp, Symbol], [], false, filename) || {}
+      end
     end
 
     private