aimeos / aimeos-core

lib/mwlib/src/MW/DB/Result/PDO.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 	{
 		try {
 			return $this->statement->rowCount();
-		} catch ( \PDOException $e ) {
+		} catch( \PDOException $e ) {
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -65,7 +65,7 @@ 
 	{
 		try {
 			return $this->statement->fetch( $this->style[$style] );
-		} catch ( \PDOException $e ) {
+		} catch( \PDOException $e ) {
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -80,7 +80,7 @@ 
 	{
 		try {
 			$this->statement->closeCursor();
-		} catch ( \PDOException $e ) {
+		} catch( \PDOException $e ) {
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -95,7 +95,7 @@ 
 	{
 		try {
 			return $this->statement->nextRowset();
-		} catch ( \PDOException $e ) {
+		} catch( \PDOException $e ) {
 			return false;
 		}
 	}

Braces +20 added lines, -8 removed lines

@@ -46,9 +46,12 @@ 
 	 */
 	public function affectedRows()
 	{
-		try {
+		try
+		{
 			return $this->statement->rowCount();
-		} catch ( \PDOException $e ) {
+		}
+		catch ( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -63,9 +66,12 @@ 
 	 */
 	public function fetch( $style = \Aimeos\MW\DB\Result\Base::FETCH_ASSOC )
 	{
-		try {
+		try
+		{
 			return $this->statement->fetch( $this->style[$style] );
-		} catch ( \PDOException $e ) {
+		}
+		catch ( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -78,9 +84,12 @@ 
 	 */
 	public function finish()
 	{
-		try {
+		try
+		{
 			$this->statement->closeCursor();
-		} catch ( \PDOException $e ) {
+		}
+		catch ( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -93,9 +102,12 @@ 
 	 */
 	public function nextResult()
 	{
-		try {
+		try
+		{
 			return $this->statement->nextRowset();
-		} catch ( \PDOException $e ) {
+		}
+		catch ( \PDOException $e )
+		{
 			return false;
 		}
 	}

lib/mwlib/src/MW/DB/Factory.php

Spacing +4 added lines, -4 removed lines

@@ -30,15 +30,15 @@
 	 */
 	static public function createManager( \Aimeos\MW\Config\Iface $config, $type = 'PDO' )
 	{
-		$classname = '\\Aimeos\\MW\\DB\\Manager\\' . $type;
-		$filename = 'MW/DB/Manager/' . $type . '.php';
+		$classname = '\\Aimeos\\MW\\DB\\Manager\\'.$type;
+		$filename = 'MW/DB/Manager/'.$type.'.php';
 
 		$paths = explode( PATH_SEPARATOR, get_include_path() );
 
 		foreach( $paths as $path )
 		{
-			$file = $path . DIRECTORY_SEPARATOR . $filename;
-			if( file_exists( $file ) === true  && ( include_once $file ) !== false && class_exists($classname)) {
+			$file = $path.DIRECTORY_SEPARATOR.$filename;
+			if( file_exists( $file ) === true && ( include_once $file ) !== false && class_exists( $classname ) ) {
 				return new $classname( $config );
 			}
 		}

lib/mwlib/src/MW/DB/Manager/DBAL.php

Braces +2 added lines, -1 removed lines

@@ -88,7 +88,8 @@
 			return array_pop( $this->connections[$name] );
 
 		}
-		catch( \Exception $e ) {
+		catch( \Exception $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode() );
 		}
 	}

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
 	{
 		try
 		{
-			$adapter = $this->config->get( 'resource/' . $name . '/adapter', 'mysql' );
+			$adapter = $this->config->get( 'resource/'.$name.'/adapter', 'mysql' );
 
 			if( !isset( $this->connections[$name] ) || empty( $this->connections[$name] ) )
 			{
@@ -80,7 +80,7 @@ 
 					$this->count[$name] = 0;
 				}
 
-				$limit = $this->config->get( 'resource/' . $name . '/limit', -1 );
+				$limit = $this->config->get( 'resource/'.$name.'/limit', -1 );
 
 				if( $limit >= 0 && $this->count[$name] >= $limit )
 				{
@@ -126,12 +126,12 @@ 
 	 */
 	protected function createConnection( $name, $adapter )
 	{
-		$params = $this->config->get( 'resource/' . $name );
+		$params = $this->config->get( 'resource/'.$name );
 
-		$params['user'] = $this->config->get( 'resource/' . $name . '/username' );
-		$params['dbname'] = $this->config->get( 'resource/' . $name . '/database' );
+		$params['user'] = $this->config->get( 'resource/'.$name.'/username' );
+		$params['dbname'] = $this->config->get( 'resource/'.$name.'/database' );
 
-		if( ( $socket = $this->config->get( 'resource/' . $name . '/socket' ) ) != null ) {
+		if( ( $socket = $this->config->get( 'resource/'.$name.'/socket' ) ) != null ) {
 			$params['unix_socket'] = $socket;
 		}
 
@@ -144,7 +144,7 @@ 
 			default: $params['driver'] = $adapter;
 		}
 
-		$stmts = $this->config->get( 'resource/' . $name . '/stmt', [] );
+		$stmts = $this->config->get( 'resource/'.$name.'/stmt', [] );
 
 		return new \Aimeos\MW\DB\Connection\DBAL( $params, $stmts );
 	}

lib/mwlib/src/MW/DB/Manager/PDO.php

Braces +3 added lines, -3 removed lines

@@ -88,7 +88,8 @@ 
 			return array_pop( $this->connections[$name] );
 
 		}
-		catch( \PDOException $e ) {
+		catch( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -131,8 +132,7 @@ 
 		{
 			$dsn .= isset( $host ) ? ';host=' . $host : '';
 			$dsn .= isset( $port ) ? ';port=' . $port : '';
-		}
-		else
+		} else
 		{
 			$dsn .= ';unix_socket=' . $sock;
 		}

Spacing +15 added lines, -15 removed lines

@@ -73,7 +73,7 @@ 
 	{
 		try
 		{
-			$adapter = $this->config->get( 'resource/' . $name . '/adapter', 'mysql' );
+			$adapter = $this->config->get( 'resource/'.$name.'/adapter', 'mysql' );
 
 			if( !isset( $this->connections[$name] ) || empty( $this->connections[$name] ) )
 			{
@@ -81,7 +81,7 @@ 
 					$this->count[$name] = 0;
 				}
 
-				$limit = $this->config->get( 'resource/' . $name . '/limit', -1 );
+				$limit = $this->config->get( 'resource/'.$name.'/limit', -1 );
 
 				if( $limit >= 0 && $this->count[$name] >= $limit )
 				{
@@ -127,27 +127,27 @@ 
 	 */
 	protected function createConnection( $name, $adapter )
 	{
-		$host = $this->config->get( 'resource/' . $name . '/host' );
-		$port = $this->config->get( 'resource/' . $name . '/port' );
-		$user = $this->config->get( 'resource/' . $name . '/username' );
-		$pass = $this->config->get( 'resource/' . $name . '/password' );
-		$sock = $this->config->get( 'resource/' . $name . '/socket' );
-		$dbase = $this->config->get( 'resource/' . $name . '/database' );
-		$persist = $this->config->get( 'resource/' . $name . '/opt-persistent', false );
-
-		$dsn = $adapter . ':dbname=' . $dbase;
+		$host = $this->config->get( 'resource/'.$name.'/host' );
+		$port = $this->config->get( 'resource/'.$name.'/port' );
+		$user = $this->config->get( 'resource/'.$name.'/username' );
+		$pass = $this->config->get( 'resource/'.$name.'/password' );
+		$sock = $this->config->get( 'resource/'.$name.'/socket' );
+		$dbase = $this->config->get( 'resource/'.$name.'/database' );
+		$persist = $this->config->get( 'resource/'.$name.'/opt-persistent', false );
+
+		$dsn = $adapter.':dbname='.$dbase;
 		if( $sock == null )
 		{
-			$dsn .= isset( $host ) ? ';host=' . $host : '';
-			$dsn .= isset( $port ) ? ';port=' . $port : '';
+			$dsn .= isset( $host ) ? ';host='.$host : '';
+			$dsn .= isset( $port ) ? ';port='.$port : '';
 		}
 		else
 		{
-			$dsn .= ';unix_socket=' . $sock;
+			$dsn .= ';unix_socket='.$sock;
 		}
 
 		$params = array( $dsn, $user, $pass, array( \PDO::ATTR_PERSISTENT => $persist ) );
-		$stmts = $this->config->get( 'resource/' . $name . '/stmt', array() );
+		$stmts = $this->config->get( 'resource/'.$name.'/stmt', array() );
 
 		return new \Aimeos\MW\DB\Connection\PDO( $params, $stmts );
 	}

lib/mwlib/src/MW/Logger/Errorlog.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 				$message = json_encode( $message );
 			}
 
-			if( error_log( '<' . $facility . '> ' . $level . ' ' . $message ) === false ) {
+			if( error_log( '<'.$facility.'> '.$level.' '.$message ) === false ) {
 				throw new \Aimeos\MW\Logger\Exception( sprintf(
 					'Unable to log message with priority "%1$d": %2$s', $priority, $message ) );
 			}

lib/mwlib/src/MW/Logger/DB.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 /**
  * Log messages to a database table.
-  *
+ *
  * @package MW
  * @subpackage Logger
  */

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 		$this->facilities = $facilities;
 
 		if( $requestid === null ) {
-			$requestid = md5( php_uname('n') . getmypid() . date( 'Y-m-d H:i:s' ) );
+			$requestid = md5( php_uname( 'n' ).getmypid().date( 'Y-m-d H:i:s' ) );
 		}
 		$this->requestid = $requestid;
 	}

lib/mwlib/src/MW/Common/Base.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public static function checkClass( $name, $object )
 	{
-		if( ($object instanceof $name) === false ) {
+		if( ( $object instanceof $name ) === false ) {
 			throw new \Aimeos\MW\Common\Exception( sprintf( 'Object doesn\'t implement "%1$s"', $name ) );
 		}
 	}
@@ -45,7 +45,7 @@ 
 	public static function checkClassList( $name, array $list )
 	{
 		foreach( $list as $object ) {
-			if( ($object instanceof $name) === false ) {
+			if( ( $object instanceof $name ) === false ) {
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'Object doesn\'t implement "%1$s"', $name ) );
 			}
 		}

lib/mwlib/src/MW/Common/Manager/Base.php

Spacing +4 added lines, -4 removed lines

@@ -98,9 +98,9 @@ 
 		foreach( $attributes as $key => $item )
 		{
 			if( $item instanceof $iface ) {
-				$translations[ $item->getCode() ] = $item->getInternalCode();
+				$translations[$item->getCode()] = $item->getInternalCode();
 			} else if( isset( $item['code'] ) ) {
-				$translations[ $item['code'] ] = $item['internalcode'];
+				$translations[$item['code']] = $item['internalcode'];
 			} else {
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'Invalid attribute at position "%1$d"', $key ) );
 			}
@@ -126,9 +126,9 @@ 
 		foreach( $attributes as $key => $item )
 		{
 			if( $item instanceof $iface ) {
-				$types[ $item->getCode() ] = $item->getInternalType();
+				$types[$item->getCode()] = $item->getInternalType();
 			} else if( isset( $item['code'] ) ) {
-				$types[ $item['code'] ] = $item['internaltype'];
+				$types[$item['code']] = $item['internaltype'];
 			} else {
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'Invalid attribute at position "%1$d"', $key ) );
 			}

controller/common/tests/Controller/Common/Media/StandardTest.php

Doc Comments +3 added lines

@@ -335,6 +335,9 @@
 	}
 
 
+	/**
+	 * @param string $name
+	 */
 	protected function access( $name )
 	{
 		$class = new \ReflectionClass( '\Aimeos\Controller\Common\Media\Standard' );

Spacing +15 added lines, -15 removed lines

@@ -40,7 +40,7 @@ 
 
 		$file = $this->getMockBuilder( '\Psr\Http\Message\UploadedFileInterface' )->getMock();
 		$file->expects( $this->once() )->method( 'getStream' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.gif' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.gif' ) ) );
 
 		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'media' )->createItem();
 
@@ -60,7 +60,7 @@ 
 
 		$file = $this->getMockBuilder( '\Psr\Http\Message\UploadedFileInterface' )->getMock();
 		$file->expects( $this->once() )->method( 'getStream' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.pdf' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.pdf' ) ) );
 
 		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'media' )->createItem();
 
@@ -108,7 +108,7 @@ 
 			->getMock();
 
 		$object->expects( $this->once() )->method( 'getFileContent' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.png' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.png' ) ) );
 
 		$object->expects( $this->exactly( 2 ) )->method( 'storeFile' );
 
@@ -204,9 +204,9 @@ 
 
 	public function testGetFileContent()
 	{
-		$dest = dirname( dirname( dirname( __DIR__ ) ) ) . '/tmp/';
+		$dest = dirname( dirname( dirname( __DIR__ ) ) ).'/tmp/';
 		if( !is_dir( $dest ) ) { mkdir( $dest, 0755, true ); }
-		copy( __DIR__ . '/testfiles/test.gif', $dest . 'test.gif' );
+		copy( __DIR__.'/testfiles/test.gif', $dest.'test.gif' );
 
 		$result = $this->access( 'getFileContent' )->invokeArgs( $this->object, array( 'test.gif', 'fs-media' ) );
 
@@ -296,7 +296,7 @@ 
 
 	public function testGetMimeType()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.png' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.png' );
 
 		$result = $this->access( 'getMimeType' )->invokeArgs( $this->object, array( $file, 'files' ) );
 		$this->assertEquals( 'image/png', $result );
@@ -305,7 +305,7 @@ 
 
 	public function testGetMimeTypeNotAllowed()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 		$this->context->getConfig()->set( 'controller/common/media/standard/files/allowedtypes', array( 'image/jpeg' ) );
 
 		$result = $this->access( 'getMimeType' )->invokeArgs( $this->object, array( $file, 'files' ) );
@@ -315,7 +315,7 @@ 
 
 	public function testGetMimeTypeNoTypes()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 		$this->context->getConfig()->set( 'controller/common/media/standard/files/allowedtypes', [] );
 
 		$this->setExpectedException( '\Aimeos\Controller\Common\Exception' );
@@ -325,7 +325,7 @@ 
 
 	public function testScaleImage()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 
 		$this->access( 'scaleImage' )->invokeArgs( $this->object, array( $file, 'files' ) );
 	}
@@ -333,18 +333,18 @@ 
 
 	public function testStoreFile()
 	{
-		$content = file_get_contents( __DIR__ . '/testfiles/test.gif' );
+		$content = file_get_contents( __DIR__.'/testfiles/test.gif' );
 
-		$dest = dirname( dirname( dirname( __DIR__ ) ) ) . '/tmp/';
+		$dest = dirname( dirname( dirname( __DIR__ ) ) ).'/tmp/';
 		if( !is_dir( $dest ) ) { mkdir( $dest, 0755, true ); }
-		copy( __DIR__ . '/testfiles/test.gif', $dest . 'test2.gif' );
+		copy( __DIR__.'/testfiles/test.gif', $dest.'test2.gif' );
 
 		$this->access( 'storeFile' )->invokeArgs( $this->object, array( $content, 'fs-media', 'test.gif', 'test2.gif' ) );
 
-		$this->assertFalse( file_exists( $dest . 'test2.gif' ) );
-		$this->assertTrue( file_exists( $dest . 'test.gif' ) );
+		$this->assertFalse( file_exists( $dest.'test2.gif' ) );
+		$this->assertTrue( file_exists( $dest.'test.gif' ) );
 
-		unlink( $dest . 'test.gif' );
+		unlink( $dest.'test.gif' );
 	}