aimeos / ai-slim

lib/custom/tests/Slim/RouterTest.php

Indentation +131 added lines, -131 removed lines

@@ -10,140 +10,140 @@
 
 class RouterTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var Router */
-    protected $router;
+	/** @var Router */
+	protected $router;
 
-    public function setUp()
-    {
+	public function setUp()
+	{
 		if( !class_exists( \Slim\Router::class, false ) ) {
 			$this->markTestSkipped( '\Slim\Router is not available' );
 		}
 
-        $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']);
-    }
+		$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 +39 added lines, -39 removed lines

@@ -24,37 +24,37 @@ 
 
     public function testRelativePathFor()
     {
-        $this->router->setBasePath('/base/path');
+        $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']);
+        $callable = function( $request, $response, $args ) {
+            echo sprintf( 'Hello %s %s', $args['first'], $args['last'] );
         };
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
+        $route = $this->router->map( $methods, $pattern, $callable );
+        $route->setName( 'foo' );
 
         $this->assertEquals(
             '/hello/josh/lockhart',
-            $this->router->relativePathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
+            $this->router->relativePathFor( 'foo', ['first' => 'josh', 'last' => 'lockhart'] )
         );
     }
 
     public function testPathForWithNoBasePath()
     {
-        $this->router->setBasePath('');
+        $this->router->setBasePath( '' );
 
         $methods = ['GET'];
         $pattern = '/hello/{first:\w+}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['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');
+        $route = $this->router->map( $methods, $pattern, $callable );
+        $route->setName( 'foo' );
 
         $this->assertEquals(
             '/hello/josh/lockhart',
-            $this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
+            $this->router->pathFor( 'foo', ['first' => 'josh', 'last' => 'lockhart'] )
         );
     }
 
@@ -62,16 +62,16 @@ 
     {
         $methods = ['GET'];
         $pattern = '/hello/{first:\w+}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['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->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'])
+            $this->router->pathFor( 'foo', ['first' => 'josh', 'last' => 'lockhart'] )
         );
     }
 
@@ -79,23 +79,23 @@ 
     {
         $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);
-        $route->setName('foo');
+        $route = $this->router->map( $methods, $pattern, $callable );
+        $route->setName( 'foo' );
 
         $this->assertEquals(
             '/archive/2015',
-            $this->router->pathFor('foo', ['year' => '2015'])
+            $this->router->pathFor( 'foo', ['year' => '2015'] )
         );
         $this->assertEquals(
             '/archive/2015/07',
-            $this->router->pathFor('foo', ['year' => '2015', 'month' => '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'])
+            $this->router->pathFor( 'foo', ['year' => '2015', 'month' => '07', 'day' => '19'] )
         );
     }
 
@@ -103,15 +103,15 @@ 
     {
         $methods = ['GET'];
         $pattern = '/hello/{name}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s', $args['name']);
+        $callable = function( $request, $response, $args ) {
+            echo sprintf( 'Hello %s', $args['name'] );
         };
-        $route = $this->router->map($methods, $pattern, $callable);
-        $route->setName('foo');
+        $route = $this->router->map( $methods, $pattern, $callable );
+        $route->setName( 'foo' );
 
         $this->assertEquals(
             '/hello/josh?a=b',
-            $this->router->pathFor('foo', ['name' => 'josh', 'a' => 'b'])
+            $this->router->pathFor( 'foo', ['name' => 'josh', 'a' => 'b'] )
         );
     }
 
@@ -122,13 +122,13 @@ 
     {
         $methods = ['GET'];
         $pattern = '/hello/{first}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['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');
+        $route = $this->router->map( $methods, $pattern, $callable );
+        $route->setName( 'foo' );
 
-        $this->router->pathFor('foo', ['last' => 'lockhart']);
+        $this->router->pathFor( 'foo', ['last' => 'lockhart'] );
     }
 
     /**
@@ -138,12 +138,12 @@ 
     {
         $methods = ['GET'];
         $pattern = '/hello/{first}/{last}';
-        $callable = function ($request, $response, $args) {
-            echo sprintf('Hello %s %s', $args['first'], $args['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');
+        $route = $this->router->map( $methods, $pattern, $callable );
+        $route->setName( 'foo' );
 
-        $this->router->pathFor('bar', ['first' => 'josh', 'last' => 'lockhart']);
+        $this->router->pathFor( 'bar', ['first' => 'josh', 'last' => 'lockhart'] );
     }
 }

Braces +14 added lines, -7 removed lines

@@ -28,7 +28,8 @@ 
 
         $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);
@@ -46,7 +47,8 @@ 
 
         $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);
@@ -62,7 +64,8 @@ 
     {
         $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');
@@ -79,7 +82,8 @@ 
     {
         $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);
@@ -103,7 +107,8 @@ 
     {
         $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);
@@ -122,7 +127,8 @@ 
     {
         $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);
@@ -138,7 +144,8 @@ 
     {
         $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);

lib/custom/src/Slim/Router.php

Spacing +15 added lines, -15 removed lines

@@ -34,29 +34,29 @@ 
 	 * @throws RuntimeException		 If named route does not exist
 	 * @throws InvalidArgumentException If required data not provided
 	 */
-	public function relativePathFor($name, array $data = [], array $queryParams = [])
+	public function relativePathFor( $name, array $data = [], array $queryParams = [] )
 	{
-		$route = $this->getNamedRoute($name);
+		$route = $this->getNamedRoute( $name );
 		$pattern = $route->getPattern();
 
-		$routeDatas = $this->routeParser->parse($pattern);
+		$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 = array_reverse( $routeDatas );
 
 		$segments = $segmentKeys = [];
-		foreach ($routeDatas as $routeData) {
-			foreach ($routeData as $item) {
-				if (is_string($item)) {
+		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)) {
+				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.
@@ -67,21 +67,21 @@ 
 				$segments[] = $data[$item[0]];
 				$segmentKeys[$item[0]] = true;
 			}
-			if (!empty($segments)) {
+			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);
+		if( empty( $segments ) ) {
+			throw new InvalidArgumentException( 'Missing data for URL segment: ' . $segmentName );
 		}
-		$url = implode('', $segments);
+		$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;

lib/custom/tests/bootstrap.php

Spacing +5 added lines, -5 removed lines

@@ -4,16 +4,16 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set('display_errors', '1');
+ini_set( 'display_errors', '1' );
 
 
 /*
  * Set locale settings to reasonable defaults
  */
-setlocale(LC_ALL, 'en_US.UTF-8');
-setlocale(LC_NUMERIC, 'POSIX');
-setlocale(LC_CTYPE, 'en_US.UTF-8');
-setlocale(LC_TIME, 'POSIX');
+setlocale( LC_ALL, 'en_US.UTF-8' );
+setlocale( LC_NUMERIC, 'POSIX' );
+setlocale( LC_CTYPE, 'en_US.UTF-8' );
+setlocale( LC_TIME, 'POSIX' );
 
 
 require_once 'TestHelper.php';