@@ -61,7 +61,6 @@ public function match(string $path, string $method): bool
6161
6262 return true ;
6363 }
64-
6564 return false ;
6665 }
6766
@@ -80,11 +79,6 @@ public function getController(): array
8079 return $ this ->controller ;
8180 }
8281
83- public function getVars (): array
84- {
85- return $ this ->vars ;
86- }
87-
8882 public function getVarsNames (): array
8983 {
9084 preg_match_all ('/{[^}]*}/ ' , $ this ->path , $ matches );
@@ -96,27 +90,32 @@ public function getMethods(): array
9690 return $ this ->methods ;
9791 }
9892
99- private function generateRegex (): string
93+ public function hasVars (): bool
10094 {
101- $ regex = $ this ->path ;
102- foreach ($ this ->getVarsNames () as $ variable ) {
103- $ varName = trim ($ variable , '{\} ' );
104- $ regex = str_replace ($ variable , '(?P< ' . $ varName . '>[^/]++) ' , $ regex );
105- }
106- return $ regex ;
95+ return $ this ->getVarsNames () !== [];
10796 }
10897
109- public function hasVars (): bool
98+ public function getVars (): array
11099 {
111- return $ this ->getVarsNames () !== [] ;
100+ return $ this ->vars ;
112101 }
113102
114- public function addVar (string $ key , string $ value ): self
103+ private function addVar (string $ key , string $ value ): self
115104 {
116105 $ this ->vars [$ key ] = $ value ;
117106 return $ this ;
118107 }
119108
109+ private function generateRegex (): string
110+ {
111+ $ regex = $ this ->path ;
112+ foreach ($ this ->getVarsNames () as $ variable ) {
113+ $ varName = trim ($ variable , '{\} ' );
114+ $ regex = str_replace ($ variable , '(?P< ' . $ varName . '>[^/]++) ' , $ regex );
115+ }
116+ return $ regex ;
117+ }
118+
120119 private static function trimPath (string $ path ): string
121120 {
122121 return '/ ' . rtrim (ltrim (trim ($ path ), '/ ' ), '/ ' );
0 commit comments