| @@ -242,11 +242,11 @@ discard block | ||
| 242 | 242 | * | 
| 243 | 243 | * @param array $siteids List of IDs for sites whose entries should be deleted | 
| 244 | 244 | */ | 
| 245 | - public function cleanup( array $siteids ) | |
| 245 | + public function cleanup(array $siteids) | |
| 246 | 246 |  	{ | 
| 247 | 247 | $path = 'mshop/customer/manager/submanagers'; | 
| 248 | -		foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) { | |
| 249 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); | |
| 248 | +		foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) { | |
| 249 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); | |
| 250 | 250 | } | 
| 251 | 251 | } | 
| 252 | 252 | |
| @@ -256,10 +256,10 @@ discard block | ||
| 256 | 256 | * | 
| 257 | 257 | * @param array $ids List of IDs | 
| 258 | 258 | */ | 
| 259 | - public function deleteItems( array $ids ) | |
| 259 | + public function deleteItems(array $ids) | |
| 260 | 260 |  	{ | 
| 261 | 261 | $path = 'mshop/customer/manager/fosuser/delete'; | 
| 262 | - $this->deleteItemsBase( $ids, $path, false ); | |
| 262 | + $this->deleteItemsBase($ids, $path, false); | |
| 263 | 263 | } | 
| 264 | 264 | |
| 265 | 265 | |
| @@ -269,11 +269,11 @@ discard block | ||
| 269 | 269 | * @param boolean $withsub Return also attributes of sub-managers if true | 
| 270 | 270 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface | 
| 271 | 271 | */ | 
| 272 | - public function getSearchAttributes( $withsub = true ) | |
| 272 | + public function getSearchAttributes($withsub = true) | |
| 273 | 273 |  	{ | 
| 274 | 274 | $path = 'mshop/customer/manager/submanagers'; | 
| 275 | 275 | |
| 276 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub ); | |
| 276 | +		return $this->getSearchAttributesBase($this->searchConfig, $path, array('address', 'lists'), $withsub); | |
| 277 | 277 | } | 
| 278 | 278 | |
| 279 | 279 | |
| @@ -284,7 +284,7 @@ discard block | ||
| 284 | 284 | */ | 
| 285 | 285 | public function createItem() | 
| 286 | 286 |  	{ | 
| 287 | - return $this->createItemBase( ['customer.siteid' => $this->getContext()->getLocale()->getSiteId()] ); | |
| 287 | + return $this->createItemBase(['customer.siteid' => $this->getContext()->getLocale()->getSiteId()]); | |
| 288 | 288 | } | 
| 289 | 289 | |
| 290 | 290 | |
| @@ -294,27 +294,27 @@ discard block | ||
| 294 | 294 | * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object | 
| 295 | 295 | * @param boolean $fetch True if the new ID should be returned in the item | 
| 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\\FosUser'; | 
| 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() ) { return; } | |
| 304 | +		if (!$item->isModified()) { return; } | |
| 305 | 305 | |
| 306 | 306 | $context = $this->getContext(); | 
| 307 | 307 | $dbm = $context->getDatabaseManager(); | 
| 308 | 308 | $dbname = $this->getResourceName(); | 
| 309 | - $conn = $dbm->acquire( $dbname ); | |
| 309 | + $conn = $dbm->acquire($dbname); | |
| 310 | 310 | |
| 311 | 311 | try | 
| 312 | 312 |  		{ | 
| 313 | 313 | $id = $item->getId(); | 
| 314 | - $date = date( 'Y-m-d H:i:s' ); | |
| 314 | +			$date = date('Y-m-d H:i:s'); | |
| 315 | 315 | $billingAddress = $item->getPaymentAddress(); | 
| 316 | 316 | |
| 317 | - if( $id === null ) | |
| 317 | + if ($id === null) | |
| 318 | 318 |  			{ | 
| 319 | 319 | /** mshop/customer/manager/fosuser/insert | 
| 320 | 320 | * Inserts a new customer record into the database table | 
| @@ -378,51 +378,51 @@ discard block | ||
| 378 | 378 | $path = 'mshop/customer/manager/fosuser/update'; | 
| 379 | 379 | } | 
| 380 | 380 | |
| 381 | - $stmt = $this->getCachedStatement( $conn, $path ); | |
| 382 | - | |
| 383 | - $stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); | |
| 384 | - $stmt->bind( 2, $item->getCode() ); // canonical username | |
| 385 | - $stmt->bind( 3, $item->getCode() ); // username | |
| 386 | - $stmt->bind( 4, $billingAddress->getCompany() ); | |
| 387 | - $stmt->bind( 5, $billingAddress->getVatID() ); | |
| 388 | - $stmt->bind( 6, $billingAddress->getSalutation() ); | |
| 389 | - $stmt->bind( 7, $billingAddress->getTitle() ); | |
| 390 | - $stmt->bind( 8, $billingAddress->getFirstname() ); | |
| 391 | - $stmt->bind( 9, $billingAddress->getLastname() ); | |
| 392 | - $stmt->bind( 10, $billingAddress->getAddress1() ); | |
| 393 | - $stmt->bind( 11, $billingAddress->getAddress2() ); | |
| 394 | - $stmt->bind( 12, $billingAddress->getAddress3() ); | |
| 395 | - $stmt->bind( 13, $billingAddress->getPostal() ); | |
| 396 | - $stmt->bind( 14, $billingAddress->getCity() ); | |
| 397 | - $stmt->bind( 15, $billingAddress->getState() ); | |
| 398 | - $stmt->bind( 16, $billingAddress->getCountryId() ); | |
| 399 | - $stmt->bind( 17, $billingAddress->getLanguageId() ); | |
| 400 | - $stmt->bind( 18, $billingAddress->getTelephone() ); | |
| 401 | - $stmt->bind( 19, $billingAddress->getEmail() ); | |
| 402 | - $stmt->bind( 20, $billingAddress->getEmail() ); | |
| 403 | - $stmt->bind( 21, $billingAddress->getTelefax() ); | |
| 404 | - $stmt->bind( 22, $billingAddress->getWebsite() ); | |
| 405 | - $stmt->bind( 23, $billingAddress->getLongitude() ); | |
| 406 | - $stmt->bind( 24, $billingAddress->getLatitude() ); | |
| 407 | - $stmt->bind( 25, $item->getBirthday() ); | |
| 408 | - $stmt->bind( 26, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); | |
| 409 | - $stmt->bind( 27, $item->getDateVerified() ); | |
| 410 | - $stmt->bind( 28, $item->getPassword() ); | |
| 411 | - $stmt->bind( 29, $date ); // Modification time | |
| 412 | - $stmt->bind( 30, $context->getEditor() ); | |
| 413 | - $stmt->bind( 31, serialize( $item->getRoles() ) ); | |
| 414 | - $stmt->bind( 32, $item->getSalt() ); | |
| 415 | - | |
| 416 | -			if( $id !== null ) { | |
| 417 | - $stmt->bind( 33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); | |
| 418 | - $item->setId( $id ); | |
| 381 | + $stmt = $this->getCachedStatement($conn, $path); | |
| 382 | + | |
| 383 | + $stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); | |
| 384 | + $stmt->bind(2, $item->getCode()); // canonical username | |
| 385 | + $stmt->bind(3, $item->getCode()); // username | |
| 386 | + $stmt->bind(4, $billingAddress->getCompany()); | |
| 387 | + $stmt->bind(5, $billingAddress->getVatID()); | |
| 388 | + $stmt->bind(6, $billingAddress->getSalutation()); | |
| 389 | + $stmt->bind(7, $billingAddress->getTitle()); | |
| 390 | + $stmt->bind(8, $billingAddress->getFirstname()); | |
| 391 | + $stmt->bind(9, $billingAddress->getLastname()); | |
| 392 | + $stmt->bind(10, $billingAddress->getAddress1()); | |
| 393 | + $stmt->bind(11, $billingAddress->getAddress2()); | |
| 394 | + $stmt->bind(12, $billingAddress->getAddress3()); | |
| 395 | + $stmt->bind(13, $billingAddress->getPostal()); | |
| 396 | + $stmt->bind(14, $billingAddress->getCity()); | |
| 397 | + $stmt->bind(15, $billingAddress->getState()); | |
| 398 | + $stmt->bind(16, $billingAddress->getCountryId()); | |
| 399 | + $stmt->bind(17, $billingAddress->getLanguageId()); | |
| 400 | + $stmt->bind(18, $billingAddress->getTelephone()); | |
| 401 | + $stmt->bind(19, $billingAddress->getEmail()); | |
| 402 | + $stmt->bind(20, $billingAddress->getEmail()); | |
| 403 | + $stmt->bind(21, $billingAddress->getTelefax()); | |
| 404 | + $stmt->bind(22, $billingAddress->getWebsite()); | |
| 405 | + $stmt->bind(23, $billingAddress->getLongitude()); | |
| 406 | + $stmt->bind(24, $billingAddress->getLatitude()); | |
| 407 | + $stmt->bind(25, $item->getBirthday()); | |
| 408 | + $stmt->bind(26, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); | |
| 409 | + $stmt->bind(27, $item->getDateVerified()); | |
| 410 | + $stmt->bind(28, $item->getPassword()); | |
| 411 | + $stmt->bind(29, $date); // Modification time | |
| 412 | + $stmt->bind(30, $context->getEditor()); | |
| 413 | + $stmt->bind(31, serialize($item->getRoles())); | |
| 414 | + $stmt->bind(32, $item->getSalt()); | |
| 415 | + | |
| 416 | +			if ($id !== null) { | |
| 417 | + $stmt->bind(33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT); | |
| 418 | + $item->setId($id); | |
| 419 | 419 |  			} else { | 
| 420 | - $stmt->bind( 33, $date ); // Creation time | |
| 420 | + $stmt->bind(33, $date); // Creation time | |
| 421 | 421 | } | 
| 422 | 422 | |
| 423 | 423 | $stmt->execute()->finish(); | 
| 424 | 424 | |
| 425 | - if( $id === null && $fetch === true ) | |
| 425 | + if ($id === null && $fetch === true) | |
| 426 | 426 |  			{ | 
| 427 | 427 | /** mshop/customer/manager/fosuser/newid | 
| 428 | 428 | * Retrieves the ID generated by the database when inserting a new record | 
| @@ -455,14 +455,14 @@ discard block | ||
| 455 | 455 | * @see mshop/customer/manager/fosuser/count | 
| 456 | 456 | */ | 
| 457 | 457 | $path = 'mshop/customer/manager/fosuser/newid'; | 
| 458 | - $item->setId( $this->newId( $conn, $path ) ); | |
| 458 | + $item->setId($this->newId($conn, $path)); | |
| 459 | 459 | } | 
| 460 | 460 | |
| 461 | - $dbm->release( $conn, $dbname ); | |
| 461 | + $dbm->release($conn, $dbname); | |
| 462 | 462 | } | 
| 463 | - catch( \Exception $e ) | |
| 463 | + catch (\Exception $e) | |
| 464 | 464 |  		{ | 
| 465 | - $dbm->release( $conn, $dbname ); | |
| 465 | + $dbm->release($conn, $dbname); | |
| 466 | 466 | throw $e; | 
| 467 | 467 | } | 
| 468 | 468 | } | 
| @@ -476,11 +476,11 @@ discard block | ||
| 476 | 476 | * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface | 
| 477 | 477 | * @throws \Aimeos\MShop\Customer\Exception If creating items failed | 
| 478 | 478 | */ | 
| 479 | - public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null ) | |
| 479 | + public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null) | |
| 480 | 480 |  	{ | 
| 481 | 481 | $dbm = $this->getContext()->getDatabaseManager(); | 
| 482 | 482 | $dbname = $this->getResourceName(); | 
| 483 | - $conn = $dbm->acquire( $dbname ); | |
| 483 | + $conn = $dbm->acquire($dbname); | |
| 484 | 484 | $map = []; | 
| 485 | 485 | |
| 486 | 486 | try | 
| @@ -488,27 +488,27 @@ discard block | ||
| 488 | 488 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; | 
| 489 | 489 | $cfgPathSearch = 'mshop/customer/manager/fosuser/search'; | 
| 490 | 490 | $cfgPathCount = 'mshop/customer/manager/fosuser/count'; | 
| 491 | - $required = array( 'customer' ); | |
| 491 | +			$required = array('customer'); | |
| 492 | 492 | |
| 493 | - $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); | |
| 494 | -			while( ( $row = $results->fetch() ) !== false ) { | |
| 495 | - $map[ $row['customer.id'] ] = $row; | |
| 493 | + $results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level); | |
| 494 | +			while (($row = $results->fetch()) !== false) { | |
| 495 | + $map[$row['customer.id']] = $row; | |
| 496 | 496 | } | 
| 497 | 497 | |
| 498 | - $dbm->release( $conn, $dbname ); | |
| 498 | + $dbm->release($conn, $dbname); | |
| 499 | 499 | } | 
| 500 | - catch( \Exception $e ) | |
| 500 | + catch (\Exception $e) | |
| 501 | 501 |  		{ | 
| 502 | - $dbm->release( $conn, $dbname ); | |
| 502 | + $dbm->release($conn, $dbname); | |
| 503 | 503 | throw $e; | 
| 504 | 504 | } | 
| 505 | 505 | |
| 506 | 506 | $addrItems = []; | 
| 507 | -		if( in_array( 'address', $ref, true ) ) { | |
| 508 | - $addrItems = $this->getAddressItems( array_keys( $map ) ); | |
| 507 | +		if (in_array('address', $ref, true)) { | |
| 508 | + $addrItems = $this->getAddressItems(array_keys($map)); | |
| 509 | 509 | } | 
| 510 | 510 | |
| 511 | - return $this->buildItems( $map, $ref, 'customer', $addrItems ); | |
| 511 | + return $this->buildItems($map, $ref, 'customer', $addrItems); | |
| 512 | 512 | } | 
| 513 | 513 | |
| 514 | 514 | |
| @@ -519,9 +519,9 @@ discard block | ||
| 519 | 519 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 520 | 520 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | 
| 521 | 521 | */ | 
| 522 | - public function getSubManager( $manager, $name = null ) | |
| 522 | + public function getSubManager($manager, $name = null) | |
| 523 | 523 |  	{ | 
| 524 | - return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'FosUser' : $name ) ); | |
| 524 | +		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'FosUser' : $name)); | |
| 525 | 525 | } | 
| 526 | 526 | |
| 527 | 527 | |
| @@ -533,19 +533,19 @@ discard block | ||
| 533 | 533 | * @param array $refItems Items referenced by the customer item via the list items | 
| 534 | 534 | * @return \Aimeos\MShop\Customer\Item\Iface New customer item | 
| 535 | 535 | */ | 
| 536 | - protected function createItemBase( array $values = [], array $listItems = [], array $refItems = [], array $addresses = [] ) | |
| 536 | + protected function createItemBase(array $values = [], array $listItems = [], array $refItems = [], array $addresses = []) | |
| 537 | 537 |  	{ | 
| 538 | -		if( !isset( $this->addressManager ) ) { | |
| 539 | - $this->addressManager = $this->getObject()->getSubManager( 'address' ); | |
| 538 | +		if (!isset($this->addressManager)) { | |
| 539 | +			$this->addressManager = $this->getObject()->getSubManager('address'); | |
| 540 | 540 | } | 
| 541 | 541 | |
| 542 | -		if( isset( $values['roles'] ) ) { | |
| 543 | - $values['roles'] = unserialize( $values['roles'] ); | |
| 542 | +		if (isset($values['roles'])) { | |
| 543 | + $values['roles'] = unserialize($values['roles']); | |
| 544 | 544 | } | 
| 545 | 545 | |
| 546 | 546 | $helper = $this->getPasswordHelper(); | 
| 547 | 547 | $address = $this->addressManager->createItem(); | 
| 548 | 548 | |
| 549 | - return new \Aimeos\MShop\Customer\Item\FosUser( $address, $values, $listItems, $refItems, null, $helper, $addresses ); | |
| 549 | + return new \Aimeos\MShop\Customer\Item\FosUser($address, $values, $listItems, $refItems, null, $helper, $addresses); | |
| 550 | 550 | } | 
| 551 | 551 | } |