aimeos / ai-symfony

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

Spacing +16 added lines, -16 removed lines

@@ -34,11 +34,11 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 * @param \Symfony\Component\HttpFoundation\Request $request Symfony2 request object
 	 */
-	public function __construct( $view, \Symfony\Component\HttpFoundation\Request $request )
+	public function __construct($view, \Symfony\Component\HttpFoundation\Request $request)
 	{
 		$this->request = $request;
 
-		parent::__construct( $view, $this->createRequest( $request ) );
+		parent::__construct($view, $this->createRequest($request));
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->request->get( '_route' );
+		return $this->request->get('_route');
 	}
 
 
@@ -70,10 +70,10 @@ 
 	 * @param \Symfony\Component\HttpFoundation\Request $nativeRequest Symfony request object
 	 * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object
 	 */
-	protected function createRequest( \Symfony\Component\HttpFoundation\Request $nativeRequest )
+	protected function createRequest(\Symfony\Component\HttpFoundation\Request $nativeRequest)
 	{
-		$files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) );
-		$server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() );
+		$files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all()));
+		$server = ServerRequestFactory::normalizeServer($nativeRequest->server->all());
 		$headers = $nativeRequest->headers->all();
 		$cookies = $nativeRequest->cookies->all();
 		$post = $nativeRequest->request->all();
@@ -81,13 +81,13 @@ 
 		$method = $nativeRequest->getMethod();
 		$uri = $nativeRequest->getUri();
 
-		$body = new Stream( 'php://temp', 'wb+' );
-		$body->write( $nativeRequest->getContent() );
+		$body = new Stream('php://temp', 'wb+');
+		$body->write($nativeRequest->getContent());
 
-		$request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post );
+		$request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post);
 
-		foreach( $nativeRequest->attributes->all() as $key => $value ) {
-			$request = $request->withAttribute( $key, $value );
+		foreach ($nativeRequest->attributes->all() as $key => $value) {
+			$request = $request->withAttribute($key, $value);
 		}
 
 		return $request;
@@ -100,13 +100,13 @@ 
 	 * @param array $files Multi-dimensional list of uploaded files from Symfony request
 	 * @return array Multi-dimensional list of uploaded files as PSR-7 objects
 	 */
-	protected function getFiles( array $files )
+	protected function getFiles(array $files)
 	{
 		$list = [];
 
-		foreach( $files as $key => $value )
+		foreach ($files as $key => $value)
 		{
-			if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile )
+			if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile)
 			{
 				$list[$key] = new \Zend\Diactoros\UploadedFile(
 					$value->getRealPath(),
@@ -116,9 +116,9 @@ 
 					$value->getClientMimeType()
 				);
 			}
-			elseif( is_array( $value ) )
+			elseif (is_array($value))
 			{
-				$list[$key] = $this->getFiles( $value );
+				$list[$key] = $this->getFiles($value);
 			}
 		}
 

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

Spacing +8 added lines, -8 removed lines

@@ -32,9 +32,9 @@ 
 	 * @param Symfony\Component\Routing\RouterInterface $router Symfony2 Router implementation
 	 * @param array $fixed Fixed parameters that should be added to each URL
 	 */
-	public function __construct( $view, \Symfony\Component\Routing\RouterInterface $router, array $fixed )
+	public function __construct($view, \Symfony\Component\Routing\RouterInterface $router, array $fixed)
 	{
-		parent::__construct( $view );
+		parent::__construct($view);
 
 		$this->router = $router;
 		$this->fixed = $fixed;
@@ -52,19 +52,19 @@ 
 	 * @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 = [])
 	{
-		if( !empty( $trailing ) ) {
-			$params['trailing'] = join( '_', $trailing );
+		if (!empty($trailing)) {
+			$params['trailing'] = join('_', $trailing);
 		}
 
-		$params = $this->sanitize( $params );
+		$params = $this->sanitize($params);
 		$refType = \Symfony\Component\Routing\Generator\UrlGeneratorInterface::ABSOLUTE_PATH;
 
-		if( isset( $config['absoluteUri'] ) ) {
+		if (isset($config['absoluteUri'])) {
 			$refType = \Symfony\Component\Routing\Generator\UrlGeneratorInterface::ABSOLUTE_URL;
 		}
 
-		return $this->router->generate( $target, $params + $this->fixed, $refType );
+		return $this->router->generate($target, $params + $this->fixed, $refType);
 	}
 }

lib/custom/tests/TestHelper.php

Spacing +22 added lines, -22 removed lines

@@ -17,14 +17,14 @@ 
 
 		$includepaths = $mshop->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];
@@ -33,13 +33,13 @@ 
 
 	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;
@@ -52,37 +52,37 @@ 
 	 * @param string $site Unique site code
 	 * @return \\Aimeos\MShop\Context\Item\Iface Context object
 	 */
-		private static function createContext( $site )
+		private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$mshop = self::getAimeos();
 
 
-		$paths = $mshop->getConfigPaths( 'mysql' );
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
+		$paths = $mshop->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);
 
 
 		$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-symfony:unittest' );
+		$ctx->setEditor('ai-symfony:unittest');
 
 		return $ctx;
 	}

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

Spacing +13 added lines, -13 removed lines

@@ -15,42 +15,42 @@
 
 	protected function setUp()
 	{
-		if( !class_exists( '\Symfony\Component\HttpFoundation\Request' ) ) {
-			$this->markTestSkipped( '\Symfony\Component\HttpFoundation\Request is not available' );
+		if (!class_exists('\Symfony\Component\HttpFoundation\Request')) {
+			$this->markTestSkipped('\Symfony\Component\HttpFoundation\Request is not available');
 		}
 
-		if( !class_exists( '\Zend\Diactoros\Response' ) ) {
-			$this->markTestSkipped( '\Zend\Diactoros\Response is not available' );
+		if (!class_exists('\Zend\Diactoros\Response')) {
+			$this->markTestSkipped('\Zend\Diactoros\Response is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
-		$files = array( 'test' => array( 'file' => array(
+		$files = array('test' => array('file' => array(
 			'name' => 'test.txt',
 			'type' => 'text/plain',
-			'tmp_name' => tempnam( sys_get_temp_dir(), 'ai-symfony_' ),
+			'tmp_name' => tempnam(sys_get_temp_dir(), 'ai-symfony_'),
 			'error' => UPLOAD_ERR_OK,
 			'size' => 123
-		) ) );
-		$param = array( 'HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1' );
-		$request = new \Symfony\Component\HttpFoundation\Request( [], [], [], [], $files, $param, 'Content' );
-		$this->object = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request );
+		)));
+		$param = array('HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1');
+		$request = new \Symfony\Component\HttpFoundation\Request([], [], [], [], $files, $param, 'Content');
+		$this->object = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request);
 	}
 
 
 	public function testTransform()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\View\Helper\Request\Symfony2', $this->object->transform() );
+		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Request\Symfony2', $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( null, $this->object->getTarget() );
+		$this->assertEquals(null, $this->object->getTarget());
 	}
 }

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

Spacing +12 added lines, -12 removed lines

@@ -25,17 +25,17 @@ 
 	 */
 	protected function setUp()
 	{
-		if( !class_exists( '\Symfony\Component\Routing\Router' ) ) {
-			$this->markTestSkipped( 'Symfony\Component\Routing\Router is not available' );
+		if (!class_exists('\Symfony\Component\Routing\Router')) {
+			$this->markTestSkipped('Symfony\Component\Routing\Router is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
 
-		$loc = new \Symfony\Component\Config\FileLocator( array( __DIR__ . DIRECTORY_SEPARATOR . '_testfiles' ) );
-		$loader = new \Symfony\Component\Routing\Loader\PhpFileLoader( $loc );
-		$router = new \Symfony\Component\Routing\Router( $loader, 'routing.php' );
+		$loc = new \Symfony\Component\Config\FileLocator(array(__DIR__.DIRECTORY_SEPARATOR.'_testfiles'));
+		$loader = new \Symfony\Component\Routing\Loader\PhpFileLoader($loc);
+		$router = new \Symfony\Component\Routing\Router($loader, 'routing.php');
 
-		$this->object = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $router, array( 'site' => 'unittest' ) );
+		$this->object = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $router, array('site' => 'unittest'));
 	}
 
 
@@ -53,26 +53,26 @@ 
 
 	public function testTransform()
 	{
-		$this->assertEquals( '/unittest/lists', $this->object->transform( 'catalog_list' ) );
+		$this->assertEquals('/unittest/lists', $this->object->transform('catalog_list'));
 	}
 
 
 	public function testTransformArrays()
 	{
-		$this->assertEquals( '/unittest/lists?test%5B0%5D=a&test%5B1%5D=b', $this->object->transform( 'catalog_list', null, null, array( 'test' => array( 'a', 'b' ) ) ) );
+		$this->assertEquals('/unittest/lists?test%5B0%5D=a&test%5B1%5D=b', $this->object->transform('catalog_list', null, null, array('test' => array('a', 'b'))));
 	}
 
 
 	public function testTransformTrailing()
 	{
-		$this->assertEquals( '/unittest/lists?trailing=a_b', $this->object->transform( 'catalog_list', null, null, [], array( 'a', 'b' ) ) );
+		$this->assertEquals('/unittest/lists?trailing=a_b', $this->object->transform('catalog_list', null, null, [], array('a', 'b')));
 	}
 
 
 	public function testTransformAbsolute()
 	{
-		$options = array( 'absoluteUri' => true );
-		$result = $this->object->transform( 'catalog_list', null, null, [], [], $options );
-		$this->assertEquals( 'http://localhost/unittest/lists', $result );
+		$options = array('absoluteUri' => true);
+		$result = $this->object->transform('catalog_list', null, null, [], [], $options);
+		$this->assertEquals('http://localhost/unittest/lists', $result);
 	}
 }