aimeos / ai-slim

lib/custom/tests/MW/View/Helper/Request/SlimTest.php

Spacing +17 added lines, -17 removed lines

@@ -17,51 +17,51 @@
 
 	protected function setUp()
 	{
-		if( !interface_exists( '\Psr\Http\Message\ServerRequestInterface' ) ) {
-			$this->markTestSkipped( '\Psr\Http\Message\ServerRequestInterface is not available' );
+		if (!interface_exists('\Psr\Http\Message\ServerRequestInterface')) {
+			$this->markTestSkipped('\Psr\Http\Message\ServerRequestInterface is not available');
 		}
 
-		if( !class_exists( '\Slim\Route' ) ) {
-			$this->markTestSkipped( '\Slim\Route is not available' );
+		if (!class_exists('\Slim\Route')) {
+			$this->markTestSkipped('\Slim\Route is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
-		$route = new \Slim\Route( array( 'GET' ), '/shop', null );
-		$route->setName( 'route' );
+		$route = new \Slim\Route(array('GET'), '/shop', null);
+		$route->setName('route');
 
-		$this->mock = $this->getMock( '\Psr\Http\Message\ServerRequestInterface' );
+		$this->mock = $this->getMock('\Psr\Http\Message\ServerRequestInterface');
 
-		$this->mock->expects( $this->once() )->method( 'getAttribute' )
-			->will( $this->returnValue( $route ) );
+		$this->mock->expects($this->once())->method('getAttribute')
+			->will($this->returnValue($route));
 
-		$this->mock->expects( $this->once() )->method( 'getServerParams' )
-			->will( $this->returnValue( array( 'REMOTE_ADDR' => '127.0.0.1' ) ) );
+		$this->mock->expects($this->once())->method('getServerParams')
+			->will($this->returnValue(array('REMOTE_ADDR' => '127.0.0.1')));
 
-		$this->object = new \Aimeos\MW\View\Helper\Request\Slim( $view, $this->mock );
+		$this->object = new \Aimeos\MW\View\Helper\Request\Slim($view, $this->mock);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock );
+		unset($this->object, $this->mock);
 	}
 
 
 	public function testTransform()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\View\Helper\Request\Slim', $this->object->transform() );
-		$this->assertInstanceOf( '\Psr\Http\Message\ServerRequestInterface', $this->object->transform() );
+		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Request\Slim', $this->object->transform());
+		$this->assertInstanceOf('\Psr\Http\Message\ServerRequestInterface', $this->object->transform());
 	}
 
 
 	public function testGetClientAddress()
 	{
-		$this->assertEquals( '127.0.0.1', $this->object->getClientAddress() );
+		$this->assertEquals('127.0.0.1', $this->object->getClientAddress());
 	}
 
 
 	public function testGetTarget()
 	{
-		$this->assertEquals( 'route', $this->object->getTarget() );
+		$this->assertEquals('route', $this->object->getTarget());
 	}
 }

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

Spacing +6 added lines, -6 removed lines

@@ -27,11 +27,11 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 * @param \Psr\Http\Message\ServerRequestInterface $request PSR-7 request object
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view, \Psr\Http\Message\ServerRequestInterface $request )
+	public function __construct(\Aimeos\MW\View\Iface $view, \Psr\Http\Message\ServerRequestInterface $request)
 	{
-		$route = $request->getAttribute( 'route' );
+		$route = $request->getAttribute('route');
 
-		parent::__construct( $view, $request, $this->getIPAddress( $request ), ( $route ? $route->getName() : null ) );
+		parent::__construct($view, $request, $this->getIPAddress($request), ($route ? $route->getName() : null));
 	}
 
 
@@ -41,13 +41,13 @@ 
 	 * @param \Psr\Http\Message\ServerRequestInterface $request
 	 * @return string|null IPv4 or IPv6 address or null if invalid
 	 */
-	protected function getIPAddress( \Psr\Http\Message\ServerRequestInterface $request )
+	protected function getIPAddress(\Psr\Http\Message\ServerRequestInterface $request)
 	{
 		$server = $request->getServerParams();
 		$flags = FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6;
 
-		if( isset( $server['REMOTE_ADDR'] )
-			&& ( $ip = filter_var( $server['REMOTE_ADDR'], FILTER_VALIDATE_IP, $flags ) ) !== false
+		if (isset($server['REMOTE_ADDR'])
+			&& ($ip = filter_var($server['REMOTE_ADDR'], FILTER_VALIDATE_IP, $flags)) !== false
 		) {
 			return $ip;
 		}