@@ -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'; |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | 'customer.address.position' => 1, |
| 31 | 31 | ); |
| 32 | 32 | |
| 33 | - $address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.', $addressValues ); |
|
| 33 | + $address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.', $addressValues); |
|
| 34 | 34 | |
| 35 | 35 | $values = array( |
| 36 | 36 | 'customer.id' => 541, |
@@ -62,10 +62,10 @@ discard block |
||
| 62 | 62 | 'customer.mtime'=> '2010-01-05 00:00:05', |
| 63 | 63 | 'customer.ctime'=> '2010-01-01 00:00:00', |
| 64 | 64 | 'customer.editor' => 'unitTestUser', |
| 65 | - 'roles' => array( 'ROLE_ADMIN' ), |
|
| 65 | + 'roles' => array('ROLE_ADMIN'), |
|
| 66 | 66 | ); |
| 67 | 67 | |
| 68 | - $this->object = new \Aimeos\MShop\Customer\Item\FosUser( $address, $values, array(), array(), 'mshop', null ); |
|
| 68 | + $this->object = new \Aimeos\MShop\Customer\Item\FosUser($address, $values, array(), array(), 'mshop', null); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -76,23 +76,23 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | protected function tearDown() |
| 78 | 78 | { |
| 79 | - unset( $this->object ); |
|
| 79 | + unset($this->object); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public function testGetRoles() |
| 83 | 83 | { |
| 84 | - $this->assertEquals( array( 'ROLE_ADMIN' ), $this->object->getRoles() ); |
|
| 84 | + $this->assertEquals(array('ROLE_ADMIN'), $this->object->getRoles()); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | public function testSetRoles() |
| 88 | 88 | { |
| 89 | - $this->object->setRoles( array( 'ROLE_USER' ) ); |
|
| 90 | - $this->assertTrue( $this->object->isModified() ); |
|
| 91 | - $this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() ); |
|
| 89 | + $this->object->setRoles(array('ROLE_USER')); |
|
| 90 | + $this->assertTrue($this->object->isModified()); |
|
| 91 | + $this->assertEquals(array('ROLE_USER'), $this->object->getRoles()); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | public function testIsModified() |
| 95 | 95 | { |
| 96 | - $this->assertFalse( $this->object->isModified() ); |
|
| 96 | + $this->assertFalse($this->object->isModified()); |
|
| 97 | 97 | } |
| 98 | 98 | } |
@@ -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( array(), $paths ); |
|
| 63 | - $ctx->setConfig( $conf ); |
|
| 62 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $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 | } |
@@ -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, |
@@ -209,11 +209,11 @@ discard block |
||
| 209 | 209 | * |
| 210 | 210 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 211 | 211 | */ |
| 212 | - public function cleanup( array $siteids ) |
|
| 212 | + public function cleanup(array $siteids) |
|
| 213 | 213 | { |
| 214 | 214 | $path = 'mshop/customer/manager/address/submanagers'; |
| 215 | - foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) { |
|
| 216 | - $this->getSubManager( $domain )->cleanup( $siteids ); |
|
| 215 | + foreach ($this->getContext()->getConfig()->get($path, array()) as $domain) { |
|
| 216 | + $this->getSubManager($domain)->cleanup($siteids); |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
@@ -223,10 +223,10 @@ discard block |
||
| 223 | 223 | * |
| 224 | 224 | * @param array $ids List of IDs |
| 225 | 225 | */ |
| 226 | - public function deleteItems( array $ids ) |
|
| 226 | + public function deleteItems(array $ids) |
|
| 227 | 227 | { |
| 228 | 228 | $path = 'mshop/customer/manager/address/fosuser/delete'; |
| 229 | - $this->deleteItemsBase( $ids, $path, false ); |
|
| 229 | + $this->deleteItemsBase($ids, $path, false); |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | |
@@ -236,11 +236,11 @@ discard block |
||
| 236 | 236 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 237 | 237 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 238 | 238 | */ |
| 239 | - public function getSearchAttributes( $withsub = true ) |
|
| 239 | + public function getSearchAttributes($withsub = true) |
|
| 240 | 240 | { |
| 241 | 241 | $path = 'mshop/customer/manager/address/submanagers'; |
| 242 | 242 | |
| 243 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub ); |
|
| 243 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array(), $withsub); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | |
@@ -251,9 +251,9 @@ discard block |
||
| 251 | 251 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 252 | 252 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 253 | 253 | */ |
| 254 | - public function getSubManager( $manager, $name = null ) |
|
| 254 | + public function getSubManager($manager, $name = null) |
|
| 255 | 255 | { |
| 256 | - return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'FosUser' : $name ) ); |
|
| 256 | + return $this->getSubManagerBase('customer', 'address/' . $manager, ($name === null ? 'FosUser' : $name)); |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | |
@@ -126,7 +126,7 @@ |
||
| 126 | 126 | * |
| 127 | 127 | * @param string $manager Name of the sub manager type in lower case |
| 128 | 128 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 129 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 129 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 130 | 130 | */ |
| 131 | 131 | public function getSubManager( $manager, $name = null ) |
| 132 | 132 | { |
@@ -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; |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | /** |
| 227 | 227 | * Removes old entries from the storage. |
| 228 | 228 | * |
| 229 | - * @param array $siteids List of IDs for sites whose entries should be deleted |
|
| 229 | + * @param integer[] $siteids List of IDs for sites whose entries should be deleted |
|
| 230 | 230 | */ |
| 231 | 231 | public function cleanup( array $siteids ) |
| 232 | 232 | { |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | * |
| 495 | 495 | * @param string $manager Name of the sub manager type in lower case |
| 496 | 496 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 497 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 497 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 498 | 498 | */ |
| 499 | 499 | public function getSubManager( $manager, $name = null ) |
| 500 | 500 | { |
@@ -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->getSubManager( $domain )->cleanup( $siteids ); |
|
| 248 | + foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) { |
|
| 249 | + $this->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 | |
@@ -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\\Iface'; |
| 300 | - if( !( $item instanceof $iface ) ) { |
|
| 301 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) ); |
|
| 300 | + if (!($item instanceof $iface)) { |
|
| 301 | + throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface)); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | - if( !$item->isModified() ) { 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,49 +378,49 @@ 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, $item->getCode() ); // canonical username |
|
| 384 | - $stmt->bind( 2, $item->getCode() ); // username |
|
| 385 | - $stmt->bind( 3, $billingAddress->getCompany() ); |
|
| 386 | - $stmt->bind( 4, $billingAddress->getVatID() ); |
|
| 387 | - $stmt->bind( 5, $billingAddress->getSalutation() ); |
|
| 388 | - $stmt->bind( 6, $billingAddress->getTitle() ); |
|
| 389 | - $stmt->bind( 7, $billingAddress->getFirstname() ); |
|
| 390 | - $stmt->bind( 8, $billingAddress->getLastname() ); |
|
| 391 | - $stmt->bind( 9, $billingAddress->getAddress1() ); |
|
| 392 | - $stmt->bind( 10, $billingAddress->getAddress2() ); |
|
| 393 | - $stmt->bind( 11, $billingAddress->getAddress3() ); |
|
| 394 | - $stmt->bind( 12, $billingAddress->getPostal() ); |
|
| 395 | - $stmt->bind( 13, $billingAddress->getCity() ); |
|
| 396 | - $stmt->bind( 14, $billingAddress->getState() ); |
|
| 397 | - $stmt->bind( 15, $billingAddress->getCountryId() ); |
|
| 398 | - $stmt->bind( 16, $billingAddress->getLanguageId() ); |
|
| 399 | - $stmt->bind( 17, $billingAddress->getTelephone() ); |
|
| 400 | - $stmt->bind( 18, $billingAddress->getEmail() ); |
|
| 401 | - $stmt->bind( 19, $billingAddress->getEmail() ); |
|
| 402 | - $stmt->bind( 20, $billingAddress->getTelefax() ); |
|
| 403 | - $stmt->bind( 21, $billingAddress->getWebsite() ); |
|
| 404 | - $stmt->bind( 22, $billingAddress->getLongitude() ); |
|
| 405 | - $stmt->bind( 23, $billingAddress->getLatitude() ); |
|
| 406 | - $stmt->bind( 24, $item->getBirthday() ); |
|
| 407 | - $stmt->bind( 25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
| 408 | - $stmt->bind( 26, $item->getDateVerified() ); |
|
| 409 | - $stmt->bind( 27, $item->getPassword() ); |
|
| 410 | - $stmt->bind( 28, $date ); // Modification time |
|
| 411 | - $stmt->bind( 29, $context->getEditor() ); |
|
| 412 | - $stmt->bind( 30, serialize( $item->getRoles() ) ); |
|
| 413 | - |
|
| 414 | - if( $id !== null ) { |
|
| 415 | - $stmt->bind( 31, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
| 416 | - $item->setId( $id ); |
|
| 381 | + $stmt = $this->getCachedStatement($conn, $path); |
|
| 382 | + |
|
| 383 | + $stmt->bind(1, $item->getCode()); // canonical username |
|
| 384 | + $stmt->bind(2, $item->getCode()); // username |
|
| 385 | + $stmt->bind(3, $billingAddress->getCompany()); |
|
| 386 | + $stmt->bind(4, $billingAddress->getVatID()); |
|
| 387 | + $stmt->bind(5, $billingAddress->getSalutation()); |
|
| 388 | + $stmt->bind(6, $billingAddress->getTitle()); |
|
| 389 | + $stmt->bind(7, $billingAddress->getFirstname()); |
|
| 390 | + $stmt->bind(8, $billingAddress->getLastname()); |
|
| 391 | + $stmt->bind(9, $billingAddress->getAddress1()); |
|
| 392 | + $stmt->bind(10, $billingAddress->getAddress2()); |
|
| 393 | + $stmt->bind(11, $billingAddress->getAddress3()); |
|
| 394 | + $stmt->bind(12, $billingAddress->getPostal()); |
|
| 395 | + $stmt->bind(13, $billingAddress->getCity()); |
|
| 396 | + $stmt->bind(14, $billingAddress->getState()); |
|
| 397 | + $stmt->bind(15, $billingAddress->getCountryId()); |
|
| 398 | + $stmt->bind(16, $billingAddress->getLanguageId()); |
|
| 399 | + $stmt->bind(17, $billingAddress->getTelephone()); |
|
| 400 | + $stmt->bind(18, $billingAddress->getEmail()); |
|
| 401 | + $stmt->bind(19, $billingAddress->getEmail()); |
|
| 402 | + $stmt->bind(20, $billingAddress->getTelefax()); |
|
| 403 | + $stmt->bind(21, $billingAddress->getWebsite()); |
|
| 404 | + $stmt->bind(22, $billingAddress->getLongitude()); |
|
| 405 | + $stmt->bind(23, $billingAddress->getLatitude()); |
|
| 406 | + $stmt->bind(24, $item->getBirthday()); |
|
| 407 | + $stmt->bind(25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
| 408 | + $stmt->bind(26, $item->getDateVerified()); |
|
| 409 | + $stmt->bind(27, $item->getPassword()); |
|
| 410 | + $stmt->bind(28, $date); // Modification time |
|
| 411 | + $stmt->bind(29, $context->getEditor()); |
|
| 412 | + $stmt->bind(30, serialize($item->getRoles())); |
|
| 413 | + |
|
| 414 | + if ($id !== null) { |
|
| 415 | + $stmt->bind(31, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
| 416 | + $item->setId($id); |
|
| 417 | 417 | } else { |
| 418 | - $stmt->bind( 31, $date ); // Creation time |
|
| 418 | + $stmt->bind(31, $date); // Creation time |
|
| 419 | 419 | } |
| 420 | 420 | |
| 421 | 421 | $stmt->execute()->finish(); |
| 422 | 422 | |
| 423 | - if( $id === null && $fetch === true ) |
|
| 423 | + if ($id === null && $fetch === true) |
|
| 424 | 424 | { |
| 425 | 425 | /** mshop/customer/manager/fosuser/newid |
| 426 | 426 | * Retrieves the ID generated by the database when inserting a new record |
@@ -453,14 +453,14 @@ discard block |
||
| 453 | 453 | * @see mshop/customer/manager/fosuser/count |
| 454 | 454 | */ |
| 455 | 455 | $path = 'mshop/customer/manager/fosuser/newid'; |
| 456 | - $item->setId( $this->newId( $conn, $path ) ); |
|
| 456 | + $item->setId($this->newId($conn, $path)); |
|
| 457 | 457 | } |
| 458 | 458 | |
| 459 | - $dbm->release( $conn, $dbname ); |
|
| 459 | + $dbm->release($conn, $dbname); |
|
| 460 | 460 | } |
| 461 | - catch( \Exception $e ) |
|
| 461 | + catch (\Exception $e) |
|
| 462 | 462 | { |
| 463 | - $dbm->release( $conn, $dbname ); |
|
| 463 | + $dbm->release($conn, $dbname); |
|
| 464 | 464 | throw $e; |
| 465 | 465 | } |
| 466 | 466 | } |
@@ -474,11 +474,11 @@ discard block |
||
| 474 | 474 | * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface |
| 475 | 475 | * @throws \Aimeos\MShop\Customer\Exception If creating items failed |
| 476 | 476 | */ |
| 477 | - public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null ) |
|
| 477 | + public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null) |
|
| 478 | 478 | { |
| 479 | 479 | $dbm = $this->getContext()->getDatabaseManager(); |
| 480 | 480 | $dbname = $this->getResourceName(); |
| 481 | - $conn = $dbm->acquire( $dbname ); |
|
| 481 | + $conn = $dbm->acquire($dbname); |
|
| 482 | 482 | $map = array(); |
| 483 | 483 | |
| 484 | 484 | try |
@@ -486,22 +486,22 @@ discard block |
||
| 486 | 486 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; |
| 487 | 487 | $cfgPathSearch = 'mshop/customer/manager/fosuser/search'; |
| 488 | 488 | $cfgPathCount = 'mshop/customer/manager/fosuser/count'; |
| 489 | - $required = array( 'customer' ); |
|
| 489 | + $required = array('customer'); |
|
| 490 | 490 | |
| 491 | - $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
|
| 492 | - while( ( $row = $results->fetch() ) !== false ) { |
|
| 493 | - $map[ $row['customer.id'] ] = $row; |
|
| 491 | + $results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level); |
|
| 492 | + while (($row = $results->fetch()) !== false) { |
|
| 493 | + $map[$row['customer.id']] = $row; |
|
| 494 | 494 | } |
| 495 | 495 | |
| 496 | - $dbm->release( $conn, $dbname ); |
|
| 496 | + $dbm->release($conn, $dbname); |
|
| 497 | 497 | } |
| 498 | - catch( \Exception $e ) |
|
| 498 | + catch (\Exception $e) |
|
| 499 | 499 | { |
| 500 | - $dbm->release( $conn, $dbname ); |
|
| 500 | + $dbm->release($conn, $dbname); |
|
| 501 | 501 | throw $e; |
| 502 | 502 | } |
| 503 | 503 | |
| 504 | - return $this->buildItems( $map, $ref, 'customer' ); |
|
| 504 | + return $this->buildItems($map, $ref, 'customer'); |
|
| 505 | 505 | } |
| 506 | 506 | |
| 507 | 507 | |
@@ -512,9 +512,9 @@ discard block |
||
| 512 | 512 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 513 | 513 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 514 | 514 | */ |
| 515 | - public function getSubManager( $manager, $name = null ) |
|
| 515 | + public function getSubManager($manager, $name = null) |
|
| 516 | 516 | { |
| 517 | - return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'FosUser' : $name ) ); |
|
| 517 | + return $this->getSubManagerBase('customer', $manager, ($name === null ? 'FosUser' : $name)); |
|
| 518 | 518 | } |
| 519 | 519 | |
| 520 | 520 | |
@@ -526,19 +526,19 @@ discard block |
||
| 526 | 526 | * @param array $refItems Items referenced by the customer item via the list items |
| 527 | 527 | * @return \Aimeos\MShop\Customer\Item\Iface New customer item |
| 528 | 528 | */ |
| 529 | - protected function createItemBase( array $values = array(), array $listItems = array(), array $refItems = array() ) |
|
| 529 | + protected function createItemBase(array $values = array(), array $listItems = array(), array $refItems = array()) |
|
| 530 | 530 | { |
| 531 | - if( !isset( $this->addressManager ) ) { |
|
| 532 | - $this->addressManager = $this->getSubManager( 'address' ); |
|
| 531 | + if (!isset($this->addressManager)) { |
|
| 532 | + $this->addressManager = $this->getSubManager('address'); |
|
| 533 | 533 | } |
| 534 | 534 | |
| 535 | - if( isset( $values['roles'] ) ) { |
|
| 536 | - $values['roles'] = unserialize( $values['roles'] ); |
|
| 535 | + if (isset($values['roles'])) { |
|
| 536 | + $values['roles'] = unserialize($values['roles']); |
|
| 537 | 537 | } |
| 538 | 538 | |
| 539 | 539 | $helper = $this->getPasswordHelper(); |
| 540 | 540 | $address = $this->addressManager->createItem(); |
| 541 | 541 | |
| 542 | - return new \Aimeos\MShop\Customer\Item\FosUser( $address, $values, $listItems, $refItems, null, $helper ); |
|
| 542 | + return new \Aimeos\MShop\Customer\Item\FosUser($address, $values, $listItems, $refItems, null, $helper); |
|
| 543 | 543 | } |
| 544 | 544 | } |
@@ -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->getSubManager( $domain )->cleanup( $siteids ); |
|
| 139 | + foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) { |
|
| 140 | + $this->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 | |
@@ -126,7 +126,7 @@ |
||
| 126 | 126 | * |
| 127 | 127 | * @param string $manager Name of the sub manager type in lower case |
| 128 | 128 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 129 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 129 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 130 | 130 | */ |
| 131 | 131 | public function getSubManager( $manager, $name = null ) |
| 132 | 132 | { |
@@ -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, array() ) as $domain ) { |
|
| 103 | - $this->getSubManager( $domain )->cleanup( $siteids ); |
|
| 102 | + foreach ($this->getContext()->getConfig()->get($path, array()) as $domain) { |
|
| 103 | + $this->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, array(), $withsub ); |
|
| 120 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array(), $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 | |
@@ -126,7 +126,7 @@ |
||
| 126 | 126 | * |
| 127 | 127 | * @param string $manager Name of the sub manager type in lower case |
| 128 | 128 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 129 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 129 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
| 130 | 130 | */ |
| 131 | 131 | public function getSubManager( $manager, $name = null ) |
| 132 | 132 | { |
@@ -30,12 +30,12 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function getRoles() |
| 32 | 32 | { |
| 33 | - if( isset( $this->roles ) ) { |
|
| 33 | + if (isset($this->roles)) { |
|
| 34 | 34 | return $this->roles; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $values = $this->getRawValues(); |
| 38 | - return ( isset( $values['roles'] ) ? (array) $values['roles'] : array() ); |
|
| 38 | + return (isset($values['roles']) ? (array) $values['roles'] : array()); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @param array $roles List of Symfony roles |
| 46 | 46 | */ |
| 47 | - public function setRoles( array $roles ) |
|
| 47 | + public function setRoles(array $roles) |
|
| 48 | 48 | { |
| 49 | 49 | $this->roles = $roles; |
| 50 | 50 | $this->setModified(); |
@@ -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 | } |