| @@ -4,17 +4,17 @@ | ||
| 4 | 4 | * Set error reporting to maximum | 
| 5 | 5 | */ | 
| 6 | 6 | error_reporting( -1 ); | 
| 7 | -ini_set( 'display_errors', true ); | |
| 7 | +ini_set('display_errors', true); | |
| 8 | 8 | |
| 9 | -date_default_timezone_set( 'UTC' ); | |
| 9 | +date_default_timezone_set('UTC'); | |
| 10 | 10 | |
| 11 | 11 | /* | 
| 12 | 12 | * Set locale settings to reasonable defaults | 
| 13 | 13 | */ | 
| 14 | -setlocale( LC_ALL, 'en_US.UTF-8' ); | |
| 15 | -setlocale( LC_CTYPE, 'en_US.UTF-8' ); | |
| 16 | -setlocale( LC_NUMERIC, 'POSIX' ); | |
| 17 | -setlocale( LC_TIME, 'POSIX' ); | |
| 14 | +setlocale(LC_ALL, 'en_US.UTF-8'); | |
| 15 | +setlocale(LC_CTYPE, 'en_US.UTF-8'); | |
| 16 | +setlocale(LC_NUMERIC, 'POSIX'); | |
| 17 | +setlocale(LC_TIME, 'POSIX'); | |
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | require_once 'TestHelper.php'; | 
| @@ -332,8 +332,7 @@ discard block | ||
| 332 | 332 | * @see mshop/customer/manager/fosuser/count | 
| 333 | 333 | */ | 
| 334 | 334 | $path = 'mshop/customer/manager/fosuser/insert'; | 
| 335 | - } | |
| 336 | - else | |
| 335 | + } else | |
| 337 | 336 |  			{ | 
| 338 | 337 | /** mshop/customer/manager/fosuser/update | 
| 339 | 338 | * Updates an existing customer record in the database | 
| @@ -441,8 +440,7 @@ discard block | ||
| 441 | 440 | } | 
| 442 | 441 | |
| 443 | 442 | $dbm->release( $conn, $dbname ); | 
| 444 | - } | |
| 445 | - catch( \Exception $e ) | |
| 443 | + } catch( \Exception $e ) | |
| 446 | 444 |  		{ | 
| 447 | 445 | $dbm->release( $conn, $dbname ); | 
| 448 | 446 | throw $e; | 
| @@ -478,8 +476,7 @@ discard block | ||
| 478 | 476 | } | 
| 479 | 477 | |
| 480 | 478 | $dbm->release( $conn, $dbname ); | 
| 481 | - } | |
| 482 | - catch( \Exception $e ) | |
| 479 | + } catch( \Exception $e ) | |
| 483 | 480 |  		{ | 
| 484 | 481 | $dbm->release( $conn, $dbname ); | 
| 485 | 482 | throw $e; | 
| @@ -241,7 +241,7 @@ discard block | ||
| 241 | 241 | /** | 
| 242 | 242 | * Removes old entries from the storage. | 
| 243 | 243 | * | 
| 244 | - * @param array $siteids List of IDs for sites whose entries should be deleted | |
| 244 | + * @param integer[] $siteids List of IDs for sites whose entries should be deleted | |
| 245 | 245 | */ | 
| 246 | 246 | public function cleanup( array $siteids ) | 
| 247 | 247 |  	{ | 
| @@ -294,7 +294,7 @@ discard block | ||
| 294 | 294 | * | 
| 295 | 295 | * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object | 
| 296 | 296 | * @param boolean $fetch True if the new ID should be returned in the item | 
| 297 | - * @return \Aimeos\MShop\Common\Item\Iface $item Updated item including the generated ID | |
| 297 | + * @return \Aimeos\MShop\Common\Item\ListRef\Iface $item Updated item including the generated ID | |
| 298 | 298 | */ | 
| 299 | 299 | public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) | 
| 300 | 300 |  	{ | 
| @@ -525,7 +525,7 @@ discard block | ||
| 525 | 525 | * | 
| 526 | 526 | * @param string $manager Name of the sub manager type in lower case | 
| 527 | 527 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 528 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | |
| 528 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. | |
| 529 | 529 | */ | 
| 530 | 530 | public function getSubManager( $manager, $name = null ) | 
| 531 | 531 |  	{ | 
| @@ -243,13 +243,13 @@ discard block | ||
| 243 | 243 | * | 
| 244 | 244 | * @param array $siteids List of IDs for sites whose entries should be deleted | 
| 245 | 245 | */ | 
| 246 | - public function cleanup( array $siteids ) | |
| 246 | + public function cleanup(array $siteids) | |
| 247 | 247 |  	{ | 
| 248 | 248 | $path = 'mshop/customer/manager/submanagers'; | 
| 249 | 249 | $default = ['address', 'group', 'lists', 'property']; | 
| 250 | 250 | |
| 251 | -		foreach( $this->getContext()->getConfig()->get( $path, $default ) as $domain ) { | |
| 252 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); | |
| 251 | +		foreach ($this->getContext()->getConfig()->get($path, $default) as $domain) { | |
| 252 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); | |
| 253 | 253 | } | 
| 254 | 254 | } | 
| 255 | 255 | |
| @@ -259,10 +259,10 @@ discard block | ||
| 259 | 259 | * | 
| 260 | 260 | * @param array $ids List of IDs | 
| 261 | 261 | */ | 
| 262 | - public function deleteItems( array $ids ) | |
| 262 | + public function deleteItems(array $ids) | |
| 263 | 263 |  	{ | 
| 264 | 264 | $path = 'mshop/customer/manager/fosuser/delete'; | 
| 265 | - $this->deleteItemsBase( $ids, $path, false ); | |
| 265 | + $this->deleteItemsBase($ids, $path, false); | |
| 266 | 266 | } | 
| 267 | 267 | |
| 268 | 268 | |
| @@ -272,12 +272,12 @@ discard block | ||
| 272 | 272 | * @param boolean $withsub Return also attributes of sub-managers if true | 
| 273 | 273 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface | 
| 274 | 274 | */ | 
| 275 | - public function getSearchAttributes( $withsub = true ) | |
| 275 | + public function getSearchAttributes($withsub = true) | |
| 276 | 276 |  	{ | 
| 277 | 277 | $path = 'mshop/customer/manager/submanagers'; | 
| 278 | 278 | $default = ['address', 'group', 'lists', 'property']; | 
| 279 | 279 | |
| 280 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, $default, $withsub ); | |
| 280 | + return $this->getSearchAttributesBase($this->searchConfig, $path, $default, $withsub); | |
| 281 | 281 | } | 
| 282 | 282 | |
| 283 | 283 | |
| @@ -288,7 +288,7 @@ discard block | ||
| 288 | 288 | */ | 
| 289 | 289 | public function createItem() | 
| 290 | 290 |  	{ | 
| 291 | - return $this->createItemBase( ['customer.siteid' => $this->getContext()->getLocale()->getSiteId()] ); | |
| 291 | + return $this->createItemBase(['customer.siteid' => $this->getContext()->getLocale()->getSiteId()]); | |
| 292 | 292 | } | 
| 293 | 293 | |
| 294 | 294 | |
| @@ -299,32 +299,32 @@ discard block | ||
| 299 | 299 | * @param boolean $fetch True if the new ID should be returned in the item | 
| 300 | 300 | * @return \Aimeos\MShop\Common\Item\Iface $item Updated item including the generated ID | 
| 301 | 301 | */ | 
| 302 | - public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) | |
| 302 | + public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true) | |
| 303 | 303 |  	{ | 
| 304 | 304 | $iface = '\\Aimeos\\MShop\\Customer\\Item\\FosUser'; | 
| 305 | -		if( !( $item instanceof $iface ) ) { | |
| 306 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) ); | |
| 305 | +		if (!($item instanceof $iface)) { | |
| 306 | +			throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface)); | |
| 307 | 307 | } | 
| 308 | 308 | |
| 309 | - if( !$item->isModified() ) | |
| 309 | + if (!$item->isModified()) | |
| 310 | 310 |  		{ | 
| 311 | - $item = $this->savePropertyItems( $item, 'customer' ); | |
| 312 | - $item = $this->saveAddressItems( $item, 'customer' ); | |
| 313 | - return $this->saveRefItems( $item, 'customer' ); | |
| 311 | + $item = $this->savePropertyItems($item, 'customer'); | |
| 312 | + $item = $this->saveAddressItems($item, 'customer'); | |
| 313 | + return $this->saveRefItems($item, 'customer'); | |
| 314 | 314 | } | 
| 315 | 315 | |
| 316 | 316 | $context = $this->getContext(); | 
| 317 | 317 | $dbm = $context->getDatabaseManager(); | 
| 318 | 318 | $dbname = $this->getResourceName(); | 
| 319 | - $conn = $dbm->acquire( $dbname ); | |
| 319 | + $conn = $dbm->acquire($dbname); | |
| 320 | 320 | |
| 321 | 321 | try | 
| 322 | 322 |  		{ | 
| 323 | 323 | $id = $item->getId(); | 
| 324 | - $date = date( 'Y-m-d H:i:s' ); | |
| 324 | +			$date = date('Y-m-d H:i:s'); | |
| 325 | 325 | $billingAddress = $item->getPaymentAddress(); | 
| 326 | 326 | |
| 327 | - if( $id === null ) | |
| 327 | + if ($id === null) | |
| 328 | 328 |  			{ | 
| 329 | 329 | /** mshop/customer/manager/fosuser/insert | 
| 330 | 330 | * Inserts a new customer record into the database table | 
| @@ -388,51 +388,51 @@ discard block | ||
| 388 | 388 | $path = 'mshop/customer/manager/fosuser/update'; | 
| 389 | 389 | } | 
| 390 | 390 | |
| 391 | - $stmt = $this->getCachedStatement( $conn, $path ); | |
| 392 | - | |
| 393 | - $stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); | |
| 394 | - $stmt->bind( 2, $item->getCode() ); // canonical username | |
| 395 | - $stmt->bind( 3, $item->getCode() ); // username | |
| 396 | - $stmt->bind( 4, $billingAddress->getCompany() ); | |
| 397 | - $stmt->bind( 5, $billingAddress->getVatID() ); | |
| 398 | - $stmt->bind( 6, $billingAddress->getSalutation() ); | |
| 399 | - $stmt->bind( 7, $billingAddress->getTitle() ); | |
| 400 | - $stmt->bind( 8, $billingAddress->getFirstname() ); | |
| 401 | - $stmt->bind( 9, $billingAddress->getLastname() ); | |
| 402 | - $stmt->bind( 10, $billingAddress->getAddress1() ); | |
| 403 | - $stmt->bind( 11, $billingAddress->getAddress2() ); | |
| 404 | - $stmt->bind( 12, $billingAddress->getAddress3() ); | |
| 405 | - $stmt->bind( 13, $billingAddress->getPostal() ); | |
| 406 | - $stmt->bind( 14, $billingAddress->getCity() ); | |
| 407 | - $stmt->bind( 15, $billingAddress->getState() ); | |
| 408 | - $stmt->bind( 16, $billingAddress->getCountryId() ); | |
| 409 | - $stmt->bind( 17, $billingAddress->getLanguageId() ); | |
| 410 | - $stmt->bind( 18, $billingAddress->getTelephone() ); | |
| 411 | - $stmt->bind( 19, $billingAddress->getEmail() ); | |
| 412 | - $stmt->bind( 20, $billingAddress->getEmail() ); | |
| 413 | - $stmt->bind( 21, $billingAddress->getTelefax() ); | |
| 414 | - $stmt->bind( 22, $billingAddress->getWebsite() ); | |
| 415 | - $stmt->bind( 23, $billingAddress->getLongitude() ); | |
| 416 | - $stmt->bind( 24, $billingAddress->getLatitude() ); | |
| 417 | - $stmt->bind( 25, $item->getBirthday() ); | |
| 418 | - $stmt->bind( 26, ( $item->getStatus() > 0 ? true : false ), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL ); | |
| 419 | - $stmt->bind( 27, $item->getDateVerified() ); | |
| 420 | - $stmt->bind( 28, $item->getPassword() ); | |
| 421 | - $stmt->bind( 29, $date ); // Modification time | |
| 422 | - $stmt->bind( 30, $context->getEditor() ); | |
| 423 | - $stmt->bind( 31, serialize( $item->getRoles() ) ); | |
| 424 | - $stmt->bind( 32, $item->getSalt() ); | |
| 425 | - | |
| 426 | -			if( $id !== null ) { | |
| 427 | - $stmt->bind( 33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); | |
| 428 | - $item->setId( $id ); | |
| 391 | + $stmt = $this->getCachedStatement($conn, $path); | |
| 392 | + | |
| 393 | + $stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); | |
| 394 | + $stmt->bind(2, $item->getCode()); // canonical username | |
| 395 | + $stmt->bind(3, $item->getCode()); // username | |
| 396 | + $stmt->bind(4, $billingAddress->getCompany()); | |
| 397 | + $stmt->bind(5, $billingAddress->getVatID()); | |
| 398 | + $stmt->bind(6, $billingAddress->getSalutation()); | |
| 399 | + $stmt->bind(7, $billingAddress->getTitle()); | |
| 400 | + $stmt->bind(8, $billingAddress->getFirstname()); | |
| 401 | + $stmt->bind(9, $billingAddress->getLastname()); | |
| 402 | + $stmt->bind(10, $billingAddress->getAddress1()); | |
| 403 | + $stmt->bind(11, $billingAddress->getAddress2()); | |
| 404 | + $stmt->bind(12, $billingAddress->getAddress3()); | |
| 405 | + $stmt->bind(13, $billingAddress->getPostal()); | |
| 406 | + $stmt->bind(14, $billingAddress->getCity()); | |
| 407 | + $stmt->bind(15, $billingAddress->getState()); | |
| 408 | + $stmt->bind(16, $billingAddress->getCountryId()); | |
| 409 | + $stmt->bind(17, $billingAddress->getLanguageId()); | |
| 410 | + $stmt->bind(18, $billingAddress->getTelephone()); | |
| 411 | + $stmt->bind(19, $billingAddress->getEmail()); | |
| 412 | + $stmt->bind(20, $billingAddress->getEmail()); | |
| 413 | + $stmt->bind(21, $billingAddress->getTelefax()); | |
| 414 | + $stmt->bind(22, $billingAddress->getWebsite()); | |
| 415 | + $stmt->bind(23, $billingAddress->getLongitude()); | |
| 416 | + $stmt->bind(24, $billingAddress->getLatitude()); | |
| 417 | + $stmt->bind(25, $item->getBirthday()); | |
| 418 | + $stmt->bind(26, ($item->getStatus() > 0 ? true : false), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL); | |
| 419 | + $stmt->bind(27, $item->getDateVerified()); | |
| 420 | + $stmt->bind(28, $item->getPassword()); | |
| 421 | + $stmt->bind(29, $date); // Modification time | |
| 422 | + $stmt->bind(30, $context->getEditor()); | |
| 423 | + $stmt->bind(31, serialize($item->getRoles())); | |
| 424 | + $stmt->bind(32, $item->getSalt()); | |
| 425 | + | |
| 426 | +			if ($id !== null) { | |
| 427 | + $stmt->bind(33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT); | |
| 428 | + $item->setId($id); | |
| 429 | 429 |  			} else { | 
| 430 | - $stmt->bind( 33, $date ); // Creation time | |
| 430 | + $stmt->bind(33, $date); // Creation time | |
| 431 | 431 | } | 
| 432 | 432 | |
| 433 | 433 | $stmt->execute()->finish(); | 
| 434 | 434 | |
| 435 | - if( $id === null && $fetch === true ) | |
| 435 | + if ($id === null && $fetch === true) | |
| 436 | 436 |  			{ | 
| 437 | 437 | /** mshop/customer/manager/fosuser/newid | 
| 438 | 438 | * Retrieves the ID generated by the database when inserting a new record | 
| @@ -465,22 +465,22 @@ discard block | ||
| 465 | 465 | * @see mshop/customer/manager/fosuser/count | 
| 466 | 466 | */ | 
| 467 | 467 | $path = 'mshop/customer/manager/fosuser/newid'; | 
| 468 | - $item->setId( $this->newId( $conn, $path ) ); | |
| 468 | + $item->setId($this->newId($conn, $path)); | |
| 469 | 469 | } | 
| 470 | 470 | |
| 471 | - $dbm->release( $conn, $dbname ); | |
| 471 | + $dbm->release($conn, $dbname); | |
| 472 | 472 | } | 
| 473 | - catch( \Exception $e ) | |
| 473 | + catch (\Exception $e) | |
| 474 | 474 |  		{ | 
| 475 | - $dbm->release( $conn, $dbname ); | |
| 475 | + $dbm->release($conn, $dbname); | |
| 476 | 476 | throw $e; | 
| 477 | 477 | } | 
| 478 | 478 | |
| 479 | - $this->addGroups( $item ); | |
| 479 | + $this->addGroups($item); | |
| 480 | 480 | |
| 481 | - $item = $this->savePropertyItems( $item, 'customer' ); | |
| 482 | - $item = $this->saveAddressItems( $item, 'customer' ); | |
| 483 | - return $this->saveRefItems( $item, 'customer' ); | |
| 481 | + $item = $this->savePropertyItems($item, 'customer'); | |
| 482 | + $item = $this->saveAddressItems($item, 'customer'); | |
| 483 | + return $this->saveRefItems($item, 'customer'); | |
| 484 | 484 | } | 
| 485 | 485 | |
| 486 | 486 | |
| @@ -492,11 +492,11 @@ discard block | ||
| 492 | 492 | * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface | 
| 493 | 493 | * @throws \Aimeos\MShop\Customer\Exception If creating items failed | 
| 494 | 494 | */ | 
| 495 | - public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null ) | |
| 495 | + public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null) | |
| 496 | 496 |  	{ | 
| 497 | 497 | $dbm = $this->getContext()->getDatabaseManager(); | 
| 498 | 498 | $dbname = $this->getResourceName(); | 
| 499 | - $conn = $dbm->acquire( $dbname ); | |
| 499 | + $conn = $dbm->acquire($dbname); | |
| 500 | 500 | $map = []; | 
| 501 | 501 | |
| 502 | 502 | try | 
| @@ -504,32 +504,32 @@ discard block | ||
| 504 | 504 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; | 
| 505 | 505 | $cfgPathSearch = 'mshop/customer/manager/fosuser/search'; | 
| 506 | 506 | $cfgPathCount = 'mshop/customer/manager/fosuser/count'; | 
| 507 | - $required = array( 'customer' ); | |
| 507 | +			$required = array('customer'); | |
| 508 | 508 | |
| 509 | - $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); | |
| 510 | -			while( ( $row = $results->fetch() ) !== false ) { | |
| 511 | - $map[ $row['customer.id'] ] = $row; | |
| 509 | + $results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level); | |
| 510 | +			while (($row = $results->fetch()) !== false) { | |
| 511 | + $map[$row['customer.id']] = $row; | |
| 512 | 512 | } | 
| 513 | 513 | |
| 514 | - $dbm->release( $conn, $dbname ); | |
| 514 | + $dbm->release($conn, $dbname); | |
| 515 | 515 | } | 
| 516 | - catch( \Exception $e ) | |
| 516 | + catch (\Exception $e) | |
| 517 | 517 |  		{ | 
| 518 | - $dbm->release( $conn, $dbname ); | |
| 518 | + $dbm->release($conn, $dbname); | |
| 519 | 519 | throw $e; | 
| 520 | 520 | } | 
| 521 | 521 | |
| 522 | 522 | $addrItems = []; | 
| 523 | -		if( in_array( 'customer/address', $ref, true ) ) { | |
| 524 | - $addrItems = $this->getAddressItems( array_keys( $map ), 'customer' ); | |
| 523 | +		if (in_array('customer/address', $ref, true)) { | |
| 524 | + $addrItems = $this->getAddressItems(array_keys($map), 'customer'); | |
| 525 | 525 | } | 
| 526 | 526 | |
| 527 | 527 | $propItems = []; | 
| 528 | -		if( in_array( 'customer/property', $ref, true ) ) { | |
| 529 | - $propItems = $this->getPropertyItems( array_keys( $map ), 'customer' ); | |
| 528 | +		if (in_array('customer/property', $ref, true)) { | |
| 529 | + $propItems = $this->getPropertyItems(array_keys($map), 'customer'); | |
| 530 | 530 | } | 
| 531 | 531 | |
| 532 | - return $this->buildItems( $map, $ref, 'customer', $addrItems, $propItems ); | |
| 532 | + return $this->buildItems($map, $ref, 'customer', $addrItems, $propItems); | |
| 533 | 533 | } | 
| 534 | 534 | |
| 535 | 535 | |
| @@ -540,9 +540,9 @@ discard block | ||
| 540 | 540 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 541 | 541 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | 
| 542 | 542 | */ | 
| 543 | - public function getSubManager( $manager, $name = null ) | |
| 543 | + public function getSubManager($manager, $name = null) | |
| 544 | 544 |  	{ | 
| 545 | - return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'FosUser' : $name ) ); | |
| 545 | +		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'FosUser' : $name)); | |
| 546 | 546 | } | 
| 547 | 547 | |
| 548 | 548 | |
| @@ -556,15 +556,15 @@ discard block | ||
| 556 | 556 | * @param array $propItems List of property items of the customer item | 
| 557 | 557 | * @return \Aimeos\MShop\Customer\Item\Iface New customer item | 
| 558 | 558 | */ | 
| 559 | - protected function createItemBase( array $values = [], array $listItems = [], array $refItems = [], | |
| 560 | - array $addresses = [], array $propItems = [] ) | |
| 559 | + protected function createItemBase(array $values = [], array $listItems = [], array $refItems = [], | |
| 560 | + array $addresses = [], array $propItems = []) | |
| 561 | 561 |  	{ | 
| 562 | -		if( !isset( $this->addressManager ) ) { | |
| 563 | - $this->addressManager = $this->getObject()->getSubManager( 'address' ); | |
| 562 | +		if (!isset($this->addressManager)) { | |
| 563 | +			$this->addressManager = $this->getObject()->getSubManager('address'); | |
| 564 | 564 | } | 
| 565 | 565 | |
| 566 | -		if( isset( $values['roles'] ) ) { | |
| 567 | - $values['roles'] = unserialize( $values['roles'] ); | |
| 566 | +		if (isset($values['roles'])) { | |
| 567 | + $values['roles'] = unserialize($values['roles']); | |
| 568 | 568 | } | 
| 569 | 569 | |
| 570 | 570 | $helper = $this->getPasswordHelper(); | 
| @@ -44,7 +44,7 @@ discard block | ||
| 44 | 44 | */ | 
| 45 | 45 | public function getPostDependencies() | 
| 46 | 46 |  	{ | 
| 47 | - return array( 'TablesCreateFosUser' ); | |
| 47 | +		return array('TablesCreateFosUser'); | |
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | 50 | |
| @@ -53,23 +53,23 @@ discard block | ||
| 53 | 53 | */ | 
| 54 | 54 | public function migrate() | 
| 55 | 55 |  	{ | 
| 56 | - $this->msg( 'Adding indexes from "fos_user"', 0 ); $this->status( '' ); | |
| 56 | +		$this->msg('Adding indexes from "fos_user"', 0); $this->status(''); | |
| 57 | 57 | |
| 58 | - $schema = $this->getSchema( 'db-customer' ); | |
| 58 | +		$schema = $this->getSchema('db-customer'); | |
| 59 | 59 | |
| 60 | - foreach( $this->list as $idx => $stmt ) | |
| 60 | + foreach ($this->list as $idx => $stmt) | |
| 61 | 61 |  		{ | 
| 62 | - $this->msg( sprintf( 'Checking index "%1$s"', $idx ), 0 ); | |
| 62 | +			$this->msg(sprintf('Checking index "%1$s"', $idx), 0); | |
| 63 | 63 | |
| 64 | - if( $schema->tableExists( 'fos_user' ) === true | |
| 65 | - && $schema->indexExists( 'fos_user', $idx ) === false ) | |
| 64 | +			if ($schema->tableExists('fos_user') === true | |
| 65 | +				&& $schema->indexExists('fos_user', $idx) === false) | |
| 66 | 66 |  			{ | 
| 67 | - $this->execute( $stmt ); | |
| 68 | - $this->status( 'done' ); | |
| 67 | + $this->execute($stmt); | |
| 68 | +				$this->status('done'); | |
| 69 | 69 | } | 
| 70 | 70 | else | 
| 71 | 71 |  			{ | 
| 72 | - $this->status( 'OK' ); | |
| 72 | +				$this->status('OK'); | |
| 73 | 73 | } | 
| 74 | 74 | } | 
| 75 | 75 | } | 
| @@ -66,8 +66,7 @@ | ||
| 66 | 66 |  			{ | 
| 67 | 67 | $this->execute( $stmt ); | 
| 68 | 68 | $this->status( 'done' ); | 
| 69 | - } | |
| 70 | - else | |
| 69 | + } else | |
| 71 | 70 |  			{ | 
| 72 | 71 | $this->status( 'OK' ); | 
| 73 | 72 | } | 
| @@ -249,7 +249,7 @@ | ||
| 249 | 249 | * | 
| 250 | 250 | * @param string $manager Name of the sub manager type in lower case | 
| 251 | 251 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 252 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | |
| 252 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. | |
| 253 | 253 | */ | 
| 254 | 254 | public function getSubManager( $manager, $name = null ) | 
| 255 | 255 |  	{ | 
| @@ -26,7 +26,7 @@ discard block | ||
| 26 | 26 | 'label' => 'Customer address ID', | 
| 27 | 27 | 'code' => 'customer.address.id', | 
| 28 | 28 | 'internalcode' => 'fosad."id"', | 
| 29 | - 'internaldeps' => array( 'LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )' ), | |
| 29 | +			'internaldeps' => array('LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )'), | |
| 30 | 30 | 'type' => 'integer', | 
| 31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, | 
| 32 | 32 | 'public' => false, | 
| @@ -223,11 +223,11 @@ discard block | ||
| 223 | 223 | * | 
| 224 | 224 | * @param array $siteids List of IDs for sites whose entries should be deleted | 
| 225 | 225 | */ | 
| 226 | - public function cleanup( array $siteids ) | |
| 226 | + public function cleanup(array $siteids) | |
| 227 | 227 |  	{ | 
| 228 | 228 | $path = 'mshop/customer/manager/address/submanagers'; | 
| 229 | -		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { | |
| 230 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); | |
| 229 | +		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { | |
| 230 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); | |
| 231 | 231 | } | 
| 232 | 232 | } | 
| 233 | 233 | |
| @@ -237,10 +237,10 @@ discard block | ||
| 237 | 237 | * | 
| 238 | 238 | * @param array $ids List of IDs | 
| 239 | 239 | */ | 
| 240 | - public function deleteItems( array $ids ) | |
| 240 | + public function deleteItems(array $ids) | |
| 241 | 241 |  	{ | 
| 242 | 242 | $path = 'mshop/customer/manager/address/fosuser/delete'; | 
| 243 | - $this->deleteItemsBase( $ids, $path, false ); | |
| 243 | + $this->deleteItemsBase($ids, $path, false); | |
| 244 | 244 | } | 
| 245 | 245 | |
| 246 | 246 | |
| @@ -250,11 +250,11 @@ discard block | ||
| 250 | 250 | * @param boolean $withsub Return also attributes of sub-managers if true | 
| 251 | 251 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface | 
| 252 | 252 | */ | 
| 253 | - public function getSearchAttributes( $withsub = true ) | |
| 253 | + public function getSearchAttributes($withsub = true) | |
| 254 | 254 |  	{ | 
| 255 | 255 | $path = 'mshop/customer/manager/address/submanagers'; | 
| 256 | 256 | |
| 257 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); | |
| 257 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); | |
| 258 | 258 | } | 
| 259 | 259 | |
| 260 | 260 | |
| @@ -265,9 +265,9 @@ discard block | ||
| 265 | 265 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 266 | 266 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | 
| 267 | 267 | */ | 
| 268 | - public function getSubManager( $manager, $name = null ) | |
| 268 | + public function getSubManager($manager, $name = null) | |
| 269 | 269 |  	{ | 
| 270 | - return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'FosUser' : $name ) ); | |
| 270 | +		return $this->getSubManagerBase('customer', 'address/' . $manager, ($name === null ? 'FosUser' : $name)); | |
| 271 | 271 | } | 
| 272 | 272 | |
| 273 | 273 | |
| @@ -98,7 +98,7 @@ | ||
| 98 | 98 | /** | 
| 99 | 99 | * Sets the associated user roles | 
| 100 | 100 | * | 
| 101 | - * @param array $roles List of Symfony roles | |
| 101 | + * @param string[] $roles List of Symfony roles | |
| 102 | 102 | */ | 
| 103 | 103 | public function setRoles( array $roles ) | 
| 104 | 104 |  	{ | 
| @@ -32,11 +32,11 @@ discard block | ||
| 32 | 32 | * @param \Aimeos\MShop\Common\Item\Iface[] $refItems List of referenced items | 
| 33 | 33 | * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object | 
| 34 | 34 | */ | 
| 35 | - public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address, | |
| 35 | + public function __construct(\Aimeos\MShop\Common\Item\Address\Iface $address, | |
| 36 | 36 | array $values = [], array $listItems = [], array $refItems = [], $salt = '', | 
| 37 | - \Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [], array $propItems = [] ) | |
| 37 | + \Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [], array $propItems = []) | |
| 38 | 38 |  	{ | 
| 39 | - parent::__construct( $address, $values, $listItems, $refItems, $salt, $helper, $addresses, $propItems, $propItems ); | |
| 39 | + parent::__construct($address, $values, $listItems, $refItems, $salt, $helper, $addresses, $propItems, $propItems); | |
| 40 | 40 | |
| 41 | 41 | $this->values = $values; | 
| 42 | 42 | $this->helper = $helper; | 
| @@ -51,7 +51,7 @@ discard block | ||
| 51 | 51 | */ | 
| 52 | 52 | public function getPassword() | 
| 53 | 53 |  	{ | 
| 54 | -		if( isset( $this->values['customer.password'] ) ) { | |
| 54 | +		if (isset($this->values['customer.password'])) { | |
| 55 | 55 | return (string) $this->values['customer.password']; | 
| 56 | 56 | } | 
| 57 | 57 | |
| @@ -65,12 +65,12 @@ discard block | ||
| 65 | 65 | * @param string $value Password of the customer item | 
| 66 | 66 | * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls | 
| 67 | 67 | */ | 
| 68 | - public function setPassword( $value ) | |
| 68 | + public function setPassword($value) | |
| 69 | 69 |  	{ | 
| 70 | - if( (string) $value !== $this->getPassword() ) | |
| 70 | + if ((string) $value !== $this->getPassword()) | |
| 71 | 71 |  		{ | 
| 72 | -			if( $this->helper !== null ) { | |
| 73 | - $value = $this->helper->encode( $value, $this->getSalt() ); | |
| 72 | +			if ($this->helper !== null) { | |
| 73 | + $value = $this->helper->encode($value, $this->getSalt()); | |
| 74 | 74 | } | 
| 75 | 75 | |
| 76 | 76 | $this->values['customer.password'] = (string) $value; | 
| @@ -88,7 +88,7 @@ discard block | ||
| 88 | 88 | */ | 
| 89 | 89 | public function getRoles() | 
| 90 | 90 |  	{ | 
| 91 | -		if( isset( $this->values['roles'] ) ) { | |
| 91 | +		if (isset($this->values['roles'])) { | |
| 92 | 92 | return (array) $this->values['roles']; | 
| 93 | 93 | } | 
| 94 | 94 | |
| @@ -101,7 +101,7 @@ discard block | ||
| 101 | 101 | * | 
| 102 | 102 | * @param array $roles List of Symfony roles | 
| 103 | 103 | */ | 
| 104 | - public function setRoles( array $roles ) | |
| 104 | + public function setRoles(array $roles) | |
| 105 | 105 |  	{ | 
| 106 | 106 | $this->values['roles'] = $roles; | 
| 107 | 107 | $this->setModified(); | 
| @@ -117,7 +117,7 @@ discard block | ||
| 117 | 117 | */ | 
| 118 | 118 | public function getSalt() | 
| 119 | 119 |  	{ | 
| 120 | -		if( isset( $this->values['salt'] ) ) { | |
| 120 | +		if (isset($this->values['salt'])) { | |
| 121 | 121 | return $this->values['salt']; | 
| 122 | 122 | } | 
| 123 | 123 | |
| @@ -130,9 +130,9 @@ discard block | ||
| 130 | 130 | * | 
| 131 | 131 | * @param string $value Password salt | 
| 132 | 132 | */ | 
| 133 | - public function setSalt( $value ) | |
| 133 | + public function setSalt($value) | |
| 134 | 134 |  	{ | 
| 135 | - if( (string) $value !== $this->getSalt() ) | |
| 135 | + if ((string) $value !== $this->getSalt()) | |
| 136 | 136 |  		{ | 
| 137 | 137 | $this->values['salt'] = (string) $value; | 
| 138 | 138 | $this->setModified(); | 
| @@ -249,7 +249,7 @@ | ||
| 249 | 249 | * | 
| 250 | 250 | * @param string $manager Name of the sub manager type in lower case | 
| 251 | 251 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 252 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | |
| 252 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. | |
| 253 | 253 | */ | 
| 254 | 254 | public function getSubManager( $manager, $name = null ) | 
| 255 | 255 |  	{ | 
| @@ -25,7 +25,7 @@ discard block | ||
| 25 | 25 | 'customer.lists.id'=> array( | 
| 26 | 26 | 'code'=>'customer.lists.id', | 
| 27 | 27 | 'internalcode'=>'fosli."id"', | 
| 28 | - 'internaldeps' => array( 'LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )' ), | |
| 28 | +			'internaldeps' => array('LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )'), | |
| 29 | 29 | 'label'=>'Customer list ID', | 
| 30 | 30 | 'type'=> 'integer', | 
| 31 | 31 | 'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT, | 
| @@ -133,14 +133,14 @@ discard block | ||
| 133 | 133 | * | 
| 134 | 134 | * @param array $siteids List of IDs for sites whose entries should be deleted | 
| 135 | 135 | */ | 
| 136 | - public function cleanup( array $siteids ) | |
| 136 | + public function cleanup(array $siteids) | |
| 137 | 137 |  	{ | 
| 138 | 138 | $path = 'mshop/customer/manager/lists/submanagers'; | 
| 139 | -		foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) { | |
| 140 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); | |
| 139 | +		foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) { | |
| 140 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); | |
| 141 | 141 | } | 
| 142 | 142 | |
| 143 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/fosuser/delete' ); | |
| 143 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/fosuser/delete'); | |
| 144 | 144 | } | 
| 145 | 145 | |
| 146 | 146 | |
| @@ -150,11 +150,11 @@ discard block | ||
| 150 | 150 | * @param boolean $withsub Return also attributes of sub-managers if true | 
| 151 | 151 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface | 
| 152 | 152 | */ | 
| 153 | - public function getSearchAttributes( $withsub = true ) | |
| 153 | + public function getSearchAttributes($withsub = true) | |
| 154 | 154 |  	{ | 
| 155 | 155 | $path = 'mshop/customer/manager/lists/submanagers'; | 
| 156 | 156 | |
| 157 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub ); | |
| 157 | +		return $this->getSearchAttributesBase($this->searchConfig, $path, array('type'), $withsub); | |
| 158 | 158 | } | 
| 159 | 159 | |
| 160 | 160 | |
| @@ -165,9 +165,9 @@ discard block | ||
| 165 | 165 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 166 | 166 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | 
| 167 | 167 | */ | 
| 168 | - public function getSubManager( $manager, $name = null ) | |
| 168 | + public function getSubManager($manager, $name = null) | |
| 169 | 169 |  	{ | 
| 170 | - return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'FosUser' : $name ) ); | |
| 170 | +		return $this->getSubManagerBase('customer', 'lists/' . $manager, ($name === null ? 'FosUser' : $name)); | |
| 171 | 171 | } | 
| 172 | 172 | |
| 173 | 173 | |
| @@ -249,7 +249,7 @@ | ||
| 249 | 249 | * | 
| 250 | 250 | * @param string $manager Name of the sub manager type in lower case | 
| 251 | 251 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 252 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | |
| 252 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. | |
| 253 | 253 | */ | 
| 254 | 254 | public function getSubManager( $manager, $name = null ) | 
| 255 | 255 |  	{ | 
| @@ -25,7 +25,7 @@ discard block | ||
| 25 | 25 | 'customer.lists.type.id' => array( | 
| 26 | 26 | 'code'=>'customer.lists.type.id', | 
| 27 | 27 | 'internalcode'=>'foslity."id"', | 
| 28 | - 'internaldeps'=>array( 'LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )' ), | |
| 28 | +			'internaldeps'=>array('LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )'), | |
| 29 | 29 | 'label'=>'Customer list type ID', | 
| 30 | 30 | 'type'=> 'integer', | 
| 31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, | 
| @@ -96,14 +96,14 @@ discard block | ||
| 96 | 96 | * | 
| 97 | 97 | * @param array $siteids List of IDs for sites whose entries should be deleted | 
| 98 | 98 | */ | 
| 99 | - public function cleanup( array $siteids ) | |
| 99 | + public function cleanup(array $siteids) | |
| 100 | 100 |  	{ | 
| 101 | 101 | $path = 'mshop/customer/manager/lists/type/submanagers'; | 
| 102 | -		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { | |
| 103 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); | |
| 102 | +		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { | |
| 103 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); | |
| 104 | 104 | } | 
| 105 | 105 | |
| 106 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/fosuser/delete' ); | |
| 106 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/type/fosuser/delete'); | |
| 107 | 107 | } | 
| 108 | 108 | |
| 109 | 109 | |
| @@ -113,11 +113,11 @@ discard block | ||
| 113 | 113 | * @param boolean $withsub Return also attributes of sub-managers if true | 
| 114 | 114 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface | 
| 115 | 115 | */ | 
| 116 | - public function getSearchAttributes( $withsub = true ) | |
| 116 | + public function getSearchAttributes($withsub = true) | |
| 117 | 117 |  	{ | 
| 118 | 118 | $path = 'mshop/customer/manager/lists/type/submanagers'; | 
| 119 | 119 | |
| 120 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); | |
| 120 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); | |
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | 123 | |
| @@ -128,9 +128,9 @@ discard block | ||
| 128 | 128 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 129 | 129 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | 
| 130 | 130 | */ | 
| 131 | - public function getSubManager( $manager, $name = null ) | |
| 131 | + public function getSubManager($manager, $name = null) | |
| 132 | 132 |  	{ | 
| 133 | - return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'FosUser' : $name ) ); | |
| 133 | +		return $this->getSubManagerBase('customer', 'lists/type/' . $manager, ($name === null ? 'FosUser' : $name)); | |
| 134 | 134 | } | 
| 135 | 135 | |
| 136 | 136 | |
| @@ -21,7 +21,7 @@ discard block | ||
| 21 | 21 | */ | 
| 22 | 22 | public function getPreDependencies() | 
| 23 | 23 |  	{ | 
| 24 | - return array( 'TablesCreateFosUser' ); | |
| 24 | +		return array('TablesCreateFosUser'); | |
| 25 | 25 | } | 
| 26 | 26 | |
| 27 | 27 | |
| @@ -31,38 +31,38 @@ discard block | ||
| 31 | 31 | public function migrate() | 
| 32 | 32 |  	{ | 
| 33 | 33 | $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface'; | 
| 34 | -		if( !( $this->additional instanceof $iface ) ) { | |
| 35 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) ); | |
| 34 | +		if (!($this->additional instanceof $iface)) { | |
| 35 | +			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface)); | |
| 36 | 36 | } | 
| 37 | 37 | |
| 38 | - $this->msg( 'Adding Fos user bundle customer test data', 0 ); | |
| 38 | +		$this->msg('Adding Fos user bundle customer test data', 0); | |
| 39 | 39 | |
| 40 | 40 | $parentIds = []; | 
| 41 | 41 | $ds = DIRECTORY_SEPARATOR; | 
| 42 | - $this->additional->setEditor( 'ai-fosuser:unittest' ); | |
| 42 | +		$this->additional->setEditor('ai-fosuser:unittest'); | |
| 43 | 43 | $path = __DIR__ . $ds . 'data' . $ds . 'customer.php'; | 
| 44 | 44 | |
| 45 | -		if( ( $testdata = include( $path ) ) === false ){ | |
| 46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) ); | |
| 45 | +		if (($testdata = include($path)) === false) { | |
| 46 | +			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path)); | |
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | 49 | |
| 50 | - $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'FosUser' ); | |
| 51 | - $customerAddressManager = $customerManager->getSubManager( 'address', 'FosUser' ); | |
| 50 | + $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'FosUser'); | |
| 51 | +		$customerAddressManager = $customerManager->getSubManager('address', 'FosUser'); | |
| 52 | 52 | |
| 53 | 53 | $search = $customerManager->createSearch(); | 
| 54 | - $search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) ); | |
| 55 | - $items = $customerManager->searchItems( $search ); | |
| 54 | +		$search->setConditions($search->compare('==', 'customer.code', array('UTC001', 'UTC002', 'UTC003'))); | |
| 55 | + $items = $customerManager->searchItems($search); | |
| 56 | 56 | |
| 57 | 57 | $this->conn->begin(); | 
| 58 | 58 | |
| 59 | - $customerManager->deleteItems( array_keys( $items ) ); | |
| 60 | - $parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() ); | |
| 61 | - $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds ); | |
| 59 | + $customerManager->deleteItems(array_keys($items)); | |
| 60 | + $parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem()); | |
| 61 | + $this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds); | |
| 62 | 62 | |
| 63 | 63 | $this->conn->commit(); | 
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $this->status( 'done' ); | |
| 66 | +		$this->status('done'); | |
| 67 | 67 | } | 
| 68 | 68 | } | 
| @@ -22,7 +22,7 @@ discard block | ||
| 22 | 22 | */ | 
| 23 | 23 | public function getPreDependencies() | 
| 24 | 24 |  	{ | 
| 25 | - return array( 'TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData' ); | |
| 25 | +		return array('TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData'); | |
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | 28 | |
| @@ -32,29 +32,29 @@ discard block | ||
| 32 | 32 | public function migrate() | 
| 33 | 33 |  	{ | 
| 34 | 34 | $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface'; | 
| 35 | -		if( !( $this->additional instanceof $iface ) ) { | |
| 36 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) ); | |
| 35 | +		if (!($this->additional instanceof $iface)) { | |
| 36 | +			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface)); | |
| 37 | 37 | } | 
| 38 | 38 | |
| 39 | - $this->msg( 'Adding customer-list Fos user bundle test data', 0 ); | |
| 40 | - $this->additional->setEditor( 'ai-fosuser:unittest' ); | |
| 39 | +		$this->msg('Adding customer-list Fos user bundle test data', 0); | |
| 40 | +		$this->additional->setEditor('ai-fosuser:unittest'); | |
| 41 | 41 | |
| 42 | 42 | $ds = DIRECTORY_SEPARATOR; | 
| 43 | - $path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php'; | |
| 43 | + $path = dirname(__FILE__) . $ds . 'data' . $ds . 'customer-list.php'; | |
| 44 | 44 | |
| 45 | -		if( ( $testdata = include( $path ) ) === false ){ | |
| 46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) ); | |
| 45 | +		if (($testdata = include($path)) === false) { | |
| 46 | +			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path)); | |
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | 49 | $refKeys = []; | 
| 50 | -		foreach( $testdata['customer/lists'] as $dataset ) { | |
| 51 | - $refKeys[ $dataset['domain'] ][] = $dataset['refid']; | |
| 50 | +		foreach ($testdata['customer/lists'] as $dataset) { | |
| 51 | + $refKeys[$dataset['domain']][] = $dataset['refid']; | |
| 52 | 52 | } | 
| 53 | 53 | |
| 54 | 54 | $refIds = []; | 
| 55 | - $refIds['text'] = $this->getTextData( $refKeys['text'] ); | |
| 56 | - $this->addCustomerListData( $testdata, $refIds, 'FosUser' ); | |
| 55 | + $refIds['text'] = $this->getTextData($refKeys['text']); | |
| 56 | + $this->addCustomerListData($testdata, $refIds, 'FosUser'); | |
| 57 | 57 | |
| 58 | - $this->status( 'done' ); | |
| 58 | +		$this->status('done'); | |
| 59 | 59 | } | 
| 60 | 60 | } |