aimeos / aimeos-symfony

Entity/FosUser.php

Spacing +7 added lines, -7 removed lines

@@ -209,7 +209,7 @@ 
 	 */
 	public function getSalutation()
 	{
-		return ( isset( $this->salutation ) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN );
+		return (isset($this->salutation) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN);
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 */
 	public function setSalutation($salutation)
 	{
-		switch( $salutation )
+		switch ($salutation)
 		{
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN:
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY:
@@ -229,7 +229,7 @@ 
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR:
 				break;
 			default:
-				throw new \Exception( sprintf( 'Address salutation "%1$s" is unknown', $value ) );
+				throw new \Exception(sprintf('Address salutation "%1$s" is unknown', $value));
 		}
 
 		$this->salutation = (string) $salutation;
@@ -441,7 +441,7 @@ 
 	 */
 	public function setCountryId($countryid)
 	{
-		$this->countryid = strtoupper( (string) $countryid );
+		$this->countryid = strtoupper((string) $countryid);
 	}
 
 
@@ -463,7 +463,7 @@ 
 	 */
 	public function setLanguageId($langid)
 	{
-		$this->langid = strtolower( (string) $langid );
+		$this->langid = strtolower((string) $langid);
 	}
 
 
@@ -542,8 +542,8 @@ 
 	{
 		$pattern = '#^([a-z]+://)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+(:[0-9]+)?(/.*)?$#';
 
-		if( $website !== '' && preg_match( $pattern, $website ) !== 1 ) {
-			throw new \Exception( sprintf( 'Invalid web site URL "%1$s"', $website ) );
+		if ($website !== '' && preg_match($pattern, $website) !== 1) {
+			throw new \Exception(sprintf('Invalid web site URL "%1$s"', $website));
 		}
 
 		$this->website = (string) $website;

Tests/Entity/UserTest.php

Spacing +7 added lines, -7 removed lines

@@ -19,31 +19,31 @@ 
 
 	public function testGetId()
 	{
-		$this->assertEquals( null, $this->object->getId() );
+		$this->assertEquals(null, $this->object->getId());
 	}
 
 
 	public function testGetUsername()
 	{
-		$this->assertEquals( null, $this->object->getUsername() );
+		$this->assertEquals(null, $this->object->getUsername());
 	}
 
 
 	public function testGetPassword()
 	{
-		$this->assertEquals( null, $this->object->getPassword() );
+		$this->assertEquals(null, $this->object->getPassword());
 	}
 
 
 	public function testGetSalt()
 	{
-		$this->assertEquals( 'mshop', $this->object->getSalt() );
+		$this->assertEquals('mshop', $this->object->getSalt());
 	}
 
 
 	public function testGetRoles()
 	{
-		$this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() );
+		$this->assertEquals(array('ROLE_USER'), $this->object->getRoles());
 	}
 
 
@@ -55,12 +55,12 @@ 
 
 	public function testSerialize()
 	{
-		$this->assertEquals( 'a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize() );
+		$this->assertEquals('a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize());
 	}
 
 
 	public function testUnserialize()
 	{
-		$this->object->unserialize( 'a:3:{i:0;N;i:1;N;i:2;N;}' );
+		$this->object->unserialize('a:3:{i:0;N;i:1;N;i:2;N;}');
 	}
 }

Controller/ExtadmController.php

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 	 * Creates a list of all available translations.
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @return array List of language IDs with labels
+	 * @return string List of language IDs with labels
 	 */
 	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
 	{

Spacing +66 added lines, -66 removed lines

@@ -30,63 +30,63 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response Generated output for the admin interface
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		$site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) );
-		$lang = $request->attributes->get( 'lang', $request->query->get( 'lang', 'en' ) );
-		$tab = $request->attributes->get( 'tab', $request->query->get( 'tab', 0 ) );
+		$site = $request->attributes->get('site', $request->query->get('site', 'default'));
+		$lang = $request->attributes->get('lang', $request->query->get('lang', 'en'));
+		$tab = $request->attributes->get('tab', $request->query->get('tab', 0));
 
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
-		$context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) );
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context->setLocale($this->get('aimeos_locale')->getBackend($context, $site));
 
-		$aimeos = $this->get( 'aimeos' );
+		$aimeos = $this->get('aimeos');
 		$bootstrap = $aimeos->get();
 
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
+				$jsbAbsPath = $base.'/'.$path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' );
-		$adminUrl = $this->generateUrl( 'aimeos_shop_extadm', $params );
+		$params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}');
+		$adminUrl = $this->generateUrl('aimeos_shop_extadm', $params);
 
-		$token = $this->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' )->getValue();
-		$jsonUrl = $this->generateUrl( 'aimeos_shop_extadm_json', array( '_token' => $token, 'site' => $site ) );
+		$token = $this->get('security.csrf.token_manager')->getToken('aimeos_admin_token')->getValue();
+		$jsonUrl = $this->generateUrl('aimeos_shop_extadm_json', array('_token' => $token, 'site' => $site));
 
-		$jqadmUrl = $this->generateUrl( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
+		$jqadmUrl = $this->generateUrl('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
 			'languages' => $this->getJsonLanguages(),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => urldecode( $adminUrl ),
-			'uploaddir' => $this->container->getParameter( 'aimeos_shop.uploaddir' ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => urldecode($adminUrl),
+			'uploaddir' => $this->container->getParameter('aimeos_shop.uploaddir'),
 			'version' => $aimeos->getVersion(),
 			'jqadmurl' => $jqadmUrl,
 			'activeTab' => $tab,
 		);
 
-		return $this->render( 'AimeosShopBundle:Extadm:index.html.twig', $vars );
+		return $this->render('AimeosShopBundle:Extadm:index.html.twig', $vars);
 	}
 
 
@@ -96,23 +96,23 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response JSON RPC message response
 	 */
-	public function doAction( Request $request )
+	public function doAction(Request $request)
 	{
 		$csrfProvider = $this->get('security.csrf.token_manager');
 
-		if( $csrfProvider->isTokenValid( new CsrfToken( 'aimeos_admin_token',  $request->query->get( '_token' ) ) ) !== true ) {
-			throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException( 'CSRF token is invalid' );
+		if ($csrfProvider->isTokenValid(new CsrfToken('aimeos_admin_token', $request->query->get('_token'))) !== true) {
+			throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException('CSRF token is invalid');
 		}
 
-		$cntlPaths = $this->get( 'aimeos' )->get()->getCustomPaths( 'controller/extjs' );
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
-		$context->setView( $this->get( 'aimeos_view' )->create( $context, array() ) );
-		$context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, 'default' ) );
+		$cntlPaths = $this->get('aimeos')->get()->getCustomPaths('controller/extjs');
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context->setView($this->get('aimeos_view')->create($context, array()));
+		$context->setLocale($this->get('aimeos_locale')->getBackend($context, 'default'));
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 
-		$response = $controller->process( $request->request->all(), $request->getContent() );
-		return $this->render( 'AimeosShopBundle:Extadm:do.html.twig', array( 'output' => $response ) );
+		$response = $controller->process($request->request->all(), $request->getContent());
+		return $this->render('AimeosShopBundle:Extadm:do.html.twig', array('output' => $response));
 	}
 
 
@@ -125,27 +125,27 @@ 
 	{
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$response = new Response($contents);
+		$response->headers->set('Content-Type', 'application/javascript');
 
 		return $response;
 	}
@@ -160,11 +160,11 @@ 
 	{
 		$result = array();
 
-		foreach( $this->get( 'aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach ($this->get('aimeos')->get()->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -174,10 +174,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -188,16 +188,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -209,18 +209,18 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 }

Service/I18n.php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -41,27 +41,27 @@ 
 	 * @param array $languageIds List of two letter ISO language IDs
 	 * @return \Aimeos\MW\Translation\Interface[] List of translation objects
 	 */
-	public function get( array $languageIds )
+	public function get(array $languageIds)
 	{
-		$i18nPaths = $this->container->get( 'aimeos' )->get()->getI18nPaths();
+		$i18nPaths = $this->container->get('aimeos')->get()->getI18nPaths();
 
-		foreach( $languageIds as $langid )
+		foreach ($languageIds as $langid)
 		{
-			if( !isset( $this->i18n[$langid] ) )
+			if (!isset($this->i18n[$langid]))
 			{
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
 
-				$apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' );
-				$prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' );
+				$apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable');
+				$prefix = $this->container->getParameter('aimeos_shop.apc_prefix');
 
-				if( function_exists( 'apc_store' ) === true && $apc === true ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $prefix );
+				if (function_exists('apc_store') === true && $apc === true) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $prefix);
 				}
 
-				$translations = $this->container->getParameter( 'aimeos_shop.i18n' );
+				$translations = $this->container->getParameter('aimeos_shop.i18n');
 
-				if( isset( $translations[$langid] ) ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $translations[$langid] );
+				if (isset($translations[$langid])) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $translations[$langid]);
 				}
 
 				$this->i18n[$langid] = $i18n;

Service/Aimeos.php

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -42,10 +42,10 @@ 
 	 */
 	public function get()
 	{
-		if( $this->object === null )
+		if ($this->object === null)
 		{
-			$extDirs = (array) $this->container->getParameter( 'aimeos_shop.extdir' );
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
+			$extDirs = (array) $this->container->getParameter('aimeos_shop.extdir');
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
 		}
 
 		return $this->object;
@@ -59,14 +59,14 @@ 
 	 */
 	public function getVersion()
 	{
-		$filename = dirname( $this->container->get( 'kernel' )->getRootDir() ) . DIRECTORY_SEPARATOR . 'composer.lock';
+		$filename = dirname($this->container->get('kernel')->getRootDir()).DIRECTORY_SEPARATOR.'composer.lock';
 
-		if( file_exists( $filename ) === true && ( $content = file_get_contents( $filename ) ) !== false
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
+		if (file_exists($filename) === true && ($content = file_get_contents($filename)) !== false
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
 		) {
-			foreach( (array) $content['packages'] as $item )
+			foreach ((array) $content['packages'] as $item)
 			{
-				if( $item['name'] === 'aimeos/aimeos-symfony' ) {
+				if ($item['name'] === 'aimeos/aimeos-symfony') {
 					return $item['version'];
 				}
 			}

DependencyInjection/AimeosShopExtension.php

Spacing +19 added lines, -19 removed lines

@@ -31,21 +31,21 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function load( array $configs, ContainerBuilder $container )
+	public function load(array $configs, ContainerBuilder $container)
 	{
 		$configuration = new Configuration();
-		$config = $this->processConfiguration( $configuration, $configs );
+		$config = $this->processConfiguration($configuration, $configs);
 
-		foreach( $configs as $list ) {
-			$this->merge( $config, $list );
+		foreach ($configs as $list) {
+			$this->merge($config, $list);
 		}
 
-		foreach( $config as $key => $value ) {
-			$container->setParameter( 'aimeos_shop.' . $key, $value );
+		foreach ($config as $key => $value) {
+			$container->setParameter('aimeos_shop.'.$key, $value);
 		}
 
-		$loader = new Loader\YamlFileLoader( $container, new FileLocator( dirname( __DIR__ ) . '/Resources/config' ) );
-		$loader->load( 'services.yml' );
+		$loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__).'/Resources/config'));
+		$loader->load('services.yml');
 	}
 
 
@@ -54,13 +54,13 @@ 
 	 *
 	 * @param ContainerBuilder $container ContainerBuilder object
 	 */
-	public function prepend( ContainerBuilder $container )
+	public function prepend(ContainerBuilder $container)
 	{
-		$configFile = dirname( __DIR__ ) . '/Resources/config/aimeos_shop.yml';
-		$config = Yaml::parse( file_get_contents( $configFile ) );
+		$configFile = dirname(__DIR__).'/Resources/config/aimeos_shop.yml';
+		$config = Yaml::parse(file_get_contents($configFile));
 
-		$container->prependExtensionConfig( 'aimeos_shop', $config );
-		$container->addResource( new FileResource( $configFile ) );
+		$container->prependExtensionConfig('aimeos_shop', $config);
+		$container->addResource(new FileResource($configFile));
 	}
 
 
@@ -70,15 +70,15 @@ 
 	 * @param array &$original Associative list of original values
 	 * @param array $overrule Associative list of new values
 	 */
-	protected function merge( array &$original, array $overrule )
+	protected function merge(array &$original, array $overrule)
 	{
-		foreach( array_keys( $overrule ) as $key )
+		foreach (array_keys($overrule) as $key)
 		{
-			if( isset( $original[$key] ) && is_array( $original[$key] ) ) {
-				if( is_array( $overrule[$key] ) ) {
-					$this->merge( $original[$key], $overrule[$key] );
+			if (isset($original[$key]) && is_array($original[$key])) {
+				if (is_array($overrule[$key])) {
+					$this->merge($original[$key], $overrule[$key]);
 				}
-			} elseif( isset( $overrule[$key] ) ) {
+			} elseif (isset($overrule[$key])) {
 				$original[$key] = $overrule[$key];
 			}
 		}

Tests/Controller/JsonadmControllerTest.php

Spacing +98 added lines, -98 removed lines

@@ -12,29 +12,29 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
-		$client->request( 'OPTIONS', '/unittest/jsonadm/product' );
+		$client->request('OPTIONS', '/unittest/jsonadm/product');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'resources', $json['meta'] );
-		$this->assertGreaterThan( 1, count( $json['meta']['resources'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('resources', $json['meta']);
+		$this->assertGreaterThan(1, count($json['meta']['resources']));
 
 
-		$client->request( 'OPTIONS', '/unittest/jsonadm' );
+		$client->request('OPTIONS', '/unittest/jsonadm');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'resources', $json['meta'] );
-		$this->assertGreaterThan( 1, count( $json['meta']['resources'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('resources', $json['meta']);
+		$this->assertGreaterThan(1, count($json['meta']['resources']));
 	}
 
 
@@ -43,62 +43,62 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
 		$content = '{"data":{"type":"product/stock/warehouse","attributes":{"product.stock.warehouse.code":"symfony","product.stock.warehouse.label":"symfony"}}}';
-		$client->request( 'POST', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content );
+		$client->request('POST', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony', $json['data']['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony', $json['data']['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data']['attributes']);
+		$this->assertEquals('symfony', $json['data']['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony', $json['data']['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 		$id = $json['data']['attributes']['product.stock.warehouse.id'];
 
 
 		$content = '{"data":{"type":"product/stock/warehouse","attributes":{"product.stock.warehouse.code":"symfony2","product.stock.warehouse.label":"symfony2"}}}';
-		$client->request( 'PATCH', '/unittest/jsonadm/product/stock/warehouse/' . $id, array(), array(), array(), $content );
+		$client->request('PATCH', '/unittest/jsonadm/product/stock/warehouse/'.$id, array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( $id, $json['data']['attributes']['product.stock.warehouse.id'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data']['attributes']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals($id, $json['data']['attributes']['product.stock.warehouse.id']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 
-		$client->request( 'GET', '/unittest/jsonadm/product/stock/warehouse/' . $id );
+		$client->request('GET', '/unittest/jsonadm/product/stock/warehouse/'.$id);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( $id, $json['data']['attributes']['product.stock.warehouse.id'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data']['attributes']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals($id, $json['data']['attributes']['product.stock.warehouse.id']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 
-		$client->request( 'DELETE', '/unittest/jsonadm/product/stock/warehouse/' . $id );
+		$client->request('DELETE', '/unittest/jsonadm/product/stock/warehouse/'.$id);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
 	}
 
 
@@ -107,85 +107,85 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
 		$content = '{"data":[
 			{"type":"product/stock/warehouse","attributes":{"product.stock.warehouse.code":"symfony","product.stock.warehouse.label":"symfony"}},
 			{"type":"product/stock/warehouse","attributes":{"product.stock.warehouse.code":"symfony2","product.stock.warehouse.label":"symfony"}}
 		]}';
-		$client->request( 'POST', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content );
+		$client->request('POST', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data'][0]['attributes'] );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data'][1]['attributes'] );
-		$this->assertEquals( 'symfony', $json['data'][0]['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 'symfony', $json['data'][1]['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data'][0]['attributes']);
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data'][1]['attributes']);
+		$this->assertEquals('symfony', $json['data'][0]['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals('symfony', $json['data'][1]['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals(2, $json['meta']['total']);
 
-		$ids = array( $json['data'][0]['attributes']['product.stock.warehouse.id'], $json['data'][1]['attributes']['product.stock.warehouse.id'] );
+		$ids = array($json['data'][0]['attributes']['product.stock.warehouse.id'], $json['data'][1]['attributes']['product.stock.warehouse.id']);
 
 
 		$content = '{"data":[
-			{"type":"product/stock/warehouse","id":' . $ids[0] . ',"attributes":{"product.stock.warehouse.label":"symfony2"}},
-			{"type":"product/stock/warehouse","id":' . $ids[1] . ',"attributes":{"product.stock.warehouse.label":"symfony2"}}
+			{"type":"product/stock/warehouse","id":' . $ids[0].',"attributes":{"product.stock.warehouse.label":"symfony2"}},
+			{"type":"product/stock/warehouse","id":' . $ids[1].',"attributes":{"product.stock.warehouse.label":"symfony2"}}
 		]}';
-		$client->request( 'PATCH', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content );
+		$client->request('PATCH', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
-
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data'][0]['attributes'] );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data'][1]['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data'][0]['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['product.stock.warehouse.label'] );
-		$this->assertTrue( in_array( $json['data'][0]['attributes']['product.stock.warehouse.id'], $ids ) );
-		$this->assertTrue( in_array( $json['data'][1]['attributes']['product.stock.warehouse.id'], $ids ) );
-		$this->assertEquals( 2, $json['meta']['total'] );
-
-
-		$getParams = array( 'filter' => array( '&&' => array(
-			array( '=~' => array( 'product.stock.warehouse.code' => 'symfony' ) ),
-			array( '==' => array( 'product.stock.warehouse.label' => 'symfony2' ) )
-			) ),
-			'sort' => 'product.stock.warehouse.code', 'page' => array( 'offset' => 0, 'limit' => 3 )
+		$json = json_decode($response->getContent(), true);
+
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data'][0]['attributes']);
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data'][1]['attributes']);
+		$this->assertEquals('symfony2', $json['data'][0]['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['product.stock.warehouse.label']);
+		$this->assertTrue(in_array($json['data'][0]['attributes']['product.stock.warehouse.id'], $ids));
+		$this->assertTrue(in_array($json['data'][1]['attributes']['product.stock.warehouse.id'], $ids));
+		$this->assertEquals(2, $json['meta']['total']);
+
+
+		$getParams = array('filter' => array('&&' => array(
+			array('=~' => array('product.stock.warehouse.code' => 'symfony')),
+			array('==' => array('product.stock.warehouse.label' => 'symfony2'))
+			)),
+			'sort' => 'product.stock.warehouse.code', 'page' => array('offset' => 0, 'limit' => 3)
 		);
-		$client->request( 'GET', '/unittest/jsonadm/product/stock/warehouse', $getParams );
+		$client->request('GET', '/unittest/jsonadm/product/stock/warehouse', $getParams);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertEquals( 'symfony', $json['data'][0]['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony2', $json['data'][0]['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['product.stock.warehouse.label'] );
-		$this->assertTrue( in_array( $json['data'][0]['attributes']['product.stock.warehouse.id'], $ids ) );
-		$this->assertTrue( in_array( $json['data'][1]['attributes']['product.stock.warehouse.id'], $ids ) );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertEquals('symfony', $json['data'][0]['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony2', $json['data'][0]['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['product.stock.warehouse.label']);
+		$this->assertTrue(in_array($json['data'][0]['attributes']['product.stock.warehouse.id'], $ids));
+		$this->assertTrue(in_array($json['data'][1]['attributes']['product.stock.warehouse.id'], $ids));
+		$this->assertEquals(2, $json['meta']['total']);
 
 
 		$content = '{"data":[
-			{"type":"product/stock/warehouse","id":' . $ids[0] . '},
-			{"type":"product/stock/warehouse","id":' . $ids[1] . '}
+			{"type":"product/stock/warehouse","id":' . $ids[0].'},
+			{"type":"product/stock/warehouse","id":' . $ids[1].'}
 		]}';
-		$client->request( 'DELETE', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content );
+		$client->request('DELETE', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, $json['meta']['total']);
 	}
 }

Tests/Fixtures/app/AppKernel.php

Spacing +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function registerContainerConfiguration( LoaderInterface $loader )
+	public function registerContainerConfiguration(LoaderInterface $loader)
 	{
-		$loader->load( __DIR__ . '/config/config.yml' );
+		$loader->load(__DIR__.'/config/config.yml');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getCacheDir()
 	{
-		return sys_get_temp_dir() . '/aimeos-symfony2/cache';
+		return sys_get_temp_dir().'/aimeos-symfony2/cache';
 	}
 
 
@@ -48,6 +48,6 @@ 
 	 */
 	public function getLogDir()
 	{
-		return sys_get_temp_dir() . '/aimeos-symfony2/logs';
+		return sys_get_temp_dir().'/aimeos-symfony2/logs';
 	}
 }

Tests/bootstrap.php

Spacing +7 added lines, -7 removed lines

@@ -3,24 +3,24 @@ 
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
 
-setlocale( LC_ALL, 'en_US.UTF-8' );
+setlocale(LC_ALL, 'en_US.UTF-8');
 
 // if the bundle is within a symfony project, try to reuse the project's autoload
 $files = array(
-	__DIR__ . '/../vendor/autoload.php',
-	__DIR__ . '/../../vendor/autoload.php',
+	__DIR__.'/../vendor/autoload.php',
+	__DIR__.'/../../vendor/autoload.php',
 );
 
 $autoload = false;
-foreach( $files as $file )
+foreach ($files as $file)
 {
-	if( is_file( $file ) ) {
+	if (is_file($file)) {
 		$autoload = include_once $file;
 		break;
 	}
 }
 
-if( !$autoload )
+if (!$autoload)
 {
 	exit(
 	"Unable to find autoload.php file, please use composer to load dependencies:
@@ -30,4 +30,4 @@ 
 	);
 }
 
-AnnotationRegistry::registerLoader( array( $autoload, 'loadClass' ) );
+AnnotationRegistry::registerLoader(array($autoload, 'loadClass'));