From fc8afa48780ac17e2d69aa7cc6191b3715322c26 Mon Sep 17 00:00:00 2001
From: Richardas Kuchinskas <36065987+Hidanio@users.noreply.github.com>
Date: Tue, 23 Jul 2024 16:34:11 +0300
Subject: [PATCH 1/2] dynamic rules: `path-exclude` rule fix (#1222)

---
 src/rules/parser.go           |  1 +
 src/tests/rules/rules_test.go | 48 +++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/src/rules/parser.go b/src/rules/parser.go
index 3eb6fd3e0..0e9e9be64 100644
--- a/src/rules/parser.go
+++ b/src/rules/parser.go
@@ -142,6 +142,7 @@ func (p *parser) parseRuleInfo(st ir.Node, labelStmt ir.Node, proto *Rule) (Rule
 		rule.Message = proto.Message
 		rule.Location = proto.Location
 		rule.Path = proto.Path
+		rule.PathExcludes = proto.PathExcludes
 
 		rule.Filters = make([]map[string]Filter, len(proto.Filters))
 		for i, filterSet := range proto.Filters {
diff --git a/src/tests/rules/rules_test.go b/src/tests/rules/rules_test.go
index da0c77f5b..cb8633371 100644
--- a/src/tests/rules/rules_test.go
+++ b/src/tests/rules/rules_test.go
@@ -488,3 +488,51 @@ function type_type_check(string $animal_name, int $animal_id) {
 	}
 	test.RunRulesTest()
 }
+
+func TestRulePathExcludePositive(t *testing.T) {
+	rfile := `<?php
+/**
+ * @name varEval
+ * @warning don't eval from variable
+ * @path www/
+ * @path-exclude www/no
+ */
+eval(${"var"});
+`
+	test := linttest.NewSuite(t)
+	test.RuleFile = rfile
+	code := `<?php
+          $hello = 'echo 123;';
+          eval($hello);
+          eval('echo 456;');
+        `
+	test.AddNamedFile("www/no", code)
+
+	test.RunRulesTest()
+}
+
+func TestRulePathExcludeNegative(t *testing.T) {
+	rfile := `<?php
+/**
+ * @name varEval
+ * @warning don't eval from variable
+ * @path www/
+ * @path-exclude www/no
+ */
+eval(${"var"});
+`
+	test := linttest.NewSuite(t)
+	test.RuleFile = rfile
+	code := `<?php
+          $hello = 'echo 123;';
+          eval($hello);
+          eval('echo 456;');
+        `
+	test.AddNamedFile("www/no", code)
+	test.AddNamedFile("www/yes", code)
+
+	test.Expect = []string{
+		`don't eval from variable`,
+	}
+	test.RunRulesTest()
+}

From a754718f3cb1c5bf1f053b153b56185b453b2ba6 Mon Sep 17 00:00:00 2001
From: Danil Ovchinnikov <danil42worker@gmail.com>
Date: Tue, 23 Jul 2024 21:02:41 +0700
Subject: [PATCH 2/2] docs: fixed the error generating GitHub Pages (#1226)

---
 docs/_config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 36e8b4d30..cc090c59f 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,2 +1,2 @@
-theme: minimal
-markdown: kramdown
\ No newline at end of file
+remote_theme: pages-themes/minimal@v0.2.0
+markdown: kramdown