File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -142,9 +142,17 @@ public static function dispatch($method, $path)
142142 */
143143 public static function convertToCallable ($ path , $ callback )
144144 {
145- if (\is_callable ($ callback )) return $ callback ;
146- $ callback = explode ('@ ' , $ callback );
147- if (isset ($ callback [0 ]) && isset ($ callback [1 ]) && \class_exists ($ callback [0 ]) && \is_callable ([App::container ()->get ($ callback [0 ]), $ callback [1 ]])) {
145+ if (\is_array ($ callback )) {
146+ $ callback = \array_values ($ callback );
147+ }
148+ if (\is_callable ($ callback )) {
149+ if (\is_array ($ callback ) && \is_string ($ callback [0 ])) {
150+ return [App::container ()->get ($ callback [0 ]), $ callback [1 ]];
151+ }
152+ return $ callback ;
153+ }
154+ $ callback = \explode ('@ ' , $ callback );
155+ if (isset ($ callback [1 ]) && \class_exists ($ callback [0 ]) && \is_callable ([App::container ()->get ($ callback [0 ]), $ callback [1 ]])) {
148156 return [App::container ()->get ($ callback [0 ]), $ callback [1 ]];
149157 }
150158 echo "Route set to $ path is not callable \n" ;
You can’t perform that action at this time.
0 commit comments