aimeos / ai-slim

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

Spacing +6 added lines, -6 removed lines

@@ -29,16 +29,16 @@
 	 * @param string|resource Absolute file path or file descriptor
 	 * @return \Psr\Http\Message\StreamInterface Stream object
 	 */
-	public function createStream( $resource )
+	public function createStream($resource)
 	{
-		if( is_resource( $resource ) === true ) {
-			return new \Slim\Http\Stream( $resource );
+		if (is_resource($resource) === true) {
+			return new \Slim\Http\Stream($resource);
 		}
 
-		if( ( $fh = @fopen( $resource, 'r' ) ) !== false ) {
-			return new \Slim\Http\Stream( $fh );
+		if (($fh = @fopen($resource, 'r')) !== false) {
+			return new \Slim\Http\Stream($fh);
 		}
 
-		throw new \Aimeos\MW\Exception( sprintf( 'Unable to open file "%1$s"', $resource ) );
+		throw new \Aimeos\MW\Exception(sprintf('Unable to open file "%1$s"', $resource));
 	}
 }

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;
 		}

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

Spacing +12 added lines, -12 removed lines

@@ -16,48 +16,48 @@
 
 	protected function setUp()
 	{
-		if( !class_exists( '\Slim\Http\Stream' ) ) {
-			$this->markTestSkipped( '\Slim\Http\Stream is not available' );
+		if (!class_exists('\Slim\Http\Stream')) {
+			$this->markTestSkipped('\Slim\Http\Stream is not available');
 		}
 
-		$response = $this->getMockBuilder( '\Psr\Http\Message\ResponseInterface' )->getMock();
+		$response = $this->getMockBuilder('\Psr\Http\Message\ResponseInterface')->getMock();
 
 		$view = new \Aimeos\MW\View\Standard();
-		$this->object = new \Aimeos\MW\View\Helper\Response\Slim( $view, $response );
+		$this->object = new \Aimeos\MW\View\Helper\Response\Slim($view, $response);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testTransform()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\View\Helper\Response\Slim', $this->object->transform() );
-		$this->assertInstanceOf( '\Psr\Http\Message\ResponseInterface', $this->object->transform() );
+		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Response\Slim', $this->object->transform());
+		$this->assertInstanceOf('\Psr\Http\Message\ResponseInterface', $this->object->transform());
 	}
 
 
 	public function testCreateStream()
 	{
-		$stream = $this->object->createStream( fopen( __FILE__, 'r' ) );
+		$stream = $this->object->createStream(fopen(__FILE__, 'r'));
 
-		$this->assertInstanceOf( '\Slim\Http\Stream', $stream );
-		$this->assertInstanceOf( '\Psr\Http\Message\StreamInterface', $stream );
+		$this->assertInstanceOf('\Slim\Http\Stream', $stream);
+		$this->assertInstanceOf('\Psr\Http\Message\StreamInterface', $stream);
 	}
 
 
 	public function testCreateStreamFilename()
 	{
-		$this->assertInstanceOf( '\Psr\Http\Message\StreamInterface', $this->object->createStream( __FILE__ ) );
+		$this->assertInstanceOf('\Psr\Http\Message\StreamInterface', $this->object->createStream(__FILE__));
 	}
 
 
 	public function testCreateStreamInvalid()
 	{
-		$this->setExpectedException( '\Exception' );
+		$this->setExpectedException('\Exception');
 		$this->object->createStream( -1 );
 	}
 }

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->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
+		$this->mock = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
 
-		$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/Slim/Router.php

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/tests/Slim/RouterTest.php

Spacing +9 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
 
     public function setUp()
     {
-		if( !class_exists( '\Slim\Router', false ) ) {
-			$this->markTestSkipped( '\Slim\Router is not available' );
+		if (!class_exists('\Slim\Router', false)) {
+			$this->markTestSkipped('\Slim\Router is not available');
 		}
 
         $this->router = new \Aimeos\Slim\Router;
@@ -28,7 +28,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);
@@ -46,7 +46,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);
@@ -62,7 +62,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');
@@ -79,7 +79,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);
@@ -103,7 +103,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);
@@ -122,7 +122,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);
@@ -138,7 +138,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);

lib/custom/tests/TestHelper.php

Spacing +25 added lines, -25 removed lines

@@ -18,14 +18,14 @@ 
 
 		$includepaths = $aimeos->getIncludePaths();
 		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -34,58 +34,58 @@ 
 
 	private static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false );
+			$extdir = dirname(dirname(dirname(__DIR__)));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false);
 		}
 
 		return self::$aimeos;
 	}
 
 
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths( 'mysql' );
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
+		$paths = $aimeos->getConfigPaths('mysql');
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
 		$cache = new \Aimeos\MW\Cache\None();
-		$ctx->setCache( $cache );
+		$ctx->setCache($cache);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$localeItem = $localeManager->bootstrap($site, '', '', false);
 
-		$ctx->setLocale( $localeItem );
+		$ctx->setLocale($localeItem);
 
-		$ctx->setEditor( 'ai-slim:unittest' );
+		$ctx->setEditor('ai-slim:unittest');
 
 		return $ctx;
 	}

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

Spacing +12 added lines, -12 removed lines

@@ -17,40 +17,40 @@
 
 	protected function setUp()
 	{
-		if( !class_exists( 'Slim\Router', false ) ) {
-			$this->markTestSkipped( '\Slim\Router is not available' );
+		if (!class_exists('Slim\Router', false)) {
+			$this->markTestSkipped('\Slim\Router is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
 		$this->router = new \Aimeos\Slim\Router();
-		$this->object = new \Aimeos\MW\View\Helper\Url\Slim( $view, $this->router, array( 'site' => 'default' ) );
+		$this->object = new \Aimeos\MW\View\Helper\Url\Slim($view, $this->router, array('site' => 'default'));
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->router );
+		unset($this->object, $this->router);
 	}
 
 
 	public function testTransform()
 	{
-		$this->router->map( array( 'GET' ), 'shop/{site}', null )->setName( 'route' );
-		$result = $this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ) );
+		$this->router->map(array('GET'), 'shop/{site}', null)->setName('route');
+		$result = $this->object->transform('route', 'catalog', 'lists', array('key' => 'value'));
 
-		$this->assertEquals( 'shop/default?key=value', $result );
+		$this->assertEquals('shop/default?key=value', $result);
 	}
 
 
 	public function testTransformAbsolute()
 	{
-		$config = array( 'absoluteUri' => true );
+		$config = array('absoluteUri' => true);
 
-		$this->router->setBasePath( 'https://localhost/' );
-		$this->router->map( array( 'GET' ), 'shop/{site}', null )->setName( 'route' );
+		$this->router->setBasePath('https://localhost/');
+		$this->router->map(array('GET'), 'shop/{site}', null)->setName('route');
 
-		$result = $this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ), [], $config );
+		$result = $this->object->transform('route', 'catalog', 'lists', array('key' => 'value'), [], $config);
 
-		$this->assertEquals( 'https://localhost/shop/default?key=value', $result );
+		$this->assertEquals('https://localhost/shop/default?key=value', $result);
 	}
 }

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 $trailing = [], array $config = [] )
+	public function transform($target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = [])
 	{
-		$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, $params + $this->fixed );
+		return $this->router->relativePathFor($target, $params + $this->fixed);
 	}
 }
\ No newline at end of file