fixing various bugs

scrawler-labs · May 14, 2018 · 0b3191f · 0b3191f
1 parent 688fc60
commit 0b3191f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/ArgumentResolver.php b/src/ArgumentResolver.php
@@ -8,11 +8,12 @@
 
 namespace Scrawler\Router;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 class ArgumentResolver implements ArgumentResolverInterface {
 
   public function getArguments(Request $request, $controller=null){
-    $arguments=$request->attributes->get('__arguments');
+    $arguments=$request->attributes->get('_arguments');
     return explode(",",$arguments);
   }
 

diff --git a/src/ControllerResolver.php b/src/ControllerResolver.php
@@ -10,6 +10,6 @@
 use Symfony\Component\HttpKernel\Controller\ControllerResolver as BaseResolver;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
 
-class ConrollerResolver extends BaseResolver implements ControllerResolverInterface {
+class ControllerResolver extends BaseResolver implements ControllerResolverInterface {
 
 }
diff --git a/src/RouterEngine.php b/src/RouterEngine.php
@@ -88,14 +88,13 @@ public function route() {
 
         //Sets the Request attribute according to the route
         if (class_exists($this->controller)) {
-            $controller = $this->controller();
-            $this->method = $this->getMethod($controller);
-            $this->request->attributes->set('__controller',$controller.'::'.$method);
+            $this->method = $this->getMethod($this->controller);
+            $this->request->attributes->set('_controller',$this->controller.'::'.$this->method);
         } else {
-            $controller = $this->collection->getNamespace().'\Main';
+            $this->controller = $this->collection->getNamespace().'\Main';
             array_unshift($this->path_info, '');
-            $this->method = $this->getMethod($controller);
-            $this->request->attributes->set('__controller',$controller.'::'.$method);
+            $this->method = $this->getMethod($this->controller);
+            $this->request->attributes->set('_controller',$this->controller.'::'.$this->method);
 
             }
             $this->setArguments();
@@ -142,7 +141,7 @@ private function setArguments() {
                 $this->error('Not enough arguments given to the method');
             } else {
                 //set arguments
-                $this->request->attributes->set('__arguments',implode(",",$arguments));
+                $this->request->attributes->set('_arguments',implode(",",$arguments));
 
             }
         }