aimeos / ai-flow

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

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view )
+	public function __construct(\Aimeos\MW\View\Iface $view)
 	{
-		parent::__construct( $view, new \Zend\Diactoros\Response() );
+		parent::__construct($view, new \Zend\Diactoros\Response());
 	}
 }

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

Spacing +45 added lines, -45 removed lines

@@ -26,43 +26,43 @@ 
 	 */
 	protected function setUp()
 	{
-		if( !class_exists( '\\TYPO3\\Flow\\Mvc\\Routing\\UriBuilder' ) ) {
-			$this->markTestSkipped( '\\TYPO3\\Flow\\Mvc\\Routing\\UriBuilder is not available' );
+		if (!class_exists('\\TYPO3\\Flow\\Mvc\\Routing\\UriBuilder')) {
+			$this->markTestSkipped('\\TYPO3\\Flow\\Mvc\\Routing\\UriBuilder is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
 
-		$mockHttpRequest = $this->getMockBuilder( 'TYPO3\Flow\Http\Request' )
+		$mockHttpRequest = $this->getMockBuilder('TYPO3\Flow\Http\Request')
 			->disableOriginalConstructor()
-			->setMethods( array( 'getBaseUri' ) )
+			->setMethods(array('getBaseUri'))
 			->getMock();
-		$mockHttpRequest->expects( $this->any() )
-			->method( 'getBaseUri' )
-			->will( $this->returnValue( 'http://localhost/' ) );
+		$mockHttpRequest->expects($this->any())
+			->method('getBaseUri')
+			->will($this->returnValue('http://localhost/'));
 
-		$mockMainRequest = $this->getMock( 'TYPO3\Flow\Mvc\ActionRequest',
-			array( 'getControllerObjectName', 'getArgumentNamespace' ), array( $mockHttpRequest ) );
-		$mockMainRequest->expects( $this->any() )
-			->method( 'getArgumentNamespace' )
-			->will( $this->returnValue( 'ai' ) );
+		$mockMainRequest = $this->getMock('TYPO3\Flow\Mvc\ActionRequest',
+			array('getControllerObjectName', 'getArgumentNamespace'), array($mockHttpRequest));
+		$mockMainRequest->expects($this->any())
+			->method('getArgumentNamespace')
+			->will($this->returnValue('ai'));
 
-		$this->mockRouter = $this->getMock( 'TYPO3\Flow\Mvc\Routing\Router' );
-		$mockEnv = $this->getMock( 'TYPO3\Flow\Utility\Environment', array( 'isRewriteEnabled' ), array(), '', false );
+		$this->mockRouter = $this->getMock('TYPO3\Flow\Mvc\Routing\Router');
+		$mockEnv = $this->getMock('TYPO3\Flow\Utility\Environment', array('isRewriteEnabled'), array(), '', false);
 
 		$builder = new \TYPO3\Flow\Mvc\Routing\UriBuilder();
-		$builder->setRequest( $mockMainRequest );
+		$builder->setRequest($mockMainRequest);
 
-		$objectReflection = new \ReflectionObject( $builder );
+		$objectReflection = new \ReflectionObject($builder);
 
-		$property = $objectReflection->getProperty( 'router' );
-		$property->setAccessible( true );
-		$property->setValue( $builder, $this->mockRouter );
+		$property = $objectReflection->getProperty('router');
+		$property->setAccessible(true);
+		$property->setValue($builder, $this->mockRouter);
 
-		$property = $objectReflection->getProperty( 'environment' );
-		$property->setAccessible( true );
-		$property->setValue( $builder, $mockEnv );
+		$property = $objectReflection->getProperty('environment');
+		$property->setAccessible(true);
+		$property->setValue($builder, $mockEnv);
 
-		$this->object = new \Aimeos\MW\View\Helper\Url\Flow( $view, $builder, array( 'site' => 'unittest' ) );
+		$this->object = new \Aimeos\MW\View\Helper\Url\Flow($view, $builder, array('site' => 'unittest'));
 	}
 
 
@@ -80,60 +80,60 @@ 
 
 	public function testTransform()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists'));
 
-		$this->assertEquals( '/index.php/shop/catalog/lists', $this->object->transform( 'shop', 'catalog', 'lists' ) );
+		$this->assertEquals('/index.php/shop/catalog/lists', $this->object->transform('shop', 'catalog', 'lists'));
 	}
 
 
 	public function testTransformSlashes()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists?test=a%2Fb') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists?test=a%2Fb'));
 
-		$this->assertEquals( '/index.php/shop/catalog/lists?test=a%2Fb', $this->object->transform( 'shop', 'catalog', 'lists', array( 'test' => 'a/b' ) ) );
+		$this->assertEquals('/index.php/shop/catalog/lists?test=a%2Fb', $this->object->transform('shop', 'catalog', 'lists', array('test' => 'a/b')));
 	}
 
 
 	public function testTransformArrays()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/list?test%5B0%5D=a&test%5B1%5D=b') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/list?test%5B0%5D=a&test%5B1%5D=b'));
 
-		$this->assertEquals( '/index.php/shop/catalog/list?test%5B0%5D=a&test%5B1%5D=b', $this->object->transform( 'shop', 'catalog', 'lists', array( 'test' => array( 'a', 'b' ) ) ) );
+		$this->assertEquals('/index.php/shop/catalog/list?test%5B0%5D=a&test%5B1%5D=b', $this->object->transform('shop', 'catalog', 'lists', array('test' => array('a', 'b'))));
 	}
 
 
 	public function testTransformTrailing()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists'));
 
-		$this->assertEquals( '/index.php/shop/catalog/lists#a/b', $this->object->transform( 'shop', 'catalog', 'lists', array(), array( 'a', 'b' ) ) );
+		$this->assertEquals('/index.php/shop/catalog/lists#a/b', $this->object->transform('shop', 'catalog', 'lists', array(), array('a', 'b')));
 	}
 
 
 	public function testTransformAbsolute()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists'));
 
-		$options = array( 'absoluteUri' => true );
-		$result = $this->object->transform( 'shop', 'catalog', 'lists', array(), array(), $options );
+		$options = array('absoluteUri' => true);
+		$result = $this->object->transform('shop', 'catalog', 'lists', array(), array(), $options);
 
-		$this->assertEquals( 'http://localhost/index.php/shop/catalog/lists', $result );
+		$this->assertEquals('http://localhost/index.php/shop/catalog/lists', $result);
 	}
 
 
 	public function testTransformConfig()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists'));
 
-		$options = array( 'package' => 'test', 'subpackage' => 'subtest', 'format' => 'fmt' );
-		$result = $this->object->transform( 'shop', 'catalog', 'lists', array(), array(), $options );
+		$options = array('package' => 'test', 'subpackage' => 'subtest', 'format' => 'fmt');
+		$result = $this->object->transform('shop', 'catalog', 'lists', array(), array(), $options);
 
-		$this->assertEquals( '/index.php/shop/catalog/lists', $result );
+		$this->assertEquals('/index.php/shop/catalog/lists', $result);
 	}
 }

lib/custom/src/MW/Cache/Flow.php

Spacing +34 added lines, -34 removed lines

@@ -31,9 +31,9 @@ 
 	 * @param array $config List of configuration values
 	 * @param \TYPO3\Flow\Cache\Frontend\FrontendInterface $cache TYPO3 cache object
 	 */
-	public function __construct( array $config, \TYPO3\Flow\Cache\Frontend\FrontendInterface $cache )
+	public function __construct(array $config, \TYPO3\Flow\Cache\Frontend\FrontendInterface $cache)
 	{
-		$this->prefix = ( isset( $config['siteid'] ) ? $config['siteid'] . '-' : '' );
+		$this->prefix = (isset($config['siteid']) ? $config['siteid'].'-' : '');
 		$this->object = $cache;
 	}
 
@@ -45,9 +45,9 @@ 
 	 *
 	 * @param string $key Key string that identifies the single cache entry
 	 */
-	public function delete( $key )
+	public function delete($key)
 	{
-		$this->object->remove( $this->prefix . $key );
+		$this->object->remove($this->prefix.$key);
 	}
 
 
@@ -59,10 +59,10 @@ 
 	 * @param string[] $keys List of key strings that identify the cache entries
 	 * 	that should be removed
 	 */
-	public function deleteList( array $keys )
+	public function deleteList(array $keys)
 	{
-		foreach( $keys as $key ) {
-			$this->object->remove( $this->prefix . $key );
+		foreach ($keys as $key) {
+			$this->object->remove($this->prefix.$key);
 		}
 	}
 
@@ -75,10 +75,10 @@ 
 	 * @param string[] $tags List of tag strings that are associated to one or more
 	 * 	cache entries that should be removed
 	 */
-	public function deleteByTags( array $tags )
+	public function deleteByTags(array $tags)
 	{
-		foreach( $tags as $tag ) {
-			$this->object->flushByTag( $this->prefix . $tag );
+		foreach ($tags as $tag) {
+			$this->object->flushByTag($this->prefix.$tag);
 		}
 	}
 
@@ -90,8 +90,8 @@ 
 	 */
 	public function flush()
 	{
-		if( $this->prefix ) {
-			$this->object->flushByTag( $this->prefix . 'siteid' );
+		if ($this->prefix) {
+			$this->object->flushByTag($this->prefix.'siteid');
 		} else {
 			$this->object->flush();
 		}
@@ -107,9 +107,9 @@ 
 	 * @param string $default Value returned if requested key isn't found
 	 * @return mixed Value associated to the requested key
 	 */
-	public function get( $name, $default = null )
+	public function get($name, $default = null)
 	{
-		if( ( $entry = $this->object->get( $this->prefix . $name ) ) !== false ) {
+		if (($entry = $this->object->get($this->prefix.$name)) !== false) {
 			return $entry;
 		}
 
@@ -127,13 +127,13 @@ 
 	 * 	entries. If a cache entry doesn't exist, neither its key nor a value
 	 * 	will be in the result list
 	 */
-	public function getList( array $keys )
+	public function getList(array $keys)
 	{
 		$result = array();
 
-		foreach( $keys as $key )
+		foreach ($keys as $key)
 		{
-			if( ( $entry = $this->object->get( $this->prefix . $key ) ) !== false ) {
+			if (($entry = $this->object->get($this->prefix.$key)) !== false) {
 				$result[$key] = $entry;
 			}
 		}
@@ -152,17 +152,17 @@ 
 	 * 	entries. If a tag isn't associated to any cache entry, nothing is returned
 	 * 	for that tag
 	 */
-	public function getListByTags( array $tags )
+	public function getListByTags(array $tags)
 	{
 		$result = array();
-		$len = strlen( $this->prefix );
+		$len = strlen($this->prefix);
 
-		foreach( $tags as $tag )
+		foreach ($tags as $tag)
 		{
-			foreach( $this->object->getByTag( $this->prefix . $tag ) as $key => $value )
+			foreach ($this->object->getByTag($this->prefix.$tag) as $key => $value)
 			{
-				if( strncmp( $key, $this->prefix, $len ) === 0 ) {
-					$result[ substr( $key, $len ) ] = $value;
+				if (strncmp($key, $this->prefix, $len) === 0) {
+					$result[substr($key, $len)] = $value;
 				} else {
 					$result[$key] = $value;
 				}
@@ -186,21 +186,21 @@ 
 	 * @param string|null $expires Date/time string in "YYYY-MM-DD HH:mm:ss"
 	 * 	format when the cache entry expires
 	 */
-	public function set( $name, $value, array $tags = array(), $expires = null )
+	public function set($name, $value, array $tags = array(), $expires = null)
 	{
-		if( $expires !== null && ( $timestamp = strtotime( $expires ) ) !== false ) {
+		if ($expires !== null && ($timestamp = strtotime($expires)) !== false) {
 			$expires = $timestamp;
 		} else {
 			$expires = null;
 		}
 
-		$tagList = ( $this->prefix ? array( $this->prefix . 'siteid' ) : array() );
+		$tagList = ($this->prefix ? array($this->prefix.'siteid') : array());
 
-		foreach( $tags as $tag ) {
-			$tagList[] = $this->prefix . $tag;
+		foreach ($tags as $tag) {
+			$tagList[] = $this->prefix.$tag;
 		}
 
-		$this->object->set( $this->prefix . $name, $value, $tagList, $expires );
+		$this->object->set($this->prefix.$name, $value, $tagList, $expires);
 	}
 
 
@@ -217,14 +217,14 @@ 
 	 * 	to the key can either be a tag string or an array of tag strings
 	 * @param array $expires Associative list of key/datetime pairs.
 	 */
-	public function setList( array $pairs, array $tags = array(), array $expires = array() )
+	public function setList(array $pairs, array $tags = array(), array $expires = array())
 	{
-		foreach( $pairs as $key => $value )
+		foreach ($pairs as $key => $value)
 		{
-			$tagList = ( isset( $tags[$key] ) ? (array) $tags[$key] : array() );
-			$keyExpire = ( isset( $expires[$key] ) ? $expires[$key] : null );
+			$tagList = (isset($tags[$key]) ? (array) $tags[$key] : array());
+			$keyExpire = (isset($expires[$key]) ? $expires[$key] : null);
 
-			$this->set( $key, $value, $tagList, $keyExpire );
+			$this->set($key, $value, $tagList, $keyExpire);
 		}
 	}
 }

lib/custom/src/MAdmin/Cache/Proxy/Flow.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
 	 * @param \TYPO3\Flow\Cache\Frontend\StringFrontend $cache Flow cache object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \TYPO3\Flow\Cache\Frontend\StringFrontend $cache )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \TYPO3\Flow\Cache\Frontend\StringFrontend $cache)
 	{
 		$this->context = $context;
 		$this->cache = $cache;
@@ -46,11 +46,11 @@ 
 	 */
 	protected function getObject()
 	{
-		if( !isset( $this->object ) )
+		if (!isset($this->object))
 		{
 			$siteid = $this->context->getLocale()->getSiteId();
-			$conf = array( 'siteid' => $this->context->getConfig()->get( 'madmin/cache/prefix' ) . $siteid );
-			$this->object = \Aimeos\MW\Cache\Factory::createManager( 'Flow', $conf, $this->cache );
+			$conf = array('siteid' => $this->context->getConfig()->get('madmin/cache/prefix').$siteid);
+			$this->object = \Aimeos\MW\Cache\Factory::createManager('Flow', $conf, $this->cache);
 		}
 
 		return $this->object;

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( dirname( __FILE__ ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false );
+			$extdir = dirname(dirname(dirname(dirname(__FILE__))));
+			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( array(), $paths );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $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-flow:unittest' );
+		$ctx->setEditor('ai-flow:unittest');
 
 		return $ctx;
 	}