aimeos / ai-slim

lib/custom/src/Slim/Router.php

Indentation +58 added lines, -58 removed lines

@@ -22,68 +22,68 @@
  */
 class Router extends \Slim\Router
 {
-    /**
-     * Build the path for a named route excluding the base path
-     *
-     * @param string $name        Route name
-     * @param array  $data        Named argument replacement data
-     * @param array  $queryParams Optional query string parameters
-     *
-     * @return string
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function relativePathFor($name, array $data = [], array $queryParams = [])
-    {
-        $route = $this->getNamedRoute($name);
-        $pattern = $route->getPattern();
+	/**
+	 * Build the path for a named route excluding the base path
+	 *
+	 * @param string $name        Route name
+	 * @param array  $data        Named argument replacement data
+	 * @param array  $queryParams Optional query string parameters
+	 *
+	 * @return string
+	 *
+	 * @throws RuntimeException         If named route does not exist
+	 * @throws InvalidArgumentException If required data not provided
+	 */
+	public function relativePathFor($name, array $data = [], array $queryParams = [])
+	{
+		$route = $this->getNamedRoute($name);
+		$pattern = $route->getPattern();
 
-        $routeDatas = $this->routeParser->parse($pattern);
-        // $routeDatas is an array of all possible routes that can be made. There is
-        // one routedata for each optional parameter plus one for no optional parameters.
-        //
-        // The most specific is last, so we look for that first.
-        $routeDatas = array_reverse($routeDatas);
+		$routeDatas = $this->routeParser->parse($pattern);
+		// $routeDatas is an array of all possible routes that can be made. There is
+		// one routedata for each optional parameter plus one for no optional parameters.
+		//
+		// The most specific is last, so we look for that first.
+		$routeDatas = array_reverse($routeDatas);
 
-        $segments = $segmentKeys = [];
-        foreach ($routeDatas as $routeData) {
-            foreach ($routeData as $item) {
-                if (is_string($item)) {
-                    // this segment is a static string
-                    $segments[] = $item;
-                    continue;
-                }
+		$segments = $segmentKeys = [];
+		foreach ($routeDatas as $routeData) {
+			foreach ($routeData as $item) {
+				if (is_string($item)) {
+					// this segment is a static string
+					$segments[] = $item;
+					continue;
+				}
 
-                // This segment has a parameter: first element is the name
-                if (!array_key_exists($item[0], $data)) {
-                    // we don't have a data element for this segment: cancel
-                    // testing this routeData item, so that we can try a less
-                    // specific routeData item.
-                    $segments = [];
-                    $segmentName = $item[0];
-                    break;
-                }
-                $segments[] = $data[$item[0]];
-                $segmentKeys[$item[0]] = true;
-            }
-            if (!empty($segments)) {
-                // we found all the parameters for this route data, no need to check
-                // less specific ones
-                break;
-            }
-        }
+				// This segment has a parameter: first element is the name
+				if (!array_key_exists($item[0], $data)) {
+					// we don't have a data element for this segment: cancel
+					// testing this routeData item, so that we can try a less
+					// specific routeData item.
+					$segments = [];
+					$segmentName = $item[0];
+					break;
+				}
+				$segments[] = $data[$item[0]];
+				$segmentKeys[$item[0]] = true;
+			}
+			if (!empty($segments)) {
+				// we found all the parameters for this route data, no need to check
+				// less specific ones
+				break;
+			}
+		}
 
-        if (empty($segments)) {
-            throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
-        }
-        $url = implode('', $segments);
+		if (empty($segments)) {
+			throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
+		}
+		$url = implode('', $segments);
 
-        $params = array_merge(array_diff_key($data, $segmentKeys), $queryParams);
-        if ($params) {
-            $url .= '?' . http_build_query($params);
-        }
+		$params = array_merge(array_diff_key($data, $segmentKeys), $queryParams);
+		if ($params) {
+			$url .= '?' . http_build_query($params);
+		}
 
-        return $url;
-    }
+		return $url;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -75,13 +75,13 @@
         }
 
         if (empty($segments)) {
-            throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
+            throw new InvalidArgumentException('Missing data for URL segment: '.$segmentName);
         }
         $url = implode('', $segments);
 
         $params = array_merge(array_diff_key($data, $segmentKeys), $queryParams);
         if ($params) {
-            $url .= '?' . http_build_query($params);
+            $url .= '?'.http_build_query($params);
         }
 
         return $url;

lib/custom/src/MW/View/Helper/Url/Slim.php

Spacing +7 added lines, -7 removed lines

@@ -32,9 +32,9 @@ 
 	 * @param \Slim\Router $router Slim router object
 	 * @param array Associative list of fixed parameters that should be available for all routes
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view, \Slim\Router $router, array $fixed )
+	public function __construct(\Aimeos\MW\View\Iface $view, \Slim\Router $router, array $fixed)
 	{
-		parent::__construct( $view );
+		parent::__construct($view);
 
 		$this->router = $router;
 		$this->fixed = $fixed;
@@ -52,14 +52,14 @@ 
 	 * @param array $config Additional configuration parameter per URL
 	 * @return string Complete URL that can be used in the template
 	 */
-	public function transform( $target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array() )
+	public function transform($target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array())
 	{
-		$params = $this->sanitize( $params );
+		$params = $this->sanitize($params);
 
-		if( isset( $config['absoluteUri'] ) && (bool) $config['absoluteUri'] === true ) {
-			return $this->router->pathFor( $target, $this->fixed + $params );
+		if (isset($config['absoluteUri']) && (bool) $config['absoluteUri'] === true) {
+			return $this->router->pathFor($target, $this->fixed + $params);
 		}
 
-		return $this->router->relativePathFor( $target, $this->fixed + $params );
+		return $this->router->relativePathFor($target, $this->fixed + $params);
 	}
 }
\ No newline at end of file

lib/custom/tests/Slim/RouterTest.php

Indentation +132 added lines, -132 removed lines

@@ -10,136 +10,136 @@
 
 class RouterTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var Router */
-    protected $router;
-
-    public function setUp()
-    {
-        $this->router = new \Aimeos\Slim\Router;
-    }
-
-    public function testRelativePathFor()
-    {
-        $this->router->setBasePath('/base/path');
-
-        $methods = ['GET'];
-        $pattern = '/hello/{first:\w+}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
-        };
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
-
-        $this->assertEquals(
-            '/hello/josh/lockhart',
-            $this->router->relativePathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
-        );
-    }
-
-    public function testPathForWithNoBasePath()
-    {
-        $this->router->setBasePath('');
-
-        $methods = ['GET'];
-        $pattern = '/hello/{first:\w+}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
-        };
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
-
-        $this->assertEquals(
-            '/hello/josh/lockhart',
-            $this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
-        );
-    }
-
-    public function testPathForWithBasePath()
-    {
-        $methods = ['GET'];
-        $pattern = '/hello/{first:\w+}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
-        };
-        $this->router->setBasePath('/base/path');
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
-
-        $this->assertEquals(
-            '/base/path/hello/josh/lockhart',
-            $this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
-        );
-    }
-
-    public function testPathForWithOptionalParameters()
-    {
-        $methods = ['GET'];
-        $pattern = '/archive/{year}[/{month:[\d:{2}]}[/d/{day}]]';
-        $callable = function ($request, $response, $args) {
-            return $response;
-        };
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
-
-        $this->assertEquals(
-            '/archive/2015',
-            $this->router->pathFor('foo', ['year' => '2015'])
-        );
-        $this->assertEquals(
-            '/archive/2015/07',
-            $this->router->pathFor('foo', ['year' => '2015', 'month' => '07'])
-        );
-        $this->assertEquals(
-            '/archive/2015/07/d/19',
-            $this->router->pathFor('foo', ['year' => '2015', 'month' => '07', 'day' => '19'])
-        );
-    }
-
-    public function testPathForWithSurplusRouteParameters()
-    {
-        $methods = ['GET'];
-        $pattern = '/hello/{name}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s', $args['name']);
-        };
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
-
-        $this->assertEquals(
-            '/hello/josh?a=b',
-            $this->router->pathFor('foo', ['name' => 'josh', 'a' => 'b'])
-        );
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testPathForWithMissingSegmentData()
-    {
-        $methods = ['GET'];
-        $pattern = '/hello/{first}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
-        };
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
-
-        $this->router->pathFor('foo', ['last' => 'lockhart']);
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testPathForRouteNotExists()
-    {
-        $methods = ['GET'];
-        $pattern = '/hello/{first}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
-        };
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
-
-        $this->router->pathFor('bar', ['first' => 'josh', 'last' => 'lockhart']);
-    }
+	/** @var Router */
+	protected $router;
+
+	public function setUp()
+	{
+		$this->router = new \Aimeos\Slim\Router;
+	}
+
+	public function testRelativePathFor()
+	{
+		$this->router->setBasePath('/base/path');
+
+		$methods = ['GET'];
+		$pattern = '/hello/{first:\w+}/{last}';
+		$callable = function ($request, $response, $args) {
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
+		};
+		$route = $this->router->map($methods, $pattern, $callable);
+		$route->setName('foo');
+
+		$this->assertEquals(
+			'/hello/josh/lockhart',
+			$this->router->relativePathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
+		);
+	}
+
+	public function testPathForWithNoBasePath()
+	{
+		$this->router->setBasePath('');
+
+		$methods = ['GET'];
+		$pattern = '/hello/{first:\w+}/{last}';
+		$callable = function ($request, $response, $args) {
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
+		};
+		$route = $this->router->map($methods, $pattern, $callable);
+		$route->setName('foo');
+
+		$this->assertEquals(
+			'/hello/josh/lockhart',
+			$this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
+		);
+	}
+
+	public function testPathForWithBasePath()
+	{
+		$methods = ['GET'];
+		$pattern = '/hello/{first:\w+}/{last}';
+		$callable = function ($request, $response, $args) {
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
+		};
+		$this->router->setBasePath('/base/path');
+		$route = $this->router->map($methods, $pattern, $callable);
+		$route->setName('foo');
+
+		$this->assertEquals(
+			'/base/path/hello/josh/lockhart',
+			$this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
+		);
+	}
+
+	public function testPathForWithOptionalParameters()
+	{
+		$methods = ['GET'];
+		$pattern = '/archive/{year}[/{month:[\d:{2}]}[/d/{day}]]';
+		$callable = function ($request, $response, $args) {
+			return $response;
+		};
+		$route = $this->router->map($methods, $pattern, $callable);
+		$route->setName('foo');
+
+		$this->assertEquals(
+			'/archive/2015',
+			$this->router->pathFor('foo', ['year' => '2015'])
+		);
+		$this->assertEquals(
+			'/archive/2015/07',
+			$this->router->pathFor('foo', ['year' => '2015', 'month' => '07'])
+		);
+		$this->assertEquals(
+			'/archive/2015/07/d/19',
+			$this->router->pathFor('foo', ['year' => '2015', 'month' => '07', 'day' => '19'])
+		);
+	}
+
+	public function testPathForWithSurplusRouteParameters()
+	{
+		$methods = ['GET'];
+		$pattern = '/hello/{name}';
+		$callable = function ($request, $response, $args) {
+			echo sprintf('Hello %s', $args['name']);
+		};
+		$route = $this->router->map($methods, $pattern, $callable);
+		$route->setName('foo');
+
+		$this->assertEquals(
+			'/hello/josh?a=b',
+			$this->router->pathFor('foo', ['name' => 'josh', 'a' => 'b'])
+		);
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testPathForWithMissingSegmentData()
+	{
+		$methods = ['GET'];
+		$pattern = '/hello/{first}/{last}';
+		$callable = function ($request, $response, $args) {
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
+		};
+		$route = $this->router->map($methods, $pattern, $callable);
+		$route->setName('foo');
+
+		$this->router->pathFor('foo', ['last' => 'lockhart']);
+	}
+
+	/**
+	 * @expectedException \RuntimeException
+	 */
+	public function testPathForRouteNotExists()
+	{
+		$methods = ['GET'];
+		$pattern = '/hello/{first}/{last}';
+		$callable = function ($request, $response, $args) {
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
+		};
+		$route = $this->router->map($methods, $pattern, $callable);
+		$route->setName('foo');
+
+		$this->router->pathFor('bar', ['first' => 'josh', 'last' => 'lockhart']);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
 
         $methods = ['GET'];
         $pattern = '/hello/{first:\w+}/{last}';
-        $callable = function ($request, $response, $args) {
+        $callable = function($request, $response, $args) {
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
         };
         $route = $this->router->map($methods, $pattern, $callable);
@@ -42,7 +42,7 @@ 
 
         $methods = ['GET'];
         $pattern = '/hello/{first:\w+}/{last}';
-        $callable = function ($request, $response, $args) {
+        $callable = function($request, $response, $args) {
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
         };
         $route = $this->router->map($methods, $pattern, $callable);
@@ -58,7 +58,7 @@ 
     {
         $methods = ['GET'];
         $pattern = '/hello/{first:\w+}/{last}';
-        $callable = function ($request, $response, $args) {
+        $callable = function($request, $response, $args) {
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
         };
         $this->router->setBasePath('/base/path');
@@ -75,7 +75,7 @@ 
     {
         $methods = ['GET'];
         $pattern = '/archive/{year}[/{month:[\d:{2}]}[/d/{day}]]';
-        $callable = function ($request, $response, $args) {
+        $callable = function($request, $response, $args) {
             return $response;
         };
         $route = $this->router->map($methods, $pattern, $callable);
@@ -99,7 +99,7 @@ 
     {
         $methods = ['GET'];
         $pattern = '/hello/{name}';
-        $callable = function ($request, $response, $args) {
+        $callable = function($request, $response, $args) {
             echo sprintf('Hello %s', $args['name']);
         };
         $route = $this->router->map($methods, $pattern, $callable);
@@ -118,7 +118,7 @@ 
     {
         $methods = ['GET'];
         $pattern = '/hello/{first}/{last}';
-        $callable = function ($request, $response, $args) {
+        $callable = function($request, $response, $args) {
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
         };
         $route = $this->router->map($methods, $pattern, $callable);
@@ -134,7 +134,7 @@ 
     {
         $methods = ['GET'];
         $pattern = '/hello/{first}/{last}';
-        $callable = function ($request, $response, $args) {
+        $callable = function($request, $response, $args) {
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
         };
         $route = $this->router->map($methods, $pattern, $callable);