From 60202afc19da6a29eaac42cd201aaa488e90d21a Mon Sep 17 00:00:00 2001
From: Jonas Delrue <jonas.delrue@BR-POR080.artilium.local>
Date: Sun, 4 Sep 2016 10:41:54 +0200
Subject: [PATCH] adding selectors to PhRoute

---
 src/Phroute/Dispatcher.php         | 32 ++++++++++++++++++++++++++-
 src/Phroute/RouteCollector.php     |  1 +
 src/Phroute/RouteParser.php        | 10 +++++++--
 test/Dispatcher/DispatcherTest.php |  5 +++++
 test/Dispatcher/SelectorTest.php   | 35 ++++++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 test/Dispatcher/SelectorTest.php

diff --git a/src/Phroute/Dispatcher.php b/src/Phroute/Dispatcher.php
index 6e637e5..3d5cd29 100644
--- a/src/Phroute/Dispatcher.php
+++ b/src/Phroute/Dispatcher.php
@@ -44,6 +44,8 @@ public function __construct(RouteDataInterface $data, HandlerResolverInterface $
      */
     public function dispatch($httpMethod, $uri)
     {
+        list($uri, $selectors) = $this->explodeSelectors($uri);
+     
         list($handler, $filters, $vars) = $this->dispatchRoute($httpMethod, trim($uri, '/'));
 
         list($beforeFilter, $afterFilter) = $this->parseFilters($filters);
@@ -54,12 +56,38 @@ public function dispatch($httpMethod, $uri)
         }
         
         $resolvedHandler = $this->handlerResolver->resolve($handler);
-        
+        array_push ($vars, $selectors);
         $response = call_user_func_array($resolvedHandler, $vars);
 
         return $this->dispatchFilters($afterFilter, $response);
     }
 
+    /**
+     * Add selectors (eg. ?deleted=true to called function as argument)
+     *
+     * @param $uri
+     * @return array|url, array of selectors
+     */
+    private function explodeSelectors($uri){
+        if(strpos($uri,'?') !== false){
+            list($url, $selectors) = explode("?", $_SERVER['REQUEST_URI']);
+            
+            $arrayOfFilters = explode("&", $selectors);
+            $asArrayOfFilters = Array();
+            for( $i=0; $i<count($arrayOfFilters); $i++){
+                list($key, $value) = explode("=", $arrayOfFilters[$i]);
+                $asArrayOfFilters[$key] = $value;
+            }   
+
+            $selectors = $asArrayOfFilters;
+        
+            return array($url, $selectors);
+
+         }else{
+            return array($uri, array());
+         }
+
+    }
     /**
      * Dispatch a route filter.
      *
@@ -186,6 +214,7 @@ private function dispatchVariableRoute($httpMethod, $uri)
         {
             if (!preg_match($data['regex'], $uri, $matches))
             {
+            
                 continue;
             }
 
@@ -202,6 +231,7 @@ private function dispatchVariableRoute($httpMethod, $uri)
 
             foreach (array_values($routes[$httpMethod][2]) as $i => $varName)
             {
+
                 if(!isset($matches[$i + 1]) || $matches[$i + 1] === '')
                 {
                     unset($routes[$httpMethod][2][$varName]);
diff --git a/src/Phroute/RouteCollector.php b/src/Phroute/RouteCollector.php
index 25aba08..7b8e336 100644
--- a/src/Phroute/RouteCollector.php
+++ b/src/Phroute/RouteCollector.php
@@ -169,6 +169,7 @@ private function addStaticRoute($httpMethod, $routeData, $handler, $filters)
      */
     private function addVariableRoute($httpMethod, $routeData, $handler, $filters)
     {
+
         list($regex, $variables) = $routeData;
 
         if (isset($this->regexToRoutesMap[$regex][$httpMethod]))
diff --git a/src/Phroute/RouteParser.php b/src/Phroute/RouteParser.php
index 0f25274..ed30bc7 100644
--- a/src/Phroute/RouteParser.php
+++ b/src/Phroute/RouteParser.php
@@ -59,10 +59,17 @@ class RouteParser {
      * Parse a route returning the correct data format to pass to the dispatch engine.
      *
      * @param $route
-     * @return array
+     * @return ?
      */
     public function parse($route)
     {
+        if (strpos($route, '{selectors}') == false) {
+            $route .= '/{selectors}?';
+        }else if (strpos($route, '{selectors}?') == false) {
+            $route = str_replace('{selectors}', '{selectors}?', $route);
+        }
+
+        
         $this->reset();
         
         $route = strtr($route, $this->regexShortcuts);
@@ -106,7 +113,6 @@ public function parse($route)
         }
 
         $this->staticParts($route, strlen($route));
-
         return [[implode('', $this->parts), $this->variables], array_values($this->reverseParts)];
     }
 
diff --git a/test/Dispatcher/DispatcherTest.php b/test/Dispatcher/DispatcherTest.php
index 720c2c1..f53e08d 100644
--- a/test/Dispatcher/DispatcherTest.php
+++ b/test/Dispatcher/DispatcherTest.php
@@ -1,5 +1,7 @@
 <?php
 
+
+
 namespace Phroute\Phroute\Dispatcher;
 
 use Phroute\Phroute\RouteCollector;
@@ -7,6 +9,8 @@
 use Phroute\Phroute\Dispatcher;
 use Phroute\Phroute\Route;
 
+include __DIR__ . '/../../vendor/autoload.php';
+
 class Test {
     
     public function route()
@@ -76,6 +80,7 @@ public function getParameterHyphenated($param)
 
     public function getParameterOptional($param = 'default')
     {
+        echo "ok";
         return $param;
     }
 
diff --git a/test/Dispatcher/SelectorTest.php b/test/Dispatcher/SelectorTest.php
new file mode 100644
index 0000000..0b44426
--- /dev/null
+++ b/test/Dispatcher/SelectorTest.php
@@ -0,0 +1,35 @@
+<?php
+
+    include __DIR__ . '/../../vendor/autoload.php';
+
+
+    use Phroute\Phroute\RouteCollector;
+    use Phroute\Phroute\Dispatcher;
+
+    $router = new RouteCollector();
+
+    class Selectors {
+    	public function getIndex($selectors){
+    		print_r($selectors);
+    		return "go";
+    	}
+
+
+    }
+
+
+    $router->controller('/selectors', 'Selectors');
+
+
+
+    $dispatcher = new Dispatcher($router->getData());
+	
+	
+	// Todo code should be part of phroute...
+	$url =  $_SERVER['REQUEST_URI'];
+	
+
+    $response = $dispatcher->dispatch($_SERVER['REQUEST_METHOD'], $url);
+
+    echo $response;
+?>