Completed
Push — master ( 7eb028...8a1132 )
by Aimeos
01:31
created
lib/custom/src/MW/View/Helper/Response/Slim.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,16 +29,16 @@
 block discarded – undo
29 29
 	 * @param string|resource Absolute file path or file descriptor
30 30
 	 * @return \Psr\Http\Message\StreamInterface Stream object
31 31
 	 */
32
-	public function createStream( $resource )
32
+	public function createStream($resource)
33 33
 	{
34
-		if( is_resource( $resource ) === true ) {
35
-			return new \Slim\Http\Stream( $resource );
34
+		if (is_resource($resource) === true) {
35
+			return new \Slim\Http\Stream($resource);
36 36
 		}
37 37
 
38
-		if( ( $fh = @fopen( $resource, 'r' ) ) !== false ) {
39
-			return new \Slim\Http\Stream( $fh );
38
+		if (($fh = @fopen($resource, 'r')) !== false) {
39
+			return new \Slim\Http\Stream($fh);
40 40
 		}
41 41
 
42
-		throw new \Aimeos\MW\Exception( sprintf( 'Unable to open file "%1$s"', $resource ) );
42
+		throw new \Aimeos\MW\Exception(sprintf('Unable to open file "%1$s"', $resource));
43 43
 	}
44 44
 }
Please login to merge, or discard this patch.
lib/custom/src/MW/View/Helper/Request/Slim.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
27 27
 	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
28 28
 	 * @param \Psr\Http\Message\ServerRequestInterface $request PSR-7 request object
29 29
 	 */
30
-	public function __construct( \Aimeos\MW\View\Iface $view, \Psr\Http\Message\ServerRequestInterface $request )
30
+	public function __construct(\Aimeos\MW\View\Iface $view, \Psr\Http\Message\ServerRequestInterface $request)
31 31
 	{
32
-		$route = $request->getAttribute( 'route' );
32
+		$route = $request->getAttribute('route');
33 33
 
34
-		parent::__construct( $view, $request, $this->getIPAddress( $request ), ( $route ? $route->getName() : null ) );
34
+		parent::__construct($view, $request, $this->getIPAddress($request), ($route ? $route->getName() : null));
35 35
 	}
36 36
 
37 37
 
@@ -41,13 +41,13 @@  discard block
 block discarded – undo
41 41
 	 * @param \Psr\Http\Message\ServerRequestInterface $request
42 42
 	 * @return string|null IPv4 or IPv6 address or null if invalid
43 43
 	 */
44
-	protected function getIPAddress( \Psr\Http\Message\ServerRequestInterface $request )
44
+	protected function getIPAddress(\Psr\Http\Message\ServerRequestInterface $request)
45 45
 	{
46 46
 		$server = $request->getServerParams();
47 47
 		$flags = FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6;
48 48
 
49
-		if( isset( $server['REMOTE_ADDR'] )
50
-			&& ( $ip = filter_var( $server['REMOTE_ADDR'], FILTER_VALIDATE_IP, $flags ) ) !== false
49
+		if (isset($server['REMOTE_ADDR'])
50
+			&& ($ip = filter_var($server['REMOTE_ADDR'], FILTER_VALIDATE_IP, $flags)) !== false
51 51
 		) {
52 52
 			return $ip;
53 53
 		}
Please login to merge, or discard this patch.
lib/custom/src/Slim/Router.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,13 +75,13 @@
 block discarded – undo
75 75
 		}
76 76
 
77 77
 		if (empty($segments)) {
78
-			throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
78
+			throw new InvalidArgumentException('Missing data for URL segment: '.$segmentName);
79 79
 		}
80 80
 		$url = implode('', $segments);
81 81
 
82 82
 		$params = array_merge(array_diff_key($data, $segmentKeys), $queryParams);
83 83
 		if ($params) {
84
-			$url .= '?' . http_build_query($params);
84
+			$url .= '?'.http_build_query($params);
85 85
 		}
86 86
 
87 87
 		return $url;
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Helper/Url/SlimTest.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -17,40 +17,40 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		if( !class_exists( 'Slim\Router', false ) ) {
21
-			$this->markTestSkipped( '\Slim\Router is not available' );
20
+		if (!class_exists('Slim\Router', false)) {
21
+			$this->markTestSkipped('\Slim\Router is not available');
22 22
 		}
23 23
 
24 24
 		$view = new \Aimeos\MW\View\Standard();
25 25
 		$this->router = new \Aimeos\Slim\Router();
26
-		$this->object = new \Aimeos\MW\View\Helper\Url\Slim( $view, $this->router, array( 'site' => 'default' ) );
26
+		$this->object = new \Aimeos\MW\View\Helper\Url\Slim($view, $this->router, array('site' => 'default'));
27 27
 	}
28 28
 
29 29
 
30 30
 	protected function tearDown()
31 31
 	{
32
-		unset( $this->object, $this->router );
32
+		unset($this->object, $this->router);
33 33
 	}
34 34
 
35 35
 
36 36
 	public function testTransform()
37 37
 	{
38
-		$this->router->map( array( 'GET' ), 'shop/{site}', null )->setName( 'route' );
39
-		$result = $this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ) );
38
+		$this->router->map(array('GET'), 'shop/{site}', null)->setName('route');
39
+		$result = $this->object->transform('route', 'catalog', 'lists', array('key' => 'value'));
40 40
 
41
-		$this->assertEquals( 'shop/default?key=value', $result );
41
+		$this->assertEquals('shop/default?key=value', $result);
42 42
 	}
43 43
 
44 44
 
45 45
 	public function testTransformAbsolute()
46 46
 	{
47
-		$config = array( 'absoluteUri' => true );
47
+		$config = array('absoluteUri' => true);
48 48
 
49
-		$this->router->setBasePath( 'https://localhost/' );
50
-		$this->router->map( array( 'GET' ), 'shop/{site}', null )->setName( 'route' );
49
+		$this->router->setBasePath('https://localhost/');
50
+		$this->router->map(array('GET'), 'shop/{site}', null)->setName('route');
51 51
 
52
-		$result = $this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ), [], $config );
52
+		$result = $this->object->transform('route', 'catalog', 'lists', array('key' => 'value'), [], $config);
53 53
 
54
-		$this->assertEquals( 'https://localhost/shop/default?key=value', $result );
54
+		$this->assertEquals('https://localhost/shop/default?key=value', $result);
55 55
 	}
56 56
 }
Please login to merge, or discard this patch.
lib/custom/src/MW/View/Helper/Url/Slim.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 	 * @param \Slim\Router $router Slim router object
33 33
 	 * @param array Associative list of fixed parameters that should be available for all routes
34 34
 	 */
35
-	public function __construct( \Aimeos\MW\View\Iface $view, \Slim\Router $router, array $fixed )
35
+	public function __construct(\Aimeos\MW\View\Iface $view, \Slim\Router $router, array $fixed)
36 36
 	{
37
-		parent::__construct( $view );
37
+		parent::__construct($view);
38 38
 
39 39
 		$this->router = $router;
40 40
 		$this->fixed = $fixed;
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
 	 * @param array $config Additional configuration parameter per URL
53 53
 	 * @return string Complete URL that can be used in the template
54 54
 	 */
55
-	public function transform( $target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = [] )
55
+	public function transform($target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = [])
56 56
 	{
57
-		$params = $this->sanitize( $params );
57
+		$params = $this->sanitize($params);
58 58
 
59
-		if( isset( $config['absoluteUri'] ) && (bool) $config['absoluteUri'] === true ) {
60
-			return $this->router->pathFor( $target, $this->fixed + $params );
59
+		if (isset($config['absoluteUri']) && (bool) $config['absoluteUri'] === true) {
60
+			return $this->router->pathFor($target, $this->fixed + $params);
61 61
 		}
62 62
 
63
-		return $this->router->relativePathFor( $target, $params + $this->fixed );
63
+		return $this->router->relativePathFor($target, $params + $this->fixed);
64 64
 	}
65 65
 }
66 66
\ No newline at end of file
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Helper/Request/SlimTest.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -17,51 +17,51 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		if( !interface_exists( '\Psr\Http\Message\ServerRequestInterface' ) ) {
21
-			$this->markTestSkipped( '\Psr\Http\Message\ServerRequestInterface is not available' );
20
+		if (!interface_exists('\Psr\Http\Message\ServerRequestInterface')) {
21
+			$this->markTestSkipped('\Psr\Http\Message\ServerRequestInterface is not available');
22 22
 		}
23 23
 
24
-		if( !class_exists( '\Slim\Route' ) ) {
25
-			$this->markTestSkipped( '\Slim\Route is not available' );
24
+		if (!class_exists('\Slim\Route')) {
25
+			$this->markTestSkipped('\Slim\Route is not available');
26 26
 		}
27 27
 
28 28
 		$view = new \Aimeos\MW\View\Standard();
29
-		$route = new \Slim\Route( array( 'GET' ), '/shop', null );
30
-		$route->setName( 'route' );
29
+		$route = new \Slim\Route(array('GET'), '/shop', null);
30
+		$route->setName('route');
31 31
 
32
-		$this->mock = $this->getMockBuilder( \Psr\Http\Message\ServerRequestInterface::class )->getMock();
32
+		$this->mock = $this->getMockBuilder(\Psr\Http\Message\ServerRequestInterface::class)->getMock();
33 33
 
34
-		$this->mock->expects( $this->once() )->method( 'getAttribute' )
35
-			->will( $this->returnValue( $route ) );
34
+		$this->mock->expects($this->once())->method('getAttribute')
35
+			->will($this->returnValue($route));
36 36
 
37
-		$this->mock->expects( $this->once() )->method( 'getServerParams' )
38
-			->will( $this->returnValue( array( 'REMOTE_ADDR' => '127.0.0.1' ) ) );
37
+		$this->mock->expects($this->once())->method('getServerParams')
38
+			->will($this->returnValue(array('REMOTE_ADDR' => '127.0.0.1')));
39 39
 
40
-		$this->object = new \Aimeos\MW\View\Helper\Request\Slim( $view, $this->mock );
40
+		$this->object = new \Aimeos\MW\View\Helper\Request\Slim($view, $this->mock);
41 41
 	}
42 42
 
43 43
 
44 44
 	protected function tearDown()
45 45
 	{
46
-		unset( $this->object, $this->mock );
46
+		unset($this->object, $this->mock);
47 47
 	}
48 48
 
49 49
 
50 50
 	public function testTransform()
51 51
 	{
52
-		$this->assertInstanceOf( \Aimeos\MW\View\Helper\Request\Slim::class, $this->object->transform() );
53
-		$this->assertInstanceOf( \Psr\Http\Message\ServerRequestInterface::class, $this->object->transform() );
52
+		$this->assertInstanceOf(\Aimeos\MW\View\Helper\Request\Slim::class, $this->object->transform());
53
+		$this->assertInstanceOf(\Psr\Http\Message\ServerRequestInterface::class, $this->object->transform());
54 54
 	}
55 55
 
56 56
 
57 57
 	public function testGetClientAddress()
58 58
 	{
59
-		$this->assertEquals( '127.0.0.1', $this->object->getClientAddress() );
59
+		$this->assertEquals('127.0.0.1', $this->object->getClientAddress());
60 60
 	}
61 61
 
62 62
 
63 63
 	public function testGetTarget()
64 64
 	{
65
-		$this->assertEquals( 'route', $this->object->getTarget() );
65
+		$this->assertEquals('route', $this->object->getTarget());
66 66
 	}
67 67
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Helper/Response/SlimTest.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -16,48 +16,48 @@
 block discarded – undo
16 16
 
17 17
 	protected function setUp()
18 18
 	{
19
-		if( !class_exists( '\Slim\Http\Stream' ) ) {
20
-			$this->markTestSkipped( '\Slim\Http\Stream is not available' );
19
+		if (!class_exists('\Slim\Http\Stream')) {
20
+			$this->markTestSkipped('\Slim\Http\Stream is not available');
21 21
 		}
22 22
 
23
-		$response = $this->getMockBuilder( \Psr\Http\Message\ResponseInterface::class )->getMock();
23
+		$response = $this->getMockBuilder(\Psr\Http\Message\ResponseInterface::class)->getMock();
24 24
 
25 25
 		$view = new \Aimeos\MW\View\Standard();
26
-		$this->object = new \Aimeos\MW\View\Helper\Response\Slim( $view, $response );
26
+		$this->object = new \Aimeos\MW\View\Helper\Response\Slim($view, $response);
27 27
 	}
28 28
 
29 29
 
30 30
 	protected function tearDown()
31 31
 	{
32
-		unset( $this->object );
32
+		unset($this->object);
33 33
 	}
34 34
 
35 35
 
36 36
 	public function testTransform()
37 37
 	{
38
-		$this->assertInstanceOf( \Aimeos\MW\View\Helper\Response\Slim::class, $this->object->transform() );
39
-		$this->assertInstanceOf( \Psr\Http\Message\ResponseInterface::class, $this->object->transform() );
38
+		$this->assertInstanceOf(\Aimeos\MW\View\Helper\Response\Slim::class, $this->object->transform());
39
+		$this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $this->object->transform());
40 40
 	}
41 41
 
42 42
 
43 43
 	public function testCreateStream()
44 44
 	{
45
-		$stream = $this->object->createStream( fopen( __FILE__, 'r' ) );
45
+		$stream = $this->object->createStream(fopen(__FILE__, 'r'));
46 46
 
47
-		$this->assertInstanceOf( \Slim\Http\Stream::class, $stream );
48
-		$this->assertInstanceOf( \Psr\Http\Message\StreamInterface::class, $stream );
47
+		$this->assertInstanceOf(\Slim\Http\Stream::class, $stream);
48
+		$this->assertInstanceOf(\Psr\Http\Message\StreamInterface::class, $stream);
49 49
 	}
50 50
 
51 51
 
52 52
 	public function testCreateStreamFilename()
53 53
 	{
54
-		$this->assertInstanceOf( \Psr\Http\Message\StreamInterface::class, $this->object->createStream( __FILE__ ) );
54
+		$this->assertInstanceOf(\Psr\Http\Message\StreamInterface::class, $this->object->createStream(__FILE__));
55 55
 	}
56 56
 
57 57
 
58 58
 	public function testCreateStreamInvalid()
59 59
 	{
60
-		$this->setExpectedException( \Exception::class );
60
+		$this->setExpectedException(\Exception::class);
61 61
 		$this->object->createStream( -1 );
62 62
 	}
63 63
 }
Please login to merge, or discard this patch.
lib/custom/tests/Slim/RouterTest.php 2 patches
Indentation   +131 added lines, -131 removed lines patch added patch discarded remove patch
@@ -10,140 +10,140 @@
 block discarded – undo
10 10
 
11 11
 class RouterTest extends \PHPUnit\Framework\TestCase
12 12
 {
13
-    /** @var Router */
14
-    protected $router;
13
+	/** @var Router */
14
+	protected $router;
15 15
 
16
-    public function setUp()
17
-    {
16
+	public function setUp()
17
+	{
18 18
 		if( !class_exists( \Slim\Router::class, false ) ) {
19 19
 			$this->markTestSkipped( '\Slim\Router is not available' );
20 20
 		}
21 21
 
22
-        $this->router = new \Aimeos\Slim\Router;
23
-    }
24
-
25
-    public function testRelativePathFor()
26
-    {
27
-        $this->router->setBasePath('/base/path');
28
-
29
-        $methods = ['GET'];
30
-        $pattern = '/hello/{first:\w+}/{last}';
31
-        $callable = function ($request, $response, $args) {
32
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
33
-        };
34
-        $route = $this->router->map($methods, $pattern, $callable);
35
-        $route->setName('foo');
36
-
37
-        $this->assertEquals(
38
-            '/hello/josh/lockhart',
39
-            $this->router->relativePathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
40
-        );
41
-    }
42
-
43
-    public function testPathForWithNoBasePath()
44
-    {
45
-        $this->router->setBasePath('');
46
-
47
-        $methods = ['GET'];
48
-        $pattern = '/hello/{first:\w+}/{last}';
49
-        $callable = function ($request, $response, $args) {
50
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
51
-        };
52
-        $route = $this->router->map($methods, $pattern, $callable);
53
-        $route->setName('foo');
54
-
55
-        $this->assertEquals(
56
-            '/hello/josh/lockhart',
57
-            $this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
58
-        );
59
-    }
60
-
61
-    public function testPathForWithBasePath()
62
-    {
63
-        $methods = ['GET'];
64
-        $pattern = '/hello/{first:\w+}/{last}';
65
-        $callable = function ($request, $response, $args) {
66
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
67
-        };
68
-        $this->router->setBasePath('/base/path');
69
-        $route = $this->router->map($methods, $pattern, $callable);
70
-        $route->setName('foo');
71
-
72
-        $this->assertEquals(
73
-            '/base/path/hello/josh/lockhart',
74
-            $this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
75
-        );
76
-    }
77
-
78
-    public function testPathForWithOptionalParameters()
79
-    {
80
-        $methods = ['GET'];
81
-        $pattern = '/archive/{year}[/{month:[\d:{2}]}[/d/{day}]]';
82
-        $callable = function ($request, $response, $args) {
83
-            return $response;
84
-        };
85
-        $route = $this->router->map($methods, $pattern, $callable);
86
-        $route->setName('foo');
87
-
88
-        $this->assertEquals(
89
-            '/archive/2015',
90
-            $this->router->pathFor('foo', ['year' => '2015'])
91
-        );
92
-        $this->assertEquals(
93
-            '/archive/2015/07',
94
-            $this->router->pathFor('foo', ['year' => '2015', 'month' => '07'])
95
-        );
96
-        $this->assertEquals(
97
-            '/archive/2015/07/d/19',
98
-            $this->router->pathFor('foo', ['year' => '2015', 'month' => '07', 'day' => '19'])
99
-        );
100
-    }
101
-
102
-    public function testPathForWithSurplusRouteParameters()
103
-    {
104
-        $methods = ['GET'];
105
-        $pattern = '/hello/{name}';
106
-        $callable = function ($request, $response, $args) {
107
-            echo sprintf('Hello %s', $args['name']);
108
-        };
109
-        $route = $this->router->map($methods, $pattern, $callable);
110
-        $route->setName('foo');
111
-
112
-        $this->assertEquals(
113
-            '/hello/josh?a=b',
114
-            $this->router->pathFor('foo', ['name' => 'josh', 'a' => 'b'])
115
-        );
116
-    }
117
-
118
-    /**
119
-     * @expectedException \InvalidArgumentException
120
-     */
121
-    public function testPathForWithMissingSegmentData()
122
-    {
123
-        $methods = ['GET'];
124
-        $pattern = '/hello/{first}/{last}';
125
-        $callable = function ($request, $response, $args) {
126
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
127
-        };
128
-        $route = $this->router->map($methods, $pattern, $callable);
129
-        $route->setName('foo');
130
-
131
-        $this->router->pathFor('foo', ['last' => 'lockhart']);
132
-    }
133
-
134
-    /**
135
-     * @expectedException \RuntimeException
136
-     */
137
-    public function testPathForRouteNotExists()
138
-    {
139
-        $methods = ['GET'];
140
-        $pattern = '/hello/{first}/{last}';
141
-        $callable = function ($request, $response, $args) {
142
-            echo sprintf('Hello %s %s', $args['first'], $args['last']);
143
-        };
144
-        $route = $this->router->map($methods, $pattern, $callable);
145
-        $route->setName('foo');
146
-
147
-        $this->router->pathFor('bar', ['first' => 'josh', 'last' => 'lockhart']);
148
-    }
22
+		$this->router = new \Aimeos\Slim\Router;
23
+	}
24
+
25
+	public function testRelativePathFor()
26
+	{
27
+		$this->router->setBasePath('/base/path');
28
+
29
+		$methods = ['GET'];
30
+		$pattern = '/hello/{first:\w+}/{last}';
31
+		$callable = function ($request, $response, $args) {
32
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
33
+		};
34
+		$route = $this->router->map($methods, $pattern, $callable);
35
+		$route->setName('foo');
36
+
37
+		$this->assertEquals(
38
+			'/hello/josh/lockhart',
39
+			$this->router->relativePathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
40
+		);
41
+	}
42
+
43
+	public function testPathForWithNoBasePath()
44
+	{
45
+		$this->router->setBasePath('');
46
+
47
+		$methods = ['GET'];
48
+		$pattern = '/hello/{first:\w+}/{last}';
49
+		$callable = function ($request, $response, $args) {
50
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
51
+		};
52
+		$route = $this->router->map($methods, $pattern, $callable);
53
+		$route->setName('foo');
54
+
55
+		$this->assertEquals(
56
+			'/hello/josh/lockhart',
57
+			$this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
58
+		);
59
+	}
60
+
61
+	public function testPathForWithBasePath()
62
+	{
63
+		$methods = ['GET'];
64
+		$pattern = '/hello/{first:\w+}/{last}';
65
+		$callable = function ($request, $response, $args) {
66
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
67
+		};
68
+		$this->router->setBasePath('/base/path');
69
+		$route = $this->router->map($methods, $pattern, $callable);
70
+		$route->setName('foo');
71
+
72
+		$this->assertEquals(
73
+			'/base/path/hello/josh/lockhart',
74
+			$this->router->pathFor('foo', ['first' => 'josh', 'last' => 'lockhart'])
75
+		);
76
+	}
77
+
78
+	public function testPathForWithOptionalParameters()
79
+	{
80
+		$methods = ['GET'];
81
+		$pattern = '/archive/{year}[/{month:[\d:{2}]}[/d/{day}]]';
82
+		$callable = function ($request, $response, $args) {
83
+			return $response;
84
+		};
85
+		$route = $this->router->map($methods, $pattern, $callable);
86
+		$route->setName('foo');
87
+
88
+		$this->assertEquals(
89
+			'/archive/2015',
90
+			$this->router->pathFor('foo', ['year' => '2015'])
91
+		);
92
+		$this->assertEquals(
93
+			'/archive/2015/07',
94
+			$this->router->pathFor('foo', ['year' => '2015', 'month' => '07'])
95
+		);
96
+		$this->assertEquals(
97
+			'/archive/2015/07/d/19',
98
+			$this->router->pathFor('foo', ['year' => '2015', 'month' => '07', 'day' => '19'])
99
+		);
100
+	}
101
+
102
+	public function testPathForWithSurplusRouteParameters()
103
+	{
104
+		$methods = ['GET'];
105
+		$pattern = '/hello/{name}';
106
+		$callable = function ($request, $response, $args) {
107
+			echo sprintf('Hello %s', $args['name']);
108
+		};
109
+		$route = $this->router->map($methods, $pattern, $callable);
110
+		$route->setName('foo');
111
+
112
+		$this->assertEquals(
113
+			'/hello/josh?a=b',
114
+			$this->router->pathFor('foo', ['name' => 'josh', 'a' => 'b'])
115
+		);
116
+	}
117
+
118
+	/**
119
+	 * @expectedException \InvalidArgumentException
120
+	 */
121
+	public function testPathForWithMissingSegmentData()
122
+	{
123
+		$methods = ['GET'];
124
+		$pattern = '/hello/{first}/{last}';
125
+		$callable = function ($request, $response, $args) {
126
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
127
+		};
128
+		$route = $this->router->map($methods, $pattern, $callable);
129
+		$route->setName('foo');
130
+
131
+		$this->router->pathFor('foo', ['last' => 'lockhart']);
132
+	}
133
+
134
+	/**
135
+	 * @expectedException \RuntimeException
136
+	 */
137
+	public function testPathForRouteNotExists()
138
+	{
139
+		$methods = ['GET'];
140
+		$pattern = '/hello/{first}/{last}';
141
+		$callable = function ($request, $response, $args) {
142
+			echo sprintf('Hello %s %s', $args['first'], $args['last']);
143
+		};
144
+		$route = $this->router->map($methods, $pattern, $callable);
145
+		$route->setName('foo');
146
+
147
+		$this->router->pathFor('bar', ['first' => 'josh', 'last' => 'lockhart']);
148
+	}
149 149
 }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 
16 16
     public function setUp()
17 17
     {
18
-		if( !class_exists( \Slim\Router::class, false ) ) {
19
-			$this->markTestSkipped( '\Slim\Router is not available' );
18
+		if (!class_exists(\Slim\Router::class, false)) {
19
+			$this->markTestSkipped('\Slim\Router is not available');
20 20
 		}
21 21
 
22 22
         $this->router = new \Aimeos\Slim\Router;
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
         $methods = ['GET'];
30 30
         $pattern = '/hello/{first:\w+}/{last}';
31
-        $callable = function ($request, $response, $args) {
31
+        $callable = function($request, $response, $args) {
32 32
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
33 33
         };
34 34
         $route = $this->router->map($methods, $pattern, $callable);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
         $methods = ['GET'];
48 48
         $pattern = '/hello/{first:\w+}/{last}';
49
-        $callable = function ($request, $response, $args) {
49
+        $callable = function($request, $response, $args) {
50 50
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
51 51
         };
52 52
         $route = $this->router->map($methods, $pattern, $callable);
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     {
63 63
         $methods = ['GET'];
64 64
         $pattern = '/hello/{first:\w+}/{last}';
65
-        $callable = function ($request, $response, $args) {
65
+        $callable = function($request, $response, $args) {
66 66
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
67 67
         };
68 68
         $this->router->setBasePath('/base/path');
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     {
80 80
         $methods = ['GET'];
81 81
         $pattern = '/archive/{year}[/{month:[\d:{2}]}[/d/{day}]]';
82
-        $callable = function ($request, $response, $args) {
82
+        $callable = function($request, $response, $args) {
83 83
             return $response;
84 84
         };
85 85
         $route = $this->router->map($methods, $pattern, $callable);
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
     {
104 104
         $methods = ['GET'];
105 105
         $pattern = '/hello/{name}';
106
-        $callable = function ($request, $response, $args) {
106
+        $callable = function($request, $response, $args) {
107 107
             echo sprintf('Hello %s', $args['name']);
108 108
         };
109 109
         $route = $this->router->map($methods, $pattern, $callable);
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
     {
123 123
         $methods = ['GET'];
124 124
         $pattern = '/hello/{first}/{last}';
125
-        $callable = function ($request, $response, $args) {
125
+        $callable = function($request, $response, $args) {
126 126
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
127 127
         };
128 128
         $route = $this->router->map($methods, $pattern, $callable);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
     {
139 139
         $methods = ['GET'];
140 140
         $pattern = '/hello/{first}/{last}';
141
-        $callable = function ($request, $response, $args) {
141
+        $callable = function($request, $response, $args) {
142 142
             echo sprintf('Hello %s %s', $args['first'], $args['last']);
143 143
         };
144 144
         $route = $this->router->map($methods, $pattern, $callable);
Please login to merge, or discard this patch.
lib/custom/tests/TestHelper.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -47,6 +47,9 @@
 block discarded – undo
47 47
 	}
48 48
 
49 49
 
50
+	/**
51
+	 * @param string $site
52
+	 */
50 53
 	private static function createContext( $site )
51 54
 	{
52 55
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
 
19 19
 		$includepaths = $aimeos->getIncludePaths();
20 20
 		$includepaths[] = get_include_path();
21
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
21
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
22 22
 	}
23 23
 
24 24
 
25
-	public static function getContext( $site = 'unittest' )
25
+	public static function getContext($site = 'unittest')
26 26
 	{
27
-		if( !isset( self::$context[$site] ) ) {
28
-			self::$context[$site] = self::createContext( $site );
27
+		if (!isset(self::$context[$site])) {
28
+			self::$context[$site] = self::createContext($site);
29 29
 		}
30 30
 
31 31
 		return clone self::$context[$site];
@@ -34,58 +34,58 @@  discard block
 block discarded – undo
34 34
 
35 35
 	private static function getAimeos()
36 36
 	{
37
-		if( !isset( self::$aimeos ) )
37
+		if (!isset(self::$aimeos))
38 38
 		{
39 39
 			require_once 'Bootstrap.php';
40
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
40
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
41 41
 
42
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
43
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false );
42
+			$extdir = dirname(dirname(dirname(__DIR__)));
43
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false);
44 44
 		}
45 45
 
46 46
 		return self::$aimeos;
47 47
 	}
48 48
 
49 49
 
50
-	private static function createContext( $site )
50
+	private static function createContext($site)
51 51
 	{
52 52
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
53 53
 		$aimeos = self::getAimeos();
54 54
 
55 55
 
56
-		$paths = $aimeos->getConfigPaths( 'mysql' );
57
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
56
+		$paths = $aimeos->getConfigPaths('mysql');
57
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
58 58
 
59
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
60
-		$ctx->setConfig( $conf );
59
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
60
+		$ctx->setConfig($conf);
61 61
 
62 62
 
63
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
64
-		$ctx->setDatabaseManager( $dbm );
63
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
64
+		$ctx->setDatabaseManager($dbm);
65 65
 
66 66
 
67
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
68
-		$ctx->setLogger( $logger );
67
+		$logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG);
68
+		$ctx->setLogger($logger);
69 69
 
70 70
 
71 71
 		$cache = new \Aimeos\MW\Cache\None();
72
-		$ctx->setCache( $cache );
72
+		$ctx->setCache($cache);
73 73
 
74 74
 
75
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
76
-		$ctx->setI18n( array( 'de' => $i18n ) );
75
+		$i18n = new \Aimeos\MW\Translation\None('de');
76
+		$ctx->setI18n(array('de' => $i18n));
77 77
 
78 78
 
79 79
 		$session = new \Aimeos\MW\Session\None();
80
-		$ctx->setSession( $session );
80
+		$ctx->setSession($session);
81 81
 
82 82
 
83
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::create( $ctx );
84
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
83
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::create($ctx);
84
+		$localeItem = $localeManager->bootstrap($site, '', '', false);
85 85
 
86
-		$ctx->setLocale( $localeItem );
86
+		$ctx->setLocale($localeItem);
87 87
 
88
-		$ctx->setEditor( 'ai-slim:unittest' );
88
+		$ctx->setEditor('ai-slim:unittest');
89 89
 
90 90
 		return $ctx;
91 91
 	}
Please login to merge, or discard this patch.