aimeos / aimeos-core

lib/mshoplib/src/MShop/Order/Manager/Base/Standard.php

Spacing +1 added lines, -1 removed lines

@@ -472,7 +472,7 @@
 		 * @see mshop/order/manager/base/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'order', 'base/' . $manager, $name );
+		return $this->getSubManagerBase( 'order', 'base/'.$manager, $name );
 	}
 
 

Braces +1 added lines, -2 removed lines

@@ -539,8 +539,7 @@
 				 * @see mshop/order/manager/base/standard/count/ansi
 				 */
 				$path = 'mshop/order/manager/base/standard/insert';
-			}
-			else
+			} else
 			{
 				/** mshop/order/manager/base/standard/update/mysql
 				 * Updates an existing order record in the database

Doc Comments +1 added lines

@@ -689,6 +689,7 @@
 	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
 	 * @param string[] $ref List of domains to fetch list items and referenced items for
 	 * @param integer|null &$total Number of items that are available in total
+	 * @param integer $total
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Base\Iface
 	 */
 	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null )

lib/mshoplib/src/MShop/Order/Manager/Base/Base.php

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
 		$currency = $locale->getCurrencyId();
 		$language = $locale->getLanguageId();
 		$sitecode = $locale->getSite()->getCode();
-		$key = 'aimeos/basket/content-' . $sitecode . '-' . $language . '-' . $currency . '-' . strval( $type );
+		$key = 'aimeos/basket/content-'.$sitecode.'-'.$language.'-'.$currency.'-'.strval( $type );
 
 		if( ( $serorder = $session->get( $key ) ) === null ) {
 			return $this->createItem();
@@ -133,7 +133,7 @@ 
 		$currency = $locale->getCurrencyId();
 		$language = $locale->getLanguageId();
 		$sitecode = $locale->getSite()->getCode();
-		$key = 'aimeos/basket/lock-' . $sitecode . '-' . $language . '-' . $currency . '-' . strval( $type );
+		$key = 'aimeos/basket/lock-'.$sitecode.'-'.$language.'-'.$currency.'-'.strval( $type );
 
 		if( ( $value = $session->get( $key ) ) !== null ) {
 			return (int) $value;
@@ -157,7 +157,7 @@ 
 		$currency = $locale->getCurrencyId();
 		$language = $locale->getLanguageId();
 		$sitecode = $locale->getSite()->getCode();
-		$key = 'aimeos/basket/content-' . $sitecode . '-' . $language . '-' . $currency . '-' . strval( $type );
+		$key = 'aimeos/basket/content-'.$sitecode.'-'.$language.'-'.$currency.'-'.strval( $type );
 
 		$session->set( $key, serialize( clone $order ) );
 	}
@@ -181,7 +181,7 @@ 
 		$currency = $locale->getCurrencyId();
 		$language = $locale->getLanguageId();
 		$sitecode = $locale->getSite()->getCode();
-		$key = 'aimeos/basket/lock-' . $sitecode . '-' . $language . '-' . $currency . '-' . strval( $type );
+		$key = 'aimeos/basket/lock-'.$sitecode.'-'.$language.'-'.$currency.'-'.strval( $type );
 
 		$session->set( $key, strval( $lock ) );
 	}

Braces +2 added lines, -4 removed lines

@@ -343,8 +343,7 @@ 
 				$attributes[$attribute->getParentId()][] = $attribute;
 				$attribute->setParentId( null );
 				$attribute->setId( null );
-			}
-			else
+			} else
 			{
 				$attributes[$attribute->getParentId()][$id] = $attribute;
 			}
@@ -363,8 +362,7 @@ 
 				$products[$item->getPosition()] = $item;
 
 				$subProducts = [];
-			}
-			else
+			} else
 			{	// in case it's a sub-product
 				$subProducts[$item->getPosition()] = $item;
 			}

lib/mshoplib/src/MW/Criteria/PgSQL.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 					$regex = '/(\s|\&|\%|\?|\#|\=|\{|\}|\||\\\\|\~|\[|\]|\`|\^|\/|\-|\+|\>|\<|\(|\)|\*|\:|\"|\!|\§|\$|\'|\;|\.|\,|\@)+/';
 					$search = trim( preg_replace( $regex, ' ', $params[2] ) );
 
-					$params[2] = implode( ':* & ', explode( ' ', $search ) ) . ':*';
+					$params[2] = implode( ':* & ', explode( ' ', $search ) ).':*';
 				}
 				break;
 		}

lib/mshoplib/src/MW/Criteria/MySQL.php

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
 						$len = strlen( $part );
 
 						if( $len > 3 ) {
-							$str .= ' +' . $part . '*';
+							$str .= ' +'.$part.'*';
 						} else if( $len > 0 ) {
-							$str .= ' ' . $part . '*';
+							$str .= ' '.$part.'*';
 						}
 					}
 

lib/mwlib/tests/bootstrap.php

Spacing +9 added lines, -9 removed lines

@@ -13,26 +13,26 @@
 error_reporting( -1 );
 ini_set( 'display_errors', '1' );
 
-date_default_timezone_set('UTC');
+date_default_timezone_set( 'UTC' );
 
 /*
  * Set locale settings to reasonable defaults
  */
-setlocale(LC_ALL, 'en_US.UTF-8');
-setlocale(LC_NUMERIC, 'POSIX');
-setlocale(LC_CTYPE, 'en_US.UTF-8');
-setlocale(LC_TIME, 'POSIX');
+setlocale( LC_ALL, 'en_US.UTF-8' );
+setlocale( LC_NUMERIC, 'POSIX' );
+setlocale( LC_CTYPE, 'en_US.UTF-8' );
+setlocale( LC_TIME, 'POSIX' );
 
 
 /*
  * Set include path for tests
  */
 
-require_once dirname( dirname( dirname( __DIR__ ) ) ) . '/vendor/autoload.php';
+require_once dirname( dirname( dirname( __DIR__ ) ) ).'/vendor/autoload.php';
 
-$testdir =  __DIR__;
-$srcdir =  dirname( $testdir ) . DIRECTORY_SEPARATOR . 'src';
-$libdir =  dirname( $testdir ) . DIRECTORY_SEPARATOR . 'lib';
+$testdir = __DIR__;
+$srcdir = dirname( $testdir ).DIRECTORY_SEPARATOR.'src';
+$libdir = dirname( $testdir ).DIRECTORY_SEPARATOR.'lib';
 
 $path = array( $testdir, $srcdir, $libdir, get_include_path() );
 set_include_path( implode( PATH_SEPARATOR, $path ) );

lib/mwlib/tests/MW/Session/NoneTest.php

Spacing +6 added lines, -6 removed lines

@@ -35,25 +35,25 @@
 	 */
 	protected function tearDown()
 	{
-		unset($this->object);
+		unset( $this->object );
 	}
 
 
 	public function testGet()
 	{
-		$this->assertEquals(null, $this->object->get('test'));
+		$this->assertEquals( null, $this->object->get( 'test' ) );
 
-		$this->object->set('test', '123456789');
-		$this->assertEquals('123456789', $this->object->get('test'));
+		$this->object->set( 'test', '123456789' );
+		$this->assertEquals( '123456789', $this->object->get( 'test' ) );
 	}
 
 
 	public function testSet()
 	{
-		$this->object->set('test', null);
+		$this->object->set( 'test', null );
 		$this->assertEquals( null, $this->object->get( 'test' ) );
 
-		$this->object->set('test', '234');
+		$this->object->set( 'test', '234' );
 		$this->assertEquals( '234', $this->object->get( 'test' ) );
 	}
 }

lib/mwlib/tests/MW/Session/PHPTest.php

Spacing +6 added lines, -6 removed lines

@@ -23,25 +23,25 @@
 
 	protected function tearDown()
 	{
-		unset($this->object);
+		unset( $this->object );
 	}
 
 
 	public function testGet()
 	{
-		$this->assertEquals(null, $this->object->get('test'));
+		$this->assertEquals( null, $this->object->get( 'test' ) );
 
-		$this->object->set('test', '123456789');
-		$this->assertEquals('123456789', $this->object->get('test'));
+		$this->object->set( 'test', '123456789' );
+		$this->assertEquals( '123456789', $this->object->get( 'test' ) );
 	}
 
 
 	public function testSet()
 	{
-		$this->object->set('test', null);
+		$this->object->set( 'test', null );
 		$this->assertEquals( null, $this->object->get( 'test' ) );
 
-		$this->object->set('test', '234');
+		$this->object->set( 'test', '234' );
 		$this->assertEquals( '234', $this->object->get( 'test' ) );
 	}
 }

lib/mwlib/tests/MW/Container/DirectoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -11,13 +11,13 @@ 
 {
 	public function testNewFile()
 	{
-		$dirname = 'tmp' . DIRECTORY_SEPARATOR . 'testdir';
+		$dirname = 'tmp'.DIRECTORY_SEPARATOR.'testdir';
 
 		$dir = new \Aimeos\MW\Container\Directory( $dirname, 'CSV' );
 		$dir->add( $dir->create( 'test' ) );
 		$dir->close();
 
-		$filepath = $dir->getName() . DIRECTORY_SEPARATOR . 'test.csv';
+		$filepath = $dir->getName().DIRECTORY_SEPARATOR.'test.csv';
 
 		$check = file_exists( $filepath );
 		unlink( $filepath );
@@ -31,7 +31,7 @@ 
 
 	public function testAdd()
 	{
-		$dir = new \Aimeos\MW\Container\Directory( 'tmp' . DIRECTORY_SEPARATOR . 'testdir', 'CSV' );
+		$dir = new \Aimeos\MW\Container\Directory( 'tmp'.DIRECTORY_SEPARATOR.'testdir', 'CSV' );
 
 		$content = $dir->create( 'test' );
 		$content->add( array( 'test', 'file', 'data' ) );
@@ -39,10 +39,10 @@ 
 		$dir->add( $content );
 		$dir->close();
 
-		$filepath = $dir->getName() . DIRECTORY_SEPARATOR . 'test.csv';
+		$filepath = $dir->getName().DIRECTORY_SEPARATOR.'test.csv';
 
 		$actual = file_get_contents( $filepath );
-		$expected = '"test","file","data"' . "\n";
+		$expected = '"test","file","data"'."\n";
 
 		unlink( $filepath );
 
@@ -53,7 +53,7 @@ 
 
 	public function testGet()
 	{
-		$dir = new \Aimeos\MW\Container\Directory( __DIR__ . DIRECTORY_SEPARATOR . '_testdir', 'CSV' );
+		$dir = new \Aimeos\MW\Container\Directory( __DIR__.DIRECTORY_SEPARATOR.'_testdir', 'CSV' );
 
 		$this->assertInstanceOf( '\\Aimeos\\MW\\Container\\Content\\Iface', $dir->get( 'testfile.csv' ) );
 	}
@@ -61,7 +61,7 @@ 
 
 	public function testIterator()
 	{
-		$dir = new \Aimeos\MW\Container\Directory( __DIR__ . DIRECTORY_SEPARATOR . '_testdir', 'CSV' );
+		$dir = new \Aimeos\MW\Container\Directory( __DIR__.DIRECTORY_SEPARATOR.'_testdir', 'CSV' );
 
 		$expected = array(
 			'testfile.csv' => 1,
@@ -81,7 +81,7 @@ 
 				$rows[] = $row;
 			}
 
-			$actual[ $entry->getName() ] = count( $rows );
+			$actual[$entry->getName()] = count( $rows );
 		}
 
 		$this->assertEquals( $expected, $actual );

lib/mwlib/tests/MW/Container/ZipTest.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 
 	public function testNewFile()
 	{
-		$filename = 'tmp' . DIRECTORY_SEPARATOR . 'tempfile';
+		$filename = 'tmp'.DIRECTORY_SEPARATOR.'tempfile';
 
 		$zip = new \Aimeos\MW\Container\Zip( $filename, 'CSV' );
 		$zip->add( $zip->create( 'test' ) );
@@ -39,7 +39,7 @@ 
 
 	public function testAdd()
 	{
-		$filename = 'tmp' . DIRECTORY_SEPARATOR . 'tempfile';
+		$filename = 'tmp'.DIRECTORY_SEPARATOR.'tempfile';
 
 		$zip = new \Aimeos\MW\Container\Zip( $filename, 'CSV' );
 
@@ -54,7 +54,7 @@ 
 		$actual = $za->getFromName( $content->getName() );
 		$za->close();
 
-		$expected = '"test","file","data"' . PHP_EOL;
+		$expected = '"test","file","data"'.PHP_EOL;
 
 		unlink( $zip->getName() );
 
@@ -64,7 +64,7 @@ 
 
 	public function testGet()
 	{
-		$zip = new \Aimeos\MW\Container\Zip( __DIR__ . DIRECTORY_SEPARATOR . 'testfile', 'CSV' );
+		$zip = new \Aimeos\MW\Container\Zip( __DIR__.DIRECTORY_SEPARATOR.'testfile', 'CSV' );
 
 		$this->assertInstanceOf( '\\Aimeos\\MW\\Container\\Content\\Iface', $zip->get( 'tempfile.csv' ) );
 	}
@@ -72,7 +72,7 @@ 
 
 	public function testIterator()
 	{
-		$zip = new \Aimeos\MW\Container\Zip( __DIR__ . DIRECTORY_SEPARATOR . 'testfile', 'CSV' );
+		$zip = new \Aimeos\MW\Container\Zip( __DIR__.DIRECTORY_SEPARATOR.'testfile', 'CSV' );
 
 		$expected = array(
 			'tempfile.csv' => 2,
@@ -93,7 +93,7 @@ 
 				$rows[] = $row;
 			}
 
-			$actual[ $entry->getName() ] = count( $rows );
+			$actual[$entry->getName()] = count( $rows );
 		}
 
 		$this->assertEquals( $expected, $actual );