aimeos / aimeos-core

lib/mwlib/src/MW/Media/Image/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 		parent::__construct( $mimetype );
 
 		if( ( $this->image = @imagecreatefromstring( $content ) ) === false ) {
-			throw new \Aimeos\MW\Media\Exception( sprintf( 'The image type isn\'t supported by GDlib.') );
+			throw new \Aimeos\MW\Media\Exception( sprintf( 'The image type isn\'t supported by GDlib.' ) );
 		}
 
 		if( ( $this->info = getimagesizefromstring( $content ) ) === false ) {
@@ -49,7 +49,7 @@ 
 		}
 
 		if( imagealphablending( $this->image, false ) === false ) {
-			throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagealphablending)') );
+			throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagealphablending)' ) );
 		}
 
 		$this->options = $options;
@@ -115,7 +115,7 @@ 
 				case 'image/png':
 
 					if( imagesavealpha( $this->image, true ) === false ) {
-						throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagesavealpha)') );
+						throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagesavealpha)' ) );
 					}
 
 					if( @imagepng( $this->image, $filename, (int) 10 - $quality / 10 ) === false ) {
@@ -198,15 +198,15 @@ 
 		try
 		{
 			if( imagealphablending( $newImage, false ) === false ) {
-				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagealphablending)') );
+				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagealphablending)' ) );
 			}
 
 			if( ( $transparent = imagecolorallocatealpha( $newImage, 255, 255, 255, 127 ) ) === false ) {
-				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagecolorallocatealpha)') );
+				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagecolorallocatealpha)' ) );
 			}
 
 			if( imagefilledrectangle( $newImage, 0, 0, $destWidth, $destHeight, $transparent ) === false ) {
-				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagefilledrectangle)') );
+				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagefilledrectangle)' ) );
 			}
 
 			if( imagecopyresampled( $newImage, $image, 0, 0, 0, 0, $destWidth, $destHeight, $srcWidth, $srcHeight ) === false ) {

Braces +1 added lines, -2 removed lines

@@ -166,8 +166,7 @@
 			}
 
 			$this->image = $result;
-		}
-		else
+		} else
 		{
 			$this->image = $this->resample( $this->image, $this->info[0], $this->info[1], $width, $height );
 		}

lib/mwlib/tests/MW/View/StandardTest.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		$this->object->addHelper( 'translate', $this->translate );
 
 		$ds = DIRECTORY_SEPARATOR;
-		$filenames = array( 'notexisting', __DIR__ . $ds . '_testfiles'. $ds . 'template.php' );
+		$filenames = array( 'notexisting', __DIR__.$ds.'_testfiles'.$ds.'template.php' );
 
 
 		$this->object->assign( array( 'quantity' => 1 ) );

lib/mwlib/tests/MW/View/_testfiles/template.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
 <?php $quantity = ( isset( $this->quantity ) ? $this->quantity : 0 ); ?>
-Number of files: <?php echo $quantity . ' ' . $this->translate( 'test', 'File', 'Files', $quantity );
+Number of files: <?php echo $quantity.' '.$this->translate( 'test', 'File', 'Files', $quantity );

lib/mshoplib/src/MShop/Locale/Manager/Language/Standard.php

Doc Comments +2 added lines, -2 removed lines

@@ -605,7 +605,7 @@ 
 	 * Returns the search results for the given SQL statement.
 	 *
 	 * @param \Aimeos\MW\DB\Connection\Iface $conn Database connection
-	 * @param $sql SQL statement
+	 * @param string $sql SQL statement
 	 * @return \Aimeos\MW\DB\Result\Iface Search result object
 	 */
 	protected function getSearchResults( \Aimeos\MW\DB\Connection\Iface $conn, $sql )
@@ -635,7 +635,7 @@ 
 	 * Returns the total number of items found for the conditions
 	 *
 	 * @param \Aimeos\MW\DB\Connection\Iface $conn Database connection
-	 * @param array $find List of markers that should be replaced in the SQL statement
+	 * @param string[] $find List of markers that should be replaced in the SQL statement
 	 * @param array $replace List of replacements for the markers in the SQL statement
 	 * @throws \Aimeos\MShop\Locale\Exception If no total value was found
 	 * @return integer Total number of found items

Braces +6 added lines, -4 removed lines

@@ -104,9 +104,12 @@ 
 	 */
 	public function createItem()
 	{
-		try {
+		try
+		{
 			$values = array( 'locale.language.siteid' => $this->getContext()->getLocale()->getSiteId() );
-		} catch( \Exception $ex ) {
+		}
+		catch( \Exception $ex )
+		{
 			$values = array( 'locale.language.siteid' => null );
 		}
 
@@ -173,8 +176,7 @@ 
 				 * @see mshop/locale/manager/language/standard/count/ansi
 				 */
 				$path = 'mshop/locale/manager/language/standard/insert';
-			}
-			else
+			} else
 			{
 				/** mshop/locale/manager/language/standard/update/mysql
 				 * Updates an existing language record in the database

Spacing +3 added lines, -3 removed lines

@@ -463,7 +463,7 @@ 
 		 * @see mshop/locale/manager/language/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'locale', 'language/' . $manager, $name );
+		return $this->getSubManagerBase( 'locale', 'language/'.$manager, $name );
 	}
 
 
@@ -510,7 +510,7 @@ 
 			$replace = array(
 				$search->getConditionString( $types, $translations ),
 				$search->getSortationString( $types, $translations ),
-				( $columns ? ', ' . $columns : '' ),
+				( $columns ? ', '.$columns : '' ),
 				$search->getSliceStart(),
 				$search->getSliceSize(),
 			);
@@ -632,7 +632,7 @@ 
 		$statement = $conn->create( $sql );
 		$level = \Aimeos\MW\Logger\Base::DEBUG;
 
-		$this->getContext()->getLogger()->log( __METHOD__ . ': SQL statement: ' . $statement, $level, 'core/sql' );
+		$this->getContext()->getLogger()->log( __METHOD__.': SQL statement: '.$statement, $level, 'core/sql' );
 
 		$results = $statement->execute();
 

lib/mshoplib/src/MShop/Locale/Manager/Site/Standard.php

Doc Comments +2 added lines, -2 removed lines

@@ -605,7 +605,7 @@ 
 	 * Returns the search results for the given SQL statement.
 	 *
 	 * @param \Aimeos\MW\DB\Connection\Iface $conn Database connection
-	 * @param $sql SQL statement
+	 * @param string $sql SQL statement
 	 * @return \Aimeos\MW\DB\Result\Iface Search result object
 	 */
 	protected function getSearchResults( \Aimeos\MW\DB\Connection\Iface $conn, $sql )
@@ -635,7 +635,7 @@ 
 	 * Returns the total number of items found for the conditions
 	 *
 	 * @param \Aimeos\MW\DB\Connection\Iface $conn Database connection
-	 * @param array $find List of markers that should be replaced in the SQL statement
+	 * @param string[] $find List of markers that should be replaced in the SQL statement
 	 * @param array $replace List of replacements for the markers in the SQL statement
 	 * @throws \Aimeos\MShop\Locale\Exception If no total value was found
 	 * @return integer Total number of found items

Spacing +3 added lines, -3 removed lines

@@ -529,7 +529,7 @@ 
 		 * @see mshop/locale/manager/site/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'locale', 'site/' . $manager, $name );
+		return $this->getSubManagerBase( 'locale', 'site/'.$manager, $name );
 	}
 
 
@@ -561,7 +561,7 @@ 
 			$replace = array(
 				$search->getConditionString( $types, $translations ),
 				$search->getSortationString( $types, $translations ),
-				( $columns ? ', ' . $columns : '' ),
+				( $columns ? ', '.$columns : '' ),
 				$search->getSliceStart(),
 				$search->getSliceSize(),
 			);
@@ -898,7 +898,7 @@ 
 		$statement = $conn->create( $sql );
 		$level = \Aimeos\MW\Logger\Base::DEBUG;
 
-		$this->getContext()->getLogger()->log( __METHOD__ . ': SQL statement: ' . $statement, $level, 'core/sql' );
+		$this->getContext()->getLogger()->log( __METHOD__.': SQL statement: '.$statement, $level, 'core/sql' );
 
 		$results = $statement->execute();
 

lib/mwlib/tests/MW/Setup/DBSchema/PgsqlTest.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 		$this->assertEquals( null, $columnItem->getDefaultValue() );
 		$this->assertTrue( $columnItem->isNullable() );
 
-		$this->setExpectedException('\\Aimeos\\MW\\Setup\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Setup\\Exception' );
 		$this->object->getColumnDetails( 'mw_setup_dbschema_test', 'notexisting' );
 	}
 

lib/mwlib/tests/MW/Observer/Publisher/StandardTest.php

Spacing +10 added lines, -10 removed lines

@@ -31,15 +31,15 @@ 
 	{
 		$l = new TestListener();
 
-		$this->object->addListener($l, 'test');
+		$this->object->addListener( $l, 'test' );
 	}
 
 	public function testRemoveListener()
 	{
 		$l = new TestListener();
 
-		$this->object->addListener($l, 'test');
-		$this->object->removeListener($l, 'test');
+		$this->object->addListener( $l, 'test' );
+		$this->object->removeListener( $l, 'test' );
 	}
 
 	public function testclearListeners()
@@ -50,11 +50,11 @@ 
 	public function testnotifyListeners()
 	{
 		$l = new TestListener();
-		$this->object->addListener($l, 'test');
-		$this->object->addListener($l, 'testagain');
+		$this->object->addListener( $l, 'test' );
+		$this->object->addListener( $l, 'testagain' );
 
-		$this->object->notifyListenersPublic('test', 'warn');
-		$this->object->notifyListenersPublic('testagain', 'warn');
+		$this->object->notifyListenersPublic( 'test', 'warn' );
+		$this->object->notifyListenersPublic( 'testagain', 'warn' );
 	}
 }
 
@@ -65,9 +65,9 @@ 
 	 * @param string $action
 	 * @param string|null $value
 	 */
-	public function notifyListenersPublic($action, $value = null)
+	public function notifyListenersPublic( $action, $value = null )
 	{
-		$this->notifyListeners($action, $value);
+		$this->notifyListeners( $action, $value );
 	}
 
 	public function clearListenersPublic()
@@ -85,7 +85,7 @@ 
 
 	public function update( \Aimeos\MW\Observer\Publisher\Iface $p, $action, $value = null )
 	{
-		if ($action == 'test') {
+		if( $action == 'test' ) {
 			return false;
 		}
 	}

lib/mwlib/tests/MW/Logger/FileTest.php

Spacing +3 added lines, -3 removed lines

@@ -58,13 +58,13 @@
 		$this->assertEquals( 'error', $msg[4] );
 
 
-		$this->setExpectedException('\\Aimeos\\MW\\Logger\\Exception');
-		$this->object->log( 'wrong log level', -1);
+		$this->setExpectedException( '\\Aimeos\\MW\\Logger\\Exception' );
+		$this->object->log( 'wrong log level', -1 );
 	}
 
 	public function testScalarLog()
 	{
-		$this->object->log( array ( 'scalar', 'errortest' ) );
+		$this->object->log( array( 'scalar', 'errortest' ) );
 
 		if( !file_exists( $this->filename ) ) {
 			throw new \RuntimeException( 'No test file found' );

lib/mwlib/tests/MW/DB/PDOTest.php

Braces +5 added lines, -2 removed lines

@@ -266,10 +266,13 @@
 
 		$conn = $this->object->acquire();
 
-		try {
+		try
+		{
 			$stmt = $conn->create( $sqlinsert );
 			$stmt->execute();
-		} catch ( \Aimeos\MW\DB\Exception $de ) {
+		}
+		catch ( \Aimeos\MW\DB\Exception $de )
+		{
 			$this->object->release( $conn );
 			return;
 		}

Spacing +23 added lines, -23 removed lines

@@ -207,7 +207,7 @@ 
 		$conn = $this->object->acquire();
 
 		$value = "(\\')";
-		$sqlinsert = str_replace( ':value', '\'' . $conn->escape( $value ) . '\'', $sqlinsert );
+		$sqlinsert = str_replace( ':value', '\''.$conn->escape( $value ).'\'', $sqlinsert );
 		$stmt = $conn->create( $sqlinsert );
 		$stmt->execute()->finish();
 
@@ -221,7 +221,7 @@ 
 	{
 		$conn = $this->object->acquire();
 
-		$sqlinsert = 'INSERT INTO "mw_unit_test" ("name") VALUES (\'' . $conn->escape( '\'\'' ) . '\')';
+		$sqlinsert = 'INSERT INTO "mw_unit_test" ("name") VALUES (\''.$conn->escape( '\'\'' ).'\')';
 
 		$stmt = $conn->create( $sqlinsert );
 		$stmt->execute()->finish();
@@ -248,12 +248,12 @@ 
 
 	public function testStmtSimpleBindTwo()
 	{
-		$sqlinsert2 =  'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
+		$sqlinsert2 = 'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
 
 		$conn = $this->object->acquire();
 
 		$stmt2 = $conn->create( $sqlinsert2 );
-		$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+		$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 		$stmt2->bind( 2, 0.12 );
 		$stmt2->execute()->finish();
 
@@ -265,12 +265,12 @@ 
 
 	public function testStmtSimpleBindThree()
 	{
-		$sqlinsert3 =  'INSERT INTO "mw_unit_test" ("name", "id") VALUES (\'?te?st?\', ?)';
+		$sqlinsert3 = 'INSERT INTO "mw_unit_test" ("name", "id") VALUES (\'?te?st?\', ?)';
 
 		$conn = $this->object->acquire();
 
 		$stmt2 = $conn->create( $sqlinsert3 );
-		$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+		$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 		$stmt2->execute()->finish();
 
 		$this->object->release( $conn );
@@ -281,15 +281,15 @@ 
 
 	public function testStmtSimpleInvalidBindParamType()
 	{
-		$sqlinsert2 =  'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
+		$sqlinsert2 = 'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
 
 		$conn = $this->object->acquire();
 
 		try
 		{
 			$stmt2 = $conn->create( $sqlinsert2 );
-			$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
-			$stmt2->bind( 2, 0.15, 123);
+			$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+			$stmt2->bind( 2, 0.15, 123 );
 			$stmt2->execute();
 		}
 		catch( \Aimeos\MW\DB\Exception $de )
@@ -299,7 +299,7 @@ 
 		}
 
 		$this->object->release( $conn );
-		$this->fail('An expected exception has not been raised');
+		$this->fail( 'An expected exception has not been raised' );
 	}
 
 
@@ -312,13 +312,13 @@ 
 		try {
 			$stmt = $conn->create( $sqlinsert );
 			$stmt->execute();
-		} catch ( \Aimeos\MW\DB\Exception $de ) {
+		} catch( \Aimeos\MW\DB\Exception $de ) {
 			$this->object->release( $conn );
 			return;
 		}
 
 		$this->object->release( $conn );
-		$this->fail('An expected exception has not been raised');
+		$this->fail( 'An expected exception has not been raised' );
 	}
 
 
@@ -421,7 +421,7 @@ 
 
 	public function testWrongFieldType()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 		$sqlinsert = 'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
 
 		$conn = $this->object->acquire();
@@ -433,7 +433,7 @@ 
 			$stmt->bind( 2, 'test', 123 );
 			$stmt->execute();
 		}
-		catch ( \Aimeos\MW\DB\Exception $e )
+		catch( \Aimeos\MW\DB\Exception $e )
 		{
 			$this->object->release( $conn );
 			throw $e;
@@ -457,13 +457,13 @@ 
 
 		$conn = $this->object->acquire();
 
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 
 		try
 		{
 			$conn->create( $sql )->execute()->finish();
 		}
-		catch ( \Aimeos\MW\DB\Exception $e )
+		catch( \Aimeos\MW\DB\Exception $e )
 		{
 			$this->object->release( $conn );
 			throw $e;
@@ -475,13 +475,13 @@ 
 	{
 		$conn = $this->object->acquire();
 
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 
 		try
 		{
 			$conn->create( 'SELECT *' )->execute()->finish();
 		}
-		catch ( \Aimeos\MW\DB\Exception $e )
+		catch( \Aimeos\MW\DB\Exception $e )
 		{
 			$this->object->release( $conn );
 			throw $e;
@@ -495,13 +495,13 @@ 
 
 		$conn = $this->object->acquire();
 
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 
 		try
 		{
 			$conn->create( $sql, 123 );
 		}
-		catch (\Aimeos\MW\DB\Exception $e)
+		catch( \Aimeos\MW\DB\Exception $e )
 		{
 			$this->object->release( $conn );
 			throw $e;
@@ -513,20 +513,20 @@ 
 	{
 		$mock = $this->getMockBuilder( '\Aimeos\MW\DB\Connection\Iface' )->getMock();
 
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 		$this->object->release( $mock );
 	}
 
 
 	public function testDBFactory()
 	{
-		$this->assertInstanceOf('\\Aimeos\\MW\\DB\\Manager\\Iface', $this->object);
+		$this->assertInstanceOf( '\\Aimeos\\MW\\DB\\Manager\\Iface', $this->object );
 	}
 
 
 	public function testFactoryFail()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 		\Aimeos\MW\DB\Factory::createManager( \TestHelperMw::getConfig(), 'notDefined' );
 	}
 }