Completed
Push — master ( 58b639...6e0030 )
by Aimeos
11:05
created
lib/custom/src/MW/View/Helper/Url/Laravel5.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 	 * @param \Illuminate\Contracts\Routing\UrlGenerator $builder Laravel URL builder object
33 33
 	 * @param array Associative list of fixed parameters that should be available for all routes
34 34
 	 */
35
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed )
35
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed)
36 36
 	{
37
-		parent::__construct( $view );
37
+		parent::__construct($view);
38 38
 
39 39
 		$this->builder = $builder;
40 40
 		$this->fixed = $fixed;
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	 * @param array $config Additional configuration parameter per URL
53 53
 	 * @return string Complete URL that can be used in the template
54 54
 	 */
55
-	public function transform( $target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = [] )
55
+	public function transform($target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = [])
56 56
 	{
57
-		$params = $this->sanitize( $params );
58
-		$values = $this->getValues( $config );
59
-		$fragment = ( !empty( $trailing ) ? '#' . implode( '/', $trailing ) : '' );
57
+		$params = $this->sanitize($params);
58
+		$values = $this->getValues($config);
59
+		$fragment = (!empty($trailing) ? '#'.implode('/', $trailing) : '');
60 60
 
61
-		return $this->builder->route( $target, $params + $this->fixed, $values['absoluteUri'] ) . $fragment;
61
+		return $this->builder->route($target, $params + $this->fixed, $values['absoluteUri']).$fragment;
62 62
 	}
63 63
 
64 64
 
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
 	 * @param array $config Associative list of key/value pairs
69 69
 	 * @return array Associative list of sanitized key/value pairs
70 70
 	 */
71
-	protected function getValues( array $config )
71
+	protected function getValues(array $config)
72 72
 	{
73 73
 		$values = array(
74 74
 			'absoluteUri' => false,
75 75
 		);
76 76
 
77
-		if( isset( $config['absoluteUri'] ) ) {
77
+		if (isset($config['absoluteUri'])) {
78 78
 			$values['absoluteUri'] = (bool) $config['absoluteUri'];
79 79
 		}
80 80
 
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Helper/Url/Laravel5Test.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -17,37 +17,37 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		if( !interface_exists( '\\Illuminate\\Contracts\\Routing\\UrlGenerator' ) ) {
21
-			$this->markTestSkipped( '\\Illuminate\\Contracts\\Routing\\UrlGenerator is not available' );
20
+		if (!interface_exists('\\Illuminate\\Contracts\\Routing\\UrlGenerator')) {
21
+			$this->markTestSkipped('\\Illuminate\\Contracts\\Routing\\UrlGenerator is not available');
22 22
 		}
23 23
 
24 24
 		$view = new \Aimeos\MW\View\Standard();
25
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Routing\\UrlGenerator' )->getMock();
26
-		$this->object = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, $this->mock, [] );
25
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Routing\\UrlGenerator')->getMock();
26
+		$this->object = new \Aimeos\MW\View\Helper\Url\Laravel5($view, $this->mock, []);
27 27
 	}
28 28
 
29 29
 
30 30
 	protected function tearDown()
31 31
 	{
32
-		unset( $this->object, $this->mock );
32
+		unset($this->object, $this->mock);
33 33
 	}
34 34
 
35 35
 
36 36
 	public function testTransform()
37 37
 	{
38
-		$this->mock->expects( $this->once() )->method( 'route' )
39
-			->with( $this->equalTo( 'route'), $this->equalTo( array( 'key' => 'value' ) ), $this->equalTo( false ) );
38
+		$this->mock->expects($this->once())->method('route')
39
+			->with($this->equalTo('route'), $this->equalTo(array('key' => 'value')), $this->equalTo(false));
40 40
 
41
-		$this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ) );
41
+		$this->object->transform('route', 'catalog', 'lists', array('key' => 'value'));
42 42
 	}
43 43
 
44 44
 
45 45
 	public function testTransformAbsolute()
46 46
 	{
47
-		$this->mock->expects( $this->once() )->method( 'route' )
48
-			->with( $this->equalTo( 'route'), $this->equalTo( [] ), $this->equalTo( true ) );
47
+		$this->mock->expects($this->once())->method('route')
48
+			->with($this->equalTo('route'), $this->equalTo([]), $this->equalTo(true));
49 49
 
50
-		$options = array( 'absoluteUri' => true );
51
-		$this->object->transform( 'route', 'catalog', 'lists', [], [], $options );
50
+		$options = array('absoluteUri' => true);
51
+		$this->object->transform('route', 'catalog', 'lists', [], [], $options);
52 52
 	}
53 53
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/Session/Laravel5Test.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -17,32 +17,32 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		if( interface_exists( '\\Illuminate\\Session\\Store' ) === false ) {
21
-			$this->markTestSkipped( 'Class \\Illuminate\\Session\\Store not found' );
20
+		if (interface_exists('\\Illuminate\\Session\\Store') === false) {
21
+			$this->markTestSkipped('Class \\Illuminate\\Session\\Store not found');
22 22
 		}
23 23
 
24
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Session\\Store' )->getMock();
25
-		$this->object = new \Aimeos\MW\Session\Laravel5( $this->mock );
24
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Session\\Store')->getMock();
25
+		$this->object = new \Aimeos\MW\Session\Laravel5($this->mock);
26 26
 	}
27 27
 
28 28
 
29 29
 	protected function tearDown()
30 30
 	{
31
-		unset( $this->object );
31
+		unset($this->object);
32 32
 	}
33 33
 
34 34
 
35 35
 	public function testGetDefault()
36 36
 	{
37
-		$this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( 'notexist' ) );
38
-		$this->object->get( 'notexist' );
37
+		$this->mock->expects($this->once())->method('get')->with($this->equalTo('notexist'));
38
+		$this->object->get('notexist');
39 39
 	}
40 40
 
41 41
 
42 42
 	public function testSet()
43 43
 	{
44
-		$this->mock->expects( $this->once() )->method( 'put' )
45
-			->with( $this->equalTo( 'key' ), $this->equalTo( 'value' ) );
46
-		$this->object->set( 'key', 'value' );
44
+		$this->mock->expects($this->once())->method('put')
45
+			->with($this->equalTo('key'), $this->equalTo('value'));
46
+		$this->object->set('key', 'value');
47 47
 	}
48 48
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/Logger/Laravel5Test.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -17,53 +17,53 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		if( interface_exists( '\\Illuminate\\Contracts\\Logging\\Log' ) === false ) {
21
-			$this->markTestSkipped( 'Class \\Illuminate\\Contracts\\Logging\\Log not found' );
20
+		if (interface_exists('\\Illuminate\\Contracts\\Logging\\Log') === false) {
21
+			$this->markTestSkipped('Class \\Illuminate\\Contracts\\Logging\\Log not found');
22 22
 		}
23 23
 
24
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Logging\\Log' )->getMock();
25
-		$this->object = new \Aimeos\MW\Logger\Laravel5( $this->mock );
24
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Logging\\Log')->getMock();
25
+		$this->object = new \Aimeos\MW\Logger\Laravel5($this->mock);
26 26
 	}
27 27
 
28 28
 
29 29
 	protected function tearDown()
30 30
 	{
31
-		unset( $this->mock, $this->object );
31
+		unset($this->mock, $this->object);
32 32
 	}
33 33
 
34 34
 
35 35
 	public function testLog()
36 36
 	{
37
-		$this->mock->expects( $this->once() )->method( 'log' )
38
-			->with( $this->equalTo( 'msg' ), $this->equalTo( 'error' ) );
39
-		$this->object->log( 'msg' );
37
+		$this->mock->expects($this->once())->method('log')
38
+			->with($this->equalTo('msg'), $this->equalTo('error'));
39
+		$this->object->log('msg');
40 40
 	}
41 41
 
42 42
 
43 43
 	public function testNonScalarLog()
44 44
 	{
45
-		$this->mock->expects( $this->once() )->method( 'log' )
46
-			->with( $this->equalTo( '["error","error2",2]' ), $this->equalTo( 'error' ) );
47
-		$this->object->log( array( 'error', 'error2', 2 ) );
45
+		$this->mock->expects($this->once())->method('log')
46
+			->with($this->equalTo('["error","error2",2]'), $this->equalTo('error'));
47
+		$this->object->log(array('error', 'error2', 2));
48 48
 	}
49 49
 
50 50
 
51 51
 	public function testLogDebug()
52 52
 	{
53
-		$this->object->log( 'emergency', \Aimeos\MW\Logger\Base::EMERG );
54
-		$this->object->log( 'alert', \Aimeos\MW\Logger\Base::ALERT );
55
-		$this->object->log( 'critical', \Aimeos\MW\Logger\Base::CRIT );
56
-		$this->object->log( 'error', \Aimeos\MW\Logger\Base::ERR );
57
-		$this->object->log( 'warning', \Aimeos\MW\Logger\Base::WARN );
58
-		$this->object->log( 'notice', \Aimeos\MW\Logger\Base::NOTICE );
59
-		$this->object->log( 'info', \Aimeos\MW\Logger\Base::INFO );
60
-		$this->object->log( 'debug', \Aimeos\MW\Logger\Base::DEBUG );
53
+		$this->object->log('emergency', \Aimeos\MW\Logger\Base::EMERG);
54
+		$this->object->log('alert', \Aimeos\MW\Logger\Base::ALERT);
55
+		$this->object->log('critical', \Aimeos\MW\Logger\Base::CRIT);
56
+		$this->object->log('error', \Aimeos\MW\Logger\Base::ERR);
57
+		$this->object->log('warning', \Aimeos\MW\Logger\Base::WARN);
58
+		$this->object->log('notice', \Aimeos\MW\Logger\Base::NOTICE);
59
+		$this->object->log('info', \Aimeos\MW\Logger\Base::INFO);
60
+		$this->object->log('debug', \Aimeos\MW\Logger\Base::DEBUG);
61 61
 	}
62 62
 
63 63
 
64 64
 	public function testBadPriority()
65 65
 	{
66
-		$this->setExpectedException( '\\Aimeos\\MW\\Logger\\Exception' );
67
-		$this->object->log( 'error', -1 );
66
+		$this->setExpectedException('\\Aimeos\\MW\\Logger\\Exception');
67
+		$this->object->log('error', -1);
68 68
 	}
69 69
 }
Please login to merge, or discard this patch.
lib/custom/setup/CustomerChangeAddressRefidParentidLaravel.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	public function getPostDependencies()
42 42
 	{
43
-		return array( 'TablesCreateLaravel' );
43
+		return array('TablesCreateLaravel');
44 44
 	}
45 45
 
46 46
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function migrate()
51 51
 	{
52
-		$this->process( $this->mysql );
52
+		$this->process($this->mysql);
53 53
 	}
54 54
 
55 55
 
@@ -58,22 +58,22 @@  discard block
 block discarded – undo
58 58
 	 *
59 59
 	 * array string $stmts List of SQL statements for changing the columns
60 60
 	 */
61
-	protected function process( array $stmts )
61
+	protected function process(array $stmts)
62 62
 	{
63 63
 		$table = 'users_address';
64
-		$this->msg( sprintf( 'Rename "refid" to "parentid" in table "%1$s"', $table ), 0 ); $this->status( '' );
64
+		$this->msg(sprintf('Rename "refid" to "parentid" in table "%1$s"', $table), 0); $this->status('');
65 65
 
66
-		foreach( $stmts as $column => $stmts )
66
+		foreach ($stmts as $column => $stmts)
67 67
 		{
68
-			$this->msg( sprintf( 'Checking column "%1$s"', $column ), 1 );
68
+			$this->msg(sprintf('Checking column "%1$s"', $column), 1);
69 69
 
70
-			if( $this->schema->tableExists( $table )
71
-				&& $this->schema->columnExists( $table, $column ) === true
70
+			if ($this->schema->tableExists($table)
71
+				&& $this->schema->columnExists($table, $column) === true
72 72
 			) {
73
-				$this->executeList( $stmts );
74
-				$this->status( 'done' );
73
+				$this->executeList($stmts);
74
+				$this->status('done');
75 75
 			} else {
76
-				$this->status( 'OK' );
76
+				$this->status('OK');
77 77
 			}
78 78
 		}
79 79
 	}
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/Laravel.php 1 patch
Spacing   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -241,11 +241,11 @@  discard block
 block discarded – undo
241 241
 	 *
242 242
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
243 243
 	 */
244
-	public function cleanup( array $siteids )
244
+	public function cleanup(array $siteids)
245 245
 	{
246 246
 		$path = 'mshop/customer/manager/submanagers';
247
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) {
248
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
247
+		foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) {
248
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
249 249
 		}
250 250
 	}
251 251
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	 */
258 258
 	public function createItem()
259 259
 	{
260
-		return $this->createItemBase( ['customer.siteid' => $this->getContext()->getLocale()->getSiteId()] );
260
+		return $this->createItemBase(['customer.siteid' => $this->getContext()->getLocale()->getSiteId()]);
261 261
 	}
262 262
 
263 263
 
@@ -266,10 +266,10 @@  discard block
 block discarded – undo
266 266
 	 *
267 267
 	 * @param array $ids List of IDs
268 268
 	 */
269
-	public function deleteItems( array $ids )
269
+	public function deleteItems(array $ids)
270 270
 	{
271 271
 		$path = 'mshop/customer/manager/laravel/delete';
272
-		$this->deleteItemsBase( $ids, $path, false );
272
+		$this->deleteItemsBase($ids, $path, false);
273 273
 	}
274 274
 
275 275
 
@@ -279,11 +279,11 @@  discard block
 block discarded – undo
279 279
 	 * @param boolean $withsub Return also attributes of sub-managers if true
280 280
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
281 281
 	 */
282
-	public function getSearchAttributes( $withsub = true )
282
+	public function getSearchAttributes($withsub = true)
283 283
 	{
284 284
 		$path = 'mshop/customer/manager/submanagers';
285 285
 
286
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub );
286
+		return $this->getSearchAttributesBase($this->searchConfig, $path, array('address', 'lists'), $withsub);
287 287
 	}
288 288
 
289 289
 
@@ -294,29 +294,29 @@  discard block
 block discarded – undo
294 294
 	 * @param boolean $fetch True if the new ID should be returned in the item
295 295
 	 * @return \Aimeos\MShop\Common\Item\Iface $item Updated item including the generated ID
296 296
 	 */
297
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
297
+	public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true)
298 298
 	{
299 299
 		$iface = '\\Aimeos\\MShop\\Customer\\Item\\Iface';
300
-		if( !( $item instanceof $iface ) ) {
301
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
300
+		if (!($item instanceof $iface)) {
301
+			throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface));
302 302
 		}
303 303
 
304
-		if( !$item->isModified() ) {
305
-			return $this->saveRefItems( $item, 'customer' );
304
+		if (!$item->isModified()) {
305
+			return $this->saveRefItems($item, 'customer');
306 306
 		}
307 307
 
308 308
 		$context = $this->getContext();
309 309
 		$dbm = $context->getDatabaseManager();
310 310
 		$dbname = $this->getResourceName();
311
-		$conn = $dbm->acquire( $dbname );
311
+		$conn = $dbm->acquire($dbname);
312 312
 
313 313
 		try
314 314
 		{
315 315
 			$id = $item->getId();
316
-			$date = date( 'Y-m-d H:i:s' );
316
+			$date = date('Y-m-d H:i:s');
317 317
 			$billingAddress = $item->getPaymentAddress();
318 318
 
319
-			if( $id === null )
319
+			if ($id === null)
320 320
 			{
321 321
 				/** mshop/customer/manager/laravel/insert
322 322
 				 * Inserts a new customer record into the database table
@@ -380,48 +380,48 @@  discard block
 block discarded – undo
380 380
 				$path = 'mshop/customer/manager/laravel/update';
381 381
 			}
382 382
 
383
-			$stmt = $this->getCachedStatement( $conn, $path );
384
-
385
-			$stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
386
-			$stmt->bind( 2, $item->getCode() );
387
-			$stmt->bind( 3, $billingAddress->getCompany() );
388
-			$stmt->bind( 4, $billingAddress->getVatID() );
389
-			$stmt->bind( 5, $billingAddress->getSalutation() );
390
-			$stmt->bind( 6, $billingAddress->getTitle() );
391
-			$stmt->bind( 7, $billingAddress->getFirstname() );
392
-			$stmt->bind( 8, $billingAddress->getLastname() );
393
-			$stmt->bind( 9, $billingAddress->getAddress1() );
394
-			$stmt->bind( 10, $billingAddress->getAddress2() );
395
-			$stmt->bind( 11, $billingAddress->getAddress3() );
396
-			$stmt->bind( 12, $billingAddress->getPostal() );
397
-			$stmt->bind( 13, $billingAddress->getCity() );
398
-			$stmt->bind( 14, $billingAddress->getState() );
399
-			$stmt->bind( 15, $billingAddress->getCountryId() );
400
-			$stmt->bind( 16, $billingAddress->getLanguageId() );
401
-			$stmt->bind( 17, $billingAddress->getTelephone() );
402
-			$stmt->bind( 18, $billingAddress->getTelefax() );
403
-			$stmt->bind( 19, $billingAddress->getWebsite() );
404
-			$stmt->bind( 20, $billingAddress->getEmail() );
405
-			$stmt->bind( 21, $billingAddress->getLongitude() );
406
-			$stmt->bind( 22, $billingAddress->getLatitude() );
407
-			$stmt->bind( 23, $item->getLabel() );
408
-			$stmt->bind( 24, $item->getBirthday() );
409
-			$stmt->bind( 25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
410
-			$stmt->bind( 26, $item->getDateVerified() );
411
-			$stmt->bind( 27, $item->getPassword() );
412
-			$stmt->bind( 28, $date ); // Modification time
413
-			$stmt->bind( 29, $context->getEditor() );
414
-
415
-			if( $id !== null ) {
416
-				$stmt->bind( 30, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
417
-				$item->setId( $id );
383
+			$stmt = $this->getCachedStatement($conn, $path);
384
+
385
+			$stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
386
+			$stmt->bind(2, $item->getCode());
387
+			$stmt->bind(3, $billingAddress->getCompany());
388
+			$stmt->bind(4, $billingAddress->getVatID());
389
+			$stmt->bind(5, $billingAddress->getSalutation());
390
+			$stmt->bind(6, $billingAddress->getTitle());
391
+			$stmt->bind(7, $billingAddress->getFirstname());
392
+			$stmt->bind(8, $billingAddress->getLastname());
393
+			$stmt->bind(9, $billingAddress->getAddress1());
394
+			$stmt->bind(10, $billingAddress->getAddress2());
395
+			$stmt->bind(11, $billingAddress->getAddress3());
396
+			$stmt->bind(12, $billingAddress->getPostal());
397
+			$stmt->bind(13, $billingAddress->getCity());
398
+			$stmt->bind(14, $billingAddress->getState());
399
+			$stmt->bind(15, $billingAddress->getCountryId());
400
+			$stmt->bind(16, $billingAddress->getLanguageId());
401
+			$stmt->bind(17, $billingAddress->getTelephone());
402
+			$stmt->bind(18, $billingAddress->getTelefax());
403
+			$stmt->bind(19, $billingAddress->getWebsite());
404
+			$stmt->bind(20, $billingAddress->getEmail());
405
+			$stmt->bind(21, $billingAddress->getLongitude());
406
+			$stmt->bind(22, $billingAddress->getLatitude());
407
+			$stmt->bind(23, $item->getLabel());
408
+			$stmt->bind(24, $item->getBirthday());
409
+			$stmt->bind(25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
410
+			$stmt->bind(26, $item->getDateVerified());
411
+			$stmt->bind(27, $item->getPassword());
412
+			$stmt->bind(28, $date); // Modification time
413
+			$stmt->bind(29, $context->getEditor());
414
+
415
+			if ($id !== null) {
416
+				$stmt->bind(30, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
417
+				$item->setId($id);
418 418
 			} else {
419
-				$stmt->bind( 30, $date ); // Creation time
419
+				$stmt->bind(30, $date); // Creation time
420 420
 			}
421 421
 
422 422
 			$stmt->execute()->finish();
423 423
 
424
-			if( $id === null && $fetch === true )
424
+			if ($id === null && $fetch === true)
425 425
 			{
426 426
 				/** mshop/customer/manager/laravel/newid
427 427
 				 * Retrieves the ID generated by the database when inserting a new record
@@ -454,20 +454,20 @@  discard block
 block discarded – undo
454 454
 				 * @see mshop/customer/manager/laravel/count
455 455
 				 */
456 456
 				$path = 'mshop/customer/manager/laravel/newid';
457
-				$item->setId( $this->newId( $conn, $path ) );
457
+				$item->setId($this->newId($conn, $path));
458 458
 			}
459 459
 
460
-			$dbm->release( $conn, $dbname );
460
+			$dbm->release($conn, $dbname);
461 461
 		}
462
-		catch( \Exception $e )
462
+		catch (\Exception $e)
463 463
 		{
464
-			$dbm->release( $conn, $dbname );
464
+			$dbm->release($conn, $dbname);
465 465
 			throw $e;
466 466
 		}
467 467
 
468
-		$this->addGroups( $item );
468
+		$this->addGroups($item);
469 469
 
470
-		return $this->saveRefItems( $item, 'customer' );
470
+		return $this->saveRefItems($item, 'customer');
471 471
 	}
472 472
 
473 473
 
@@ -479,11 +479,11 @@  discard block
 block discarded – undo
479 479
 	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface
480 480
 	 * @throws \Aimeos\MShop\Customer\Exception If creating items failed
481 481
 	 */
482
-	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null )
482
+	public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null)
483 483
 	{
484 484
 		$dbm = $this->getContext()->getDatabaseManager();
485 485
 		$dbname = $this->getResourceName();
486
-		$conn = $dbm->acquire( $dbname );
486
+		$conn = $dbm->acquire($dbname);
487 487
 		$map = [];
488 488
 
489 489
 		try
@@ -491,27 +491,27 @@  discard block
 block discarded – undo
491 491
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
492 492
 			$cfgPathSearch = 'mshop/customer/manager/laravel/search';
493 493
 			$cfgPathCount = 'mshop/customer/manager/laravel/count';
494
-			$required = array( 'customer' );
494
+			$required = array('customer');
495 495
 
496
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
497
-			while( ( $row = $results->fetch() ) !== false ) {
498
-				$map[ $row['customer.id'] ] = $row;
496
+			$results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level);
497
+			while (($row = $results->fetch()) !== false) {
498
+				$map[$row['customer.id']] = $row;
499 499
 			}
500 500
 
501
-			$dbm->release( $conn, $dbname );
501
+			$dbm->release($conn, $dbname);
502 502
 		}
503
-		catch( \Exception $e )
503
+		catch (\Exception $e)
504 504
 		{
505
-			$dbm->release( $conn, $dbname  );
505
+			$dbm->release($conn, $dbname);
506 506
 			throw $e;
507 507
 		}
508 508
 
509 509
 		$addrItems = [];
510
-		if( in_array( 'customer/address', $ref, true ) ) {
511
-			$addrItems = $this->getAddressItems( array_keys( $map ) );
510
+		if (in_array('customer/address', $ref, true)) {
511
+			$addrItems = $this->getAddressItems(array_keys($map));
512 512
 		}
513 513
 
514
-		return $this->buildItems( $map, $ref, 'customer', $addrItems );
514
+		return $this->buildItems($map, $ref, 'customer', $addrItems);
515 515
 	}
516 516
 
517 517
 
@@ -522,8 +522,8 @@  discard block
 block discarded – undo
522 522
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
523 523
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
524 524
 	 */
525
-	public function getSubManager( $manager, $name = null )
525
+	public function getSubManager($manager, $name = null)
526 526
 	{
527
-		return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Laravel' : $name ) );
527
+		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'Laravel' : $name));
528 528
 	}
529 529
 }
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/Property/Type/Laravel.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		'customer.property.type.id' => array(
26 26
 			'code' => 'customer.property.type.id',
27 27
 			'internalcode' => 'lvuprty."id"',
28
-			'internaldeps' => array( 'LEFT JOIN "users_property_type" AS lvuprty ON ( lvupr."typeid" = lvuprty."id" )' ),
28
+			'internaldeps' => array('LEFT JOIN "users_property_type" AS lvuprty ON ( lvupr."typeid" = lvuprty."id" )'),
29 29
 			'label' => 'Property type ID',
30 30
 			'type' => 'integer',
31 31
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -99,10 +99,10 @@  discard block
 block discarded – undo
99 99
 	 *
100 100
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
101 101
 	 */
102
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
102
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
103 103
 	{
104
-		parent::__construct( $context );
105
-		$this->setResourceName( 'db-customer' );
104
+		parent::__construct($context);
105
+		$this->setResourceName('db-customer');
106 106
 	}
107 107
 
108 108
 
@@ -111,14 +111,14 @@  discard block
 block discarded – undo
111 111
 	 *
112 112
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
113 113
 	 */
114
-	public function cleanup( array $siteids )
114
+	public function cleanup(array $siteids)
115 115
 	{
116 116
 		$path = 'mshop/customer/manager/property/type/submanagers';
117
-		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) {
118
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
117
+		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) {
118
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
119 119
 		}
120 120
 
121
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/property/type/laravel/delete' );
121
+		$this->cleanupBase($siteids, 'mshop/customer/manager/property/type/laravel/delete');
122 122
 	}
123 123
 
124 124
 
@@ -128,11 +128,11 @@  discard block
 block discarded – undo
128 128
 	 * @param boolean $withsub Return also the resource type of sub-managers if true
129 129
 	 * @return array Type of the manager and submanagers, subtypes are separated by slashes
130 130
 	 */
131
-	public function getResourceType( $withsub = true )
131
+	public function getResourceType($withsub = true)
132 132
 	{
133 133
 		$path = 'mshop/customer/manager/property/type/submanagers';
134 134
 
135
-		return $this->getResourceTypeBase( 'customer/property/type', $path, [], $withsub );
135
+		return $this->getResourceTypeBase('customer/property/type', $path, [], $withsub);
136 136
 	}
137 137
 
138 138
 
@@ -142,11 +142,11 @@  discard block
 block discarded – undo
142 142
 	 * @param boolean $withsub Return also attributes of sub-managers if true
143 143
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
144 144
 	 */
145
-	public function getSearchAttributes( $withsub = true )
145
+	public function getSearchAttributes($withsub = true)
146 146
 	{
147 147
 		$path = 'mshop/customer/manager/property/type/submanagers';
148 148
 
149
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
149
+		return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub);
150 150
 	}
151 151
 
152 152
 
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
158 158
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g types, lists etc.
159 159
 	 */
160
-	public function getSubManager( $manager, $name = null )
160
+	public function getSubManager($manager, $name = null)
161 161
 	{
162
-		return $this->getSubManagerBase( 'customer', 'property/type/' . $manager, ( $name === null ? 'Laravel' : $name ) );
162
+		return $this->getSubManagerBase('customer', 'property/type/'.$manager, ($name === null ? 'Laravel' : $name));
163 163
 	}
164 164
 
165 165
 
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/Property/Laravel.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		'customer.property.id' => array(
26 26
 			'code' => 'customer.property.id',
27 27
 			'internalcode' => 'lvupr."id"',
28
-			'internaldeps'=>array( 'LEFT JOIN "users_property" AS lvupr ON ( lvupr."parentid" = fos."id" )' ),
28
+			'internaldeps'=>array('LEFT JOIN "users_property" AS lvupr ON ( lvupr."parentid" = fos."id" )'),
29 29
 			'label' => 'Property ID',
30 30
 			'type' => 'integer',
31 31
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
101 101
 	 *
102 102
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
103 103
 	 */
104
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
104
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
105 105
 	{
106
-		parent::__construct( $context );
107
-		$this->setResourceName( 'db-customer' );
106
+		parent::__construct($context);
107
+		$this->setResourceName('db-customer');
108 108
 	}
109 109
 
110 110
 
@@ -113,14 +113,14 @@  discard block
 block discarded – undo
113 113
 	 *
114 114
 	 * @param integer[] $siteids List of IDs for sites whose entries should be deleted
115 115
 	 */
116
-	public function cleanup( array $siteids )
116
+	public function cleanup(array $siteids)
117 117
 	{
118 118
 		$path = 'mshop/customer/manager/property/submanagers';
119
-		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) {
120
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
119
+		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) {
120
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
121 121
 		}
122 122
 
123
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/property/laravel/delete' );
123
+		$this->cleanupBase($siteids, 'mshop/customer/manager/property/laravel/delete');
124 124
 	}
125 125
 
126 126
 
@@ -130,11 +130,11 @@  discard block
 block discarded – undo
130 130
 	 * @param boolean $withsub Return also the resource type of sub-managers if true
131 131
 	 * @return array Type of the manager and submanagers, subtypes are separated by slashes
132 132
 	 */
133
-	public function getResourceType( $withsub = true )
133
+	public function getResourceType($withsub = true)
134 134
 	{
135 135
 		$path = 'mshop/customer/manager/property/submanagers';
136 136
 
137
-		return $this->getResourceTypeBase( 'customer/property', $path, array( 'type' ), $withsub );
137
+		return $this->getResourceTypeBase('customer/property', $path, array('type'), $withsub);
138 138
 	}
139 139
 
140 140
 
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
144 144
 	 * @param boolean $withsub Return also attributes of sub-managers if true
145 145
 	 * @return array Returns a list of attribtes implementing \Aimeos\MW\Criteria\Attribute\Iface
146 146
 	 */
147
-	public function getSearchAttributes( $withsub = true )
147
+	public function getSearchAttributes($withsub = true)
148 148
 	{
149 149
 		$path = 'mshop/customer/manager/property/submanagers';
150 150
 
151
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub );
151
+		return $this->getSearchAttributesBase($this->searchConfig, $path, array('type'), $withsub);
152 152
 	}
153 153
 
154 154
 
@@ -160,9 +160,9 @@  discard block
 block discarded – undo
160 160
 	 * configuration (or Default) if null
161 161
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g property types, property lists etc.
162 162
 	 */
163
-	public function getSubManager( $manager, $name = null )
163
+	public function getSubManager($manager, $name = null)
164 164
 	{
165
-		return $this->getSubManagerBase( 'customer', 'property/' . $manager, ( $name === null ? 'Laravel' : $name ) );
165
+		return $this->getSubManagerBase('customer', 'property/'.$manager, ($name === null ? 'Laravel' : $name));
166 166
 	}
167 167
 
168 168
 
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/Property/LaravelTest.php 1 patch
Spacing   +92 added lines, -92 removed lines patch added patch discarded remove patch
@@ -20,91 +20,91 @@  discard block
 block discarded – undo
20 20
 		$context = \TestHelper::getContext();
21 21
 		$this->editor = $context->getEditor();
22 22
 
23
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context, 'Laravel' );
24
-		$this->object = $manager->getSubManager( 'property', 'Laravel' );
23
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context, 'Laravel');
24
+		$this->object = $manager->getSubManager('property', 'Laravel');
25 25
 	}
26 26
 
27 27
 
28 28
 	protected function tearDown()
29 29
 	{
30
-		unset( $this->object );
30
+		unset($this->object);
31 31
 	}
32 32
 
33 33
 
34 34
 	public function testCleanup()
35 35
 	{
36
-		$this->object->cleanup( array( -1 ) );
36
+		$this->object->cleanup(array( -1 ));
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testCreateItem()
41 41
 	{
42 42
 		$item = $this->object->createItem();
43
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Property\\Iface', $item );
43
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Property\\Iface', $item);
44 44
 	}
45 45
 
46 46
 
47 47
 	public function testSaveInvalid()
48 48
 	{
49
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
50
-		$this->object->saveItem( new \Aimeos\MShop\Locale\Item\Standard() );
49
+		$this->setExpectedException('\Aimeos\MShop\Exception');
50
+		$this->object->saveItem(new \Aimeos\MShop\Locale\Item\Standard());
51 51
 	}
52 52
 
53 53
 
54 54
 	public function testSaveUpdateDeleteItem()
55 55
 	{
56 56
 		$search = $this->object->createSearch();
57
-		$search->setConditions( $search->compare( '==', 'customer.property.editor', $this->editor ) );
58
-		$results = $this->object->searchItems( $search );
57
+		$search->setConditions($search->compare('==', 'customer.property.editor', $this->editor));
58
+		$results = $this->object->searchItems($search);
59 59
 
60
-		if( ( $item = reset($results) ) === false ) {
61
-			throw new \RuntimeException( 'No property item found' );
60
+		if (($item = reset($results)) === false) {
61
+			throw new \RuntimeException('No property item found');
62 62
 		}
63 63
 
64 64
 		$item->setId(null);
65
-		$item->setLanguageId( 'en' );
66
-		$resultSaved = $this->object->saveItem( $item );
67
-		$itemSaved = $this->object->getItem( $item->getId() );
65
+		$item->setLanguageId('en');
66
+		$resultSaved = $this->object->saveItem($item);
67
+		$itemSaved = $this->object->getItem($item->getId());
68 68
 
69 69
 		$itemExp = clone $itemSaved;
70
-		$itemExp->setValue( 'unittest' );
71
-		$resultUpd = $this->object->saveItem( $itemExp );
72
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
70
+		$itemExp->setValue('unittest');
71
+		$resultUpd = $this->object->saveItem($itemExp);
72
+		$itemUpd = $this->object->getItem($itemExp->getId());
73 73
 
74
-		$this->object->deleteItem( $itemSaved->getId() );
74
+		$this->object->deleteItem($itemSaved->getId());
75 75
 
76 76
 		$context = \TestHelper::getContext();
77 77
 
78
-		$this->assertTrue( $item->getId() !== null );
79
-		$this->assertTrue( $itemSaved->getType() !== null );
80
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
81
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId() );
82
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
83
-		$this->assertEquals( $item->getTypeId(), $itemSaved->getTypeId() );
84
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId() );
85
-		$this->assertEquals( $item->getValue(), $itemSaved->getValue() );
86
-
87
-		$this->assertEquals( $context->getEditor(), $itemSaved->getEditor() );
88
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
89
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
90
-
91
-		$this->assertTrue( $itemUpd->getType() !== null );
92
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
93
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() );
94
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
95
-		$this->assertEquals( $itemExp->getTypeId(), $itemUpd->getTypeId() );
96
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId() );
97
-		$this->assertEquals( $itemExp->getValue(), $itemUpd->getValue() );
98
-
99
-		$this->assertEquals( $context->getEditor(), $itemUpd->getEditor() );
100
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
101
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
102
-
103
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
104
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
105
-
106
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
107
-		$this->object->getItem( $itemSaved->getId() );
78
+		$this->assertTrue($item->getId() !== null);
79
+		$this->assertTrue($itemSaved->getType() !== null);
80
+		$this->assertEquals($item->getId(), $itemSaved->getId());
81
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
82
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
83
+		$this->assertEquals($item->getTypeId(), $itemSaved->getTypeId());
84
+		$this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId());
85
+		$this->assertEquals($item->getValue(), $itemSaved->getValue());
86
+
87
+		$this->assertEquals($context->getEditor(), $itemSaved->getEditor());
88
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
89
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
90
+
91
+		$this->assertTrue($itemUpd->getType() !== null);
92
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
93
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
94
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
95
+		$this->assertEquals($itemExp->getTypeId(), $itemUpd->getTypeId());
96
+		$this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId());
97
+		$this->assertEquals($itemExp->getValue(), $itemUpd->getValue());
98
+
99
+		$this->assertEquals($context->getEditor(), $itemUpd->getEditor());
100
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
101
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
102
+
103
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
104
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
105
+
106
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
107
+		$this->object->getItem($itemSaved->getId());
108 108
 	}
109 109
 
110 110
 
@@ -112,19 +112,19 @@  discard block
 block discarded – undo
112 112
 	{
113 113
 		$search = $this->object->createSearch();
114 114
 		$conditions = array(
115
-			$search->compare( '~=', 'customer.property.value', '1'),
116
-			$search->compare( '==', 'customer.property.editor', $this->editor )
115
+			$search->compare('~=', 'customer.property.value', '1'),
116
+			$search->compare('==', 'customer.property.editor', $this->editor)
117 117
 		);
118
-		$search->setConditions( $search->combine( '&&', $conditions ) );
119
-		$results = $this->object->searchItems( $search );
118
+		$search->setConditions($search->combine('&&', $conditions));
119
+		$results = $this->object->searchItems($search);
120 120
 
121
-		if( ($expected = reset($results)) === false ) {
122
-			throw new \RuntimeException( sprintf( 'No customer property item found for value "%1$s".', '1' ) );
121
+		if (($expected = reset($results)) === false) {
122
+			throw new \RuntimeException(sprintf('No customer property item found for value "%1$s".', '1'));
123 123
 		}
124 124
 
125
-		$actual = $this->object->getItem( $expected->getId() );
126
-		$this->assertNotEquals( '', $actual->getTypeName() );
127
-		$this->assertEquals( $expected, $actual );
125
+		$actual = $this->object->getItem($expected->getId());
126
+		$this->assertNotEquals('', $actual->getTypeName());
127
+		$this->assertEquals($expected, $actual);
128 128
 	}
129 129
 
130 130
 
@@ -132,15 +132,15 @@  discard block
 block discarded – undo
132 132
 	{
133 133
 		$result = $this->object->getResourceType();
134 134
 
135
-		$this->assertContains( 'customer/property', $result );
136
-		$this->assertContains( 'customer/property/type', $result );
135
+		$this->assertContains('customer/property', $result);
136
+		$this->assertContains('customer/property/type', $result);
137 137
 	}
138 138
 
139 139
 
140 140
 	public function testGetSearchAttributes()
141 141
 	{
142
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
143
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
142
+		foreach ($this->object->getSearchAttributes() as $attribute) {
143
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
144 144
 		}
145 145
 	}
146 146
 
@@ -151,51 +151,51 @@  discard block
 block discarded – undo
151 151
 		$search = $this->object->createSearch();
152 152
 
153 153
 		$expr = [];
154
-		$expr[] = $search->compare( '!=', 'customer.property.id', null );
155
-		$expr[] = $search->compare( '!=', 'customer.property.parentid', null );
156
-		$expr[] = $search->compare( '!=', 'customer.property.siteid', null );
157
-		$expr[] = $search->compare( '!=', 'customer.property.typeid', null );
158
-		$expr[] = $search->compare( '==', 'customer.property.languageid', null );
159
-		$expr[] = $search->compare( '==', 'customer.property.value', '1' );
160
-		$expr[] = $search->compare( '==', 'customer.property.editor', $this->editor );
161
-
162
-		$expr[] = $search->compare( '!=', 'customer.property.type.id', null );
163
-		$expr[] = $search->compare( '!=', 'customer.property.type.siteid', null );
164
-		$expr[] = $search->compare( '==', 'customer.property.type.domain', 'customer' );
165
-		$expr[] = $search->compare( '==', 'customer.property.type.code', 'newsletter' );
166
-		$expr[] = $search->compare( '>', 'customer.property.type.label', '' );
167
-		$expr[] = $search->compare( '==', 'customer.property.type.status', 1 );
168
-		$expr[] = $search->compare( '>=', 'customer.property.type.mtime', '1970-01-01 00:00:00' );
169
-		$expr[] = $search->compare( '>=', 'customer.property.type.ctime', '1970-01-01 00:00:00' );
170
-		$expr[] = $search->compare( '==', 'customer.property.type.editor', $this->editor );
171
-
172
-		$search->setConditions( $search->combine('&&', $expr) );
173
-		$results = $this->object->searchItems( $search, [], $total );
174
-		$this->assertEquals( 1, count( $results ) );
154
+		$expr[] = $search->compare('!=', 'customer.property.id', null);
155
+		$expr[] = $search->compare('!=', 'customer.property.parentid', null);
156
+		$expr[] = $search->compare('!=', 'customer.property.siteid', null);
157
+		$expr[] = $search->compare('!=', 'customer.property.typeid', null);
158
+		$expr[] = $search->compare('==', 'customer.property.languageid', null);
159
+		$expr[] = $search->compare('==', 'customer.property.value', '1');
160
+		$expr[] = $search->compare('==', 'customer.property.editor', $this->editor);
161
+
162
+		$expr[] = $search->compare('!=', 'customer.property.type.id', null);
163
+		$expr[] = $search->compare('!=', 'customer.property.type.siteid', null);
164
+		$expr[] = $search->compare('==', 'customer.property.type.domain', 'customer');
165
+		$expr[] = $search->compare('==', 'customer.property.type.code', 'newsletter');
166
+		$expr[] = $search->compare('>', 'customer.property.type.label', '');
167
+		$expr[] = $search->compare('==', 'customer.property.type.status', 1);
168
+		$expr[] = $search->compare('>=', 'customer.property.type.mtime', '1970-01-01 00:00:00');
169
+		$expr[] = $search->compare('>=', 'customer.property.type.ctime', '1970-01-01 00:00:00');
170
+		$expr[] = $search->compare('==', 'customer.property.type.editor', $this->editor);
171
+
172
+		$search->setConditions($search->combine('&&', $expr));
173
+		$results = $this->object->searchItems($search, [], $total);
174
+		$this->assertEquals(1, count($results));
175 175
 
176 176
 
177 177
 		$search = $this->object->createSearch();
178 178
 		$conditions = array(
179
-			$search->compare( '=~', 'customer.property.type.code', 'newsletter' ),
180
-			$search->compare( '==', 'customer.property.editor', $this->editor )
179
+			$search->compare('=~', 'customer.property.type.code', 'newsletter'),
180
+			$search->compare('==', 'customer.property.editor', $this->editor)
181 181
 		);
182
-		$search->setConditions( $search->combine( '&&', $conditions ) );
182
+		$search->setConditions($search->combine('&&', $conditions));
183 183
 		$search->setSlice(0, 1);
184
-		$items = $this->object->searchItems( $search, [], $total );
184
+		$items = $this->object->searchItems($search, [], $total);
185 185
 
186
-		$this->assertEquals( 1, count( $items ) );
187
-		$this->assertEquals( 1, $total );
186
+		$this->assertEquals(1, count($items));
187
+		$this->assertEquals(1, $total);
188 188
 
189
-		foreach($items as $itemId => $item) {
190
-			$this->assertEquals( $itemId, $item->getId() );
189
+		foreach ($items as $itemId => $item) {
190
+			$this->assertEquals($itemId, $item->getId());
191 191
 		}
192 192
 	}
193 193
 
194 194
 
195 195
 	public function testGetSubManager()
196 196
 	{
197
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') );
198
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') );
197
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type'));
198
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard'));
199 199
 
200 200
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
201 201
 		$this->object->getSubManager('unknown');
Please login to merge, or discard this patch.