add mac php dir; fix type on accept() for generated code to be mixed.

parrt · Mar 18, 2022 · 14ce0cd · 14ce0cd
1 parent 4d2ebbf
commit 14ce0cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/php/BasePHPTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/php/BasePHPTest.java
@@ -244,7 +244,7 @@ private String locateTool(String tool) {
 			return phpPath;
 		}
 
-		String[] roots = {"/usr/local/bin/", "/opt/local/bin", "/usr/bin/"};
+		String[] roots = {"/usr/local/bin/", "/opt/local/bin", "/opt/homebrew/bin/", "/usr/bin/"};
 
 		for (String root: roots) {
 			if (new File(root + tool).exists()) {

diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/PHP/PHP.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/PHP/PHP.stg
@@ -996,7 +996,7 @@ public function <if(method.isEnter)>enter<else>exit<endif>Rule(ParseTreeListener
 >>
 
 VisitorDispatchMethod(method) ::= <<
-public function accept(ParseTreeVisitor $visitor)
+public function accept(ParseTreeVisitor $visitor) : mixed
 {
 	if ($visitor instanceof <parser.grammarName>Visitor) {
 	    return $visitor->visit<struct.derivedFromName; format="cap">($this);