| @@ -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,13 +241,13 @@ discard block | ||
| 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 | 247 | $default = ['address', 'group', 'lists', 'property']; | 
| 248 | 248 | |
| 249 | -		foreach( $this->getContext()->getConfig()->get( $path, $default ) as $domain ) { | |
| 250 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); | |
| 249 | +		foreach ($this->getContext()->getConfig()->get($path, $default) as $domain) { | |
| 250 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); | |
| 251 | 251 | } | 
| 252 | 252 | } | 
| 253 | 253 | |
| @@ -257,10 +257,10 @@ discard block | ||
| 257 | 257 | * | 
| 258 | 258 | * @param array $ids List of IDs | 
| 259 | 259 | */ | 
| 260 | - public function deleteItems( array $ids ) | |
| 260 | + public function deleteItems(array $ids) | |
| 261 | 261 |  	{ | 
| 262 | 262 | $path = 'mshop/customer/manager/fosuser/delete'; | 
| 263 | - $this->deleteItemsBase( $ids, $path, false ); | |
| 263 | + $this->deleteItemsBase($ids, $path, false); | |
| 264 | 264 | } | 
| 265 | 265 | |
| 266 | 266 | |
| @@ -270,12 +270,12 @@ discard block | ||
| 270 | 270 | * @param boolean $withsub Return also attributes of sub-managers if true | 
| 271 | 271 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface | 
| 272 | 272 | */ | 
| 273 | - public function getSearchAttributes( $withsub = true ) | |
| 273 | + public function getSearchAttributes($withsub = true) | |
| 274 | 274 |  	{ | 
| 275 | 275 | $path = 'mshop/customer/manager/submanagers'; | 
| 276 | 276 | $default = ['address', 'group', 'lists', 'property']; | 
| 277 | 277 | |
| 278 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, $default, $withsub ); | |
| 278 | + return $this->getSearchAttributesBase($this->searchConfig, $path, $default, $withsub); | |
| 279 | 279 | } | 
| 280 | 280 | |
| 281 | 281 | |
| @@ -286,29 +286,29 @@ discard block | ||
| 286 | 286 | * @param boolean $fetch True if the new ID should be returned in the item | 
| 287 | 287 | * @return \Aimeos\MShop\Common\Item\Iface $item Updated item including the generated ID | 
| 288 | 288 | */ | 
| 289 | - public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) | |
| 289 | + public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true) | |
| 290 | 290 |  	{ | 
| 291 | - self::checkClass( '\\Aimeos\\MShop\\Customer\\Item\\FosUser', $item ); | |
| 291 | +		self::checkClass('\\Aimeos\\MShop\\Customer\\Item\\FosUser', $item); | |
| 292 | 292 | |
| 293 | - if( !$item->isModified() ) | |
| 293 | + if (!$item->isModified()) | |
| 294 | 294 |  		{ | 
| 295 | - $item = $this->savePropertyItems( $item, 'customer' ); | |
| 296 | - $item = $this->saveAddressItems( $item, 'customer' ); | |
| 297 | - return $this->saveListItems( $item, 'customer' ); | |
| 295 | + $item = $this->savePropertyItems($item, 'customer'); | |
| 296 | + $item = $this->saveAddressItems($item, 'customer'); | |
| 297 | + return $this->saveListItems($item, 'customer'); | |
| 298 | 298 | } | 
| 299 | 299 | |
| 300 | 300 | $context = $this->getContext(); | 
| 301 | 301 | $dbm = $context->getDatabaseManager(); | 
| 302 | 302 | $dbname = $this->getResourceName(); | 
| 303 | - $conn = $dbm->acquire( $dbname ); | |
| 303 | + $conn = $dbm->acquire($dbname); | |
| 304 | 304 | |
| 305 | 305 | try | 
| 306 | 306 |  		{ | 
| 307 | 307 | $id = $item->getId(); | 
| 308 | - $date = date( 'Y-m-d H:i:s' ); | |
| 308 | +			$date = date('Y-m-d H:i:s'); | |
| 309 | 309 | $billingAddress = $item->getPaymentAddress(); | 
| 310 | 310 | |
| 311 | - if( $id === null ) | |
| 311 | + if ($id === null) | |
| 312 | 312 |  			{ | 
| 313 | 313 | /** mshop/customer/manager/fosuser/insert | 
| 314 | 314 | * Inserts a new customer record into the database table | 
| @@ -372,51 +372,51 @@ discard block | ||
| 372 | 372 | $path = 'mshop/customer/manager/fosuser/update'; | 
| 373 | 373 | } | 
| 374 | 374 | |
| 375 | - $stmt = $this->getCachedStatement( $conn, $path ); | |
| 376 | - | |
| 377 | - $stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); | |
| 378 | - $stmt->bind( 2, $item->getCode() ); // canonical username | |
| 379 | - $stmt->bind( 3, $item->getCode() ); // username | |
| 380 | - $stmt->bind( 4, $billingAddress->getCompany() ); | |
| 381 | - $stmt->bind( 5, $billingAddress->getVatID() ); | |
| 382 | - $stmt->bind( 6, $billingAddress->getSalutation() ); | |
| 383 | - $stmt->bind( 7, $billingAddress->getTitle() ); | |
| 384 | - $stmt->bind( 8, $billingAddress->getFirstname() ); | |
| 385 | - $stmt->bind( 9, $billingAddress->getLastname() ); | |
| 386 | - $stmt->bind( 10, $billingAddress->getAddress1() ); | |
| 387 | - $stmt->bind( 11, $billingAddress->getAddress2() ); | |
| 388 | - $stmt->bind( 12, $billingAddress->getAddress3() ); | |
| 389 | - $stmt->bind( 13, $billingAddress->getPostal() ); | |
| 390 | - $stmt->bind( 14, $billingAddress->getCity() ); | |
| 391 | - $stmt->bind( 15, $billingAddress->getState() ); | |
| 392 | - $stmt->bind( 16, $billingAddress->getCountryId() ); | |
| 393 | - $stmt->bind( 17, $billingAddress->getLanguageId() ); | |
| 394 | - $stmt->bind( 18, $billingAddress->getTelephone() ); | |
| 395 | - $stmt->bind( 19, $billingAddress->getEmail() ); | |
| 396 | - $stmt->bind( 20, $billingAddress->getEmail() ); | |
| 397 | - $stmt->bind( 21, $billingAddress->getTelefax() ); | |
| 398 | - $stmt->bind( 22, $billingAddress->getWebsite() ); | |
| 399 | - $stmt->bind( 23, $billingAddress->getLongitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT ); | |
| 400 | - $stmt->bind( 24, $billingAddress->getLatitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT ); | |
| 401 | - $stmt->bind( 25, $item->getBirthday() ); | |
| 402 | - $stmt->bind( 26, ( $item->getStatus() > 0 ? true : false ), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL ); | |
| 403 | - $stmt->bind( 27, $item->getDateVerified() ); | |
| 404 | - $stmt->bind( 28, $item->getPassword() ); | |
| 405 | - $stmt->bind( 29, $date ); // Modification time | |
| 406 | - $stmt->bind( 30, $context->getEditor() ); | |
| 407 | - $stmt->bind( 31, serialize( $item->getRoles() ) ); | |
| 408 | - $stmt->bind( 32, $item->getSalt() ); | |
| 409 | - | |
| 410 | -			if( $id !== null ) { | |
| 411 | - $stmt->bind( 33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); | |
| 412 | - $item->setId( $id ); | |
| 375 | + $stmt = $this->getCachedStatement($conn, $path); | |
| 376 | + | |
| 377 | + $stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); | |
| 378 | + $stmt->bind(2, $item->getCode()); // canonical username | |
| 379 | + $stmt->bind(3, $item->getCode()); // username | |
| 380 | + $stmt->bind(4, $billingAddress->getCompany()); | |
| 381 | + $stmt->bind(5, $billingAddress->getVatID()); | |
| 382 | + $stmt->bind(6, $billingAddress->getSalutation()); | |
| 383 | + $stmt->bind(7, $billingAddress->getTitle()); | |
| 384 | + $stmt->bind(8, $billingAddress->getFirstname()); | |
| 385 | + $stmt->bind(9, $billingAddress->getLastname()); | |
| 386 | + $stmt->bind(10, $billingAddress->getAddress1()); | |
| 387 | + $stmt->bind(11, $billingAddress->getAddress2()); | |
| 388 | + $stmt->bind(12, $billingAddress->getAddress3()); | |
| 389 | + $stmt->bind(13, $billingAddress->getPostal()); | |
| 390 | + $stmt->bind(14, $billingAddress->getCity()); | |
| 391 | + $stmt->bind(15, $billingAddress->getState()); | |
| 392 | + $stmt->bind(16, $billingAddress->getCountryId()); | |
| 393 | + $stmt->bind(17, $billingAddress->getLanguageId()); | |
| 394 | + $stmt->bind(18, $billingAddress->getTelephone()); | |
| 395 | + $stmt->bind(19, $billingAddress->getEmail()); | |
| 396 | + $stmt->bind(20, $billingAddress->getEmail()); | |
| 397 | + $stmt->bind(21, $billingAddress->getTelefax()); | |
| 398 | + $stmt->bind(22, $billingAddress->getWebsite()); | |
| 399 | + $stmt->bind(23, $billingAddress->getLongitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT); | |
| 400 | + $stmt->bind(24, $billingAddress->getLatitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT); | |
| 401 | + $stmt->bind(25, $item->getBirthday()); | |
| 402 | + $stmt->bind(26, ($item->getStatus() > 0 ? true : false), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL); | |
| 403 | + $stmt->bind(27, $item->getDateVerified()); | |
| 404 | + $stmt->bind(28, $item->getPassword()); | |
| 405 | + $stmt->bind(29, $date); // Modification time | |
| 406 | + $stmt->bind(30, $context->getEditor()); | |
| 407 | + $stmt->bind(31, serialize($item->getRoles())); | |
| 408 | + $stmt->bind(32, $item->getSalt()); | |
| 409 | + | |
| 410 | +			if ($id !== null) { | |
| 411 | + $stmt->bind(33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT); | |
| 412 | + $item->setId($id); | |
| 413 | 413 |  			} else { | 
| 414 | - $stmt->bind( 33, $date ); // Creation time | |
| 414 | + $stmt->bind(33, $date); // Creation time | |
| 415 | 415 | } | 
| 416 | 416 | |
| 417 | 417 | $stmt->execute()->finish(); | 
| 418 | 418 | |
| 419 | - if( $id === null && $fetch === true ) | |
| 419 | + if ($id === null && $fetch === true) | |
| 420 | 420 |  			{ | 
| 421 | 421 | /** mshop/customer/manager/fosuser/newid | 
| 422 | 422 | * Retrieves the ID generated by the database when inserting a new record | 
| @@ -449,22 +449,22 @@ discard block | ||
| 449 | 449 | * @see mshop/customer/manager/fosuser/count | 
| 450 | 450 | */ | 
| 451 | 451 | $path = 'mshop/customer/manager/fosuser/newid'; | 
| 452 | - $item->setId( $this->newId( $conn, $path ) ); | |
| 452 | + $item->setId($this->newId($conn, $path)); | |
| 453 | 453 | } | 
| 454 | 454 | |
| 455 | - $dbm->release( $conn, $dbname ); | |
| 455 | + $dbm->release($conn, $dbname); | |
| 456 | 456 | } | 
| 457 | - catch( \Exception $e ) | |
| 457 | + catch (\Exception $e) | |
| 458 | 458 |  		{ | 
| 459 | - $dbm->release( $conn, $dbname ); | |
| 459 | + $dbm->release($conn, $dbname); | |
| 460 | 460 | throw $e; | 
| 461 | 461 | } | 
| 462 | 462 | |
| 463 | - $this->addGroups( $item ); | |
| 463 | + $this->addGroups($item); | |
| 464 | 464 | |
| 465 | - $item = $this->savePropertyItems( $item, 'customer' ); | |
| 466 | - $item = $this->saveAddressItems( $item, 'customer' ); | |
| 467 | - return $this->saveListItems( $item, 'customer' ); | |
| 465 | + $item = $this->savePropertyItems($item, 'customer'); | |
| 466 | + $item = $this->saveAddressItems($item, 'customer'); | |
| 467 | + return $this->saveListItems($item, 'customer'); | |
| 468 | 468 | } | 
| 469 | 469 | |
| 470 | 470 | |
| @@ -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,32 +488,32 @@ 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( 'customer/address', $ref, true ) ) { | |
| 508 | - $addrItems = $this->getAddressItems( array_keys( $map ), 'customer' ); | |
| 507 | +		if (in_array('customer/address', $ref, true)) { | |
| 508 | + $addrItems = $this->getAddressItems(array_keys($map), 'customer'); | |
| 509 | 509 | } | 
| 510 | 510 | |
| 511 | 511 | $propItems = []; | 
| 512 | -		if( in_array( 'customer/property', $ref, true ) ) { | |
| 513 | - $propItems = $this->getPropertyItems( array_keys( $map ), 'customer' ); | |
| 512 | +		if (in_array('customer/property', $ref, true)) { | |
| 513 | + $propItems = $this->getPropertyItems(array_keys($map), 'customer'); | |
| 514 | 514 | } | 
| 515 | 515 | |
| 516 | - return $this->buildItems( $map, $ref, 'customer', $addrItems, $propItems ); | |
| 516 | + return $this->buildItems($map, $ref, 'customer', $addrItems, $propItems); | |
| 517 | 517 | } | 
| 518 | 518 | |
| 519 | 519 | |
| @@ -524,9 +524,9 @@ discard block | ||
| 524 | 524 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null | 
| 525 | 525 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. | 
| 526 | 526 | */ | 
| 527 | - public function getSubManager( $manager, $name = null ) | |
| 527 | + public function getSubManager($manager, $name = null) | |
| 528 | 528 |  	{ | 
| 529 | - return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'FosUser' : $name ) ); | |
| 529 | +		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'FosUser' : $name)); | |
| 530 | 530 | } | 
| 531 | 531 | |
| 532 | 532 | |
| @@ -540,15 +540,15 @@ discard block | ||
| 540 | 540 | * @param array $propItems List of property items of the customer item | 
| 541 | 541 | * @return \Aimeos\MShop\Customer\Item\Iface New customer item | 
| 542 | 542 | */ | 
| 543 | - protected function createItemBase( array $values = [], array $listItems = [], array $refItems = [], | |
| 544 | - array $addresses = [], array $propItems = [] ) | |
| 543 | + protected function createItemBase(array $values = [], array $listItems = [], array $refItems = [], | |
| 544 | + array $addresses = [], array $propItems = []) | |
| 545 | 545 |  	{ | 
| 546 | -		if( isset( $values['roles'] ) ) { | |
| 547 | - $values['roles'] = unserialize( $values['roles'] ); | |
| 546 | +		if (isset($values['roles'])) { | |
| 547 | + $values['roles'] = unserialize($values['roles']); | |
| 548 | 548 | } | 
| 549 | 549 | |
| 550 | 550 | $helper = $this->getPasswordHelper(); | 
| 551 | - $address = new \Aimeos\MShop\Common\Item\Address\Simple( 'customer.', $values ); | |
| 551 | +		$address = new \Aimeos\MShop\Common\Item\Address\Simple('customer.', $values); | |
| 552 | 552 | |
| 553 | 553 | return new \Aimeos\MShop\Customer\Item\FosUser( | 
| 554 | 554 | $address, $values, $listItems, $refItems, | 
| @@ -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 | } | 
| @@ -18,14 +18,14 @@ discard block | ||
| 18 | 18 | |
| 19 | 19 | $includepaths = $aimeos->getIncludePaths(); | 
| 20 | 20 | $includepaths[] = get_include_path(); | 
| 21 | - set_include_path( implode( PATH_SEPARATOR, $includepaths ) ); | |
| 21 | + set_include_path(implode(PATH_SEPARATOR, $includepaths)); | |
| 22 | 22 | } | 
| 23 | 23 | |
| 24 | 24 | |
| 25 | - public static function getContext( $site = 'unittest' ) | |
| 25 | + public static function getContext($site = 'unittest') | |
| 26 | 26 |  	{ | 
| 27 | -		if( !isset( self::$context[$site] ) ) { | |
| 28 | - self::$context[$site] = self::createContext( $site ); | |
| 27 | +		if (!isset(self::$context[$site])) { | |
| 28 | + self::$context[$site] = self::createContext($site); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | return clone self::$context[$site]; | 
| @@ -34,13 +34,13 @@ discard block | ||
| 34 | 34 | |
| 35 | 35 | private static function getAimeos() | 
| 36 | 36 |  	{ | 
| 37 | - if( !isset( self::$aimeos ) ) | |
| 37 | + if (!isset(self::$aimeos)) | |
| 38 | 38 |  		{ | 
| 39 | 39 | require_once 'Bootstrap.php'; | 
| 40 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); | |
| 40 | +			spl_autoload_register('Aimeos\\Bootstrap::autoload'); | |
| 41 | 41 | |
| 42 | - $extdir = dirname( dirname( dirname( __DIR__ ) ) ); | |
| 43 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); | |
| 42 | + $extdir = dirname(dirname(dirname(__DIR__))); | |
| 43 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); | |
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 | return self::$aimeos; | 
| @@ -50,45 +50,45 @@ discard block | ||
| 50 | 50 | /** | 
| 51 | 51 | * @param string $site | 
| 52 | 52 | */ | 
| 53 | - private static function createContext( $site ) | |
| 53 | + private static function createContext($site) | |
| 54 | 54 |  	{ | 
| 55 | 55 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); | 
| 56 | 56 | $aimeos = self::getAimeos(); | 
| 57 | 57 | |
| 58 | 58 | |
| 59 | - $paths = $aimeos->getConfigPaths( 'mysql' ); | |
| 59 | +		$paths = $aimeos->getConfigPaths('mysql'); | |
| 60 | 60 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; | 
| 61 | 61 | |
| 62 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); | |
| 63 | - $ctx->setConfig( $conf ); | |
| 62 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); | |
| 63 | + $ctx->setConfig($conf); | |
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); | |
| 67 | - $ctx->setDatabaseManager( $dbm ); | |
| 66 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); | |
| 67 | + $ctx->setDatabaseManager($dbm); | |
| 68 | 68 | |
| 69 | 69 | |
| 70 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); | |
| 71 | - $ctx->setLogger( $logger ); | |
| 70 | + $logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG); | |
| 71 | + $ctx->setLogger($logger); | |
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | $cache = new \Aimeos\MW\Cache\None(); | 
| 75 | - $ctx->setCache( $cache ); | |
| 75 | + $ctx->setCache($cache); | |
| 76 | 76 | |
| 77 | 77 | |
| 78 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); | |
| 79 | - $ctx->setI18n( array( 'de' => $i18n ) ); | |
| 78 | +		$i18n = new \Aimeos\MW\Translation\None('de'); | |
| 79 | +		$ctx->setI18n(array('de' => $i18n)); | |
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | $session = new \Aimeos\MW\Session\None(); | 
| 83 | - $ctx->setSession( $session ); | |
| 83 | + $ctx->setSession($session); | |
| 84 | 84 | |
| 85 | 85 | |
| 86 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); | |
| 87 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); | |
| 86 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); | |
| 87 | + $localeItem = $localeManager->bootstrap($site, '', '', false); | |
| 88 | 88 | |
| 89 | - $ctx->setLocale( $localeItem ); | |
| 89 | + $ctx->setLocale($localeItem); | |
| 90 | 90 | |
| 91 | - $ctx->setEditor( 'ai-fosuser:unittest' ); | |
| 91 | +		$ctx->setEditor('ai-fosuser:unittest'); | |
| 92 | 92 | |
| 93 | 93 | return $ctx; | 
| 94 | 94 | } | 
| @@ -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 | |
| @@ -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 | |
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 | */ | 
| 41 | 41 | public function getPostDependencies() | 
| 42 | 42 |  	{ | 
| 43 | - return array( 'TablesCreateFosUser' ); | |
| 43 | +		return array('TablesCreateFosUser'); | |
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 | |
| @@ -49,7 +49,7 @@ discard block | ||
| 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 | ||
| 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 = 'fos_user_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 | } | 
| @@ -5,12 +5,12 @@ | ||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2018 | 
| 6 | 6 | */ | 
| 7 | 7 | |
| 8 | -return array ( | |
| 8 | +return array( | |
| 9 | 9 | 'customer/property/type' => array( | 
| 10 | - 'customer/property/type/newsletter' => array( 'domain' => 'customer', 'code' => 'newsletter', 'label' => 'Newsletter', 'status' => 1 ), | |
| 10 | +		'customer/property/type/newsletter' => array('domain' => 'customer', 'code' => 'newsletter', 'label' => 'Newsletter', 'status' => 1), | |
| 11 | 11 | ), | 
| 12 | 12 | |
| 13 | 13 | 'customer/property' => array( | 
| 14 | - 'customer/property/UTC001/newsletter' => array( 'parentid' => 'customer/UTC001', 'typeid' => 'customer/property/type/newsletter', 'langid' => null, 'value' => '1' ), | |
| 14 | +		'customer/property/UTC001/newsletter' => array('parentid' => 'customer/UTC001', 'typeid' => 'customer/property/type/newsletter', 'langid' => null, 'value' => '1'), | |
| 15 | 15 | ), | 
| 16 | 16 | ); | 
| 17 | 17 | \ No newline at end of file | 
| @@ -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(); |