aimeos /
ai-fosuser
@@ -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 | } |
@@ -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 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | 'customer.address.position' => 1, |
| 23 | 23 | ); |
| 24 | 24 | |
| 25 | - $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.', $addressValues ); |
|
| 25 | + $this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.', $addressValues); |
|
| 26 | 26 | |
| 27 | 27 | $values = array( |
| 28 | 28 | 'customer.id' => 541, |
@@ -54,71 +54,71 @@ discard block |
||
| 54 | 54 | 'customer.mtime'=> '2010-01-05 00:00:05', |
| 55 | 55 | 'customer.ctime'=> '2010-01-01 00:00:00', |
| 56 | 56 | 'customer.editor' => 'unitTestUser', |
| 57 | - 'roles' => array( 'ROLE_ADMIN' ), |
|
| 57 | + 'roles' => array('ROLE_ADMIN'), |
|
| 58 | 58 | 'salt' => 'test', |
| 59 | 59 | ); |
| 60 | 60 | |
| 61 | - $this->object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, $values ); |
|
| 61 | + $this->object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, $values); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | protected function tearDown() |
| 65 | 65 | { |
| 66 | - unset( $this->object ); |
|
| 66 | + unset($this->object); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | public function testGetPassword() |
| 70 | 70 | { |
| 71 | - $this->assertEquals( 'testpwd', $this->object->getPassword() ); |
|
| 71 | + $this->assertEquals('testpwd', $this->object->getPassword()); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | public function testSetPassword() |
| 75 | 75 | { |
| 76 | - $this->object->setPassword( 'new' ); |
|
| 77 | - $this->assertTrue( $this->object->isModified() ); |
|
| 78 | - $this->assertEquals( 'new', $this->object->getPassword() ); |
|
| 76 | + $this->object->setPassword('new'); |
|
| 77 | + $this->assertTrue($this->object->isModified()); |
|
| 78 | + $this->assertEquals('new', $this->object->getPassword()); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | public function testSetPasswordGenerated() |
| 82 | 82 | { |
| 83 | - $helper = new \Aimeos\MShop\Common\Item\Helper\Password\Standard( array( 'format' => '%1$s{%2$s}' ) ); |
|
| 84 | - $object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, [], [], [], null, $helper ); |
|
| 83 | + $helper = new \Aimeos\MShop\Common\Item\Helper\Password\Standard(array('format' => '%1$s{%2$s}')); |
|
| 84 | + $object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, [], [], [], null, $helper); |
|
| 85 | 85 | |
| 86 | - $object->setPassword( 'newpwd' ); |
|
| 87 | - $this->assertEquals( sha1( 'newpwd{' . $object->getSalt() . '}' ), $object->getPassword() ); |
|
| 86 | + $object->setPassword('newpwd'); |
|
| 87 | + $this->assertEquals(sha1('newpwd{' . $object->getSalt() . '}'), $object->getPassword()); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | public function testGetRoles() |
| 91 | 91 | { |
| 92 | - $this->assertEquals( array( 'ROLE_ADMIN' ), $this->object->getRoles() ); |
|
| 92 | + $this->assertEquals(array('ROLE_ADMIN'), $this->object->getRoles()); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | public function testSetRoles() |
| 96 | 96 | { |
| 97 | - $this->object->setRoles( array( 'ROLE_USER' ) ); |
|
| 98 | - $this->assertTrue( $this->object->isModified() ); |
|
| 99 | - $this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() ); |
|
| 97 | + $this->object->setRoles(array('ROLE_USER')); |
|
| 98 | + $this->assertTrue($this->object->isModified()); |
|
| 99 | + $this->assertEquals(array('ROLE_USER'), $this->object->getRoles()); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | public function testGetSalt() |
| 103 | 103 | { |
| 104 | - $this->assertEquals( 'test', $this->object->getSalt() ); |
|
| 104 | + $this->assertEquals('test', $this->object->getSalt()); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | public function testGetSaltGenerated() |
| 108 | 108 | { |
| 109 | - $object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, [] ); |
|
| 110 | - $this->assertEquals( 'mshop', $object->getSalt() ); |
|
| 109 | + $object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, []); |
|
| 110 | + $this->assertEquals('mshop', $object->getSalt()); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | public function testSetSalt() |
| 114 | 114 | { |
| 115 | - $this->object->setSalt( 'new' ); |
|
| 116 | - $this->assertTrue( $this->object->isModified() ); |
|
| 117 | - $this->assertEquals( 'new', $this->object->getSalt() ); |
|
| 115 | + $this->object->setSalt('new'); |
|
| 116 | + $this->assertTrue($this->object->isModified()); |
|
| 117 | + $this->assertEquals('new', $this->object->getSalt()); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | public function testIsModified() |
| 121 | 121 | { |
| 122 | - $this->assertFalse( $this->object->isModified() ); |
|
| 122 | + $this->assertFalse($this->object->isModified()); |
|
| 123 | 123 | } |
| 124 | 124 | } |
@@ -8,170 +8,170 @@ |
||
| 8 | 8 | |
| 9 | 9 | return array( |
| 10 | 10 | 'table' => array( |
| 11 | - 'fos_user' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 12 | - |
|
| 13 | - $table = $schema->createTable( 'fos_user' ); |
|
| 14 | - |
|
| 15 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 16 | - $table->addColumn( 'siteid', 'integer', array( 'notnull' => false ) ); |
|
| 17 | - $table->addColumn( 'username', 'string', array( 'length' => 255 ) ); |
|
| 18 | - $table->addColumn( 'username_canonical', 'string', array( 'length' => 255 ) ); |
|
| 19 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
| 20 | - $table->addColumn( 'email_canonical', 'string', array( 'length' => 255 ) ); |
|
| 21 | - $table->addColumn( 'enabled', 'smallint', [] ); |
|
| 22 | - $table->addColumn( 'salt', 'string', array( 'length' => 255 ) ); |
|
| 23 | - $table->addColumn( 'password', 'string', array( 'length' => 255 ) ); |
|
| 24 | - $table->addColumn( 'last_login', 'datetime', array( 'notnull' => false ) ); |
|
| 25 | - $table->addColumn( 'locked', 'smallint', [] ); |
|
| 26 | - $table->addColumn( 'expired', 'smallint', [] ); |
|
| 27 | - $table->addColumn( 'expires_at', 'datetime', array( 'notnull' => false ) ); |
|
| 28 | - $table->addColumn( 'confirmation_token', 'string', array( 'length' => 255, 'notnull' => false ) ); |
|
| 29 | - $table->addColumn( 'password_requested_at', 'datetime', array( 'notnull' => false ) ); |
|
| 30 | - $table->addColumn( 'roles', 'text', array( 'length' => 0x7fffffff, 'comment' => '(DC2Type:array)' ) ); |
|
| 31 | - $table->addColumn( 'credentials_expired', 'smallint', [] ); |
|
| 32 | - $table->addColumn( 'credentials_expire_at', 'datetime', array( 'notnull' => false ) ); |
|
| 33 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8, 'default' => '' ) ); |
|
| 34 | - $table->addColumn( 'company', 'string', array( 'length' => 100, 'default' => '' ) ); |
|
| 35 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
| 36 | - $table->addColumn( 'title', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
| 37 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
| 38 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
| 39 | - $table->addColumn( 'address1', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 40 | - $table->addColumn( 'address2', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 41 | - $table->addColumn( 'address3', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 42 | - $table->addColumn( 'postal', 'string', array( 'length' => 16, 'default' => '' ) ); |
|
| 43 | - $table->addColumn( 'city', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 44 | - $table->addColumn( 'state', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 45 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
| 46 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
| 47 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
| 48 | - $table->addColumn( 'telefax', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
| 49 | - $table->addColumn( 'website', 'string', array( 'length' => 255, 'default' => '' ) ); |
|
| 50 | - $table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
| 51 | - $table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
| 52 | - $table->addColumn( 'birthday', 'date', array( 'notnull' => false ) ); |
|
| 53 | - $table->addColumn( 'vdate', 'date', array( 'notnull' => false ) ); |
|
| 54 | - $table->addColumn( 'mtime', 'datetime', array( 'notnull' => false ) ); |
|
| 55 | - $table->addColumn( 'ctime', 'datetime', array( 'notnull' => false ) ); |
|
| 56 | - $table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) ); |
|
| 57 | - |
|
| 58 | - $table->setPrimaryKey( array( 'id' ), 'pk_fosus_id' ); |
|
| 59 | - $table->addUniqueIndex( array( 'username_canonical' ), 'unq_fosus_username' ); |
|
| 60 | - $table->addUniqueIndex( array( 'email_canonical' ), 'unq_fosus_email' ); |
|
| 61 | - $table->addIndex( array( 'langid' ), 'idx_fosus_langid' ); |
|
| 62 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosus_last_first' ); |
|
| 63 | - $table->addIndex( array( 'postal', 'address1' ), 'idx_fosus_post_addr1' ); |
|
| 64 | - $table->addIndex( array( 'postal', 'city' ), 'idx_fosus_post_city' ); |
|
| 65 | - $table->addIndex( array( 'lastname' ), 'idx_fosus_lastname' ); |
|
| 66 | - $table->addIndex( array( 'address1' ), 'idx_fosus_address1' ); |
|
| 67 | - $table->addIndex( array( 'city' ), 'idx_fosus_city' ); |
|
| 11 | + 'fos_user' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 12 | + |
|
| 13 | + $table = $schema->createTable('fos_user'); |
|
| 14 | + |
|
| 15 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 16 | + $table->addColumn('siteid', 'integer', array('notnull' => false)); |
|
| 17 | + $table->addColumn('username', 'string', array('length' => 255)); |
|
| 18 | + $table->addColumn('username_canonical', 'string', array('length' => 255)); |
|
| 19 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
| 20 | + $table->addColumn('email_canonical', 'string', array('length' => 255)); |
|
| 21 | + $table->addColumn('enabled', 'smallint', []); |
|
| 22 | + $table->addColumn('salt', 'string', array('length' => 255)); |
|
| 23 | + $table->addColumn('password', 'string', array('length' => 255)); |
|
| 24 | + $table->addColumn('last_login', 'datetime', array('notnull' => false)); |
|
| 25 | + $table->addColumn('locked', 'smallint', []); |
|
| 26 | + $table->addColumn('expired', 'smallint', []); |
|
| 27 | + $table->addColumn('expires_at', 'datetime', array('notnull' => false)); |
|
| 28 | + $table->addColumn('confirmation_token', 'string', array('length' => 255, 'notnull' => false)); |
|
| 29 | + $table->addColumn('password_requested_at', 'datetime', array('notnull' => false)); |
|
| 30 | + $table->addColumn('roles', 'text', array('length' => 0x7fffffff, 'comment' => '(DC2Type:array)')); |
|
| 31 | + $table->addColumn('credentials_expired', 'smallint', []); |
|
| 32 | + $table->addColumn('credentials_expire_at', 'datetime', array('notnull' => false)); |
|
| 33 | + $table->addColumn('salutation', 'string', array('length' => 8, 'default' => '')); |
|
| 34 | + $table->addColumn('company', 'string', array('length' => 100, 'default' => '')); |
|
| 35 | + $table->addColumn('vatid', 'string', array('length' => 32, 'default' => '')); |
|
| 36 | + $table->addColumn('title', 'string', array('length' => 64, 'default' => '')); |
|
| 37 | + $table->addColumn('firstname', 'string', array('length' => 64, 'default' => '')); |
|
| 38 | + $table->addColumn('lastname', 'string', array('length' => 64, 'default' => '')); |
|
| 39 | + $table->addColumn('address1', 'string', array('length' => 200, 'default' => '')); |
|
| 40 | + $table->addColumn('address2', 'string', array('length' => 200, 'default' => '')); |
|
| 41 | + $table->addColumn('address3', 'string', array('length' => 200, 'default' => '')); |
|
| 42 | + $table->addColumn('postal', 'string', array('length' => 16, 'default' => '')); |
|
| 43 | + $table->addColumn('city', 'string', array('length' => 200, 'default' => '')); |
|
| 44 | + $table->addColumn('state', 'string', array('length' => 200, 'default' => '')); |
|
| 45 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
| 46 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
| 47 | + $table->addColumn('telephone', 'string', array('length' => 32, 'default' => '')); |
|
| 48 | + $table->addColumn('telefax', 'string', array('length' => 32, 'default' => '')); |
|
| 49 | + $table->addColumn('website', 'string', array('length' => 255, 'default' => '')); |
|
| 50 | + $table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
| 51 | + $table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
| 52 | + $table->addColumn('birthday', 'date', array('notnull' => false)); |
|
| 53 | + $table->addColumn('vdate', 'date', array('notnull' => false)); |
|
| 54 | + $table->addColumn('mtime', 'datetime', array('notnull' => false)); |
|
| 55 | + $table->addColumn('ctime', 'datetime', array('notnull' => false)); |
|
| 56 | + $table->addColumn('editor', 'string', array('length' => 255, 'default' => '')); |
|
| 57 | + |
|
| 58 | + $table->setPrimaryKey(array('id'), 'pk_fosus_id'); |
|
| 59 | + $table->addUniqueIndex(array('username_canonical'), 'unq_fosus_username'); |
|
| 60 | + $table->addUniqueIndex(array('email_canonical'), 'unq_fosus_email'); |
|
| 61 | + $table->addIndex(array('langid'), 'idx_fosus_langid'); |
|
| 62 | + $table->addIndex(array('lastname', 'firstname'), 'idx_fosus_last_first'); |
|
| 63 | + $table->addIndex(array('postal', 'address1'), 'idx_fosus_post_addr1'); |
|
| 64 | + $table->addIndex(array('postal', 'city'), 'idx_fosus_post_city'); |
|
| 65 | + $table->addIndex(array('lastname'), 'idx_fosus_lastname'); |
|
| 66 | + $table->addIndex(array('address1'), 'idx_fosus_address1'); |
|
| 67 | + $table->addIndex(array('city'), 'idx_fosus_city'); |
|
| 68 | 68 | |
| 69 | 69 | return $schema; |
| 70 | 70 | }, |
| 71 | 71 | |
| 72 | - 'fos_user_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 73 | - |
|
| 74 | - $table = $schema->createTable( 'fos_user_address' ); |
|
| 75 | - |
|
| 76 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 77 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 78 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
| 79 | - $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); |
|
| 80 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); |
|
| 81 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); |
|
| 82 | - $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); |
|
| 83 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); |
|
| 84 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); |
|
| 85 | - $table->addColumn( 'address1', 'string', array( 'length' => 200 ) ); |
|
| 86 | - $table->addColumn( 'address2', 'string', array( 'length' => 200 ) ); |
|
| 87 | - $table->addColumn( 'address3', 'string', array( 'length' => 200 ) ); |
|
| 88 | - $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); |
|
| 89 | - $table->addColumn( 'city', 'string', array( 'length' => 200 ) ); |
|
| 90 | - $table->addColumn( 'state', 'string', array( 'length' => 200 ) ); |
|
| 91 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
| 92 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
| 93 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); |
|
| 94 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
| 95 | - $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) ); |
|
| 96 | - $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); |
|
| 97 | - $table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
| 98 | - $table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
| 99 | - $table->addColumn( 'flag', 'integer', [] ); |
|
| 100 | - $table->addColumn( 'pos', 'smallint', [] ); |
|
| 101 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 102 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 103 | - $table->addColumn( 'editor', 'string', array('length' => 255 ) ); |
|
| 104 | - |
|
| 105 | - $table->setPrimaryKey( array( 'id' ), 'pk_fosad_id' ); |
|
| 106 | - $table->addIndex( array( 'parentid' ), 'idx_fosad_pid' ); |
|
| 107 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosad_last_first' ); |
|
| 108 | - $table->addIndex( array( 'postal', 'address1' ), 'idx_fosad_post_addr1' ); |
|
| 109 | - $table->addIndex( array( 'postal', 'city' ), 'idx_fosad_post_city' ); |
|
| 110 | - $table->addIndex( array( 'address1' ), 'idx_fosad_address1' ); |
|
| 111 | - $table->addIndex( array( 'city' ), 'idx_fosad_city' ); |
|
| 112 | - $table->addIndex( array( 'email' ), 'idx_fosad_email' ); |
|
| 113 | - |
|
| 114 | - $table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ), |
|
| 115 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosad_pid' ); |
|
| 72 | + 'fos_user_address' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 73 | + |
|
| 74 | + $table = $schema->createTable('fos_user_address'); |
|
| 75 | + |
|
| 76 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 77 | + $table->addColumn('siteid', 'integer', []); |
|
| 78 | + $table->addColumn('parentid', 'integer', []); |
|
| 79 | + $table->addColumn('company', 'string', array('length' => 100)); |
|
| 80 | + $table->addColumn('vatid', 'string', array('length' => 32)); |
|
| 81 | + $table->addColumn('salutation', 'string', array('length' => 8)); |
|
| 82 | + $table->addColumn('title', 'string', array('length' => 64)); |
|
| 83 | + $table->addColumn('firstname', 'string', array('length' => 64)); |
|
| 84 | + $table->addColumn('lastname', 'string', array('length' => 64)); |
|
| 85 | + $table->addColumn('address1', 'string', array('length' => 200)); |
|
| 86 | + $table->addColumn('address2', 'string', array('length' => 200)); |
|
| 87 | + $table->addColumn('address3', 'string', array('length' => 200)); |
|
| 88 | + $table->addColumn('postal', 'string', array('length' => 16)); |
|
| 89 | + $table->addColumn('city', 'string', array('length' => 200)); |
|
| 90 | + $table->addColumn('state', 'string', array('length' => 200)); |
|
| 91 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
| 92 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
| 93 | + $table->addColumn('telephone', 'string', array('length' => 32)); |
|
| 94 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
| 95 | + $table->addColumn('telefax', 'string', array('length' => 255)); |
|
| 96 | + $table->addColumn('website', 'string', array('length' => 255)); |
|
| 97 | + $table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
| 98 | + $table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
| 99 | + $table->addColumn('flag', 'integer', []); |
|
| 100 | + $table->addColumn('pos', 'smallint', []); |
|
| 101 | + $table->addColumn('mtime', 'datetime', []); |
|
| 102 | + $table->addColumn('ctime', 'datetime', []); |
|
| 103 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 104 | + |
|
| 105 | + $table->setPrimaryKey(array('id'), 'pk_fosad_id'); |
|
| 106 | + $table->addIndex(array('parentid'), 'idx_fosad_pid'); |
|
| 107 | + $table->addIndex(array('lastname', 'firstname'), 'idx_fosad_last_first'); |
|
| 108 | + $table->addIndex(array('postal', 'address1'), 'idx_fosad_post_addr1'); |
|
| 109 | + $table->addIndex(array('postal', 'city'), 'idx_fosad_post_city'); |
|
| 110 | + $table->addIndex(array('address1'), 'idx_fosad_address1'); |
|
| 111 | + $table->addIndex(array('city'), 'idx_fosad_city'); |
|
| 112 | + $table->addIndex(array('email'), 'idx_fosad_email'); |
|
| 113 | + |
|
| 114 | + $table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'), |
|
| 115 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosad_pid'); |
|
| 116 | 116 | |
| 117 | 117 | return $schema; |
| 118 | 118 | }, |
| 119 | 119 | |
| 120 | - 'fos_user_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 120 | + 'fos_user_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 121 | 121 | |
| 122 | - $table = $schema->createTable( 'fos_user_list_type' ); |
|
| 122 | + $table = $schema->createTable('fos_user_list_type'); |
|
| 123 | 123 | |
| 124 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 125 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 126 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
| 127 | - $table->addColumn( 'code', 'string', array( 'length' => 32 ) ); |
|
| 128 | - $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); |
|
| 129 | - $table->addColumn( 'status', 'smallint', [] ); |
|
| 130 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 131 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 132 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 124 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 125 | + $table->addColumn('siteid', 'integer', []); |
|
| 126 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
| 127 | + $table->addColumn('code', 'string', array('length' => 32)); |
|
| 128 | + $table->addColumn('label', 'string', array('length' => 255)); |
|
| 129 | + $table->addColumn('status', 'smallint', []); |
|
| 130 | + $table->addColumn('mtime', 'datetime', []); |
|
| 131 | + $table->addColumn('ctime', 'datetime', []); |
|
| 132 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 133 | 133 | |
| 134 | - $table->setPrimaryKey( array( 'id' ), 'pk_foslity_id' ); |
|
| 135 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_foslity_sid_dom_code' ); |
|
| 136 | - $table->addIndex( array( 'siteid', 'status' ), 'idx_foslity_sid_status' ); |
|
| 137 | - $table->addIndex( array( 'siteid', 'label' ), 'idx_foslity_sid_label' ); |
|
| 138 | - $table->addIndex( array( 'siteid', 'code' ), 'idx_foslity_sid_code' ); |
|
| 134 | + $table->setPrimaryKey(array('id'), 'pk_foslity_id'); |
|
| 135 | + $table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_foslity_sid_dom_code'); |
|
| 136 | + $table->addIndex(array('siteid', 'status'), 'idx_foslity_sid_status'); |
|
| 137 | + $table->addIndex(array('siteid', 'label'), 'idx_foslity_sid_label'); |
|
| 138 | + $table->addIndex(array('siteid', 'code'), 'idx_foslity_sid_code'); |
|
| 139 | 139 | |
| 140 | 140 | return $schema; |
| 141 | 141 | }, |
| 142 | 142 | |
| 143 | - 'fos_user_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 144 | - |
|
| 145 | - $table = $schema->createTable( 'fos_user_list' ); |
|
| 146 | - |
|
| 147 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 148 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
| 149 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 150 | - $table->addColumn( 'typeid', 'integer', [] ); |
|
| 151 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
| 152 | - $table->addColumn( 'refid', 'string', array( 'length' => 32 ) ); |
|
| 153 | - $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) ); |
|
| 154 | - $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) ); |
|
| 155 | - $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) ); |
|
| 156 | - $table->addColumn( 'pos', 'integer', [] ); |
|
| 157 | - $table->addColumn( 'status', 'smallint', [] ); |
|
| 158 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 159 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 160 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 161 | - |
|
| 162 | - $table->setPrimaryKey( array( 'id' ), 'pk_fosli_id' ); |
|
| 163 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_fosli_sid_dm_rid_tid_pid' ); |
|
| 164 | - $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_fosli_sid_stat_start_end' ); |
|
| 165 | - $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_fosli_pid_sid_rid_dom_tid' ); |
|
| 166 | - $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_fosli_pid_sid_start' ); |
|
| 167 | - $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_fosli_pid_sid_end' ); |
|
| 168 | - $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_fosli_pid_sid_pos' ); |
|
| 169 | - |
|
| 170 | - $table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ), |
|
| 171 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_pid' ); |
|
| 172 | - |
|
| 173 | - $table->addForeignKeyConstraint( 'fos_user_list_type', array( 'typeid' ), array( 'id' ), |
|
| 174 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_typeid' ); |
|
| 143 | + 'fos_user_list' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 144 | + |
|
| 145 | + $table = $schema->createTable('fos_user_list'); |
|
| 146 | + |
|
| 147 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 148 | + $table->addColumn('parentid', 'integer', []); |
|
| 149 | + $table->addColumn('siteid', 'integer', []); |
|
| 150 | + $table->addColumn('typeid', 'integer', []); |
|
| 151 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
| 152 | + $table->addColumn('refid', 'string', array('length' => 32)); |
|
| 153 | + $table->addColumn('start', 'datetime', array('notnull' => false)); |
|
| 154 | + $table->addColumn('end', 'datetime', array('notnull' => false)); |
|
| 155 | + $table->addColumn('config', 'text', array('length' => 0xffff)); |
|
| 156 | + $table->addColumn('pos', 'integer', []); |
|
| 157 | + $table->addColumn('status', 'smallint', []); |
|
| 158 | + $table->addColumn('mtime', 'datetime', []); |
|
| 159 | + $table->addColumn('ctime', 'datetime', []); |
|
| 160 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 161 | + |
|
| 162 | + $table->setPrimaryKey(array('id'), 'pk_fosli_id'); |
|
| 163 | + $table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_fosli_sid_dm_rid_tid_pid'); |
|
| 164 | + $table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_fosli_sid_stat_start_end'); |
|
| 165 | + $table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_fosli_pid_sid_rid_dom_tid'); |
|
| 166 | + $table->addIndex(array('parentid', 'siteid', 'start'), 'idx_fosli_pid_sid_start'); |
|
| 167 | + $table->addIndex(array('parentid', 'siteid', 'end'), 'idx_fosli_pid_sid_end'); |
|
| 168 | + $table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_fosli_pid_sid_pos'); |
|
| 169 | + |
|
| 170 | + $table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'), |
|
| 171 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_pid'); |
|
| 172 | + |
|
| 173 | + $table->addForeignKeyConstraint('fos_user_list_type', array('typeid'), array('id'), |
|
| 174 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_typeid'); |
|
| 175 | 175 | |
| 176 | 176 | return $schema; |
| 177 | 177 | }, |
@@ -5,19 +5,19 @@ |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2014-2016 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -return array ( |
|
| 9 | - 'customer/lists/type' => array ( |
|
| 10 | - 'customer/group/default' => array( 'domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ), |
|
| 11 | - 'order/download' => array( 'domain' => 'order', 'code' => 'download', 'label' => 'Download', 'status' => 1 ), |
|
| 12 | - 'product/favorite' => array( 'domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1 ), |
|
| 13 | - 'product/watch' => array( 'domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1 ), |
|
| 14 | - 'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ), |
|
| 8 | +return array( |
|
| 9 | + 'customer/lists/type' => array( |
|
| 10 | + 'customer/group/default' => array('domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1), |
|
| 11 | + 'order/download' => array('domain' => 'order', 'code' => 'download', 'label' => 'Download', 'status' => 1), |
|
| 12 | + 'product/favorite' => array('domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1), |
|
| 13 | + 'product/watch' => array('domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1), |
|
| 14 | + 'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1), |
|
| 15 | 15 | ), |
| 16 | 16 | |
| 17 | - 'customer/lists' => array ( |
|
| 18 | - array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ), |
|
| 19 | - array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1 ), |
|
| 20 | - array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1 ), |
|
| 21 | - array( 'parentid' => 'customer/UTC001', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ), |
|
| 17 | + 'customer/lists' => array( |
|
| 18 | + array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1), |
|
| 19 | + array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1), |
|
| 20 | + array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1), |
|
| 21 | + array('parentid' => 'customer/UTC001', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1), |
|
| 22 | 22 | ), |
| 23 | 23 | ); |
@@ -21,41 +21,41 @@ discard block |
||
| 21 | 21 | { |
| 22 | 22 | $context = \TestHelper::getContext(); |
| 23 | 23 | $this->editor = $context->getEditor(); |
| 24 | - $this->object = new \Aimeos\MShop\Customer\Manager\FosUser( $context ); |
|
| 24 | + $this->object = new \Aimeos\MShop\Customer\Manager\FosUser($context); |
|
| 25 | 25 | |
| 26 | 26 | $this->fixture = array( |
| 27 | 27 | 'label' => 'unitTest', |
| 28 | 28 | 'status' => 2, |
| 29 | 29 | ); |
| 30 | 30 | |
| 31 | - $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' ); |
|
| 31 | + $this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.'); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | protected function tearDown() |
| 36 | 36 | { |
| 37 | - unset( $this->object, $this->fixture, $this->address ); |
|
| 37 | + unset($this->object, $this->fixture, $this->address); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | public function testCleanup() |
| 42 | 42 | { |
| 43 | - $this->object->cleanup( array( -1 ) ); |
|
| 43 | + $this->object->cleanup(array( -1 )); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
| 47 | 47 | public function testGetSearchAttributes() |
| 48 | 48 | { |
| 49 | - foreach( $this->object->getSearchAttributes() as $attribute ) |
|
| 49 | + foreach ($this->object->getSearchAttributes() as $attribute) |
|
| 50 | 50 | { |
| 51 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); |
|
| 51 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
| 56 | 56 | public function testCreateItem() |
| 57 | 57 | { |
| 58 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() ); |
|
| 58 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem()); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | |
@@ -63,21 +63,21 @@ discard block |
||
| 63 | 63 | { |
| 64 | 64 | $search = $this->object->createSearch(); |
| 65 | 65 | $conditions = array( |
| 66 | - $search->compare( '==', 'customer.code', 'UTC003' ), |
|
| 67 | - $search->compare( '==', 'customer.editor', $this->editor ) |
|
| 66 | + $search->compare('==', 'customer.code', 'UTC003'), |
|
| 67 | + $search->compare('==', 'customer.editor', $this->editor) |
|
| 68 | 68 | ); |
| 69 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 70 | - $items = $this->object->searchItems( $search, array( 'text' ) ); |
|
| 69 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 70 | + $items = $this->object->searchItems($search, array('text')); |
|
| 71 | 71 | |
| 72 | - if( ( $expected = reset( $items ) ) === false ) { |
|
| 73 | - throw new \RuntimeException( 'No customer item with code "UTC003" found' ); |
|
| 72 | + if (($expected = reset($items)) === false) { |
|
| 73 | + throw new \RuntimeException('No customer item with code "UTC003" found'); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - $actual = $this->object->getItem( $expected->getId(), array( 'text' ) ); |
|
| 76 | + $actual = $this->object->getItem($expected->getId(), array('text')); |
|
| 77 | 77 | |
| 78 | - $this->assertEquals( $expected, $actual ); |
|
| 79 | - $this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) ); |
|
| 80 | - $this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) ); |
|
| 78 | + $this->assertEquals($expected, $actual); |
|
| 79 | + $this->assertEquals(3, count($actual->getListItems('text'))); |
|
| 80 | + $this->assertEquals(3, count($actual->getRefItems('text'))); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | |
@@ -85,61 +85,61 @@ discard block |
||
| 85 | 85 | { |
| 86 | 86 | $item = $this->object->createItem(); |
| 87 | 87 | |
| 88 | - $item->setCode( 'unitTest' ); |
|
| 89 | - $item->setLabel( 'unitTest' ); |
|
| 90 | - $resultSaved = $this->object->saveItem( $item ); |
|
| 91 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
| 88 | + $item->setCode('unitTest'); |
|
| 89 | + $item->setLabel('unitTest'); |
|
| 90 | + $resultSaved = $this->object->saveItem($item); |
|
| 91 | + $itemSaved = $this->object->getItem($item->getId()); |
|
| 92 | 92 | |
| 93 | 93 | $itemExp = clone $itemSaved; |
| 94 | - $itemExp->setCode( 'unitTest2' ); |
|
| 95 | - $itemExp->setLabel( 'unitTest2' ); |
|
| 96 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
| 97 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
| 98 | - |
|
| 99 | - $this->object->deleteItem( $item->getId() ); |
|
| 100 | - |
|
| 101 | - $this->assertTrue( $item->getId() !== null ); |
|
| 102 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
| 103 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
| 104 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); |
|
| 105 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); |
|
| 106 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); |
|
| 107 | - $this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() ); |
|
| 108 | - $this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() ); |
|
| 109 | - $this->assertEquals( $item->getPassword(), $itemSaved->getPassword() ); |
|
| 110 | - $this->assertEquals( $item->getRoles(), $itemSaved->getRoles() ); |
|
| 111 | - $this->assertEquals( $item->getSalt(), $itemSaved->getSalt() ); |
|
| 112 | - |
|
| 113 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
| 114 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
| 115 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
| 116 | - |
|
| 117 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
| 118 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
| 119 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); |
|
| 120 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); |
|
| 121 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); |
|
| 122 | - $this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() ); |
|
| 123 | - $this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() ); |
|
| 124 | - $this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() ); |
|
| 125 | - $this->assertEquals( $itemExp->getRoles(), $itemUpd->getRoles() ); |
|
| 126 | - $this->assertEquals( $itemExp->getSalt(), $itemUpd->getSalt() ); |
|
| 127 | - |
|
| 128 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
| 129 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
| 130 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
| 131 | - |
|
| 132 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved ); |
|
| 133 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd ); |
|
| 134 | - |
|
| 135 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 136 | - $this->object->getItem( $item->getId() ); |
|
| 94 | + $itemExp->setCode('unitTest2'); |
|
| 95 | + $itemExp->setLabel('unitTest2'); |
|
| 96 | + $resultUpd = $this->object->saveItem($itemExp); |
|
| 97 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
| 98 | + |
|
| 99 | + $this->object->deleteItem($item->getId()); |
|
| 100 | + |
|
| 101 | + $this->assertTrue($item->getId() !== null); |
|
| 102 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
| 103 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
| 104 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); |
|
| 105 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); |
|
| 106 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); |
|
| 107 | + $this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress()); |
|
| 108 | + $this->assertEquals($item->getBirthday(), $itemSaved->getBirthday()); |
|
| 109 | + $this->assertEquals($item->getPassword(), $itemSaved->getPassword()); |
|
| 110 | + $this->assertEquals($item->getRoles(), $itemSaved->getRoles()); |
|
| 111 | + $this->assertEquals($item->getSalt(), $itemSaved->getSalt()); |
|
| 112 | + |
|
| 113 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 114 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
| 115 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
| 116 | + |
|
| 117 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
| 118 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
| 119 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); |
|
| 120 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); |
|
| 121 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); |
|
| 122 | + $this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress()); |
|
| 123 | + $this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday()); |
|
| 124 | + $this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword()); |
|
| 125 | + $this->assertEquals($itemExp->getRoles(), $itemUpd->getRoles()); |
|
| 126 | + $this->assertEquals($itemExp->getSalt(), $itemUpd->getSalt()); |
|
| 127 | + |
|
| 128 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
| 129 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
| 130 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
| 131 | + |
|
| 132 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved); |
|
| 133 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd); |
|
| 134 | + |
|
| 135 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 136 | + $this->object->getItem($item->getId()); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | |
| 140 | 140 | public function testCreateSearch() |
| 141 | 141 | { |
| 142 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() ); |
|
| 142 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch()); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | |
@@ -149,69 +149,69 @@ discard block |
||
| 149 | 149 | $search = $this->object->createSearch(); |
| 150 | 150 | |
| 151 | 151 | $expr = []; |
| 152 | - $expr[] = $search->compare( '!=', 'customer.id', null ); |
|
| 153 | - $expr[] = $search->compare( '==', 'customer.label', 'UTC002' ); |
|
| 154 | - $expr[] = $search->compare( '==', 'customer.code', 'UTC002' ); |
|
| 155 | - |
|
| 156 | - $expr[] = $search->compare( '>=', 'customer.salutation', '' ); |
|
| 157 | - $expr[] = $search->compare( '>=', 'customer.company', '' ); |
|
| 158 | - $expr[] = $search->compare( '>=', 'customer.vatid', '' ); |
|
| 159 | - $expr[] = $search->compare( '>=', 'customer.title', '' ); |
|
| 160 | - $expr[] = $search->compare( '>=', 'customer.firstname', '' ); |
|
| 161 | - $expr[] = $search->compare( '>=', 'customer.lastname', '' ); |
|
| 162 | - $expr[] = $search->compare( '>=', 'customer.address1', '' ); |
|
| 163 | - $expr[] = $search->compare( '>=', 'customer.address2', '' ); |
|
| 164 | - $expr[] = $search->compare( '>=', 'customer.address3', '' ); |
|
| 165 | - $expr[] = $search->compare( '>=', 'customer.postal', '' ); |
|
| 166 | - $expr[] = $search->compare( '>=', 'customer.city', '' ); |
|
| 167 | - $expr[] = $search->compare( '>=', 'customer.state', '' ); |
|
| 168 | - $expr[] = $search->compare( '!=', 'customer.languageid', null ); |
|
| 169 | - $expr[] = $search->compare( '>=', 'customer.countryid', '' ); |
|
| 170 | - $expr[] = $search->compare( '>=', 'customer.telephone', '' ); |
|
| 171 | - $expr[] = $search->compare( '>=', 'customer.email', '' ); |
|
| 172 | - $expr[] = $search->compare( '>=', 'customer.telefax', '' ); |
|
| 173 | - $expr[] = $search->compare( '>=', 'customer.website', '' ); |
|
| 174 | - $expr[] = $search->compare( '>=', 'customer.longitude', '10.0' ); |
|
| 175 | - $expr[] = $search->compare( '>=', 'customer.latitude', '50.0' ); |
|
| 176 | - |
|
| 177 | - $expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' ); |
|
| 178 | - $expr[] = $search->compare( '>=', 'customer.password', '' ); |
|
| 179 | - $expr[] = $search->compare( '==', 'customer.status', 0 ); |
|
| 180 | - $expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' ); |
|
| 181 | - $expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' ); |
|
| 182 | - $expr[] = $search->compare( '==', 'customer.editor', $this->editor ); |
|
| 183 | - |
|
| 184 | - $expr[] = $search->compare( '!=', 'customer.address.id', null ); |
|
| 185 | - $expr[] = $search->compare( '!=', 'customer.address.parentid', null ); |
|
| 186 | - $expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' ); |
|
| 187 | - $expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' ); |
|
| 188 | - $expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' ); |
|
| 189 | - $expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' ); |
|
| 190 | - $expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' ); |
|
| 191 | - $expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' ); |
|
| 192 | - $expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' ); |
|
| 193 | - $expr[] = $search->compare( '==', 'customer.address.address2', '2-4' ); |
|
| 194 | - $expr[] = $search->compare( '==', 'customer.address.address3', '' ); |
|
| 195 | - $expr[] = $search->compare( '==', 'customer.address.postal', '11099' ); |
|
| 196 | - $expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' ); |
|
| 197 | - $expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' ); |
|
| 198 | - $expr[] = $search->compare( '==', 'customer.address.languageid', 'de' ); |
|
| 199 | - $expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' ); |
|
| 200 | - $expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' ); |
|
| 201 | - $expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' ); |
|
| 202 | - $expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' ); |
|
| 203 | - $expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' ); |
|
| 204 | - $expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' ); |
|
| 205 | - $expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' ); |
|
| 206 | - $expr[] = $search->compare( '==', 'customer.address.flag', 0 ); |
|
| 207 | - $expr[] = $search->compare( '==', 'customer.address.position', 1 ); |
|
| 208 | - $expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' ); |
|
| 209 | - $expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' ); |
|
| 210 | - $expr[] = $search->compare( '==', 'customer.address.editor', $this->editor ); |
|
| 211 | - |
|
| 212 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 213 | - $result = $this->object->searchItems( $search, [], $total ); |
|
| 214 | - $this->assertEquals( 1, count( $result ) ); |
|
| 152 | + $expr[] = $search->compare('!=', 'customer.id', null); |
|
| 153 | + $expr[] = $search->compare('==', 'customer.label', 'UTC002'); |
|
| 154 | + $expr[] = $search->compare('==', 'customer.code', 'UTC002'); |
|
| 155 | + |
|
| 156 | + $expr[] = $search->compare('>=', 'customer.salutation', ''); |
|
| 157 | + $expr[] = $search->compare('>=', 'customer.company', ''); |
|
| 158 | + $expr[] = $search->compare('>=', 'customer.vatid', ''); |
|
| 159 | + $expr[] = $search->compare('>=', 'customer.title', ''); |
|
| 160 | + $expr[] = $search->compare('>=', 'customer.firstname', ''); |
|
| 161 | + $expr[] = $search->compare('>=', 'customer.lastname', ''); |
|
| 162 | + $expr[] = $search->compare('>=', 'customer.address1', ''); |
|
| 163 | + $expr[] = $search->compare('>=', 'customer.address2', ''); |
|
| 164 | + $expr[] = $search->compare('>=', 'customer.address3', ''); |
|
| 165 | + $expr[] = $search->compare('>=', 'customer.postal', ''); |
|
| 166 | + $expr[] = $search->compare('>=', 'customer.city', ''); |
|
| 167 | + $expr[] = $search->compare('>=', 'customer.state', ''); |
|
| 168 | + $expr[] = $search->compare('!=', 'customer.languageid', null); |
|
| 169 | + $expr[] = $search->compare('>=', 'customer.countryid', ''); |
|
| 170 | + $expr[] = $search->compare('>=', 'customer.telephone', ''); |
|
| 171 | + $expr[] = $search->compare('>=', 'customer.email', ''); |
|
| 172 | + $expr[] = $search->compare('>=', 'customer.telefax', ''); |
|
| 173 | + $expr[] = $search->compare('>=', 'customer.website', ''); |
|
| 174 | + $expr[] = $search->compare('>=', 'customer.longitude', '10.0'); |
|
| 175 | + $expr[] = $search->compare('>=', 'customer.latitude', '50.0'); |
|
| 176 | + |
|
| 177 | + $expr[] = $search->compare('==', 'customer.birthday', '1970-01-01'); |
|
| 178 | + $expr[] = $search->compare('>=', 'customer.password', ''); |
|
| 179 | + $expr[] = $search->compare('==', 'customer.status', 0); |
|
| 180 | + $expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00'); |
|
| 181 | + $expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00'); |
|
| 182 | + $expr[] = $search->compare('==', 'customer.editor', $this->editor); |
|
| 183 | + |
|
| 184 | + $expr[] = $search->compare('!=', 'customer.address.id', null); |
|
| 185 | + $expr[] = $search->compare('!=', 'customer.address.parentid', null); |
|
| 186 | + $expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH'); |
|
| 187 | + $expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999'); |
|
| 188 | + $expr[] = $search->compare('==', 'customer.address.salutation', 'mr'); |
|
| 189 | + $expr[] = $search->compare('==', 'customer.address.title', 'Dr.'); |
|
| 190 | + $expr[] = $search->compare('==', 'customer.address.firstname', 'Good'); |
|
| 191 | + $expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest'); |
|
| 192 | + $expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben'); |
|
| 193 | + $expr[] = $search->compare('==', 'customer.address.address2', '2-4'); |
|
| 194 | + $expr[] = $search->compare('==', 'customer.address.address3', ''); |
|
| 195 | + $expr[] = $search->compare('==', 'customer.address.postal', '11099'); |
|
| 196 | + $expr[] = $search->compare('==', 'customer.address.city', 'Berlin'); |
|
| 197 | + $expr[] = $search->compare('==', 'customer.address.state', 'Berlin'); |
|
| 198 | + $expr[] = $search->compare('==', 'customer.address.languageid', 'de'); |
|
| 199 | + $expr[] = $search->compare('==', 'customer.address.countryid', 'DE'); |
|
| 200 | + $expr[] = $search->compare('==', 'customer.address.telephone', '055544332221'); |
|
| 201 | + $expr[] = $search->compare('==', 'customer.address.email', '[email protected]'); |
|
| 202 | + $expr[] = $search->compare('==', 'customer.address.telefax', '055544333212'); |
|
| 203 | + $expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org'); |
|
| 204 | + $expr[] = $search->compare('>=', 'customer.address.longitude', '10.0'); |
|
| 205 | + $expr[] = $search->compare('>=', 'customer.address.latitude', '50.0'); |
|
| 206 | + $expr[] = $search->compare('==', 'customer.address.flag', 0); |
|
| 207 | + $expr[] = $search->compare('==', 'customer.address.position', 1); |
|
| 208 | + $expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00'); |
|
| 209 | + $expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00'); |
|
| 210 | + $expr[] = $search->compare('==', 'customer.address.editor', $this->editor); |
|
| 211 | + |
|
| 212 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 213 | + $result = $this->object->searchItems($search, [], $total); |
|
| 214 | + $this->assertEquals(1, count($result)); |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | |
@@ -220,60 +220,60 @@ discard block |
||
| 220 | 220 | $total = 0; |
| 221 | 221 | |
| 222 | 222 | $search = $this->object->createSearch(); |
| 223 | - $search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) ); |
|
| 224 | - $search->setSlice( 0, 2 ); |
|
| 223 | + $search->setConditions($search->compare('==', 'customer.address.editor', $this->editor)); |
|
| 224 | + $search->setSlice(0, 2); |
|
| 225 | 225 | |
| 226 | - $results = $this->object->searchItems( $search, [], $total ); |
|
| 227 | - $this->assertEquals( 2, count( $results ) ); |
|
| 228 | - $this->assertEquals( 3, $total ); |
|
| 226 | + $results = $this->object->searchItems($search, [], $total); |
|
| 227 | + $this->assertEquals(2, count($results)); |
|
| 228 | + $this->assertEquals(3, $total); |
|
| 229 | 229 | |
| 230 | - foreach($results as $itemId => $item) { |
|
| 231 | - $this->assertEquals( $itemId, $item->getId() ); |
|
| 230 | + foreach ($results as $itemId => $item) { |
|
| 231 | + $this->assertEquals($itemId, $item->getId()); |
|
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | |
| 236 | 236 | public function testSearchItemsCriteria() |
| 237 | 237 | { |
| 238 | - $search = $this->object->createSearch( true ); |
|
| 238 | + $search = $this->object->createSearch(true); |
|
| 239 | 239 | $conditions = array( |
| 240 | - $search->compare( '==', 'customer.address.editor', $this->editor ), |
|
| 240 | + $search->compare('==', 'customer.address.editor', $this->editor), |
|
| 241 | 241 | $search->getConditions() |
| 242 | 242 | ); |
| 243 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 244 | - $this->assertEquals( 2, count( $this->object->searchItems( $search, [], $total ) ) ); |
|
| 243 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 244 | + $this->assertEquals(2, count($this->object->searchItems($search, [], $total))); |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | |
| 248 | 248 | public function testSearchItemsRef() |
| 249 | 249 | { |
| 250 | 250 | $search = $this->object->createSearch(); |
| 251 | - $search->setConditions( $search->compare( '==', 'customer.code', 'UTC001' ) ); |
|
| 251 | + $search->setConditions($search->compare('==', 'customer.code', 'UTC001')); |
|
| 252 | 252 | |
| 253 | - $results = $this->object->searchItems( $search, ['address', 'text'] ); |
|
| 253 | + $results = $this->object->searchItems($search, ['address', 'text']); |
|
| 254 | 254 | |
| 255 | - if( ( $item = reset( $results ) ) === false ) { |
|
| 256 | - throw new \Exception( 'No customer item for "UTC001" available' ); |
|
| 255 | + if (($item = reset($results)) === false) { |
|
| 256 | + throw new \Exception('No customer item for "UTC001" available'); |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - $this->assertEquals( 1, count( $item->getRefItems( 'text' ) ) ); |
|
| 260 | - $this->assertEquals( 1, count( $item->getAddressItems() ) ); |
|
| 259 | + $this->assertEquals(1, count($item->getRefItems('text'))); |
|
| 260 | + $this->assertEquals(1, count($item->getAddressItems())); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | |
| 264 | 264 | public function testGetSubManager() |
| 265 | 265 | { |
| 266 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) ); |
|
| 267 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) ); |
|
| 266 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address')); |
|
| 267 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard')); |
|
| 268 | 268 | |
| 269 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 270 | - $this->object->getSubManager( 'unknown' ); |
|
| 269 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 270 | + $this->object->getSubManager('unknown'); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | |
| 274 | 274 | public function testGetSubManagerInvalidName() |
| 275 | 275 | { |
| 276 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 277 | - $this->object->getSubManager( 'address', 'unknown' ); |
|
| 276 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 277 | + $this->object->getSubManager('address', 'unknown'); |
|
| 278 | 278 | } |
| 279 | 279 | } |
@@ -18,43 +18,43 @@ discard block |
||
| 18 | 18 | { |
| 19 | 19 | $this->context = \TestHelper::getContext(); |
| 20 | 20 | $this->editor = $this->context->getEditor(); |
| 21 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' ); |
|
| 22 | - $this->object = $manager->getSubManager( 'lists', 'FosUser' ); |
|
| 21 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser'); |
|
| 22 | + $this->object = $manager->getSubManager('lists', 'FosUser'); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | protected function tearDown() |
| 27 | 27 | { |
| 28 | - unset( $this->object, $this->context ); |
|
| 28 | + unset($this->object, $this->context); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | public function testCleanup() |
| 33 | 33 | { |
| 34 | - $this->object->cleanup( array( -1 ) ); |
|
| 34 | + $this->object->cleanup(array( -1 )); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | public function testAggregate() |
| 39 | 39 | { |
| 40 | - $search = $this->object->createSearch( true ); |
|
| 40 | + $search = $this->object->createSearch(true); |
|
| 41 | 41 | $expr = array( |
| 42 | 42 | $search->getConditions(), |
| 43 | - $search->compare( '==', 'customer.lists.editor', 'ai-fosuser:unittest' ), |
|
| 43 | + $search->compare('==', 'customer.lists.editor', 'ai-fosuser:unittest'), |
|
| 44 | 44 | ); |
| 45 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 45 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 46 | 46 | |
| 47 | - $result = $this->object->aggregate( $search, 'customer.lists.domain' ); |
|
| 47 | + $result = $this->object->aggregate($search, 'customer.lists.domain'); |
|
| 48 | 48 | |
| 49 | - $this->assertEquals( 1, count( $result ) ); |
|
| 50 | - $this->assertArrayHasKey( 'text', $result ); |
|
| 51 | - $this->assertEquals( 4, $result['text'] ); |
|
| 49 | + $this->assertEquals(1, count($result)); |
|
| 50 | + $this->assertArrayHasKey('text', $result); |
|
| 51 | + $this->assertEquals(4, $result['text']); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | |
| 55 | 55 | public function testCreateItem() |
| 56 | 56 | { |
| 57 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem() ); |
|
| 57 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem()); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | |
@@ -62,13 +62,13 @@ discard block |
||
| 62 | 62 | { |
| 63 | 63 | $search = $this->object->createSearch(); |
| 64 | 64 | $search->setSlice(0, 1); |
| 65 | - $results = $this->object->searchItems( $search ); |
|
| 65 | + $results = $this->object->searchItems($search); |
|
| 66 | 66 | |
| 67 | - if( ( $item = reset( $results ) ) === false ) { |
|
| 68 | - throw new \RuntimeException( 'No item found' ); |
|
| 67 | + if (($item = reset($results)) === false) { |
|
| 68 | + throw new \RuntimeException('No item found'); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - $this->assertEquals( $item, $this->object->getItem( $item->getId() ) ); |
|
| 71 | + $this->assertEquals($item, $this->object->getItem($item->getId())); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | |
@@ -76,147 +76,147 @@ discard block |
||
| 76 | 76 | { |
| 77 | 77 | $search = $this->object->createSearch(); |
| 78 | 78 | $search->setSlice(0, 1); |
| 79 | - $items = $this->object->searchItems( $search ); |
|
| 79 | + $items = $this->object->searchItems($search); |
|
| 80 | 80 | |
| 81 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 82 | - throw new \RuntimeException( 'No item found' ); |
|
| 81 | + if (($item = reset($items)) === false) { |
|
| 82 | + throw new \RuntimeException('No item found'); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - $item->setId( null ); |
|
| 86 | - $item->setDomain( 'unittest' ); |
|
| 87 | - $resultSaved = $this->object->saveItem( $item ); |
|
| 88 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
| 85 | + $item->setId(null); |
|
| 86 | + $item->setDomain('unittest'); |
|
| 87 | + $resultSaved = $this->object->saveItem($item); |
|
| 88 | + $itemSaved = $this->object->getItem($item->getId()); |
|
| 89 | 89 | |
| 90 | 90 | $itemExp = clone $itemSaved; |
| 91 | - $itemExp->setDomain( 'unittest2' ); |
|
| 92 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
| 93 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
| 94 | - |
|
| 95 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
| 96 | - |
|
| 97 | - |
|
| 98 | - $this->assertTrue( $item->getId() !== null ); |
|
| 99 | - $this->assertTrue( $itemSaved->getType() !== null ); |
|
| 100 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
| 101 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
| 102 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId() ); |
|
| 103 | - $this->assertEquals( $item->getTypeId(), $itemSaved->getTypeId() ); |
|
| 104 | - $this->assertEquals( $item->getRefId(), $itemSaved->getRefId() ); |
|
| 105 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); |
|
| 106 | - $this->assertEquals( $item->getDateStart(), $itemSaved->getDateStart() ); |
|
| 107 | - $this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() ); |
|
| 108 | - $this->assertEquals( $item->getPosition(), $itemSaved->getPosition() ); |
|
| 109 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
| 91 | + $itemExp->setDomain('unittest2'); |
|
| 92 | + $resultUpd = $this->object->saveItem($itemExp); |
|
| 93 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
| 94 | + |
|
| 95 | + $this->object->deleteItem($itemSaved->getId()); |
|
| 96 | + |
|
| 97 | + |
|
| 98 | + $this->assertTrue($item->getId() !== null); |
|
| 99 | + $this->assertTrue($itemSaved->getType() !== null); |
|
| 100 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
| 101 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
| 102 | + $this->assertEquals($item->getParentId(), $itemSaved->getParentId()); |
|
| 103 | + $this->assertEquals($item->getTypeId(), $itemSaved->getTypeId()); |
|
| 104 | + $this->assertEquals($item->getRefId(), $itemSaved->getRefId()); |
|
| 105 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); |
|
| 106 | + $this->assertEquals($item->getDateStart(), $itemSaved->getDateStart()); |
|
| 107 | + $this->assertEquals($item->getDateEnd(), $itemSaved->getDateEnd()); |
|
| 108 | + $this->assertEquals($item->getPosition(), $itemSaved->getPosition()); |
|
| 109 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 110 | 110 | $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated()); |
| 111 | 111 | $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified()); |
| 112 | 112 | |
| 113 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
| 114 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
| 115 | - $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
| 113 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 114 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
| 115 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
| 116 | 116 | |
| 117 | - $this->assertTrue( $itemUpd->getType() !== null ); |
|
| 118 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
| 119 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
| 120 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() ); |
|
| 121 | - $this->assertEquals( $itemExp->getTypeId(), $itemUpd->getTypeId() ); |
|
| 122 | - $this->assertEquals( $itemExp->getRefId(), $itemUpd->getRefId() ); |
|
| 123 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); |
|
| 124 | - $this->assertEquals( $itemExp->getDateStart(), $itemUpd->getDateStart() ); |
|
| 125 | - $this->assertEquals( $itemExp->getDateEnd(), $itemUpd->getDateEnd() ); |
|
| 126 | - $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() ); |
|
| 117 | + $this->assertTrue($itemUpd->getType() !== null); |
|
| 118 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
| 119 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
| 120 | + $this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId()); |
|
| 121 | + $this->assertEquals($itemExp->getTypeId(), $itemUpd->getTypeId()); |
|
| 122 | + $this->assertEquals($itemExp->getRefId(), $itemUpd->getRefId()); |
|
| 123 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); |
|
| 124 | + $this->assertEquals($itemExp->getDateStart(), $itemUpd->getDateStart()); |
|
| 125 | + $this->assertEquals($itemExp->getDateEnd(), $itemUpd->getDateEnd()); |
|
| 126 | + $this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition()); |
|
| 127 | 127 | |
| 128 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
| 129 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
| 130 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
| 128 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
| 129 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
| 130 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
| 131 | 131 | |
| 132 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved ); |
|
| 133 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd ); |
|
| 132 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved); |
|
| 133 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd); |
|
| 134 | 134 | |
| 135 | 135 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
| 136 | - $this->object->getItem( $itemSaved->getId() ); |
|
| 136 | + $this->object->getItem($itemSaved->getId()); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | |
| 140 | 140 | public function testMoveItemLastToFront() |
| 141 | 141 | { |
| 142 | 142 | $listItems = $this->getListItems(); |
| 143 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
| 143 | + $this->assertGreaterThan(1, count($listItems)); |
|
| 144 | 144 | |
| 145 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
| 146 | - throw new \RuntimeException( 'No first customer list item' ); |
|
| 145 | + if (($first = reset($listItems)) === false) { |
|
| 146 | + throw new \RuntimeException('No first customer list item'); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - if( ( $last = end( $listItems ) ) === false ) { |
|
| 150 | - throw new \RuntimeException( 'No last customer list item' ); |
|
| 149 | + if (($last = end($listItems)) === false) { |
|
| 150 | + throw new \RuntimeException('No last customer list item'); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - $this->object->moveItem( $last->getId(), $first->getId() ); |
|
| 153 | + $this->object->moveItem($last->getId(), $first->getId()); |
|
| 154 | 154 | |
| 155 | - $newFirst = $this->object->getItem( $last->getId() ); |
|
| 156 | - $newSecond = $this->object->getItem( $first->getId() ); |
|
| 155 | + $newFirst = $this->object->getItem($last->getId()); |
|
| 156 | + $newSecond = $this->object->getItem($first->getId()); |
|
| 157 | 157 | |
| 158 | - $this->object->moveItem( $last->getId() ); |
|
| 158 | + $this->object->moveItem($last->getId()); |
|
| 159 | 159 | |
| 160 | - $this->assertEquals( 1, $newFirst->getPosition() ); |
|
| 161 | - $this->assertEquals( 2, $newSecond->getPosition() ); |
|
| 160 | + $this->assertEquals(1, $newFirst->getPosition()); |
|
| 161 | + $this->assertEquals(2, $newSecond->getPosition()); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | |
| 165 | 165 | public function testMoveItemFirstToLast() |
| 166 | 166 | { |
| 167 | 167 | $listItems = $this->getListItems(); |
| 168 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
| 168 | + $this->assertGreaterThan(1, count($listItems)); |
|
| 169 | 169 | |
| 170 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
| 171 | - throw new \RuntimeException( 'No first customer list item' ); |
|
| 170 | + if (($first = reset($listItems)) === false) { |
|
| 171 | + throw new \RuntimeException('No first customer list item'); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - if( ( $second = next( $listItems ) ) === false ) { |
|
| 175 | - throw new \RuntimeException( 'No second customer list item' ); |
|
| 174 | + if (($second = next($listItems)) === false) { |
|
| 175 | + throw new \RuntimeException('No second customer list item'); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - if( ( $last = end( $listItems ) ) === false ) { |
|
| 179 | - throw new \RuntimeException( 'No last customer list item' ); |
|
| 178 | + if (($last = end($listItems)) === false) { |
|
| 179 | + throw new \RuntimeException('No last customer list item'); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - $this->object->moveItem( $first->getId() ); |
|
| 182 | + $this->object->moveItem($first->getId()); |
|
| 183 | 183 | |
| 184 | - $newBefore = $this->object->getItem( $last->getId() ); |
|
| 185 | - $newLast = $this->object->getItem( $first->getId() ); |
|
| 184 | + $newBefore = $this->object->getItem($last->getId()); |
|
| 185 | + $newLast = $this->object->getItem($first->getId()); |
|
| 186 | 186 | |
| 187 | - $this->object->moveItem( $first->getId(), $second->getId() ); |
|
| 187 | + $this->object->moveItem($first->getId(), $second->getId()); |
|
| 188 | 188 | |
| 189 | - $this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() ); |
|
| 190 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); |
|
| 189 | + $this->assertEquals($last->getPosition() - 1, $newBefore->getPosition()); |
|
| 190 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | |
| 194 | 194 | public function testMoveItemFirstUp() |
| 195 | 195 | { |
| 196 | 196 | $listItems = $this->getListItems(); |
| 197 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
| 197 | + $this->assertGreaterThan(1, count($listItems)); |
|
| 198 | 198 | |
| 199 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
| 200 | - throw new \RuntimeException( 'No first customer list item' ); |
|
| 199 | + if (($first = reset($listItems)) === false) { |
|
| 200 | + throw new \RuntimeException('No first customer list item'); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - if( ( $second = next( $listItems ) ) === false ) { |
|
| 204 | - throw new \RuntimeException( 'No second customer list item' ); |
|
| 203 | + if (($second = next($listItems)) === false) { |
|
| 204 | + throw new \RuntimeException('No second customer list item'); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - if( ( $last = end( $listItems ) ) === false ) { |
|
| 208 | - throw new \RuntimeException( 'No last customer list item' ); |
|
| 207 | + if (($last = end($listItems)) === false) { |
|
| 208 | + throw new \RuntimeException('No last customer list item'); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - $this->object->moveItem( $first->getId(), $last->getId() ); |
|
| 211 | + $this->object->moveItem($first->getId(), $last->getId()); |
|
| 212 | 212 | |
| 213 | - $newLast = $this->object->getItem( $last->getId() ); |
|
| 214 | - $newUp = $this->object->getItem( $first->getId() ); |
|
| 213 | + $newLast = $this->object->getItem($last->getId()); |
|
| 214 | + $newUp = $this->object->getItem($first->getId()); |
|
| 215 | 215 | |
| 216 | - $this->object->moveItem( $first->getId(), $second->getId() ); |
|
| 216 | + $this->object->moveItem($first->getId(), $second->getId()); |
|
| 217 | 217 | |
| 218 | - $this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() ); |
|
| 219 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); |
|
| 218 | + $this->assertEquals($last->getPosition() - 1, $newUp->getPosition()); |
|
| 219 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | |
@@ -226,39 +226,39 @@ discard block |
||
| 226 | 226 | $search = $this->object->createSearch(); |
| 227 | 227 | |
| 228 | 228 | $expr = []; |
| 229 | - $expr[] = $search->compare( '!=', 'customer.lists.id', null ); |
|
| 230 | - $expr[] = $search->compare( '!=', 'customer.lists.siteid', null ); |
|
| 231 | - $expr[] = $search->compare( '>', 'customer.lists.parentid', 0 ); |
|
| 232 | - $expr[] = $search->compare( '==', 'customer.lists.domain', 'text' ); |
|
| 233 | - $expr[] = $search->compare( '>', 'customer.lists.typeid', 0 ); |
|
| 234 | - $expr[] = $search->compare( '>', 'customer.lists.refid', 0 ); |
|
| 235 | - $expr[] = $search->compare( '==', 'customer.lists.datestart', '2010-01-01 00:00:00' ); |
|
| 236 | - $expr[] = $search->compare( '==', 'customer.lists.dateend', '2100-01-01 00:00:00' ); |
|
| 237 | - $expr[] = $search->compare( '!=', 'customer.lists.config', null ); |
|
| 238 | - $expr[] = $search->compare( '>', 'customer.lists.position', 1 ); |
|
| 239 | - $expr[] = $search->compare( '==', 'customer.lists.status', 1 ); |
|
| 240 | - $expr[] = $search->compare( '>=', 'customer.lists.mtime', '1970-01-01 00:00:00' ); |
|
| 241 | - $expr[] = $search->compare( '>=', 'customer.lists.ctime', '1970-01-01 00:00:00' ); |
|
| 242 | - $expr[] = $search->compare( '==', 'customer.lists.editor', $this->editor ); |
|
| 243 | - |
|
| 244 | - $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 ); |
|
| 245 | - $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null ); |
|
| 246 | - $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' ); |
|
| 247 | - $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' ); |
|
| 248 | - $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' ); |
|
| 249 | - $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 ); |
|
| 250 | - $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' ); |
|
| 251 | - $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' ); |
|
| 252 | - $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); |
|
| 253 | - |
|
| 254 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 229 | + $expr[] = $search->compare('!=', 'customer.lists.id', null); |
|
| 230 | + $expr[] = $search->compare('!=', 'customer.lists.siteid', null); |
|
| 231 | + $expr[] = $search->compare('>', 'customer.lists.parentid', 0); |
|
| 232 | + $expr[] = $search->compare('==', 'customer.lists.domain', 'text'); |
|
| 233 | + $expr[] = $search->compare('>', 'customer.lists.typeid', 0); |
|
| 234 | + $expr[] = $search->compare('>', 'customer.lists.refid', 0); |
|
| 235 | + $expr[] = $search->compare('==', 'customer.lists.datestart', '2010-01-01 00:00:00'); |
|
| 236 | + $expr[] = $search->compare('==', 'customer.lists.dateend', '2100-01-01 00:00:00'); |
|
| 237 | + $expr[] = $search->compare('!=', 'customer.lists.config', null); |
|
| 238 | + $expr[] = $search->compare('>', 'customer.lists.position', 1); |
|
| 239 | + $expr[] = $search->compare('==', 'customer.lists.status', 1); |
|
| 240 | + $expr[] = $search->compare('>=', 'customer.lists.mtime', '1970-01-01 00:00:00'); |
|
| 241 | + $expr[] = $search->compare('>=', 'customer.lists.ctime', '1970-01-01 00:00:00'); |
|
| 242 | + $expr[] = $search->compare('==', 'customer.lists.editor', $this->editor); |
|
| 243 | + |
|
| 244 | + $expr[] = $search->compare('!=', 'customer.lists.type.id', 0); |
|
| 245 | + $expr[] = $search->compare('!=', 'customer.lists.type.siteid', null); |
|
| 246 | + $expr[] = $search->compare('==', 'customer.lists.type.code', 'default'); |
|
| 247 | + $expr[] = $search->compare('==', 'customer.lists.type.domain', 'text'); |
|
| 248 | + $expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard'); |
|
| 249 | + $expr[] = $search->compare('==', 'customer.lists.type.status', 1); |
|
| 250 | + $expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00'); |
|
| 251 | + $expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00'); |
|
| 252 | + $expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor); |
|
| 253 | + |
|
| 254 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 255 | 255 | $search->setSlice(0, 1); |
| 256 | - $results = $this->object->searchItems( $search, [], $total ); |
|
| 257 | - $this->assertEquals( 1, count( $results ) ); |
|
| 258 | - $this->assertEquals( 2, $total ); |
|
| 256 | + $results = $this->object->searchItems($search, [], $total); |
|
| 257 | + $this->assertEquals(1, count($results)); |
|
| 258 | + $this->assertEquals(2, $total); |
|
| 259 | 259 | |
| 260 | - foreach($results as $itemId => $item) { |
|
| 261 | - $this->assertEquals( $itemId, $item->getId() ); |
|
| 260 | + foreach ($results as $itemId => $item) { |
|
| 261 | + $this->assertEquals($itemId, $item->getId()); |
|
| 262 | 262 | } |
| 263 | 263 | } |
| 264 | 264 | |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | public function testSearchItemsNoCriteria() |
| 267 | 267 | { |
| 268 | 268 | $search = $this->object->createSearch(); |
| 269 | - $search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) ); |
|
| 270 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); |
|
| 269 | + $search->setConditions($search->compare('==', 'customer.lists.editor', $this->editor)); |
|
| 270 | + $this->assertEquals(4, count($this->object->searchItems($search))); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | |
@@ -275,48 +275,48 @@ discard block |
||
| 275 | 275 | { |
| 276 | 276 | $search = $this->object->createSearch(true); |
| 277 | 277 | $conditions = array( |
| 278 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), |
|
| 278 | + $search->compare('==', 'customer.lists.editor', $this->editor), |
|
| 279 | 279 | $search->getConditions() |
| 280 | 280 | ); |
| 281 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 282 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); |
|
| 281 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 282 | + $this->assertEquals(4, count($this->object->searchItems($search))); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | |
| 286 | 286 | public function testGetSubManager() |
| 287 | 287 | { |
| 288 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
| 289 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
| 288 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type')); |
|
| 289 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard')); |
|
| 290 | 290 | |
| 291 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 292 | - $this->object->getSubManager( 'unknown' ); |
|
| 291 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 292 | + $this->object->getSubManager('unknown'); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | |
| 296 | 296 | protected function getListItems() |
| 297 | 297 | { |
| 298 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' ); |
|
| 298 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser'); |
|
| 299 | 299 | |
| 300 | 300 | $search = $manager->createSearch(); |
| 301 | - $search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) ); |
|
| 302 | - $search->setSlice( 0, 1 ); |
|
| 301 | + $search->setConditions($search->compare('==', 'customer.code', 'UTC003')); |
|
| 302 | + $search->setSlice(0, 1); |
|
| 303 | 303 | |
| 304 | - $results = $manager->searchItems( $search ); |
|
| 304 | + $results = $manager->searchItems($search); |
|
| 305 | 305 | |
| 306 | - if( ( $item = reset( $results ) ) === false ) { |
|
| 307 | - throw new \RuntimeException( 'No customer item found' ); |
|
| 306 | + if (($item = reset($results)) === false) { |
|
| 307 | + throw new \RuntimeException('No customer item found'); |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | $search = $this->object->createSearch(); |
| 311 | 311 | $expr = array( |
| 312 | - $search->compare( '==', 'customer.lists.parentid', $item->getId() ), |
|
| 313 | - $search->compare( '==', 'customer.lists.domain', 'text' ), |
|
| 314 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), |
|
| 315 | - $search->compare( '==', 'customer.lists.type.code', 'default' ), |
|
| 312 | + $search->compare('==', 'customer.lists.parentid', $item->getId()), |
|
| 313 | + $search->compare('==', 'customer.lists.domain', 'text'), |
|
| 314 | + $search->compare('==', 'customer.lists.editor', $this->editor), |
|
| 315 | + $search->compare('==', 'customer.lists.type.code', 'default'), |
|
| 316 | 316 | ); |
| 317 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 318 | - $search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) ); |
|
| 317 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 318 | + $search->setSortations(array($search->sort('+', 'customer.lists.position'))); |
|
| 319 | 319 | |
| 320 | - return $this->object->searchItems( $search ); |
|
| 320 | + return $this->object->searchItems($search); |
|
| 321 | 321 | } |
| 322 | 322 | } |
@@ -16,44 +16,44 @@ discard block |
||
| 16 | 16 | protected function setUp() |
| 17 | 17 | { |
| 18 | 18 | $this->editor = \TestHelper::getContext()->getEditor(); |
| 19 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'FosUser' ); |
|
| 19 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'FosUser'); |
|
| 20 | 20 | |
| 21 | - $listManager = $manager->getSubManager( 'lists', 'FosUser' ); |
|
| 22 | - $this->object = $listManager->getSubManager( 'type', 'FosUser' ); |
|
| 21 | + $listManager = $manager->getSubManager('lists', 'FosUser'); |
|
| 22 | + $this->object = $listManager->getSubManager('type', 'FosUser'); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | protected function tearDown() |
| 27 | 27 | { |
| 28 | - unset( $this->object ); |
|
| 28 | + unset($this->object); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | public function testCleanup() |
| 33 | 33 | { |
| 34 | - $this->object->cleanup( array( -1 ) ); |
|
| 34 | + $this->object->cleanup(array( -1 )); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | public function testGetSearchAttributes() |
| 39 | 39 | { |
| 40 | - foreach( $this->object->getSearchAttributes() as $attribute ) { |
|
| 41 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); |
|
| 40 | + foreach ($this->object->getSearchAttributes() as $attribute) { |
|
| 41 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | public function testGetSubManager() |
| 47 | 47 | { |
| 48 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 49 | - $this->object->getSubManager( 'unknown' ); |
|
| 48 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 49 | + $this->object->getSubManager('unknown'); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | public function testCreateItem() |
| 54 | 54 | { |
| 55 | 55 | $item = $this->object->createItem(); |
| 56 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item ); |
|
| 56 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | |
@@ -63,11 +63,11 @@ discard block |
||
| 63 | 63 | $search->setSlice(0, 1); |
| 64 | 64 | $results = $this->object->searchItems($search); |
| 65 | 65 | |
| 66 | - if( ( $expected = reset($results) ) === false ) { |
|
| 67 | - throw new \RuntimeException( 'No list type item found' ); |
|
| 66 | + if (($expected = reset($results)) === false) { |
|
| 67 | + throw new \RuntimeException('No list type item found'); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - $this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) ); |
|
| 70 | + $this->assertEquals($expected, $this->object->getItem($expected->getId())); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | |
@@ -77,51 +77,51 @@ discard block |
||
| 77 | 77 | $search->setSlice(0, 1); |
| 78 | 78 | $results = $this->object->searchItems($search); |
| 79 | 79 | |
| 80 | - if( ( $item = reset($results) ) === false ) { |
|
| 81 | - throw new \RuntimeException( 'No type item found' ); |
|
| 80 | + if (($item = reset($results)) === false) { |
|
| 81 | + throw new \RuntimeException('No type item found'); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $item->setId(null); |
| 85 | - $item->setCode( 'unitTestInit' ); |
|
| 86 | - $resultSaved = $this->object->saveItem( $item ); |
|
| 87 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
| 85 | + $item->setCode('unitTestInit'); |
|
| 86 | + $resultSaved = $this->object->saveItem($item); |
|
| 87 | + $itemSaved = $this->object->getItem($item->getId()); |
|
| 88 | 88 | |
| 89 | 89 | $itemExp = clone $itemSaved; |
| 90 | - $itemExp->setCode( 'unitTestSave' ); |
|
| 91 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
| 92 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
| 90 | + $itemExp->setCode('unitTestSave'); |
|
| 91 | + $resultUpd = $this->object->saveItem($itemExp); |
|
| 92 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
| 93 | 93 | |
| 94 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
| 94 | + $this->object->deleteItem($itemSaved->getId()); |
|
| 95 | 95 | |
| 96 | 96 | |
| 97 | - $this->assertTrue( $item->getId() !== null ); |
|
| 98 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
| 99 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
| 100 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); |
|
| 101 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); |
|
| 102 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); |
|
| 103 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); |
|
| 97 | + $this->assertTrue($item->getId() !== null); |
|
| 98 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
| 99 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
| 100 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); |
|
| 101 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); |
|
| 102 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); |
|
| 103 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); |
|
| 104 | 104 | |
| 105 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
| 106 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
| 107 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
| 105 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 106 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
| 107 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
| 108 | 108 | |
| 109 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
| 110 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
| 111 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); |
|
| 112 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); |
|
| 113 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); |
|
| 114 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); |
|
| 109 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
| 110 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
| 111 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); |
|
| 112 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); |
|
| 113 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); |
|
| 114 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); |
|
| 115 | 115 | |
| 116 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
| 117 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
| 118 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
| 116 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
| 117 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
| 118 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
| 119 | 119 | |
| 120 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved ); |
|
| 121 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd ); |
|
| 120 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved); |
|
| 121 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd); |
|
| 122 | 122 | |
| 123 | 123 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
| 124 | - $this->object->getItem( $itemSaved->getId() ); |
|
| 124 | + $this->object->getItem($itemSaved->getId()); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | |
@@ -131,25 +131,25 @@ discard block |
||
| 131 | 131 | $search = $this->object->createSearch(); |
| 132 | 132 | |
| 133 | 133 | $expr = []; |
| 134 | - $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 ); |
|
| 135 | - $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null ); |
|
| 136 | - $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' ); |
|
| 137 | - $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' ); |
|
| 138 | - $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' ); |
|
| 139 | - $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 ); |
|
| 140 | - $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' ); |
|
| 141 | - $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' ); |
|
| 142 | - $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); |
|
| 143 | - |
|
| 144 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 134 | + $expr[] = $search->compare('!=', 'customer.lists.type.id', 0); |
|
| 135 | + $expr[] = $search->compare('!=', 'customer.lists.type.siteid', null); |
|
| 136 | + $expr[] = $search->compare('==', 'customer.lists.type.code', 'default'); |
|
| 137 | + $expr[] = $search->compare('==', 'customer.lists.type.domain', 'text'); |
|
| 138 | + $expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard'); |
|
| 139 | + $expr[] = $search->compare('==', 'customer.lists.type.status', 1); |
|
| 140 | + $expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00'); |
|
| 141 | + $expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00'); |
|
| 142 | + $expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor); |
|
| 143 | + |
|
| 144 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 145 | 145 | $search->setSlice(0, 1); |
| 146 | 146 | |
| 147 | - $results = $this->object->searchItems( $search, [], $total ); |
|
| 148 | - $this->assertEquals( 1, count( $results ) ); |
|
| 149 | - $this->assertEquals( 1, $total ); |
|
| 147 | + $results = $this->object->searchItems($search, [], $total); |
|
| 148 | + $this->assertEquals(1, count($results)); |
|
| 149 | + $this->assertEquals(1, $total); |
|
| 150 | 150 | |
| 151 | - foreach($results as $itemId => $item) { |
|
| 152 | - $this->assertEquals( $itemId, $item->getId() ); |
|
| 151 | + foreach ($results as $itemId => $item) { |
|
| 152 | + $this->assertEquals($itemId, $item->getId()); |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | |
@@ -21,18 +21,18 @@ discard block |
||
| 21 | 21 | { |
| 22 | 22 | $context = \TestHelper::getContext(); |
| 23 | 23 | $this->editor = $context->getEditor(); |
| 24 | - $customer = new \Aimeos\MShop\Customer\Manager\FosUser( $context ); |
|
| 24 | + $customer = new \Aimeos\MShop\Customer\Manager\FosUser($context); |
|
| 25 | 25 | |
| 26 | 26 | $search = $customer->createSearch(); |
| 27 | 27 | $conditions = array( |
| 28 | - $search->compare( '==', 'customer.code', 'UTC001' ), |
|
| 29 | - $search->compare( '==', 'customer.editor', $this->editor ) |
|
| 28 | + $search->compare('==', 'customer.code', 'UTC001'), |
|
| 29 | + $search->compare('==', 'customer.editor', $this->editor) |
|
| 30 | 30 | ); |
| 31 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 32 | - $result = $customer->searchItems( $search ); |
|
| 31 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 32 | + $result = $customer->searchItems($search); |
|
| 33 | 33 | |
| 34 | - if( ( $customerItem = reset( $result ) ) === false ) { |
|
| 35 | - throw new \RuntimeException( sprintf( 'No customer item found for code "%1$s"', 'UTC001' ) ); |
|
| 34 | + if (($customerItem = reset($result)) === false) { |
|
| 35 | + throw new \RuntimeException(sprintf('No customer item found for code "%1$s"', 'UTC001')); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | $this->fixture = array( |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | 'customer.address.siteid' => $context->getLocale()->getSiteId(), |
| 62 | 62 | ); |
| 63 | 63 | |
| 64 | - $this->object = $customer->getSubManager( 'address', 'FosUser' ); |
|
| 64 | + $this->object = $customer->getSubManager('address', 'FosUser'); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | |
@@ -70,133 +70,133 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | protected function tearDown() |
| 72 | 72 | { |
| 73 | - unset( $this->object, $this->fixture ); |
|
| 73 | + unset($this->object, $this->fixture); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | public function testCleanup() |
| 78 | 78 | { |
| 79 | - $this->object->cleanup( array( -1 ) ); |
|
| 79 | + $this->object->cleanup(array( -1 )); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public function testGetSearchAttributes() |
| 83 | 83 | { |
| 84 | - foreach( $this->object->getSearchAttributes() as $attribute ) { |
|
| 85 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); |
|
| 84 | + foreach ($this->object->getSearchAttributes() as $attribute) { |
|
| 85 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | public function testGetSubManager() |
| 90 | 90 | { |
| 91 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 92 | - $this->object->getSubManager( 'unknown' ); |
|
| 91 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 92 | + $this->object->getSubManager('unknown'); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | public function testCreateItem() |
| 96 | 96 | { |
| 97 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() ); |
|
| 97 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem()); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | public function testGetItem() |
| 101 | 101 | { |
| 102 | 102 | $search = $this->object->createSearch(); |
| 103 | - $search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) ); |
|
| 103 | + $search->setConditions($search->compare('~=', 'customer.address.company', 'ABC GmbH')); |
|
| 104 | 104 | |
| 105 | - $items = $this->object->searchItems( $search ); |
|
| 105 | + $items = $this->object->searchItems($search); |
|
| 106 | 106 | |
| 107 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 108 | - throw new \RuntimeException( 'No address item with company "ABC" found' ); |
|
| 107 | + if (($item = reset($items)) === false) { |
|
| 108 | + throw new \RuntimeException('No address item with company "ABC" found'); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $this->assertEquals( $item, $this->object->getItem( $item->getId() ) ); |
|
| 111 | + $this->assertEquals($item, $this->object->getItem($item->getId())); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | public function testSaveUpdateDeleteItem() |
| 115 | 115 | { |
| 116 | - $item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture ); |
|
| 117 | - $item->setId( null ); |
|
| 118 | - $resultSaved = $this->object->saveItem( $item ); |
|
| 119 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
| 116 | + $item = new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.', $this->fixture); |
|
| 117 | + $item->setId(null); |
|
| 118 | + $resultSaved = $this->object->saveItem($item); |
|
| 119 | + $itemSaved = $this->object->getItem($item->getId()); |
|
| 120 | 120 | |
| 121 | 121 | $itemExp = clone $itemSaved; |
| 122 | - $itemExp->setPosition( 1 ); |
|
| 123 | - $itemExp->setCity( 'Berlin' ); |
|
| 124 | - $itemExp->setState( 'Berlin' ); |
|
| 125 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
| 126 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
| 127 | - |
|
| 128 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
| 129 | - |
|
| 130 | - |
|
| 131 | - $this->assertTrue( $item->getId() !== null ); |
|
| 132 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
| 133 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId()); |
|
| 134 | - $this->assertEquals( $item->getPosition(), $itemSaved->getPosition()); |
|
| 135 | - $this->assertEquals( $item->getCompany(), $itemSaved->getCompany()); |
|
| 136 | - $this->assertEquals( $item->getVatID(), $itemSaved->getVatID()); |
|
| 137 | - $this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation()); |
|
| 138 | - $this->assertEquals( $item->getTitle(), $itemSaved->getTitle()); |
|
| 139 | - $this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname()); |
|
| 140 | - $this->assertEquals( $item->getLastname(), $itemSaved->getLastname()); |
|
| 141 | - $this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1()); |
|
| 142 | - $this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2()); |
|
| 143 | - $this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3()); |
|
| 144 | - $this->assertEquals( $item->getPostal(), $itemSaved->getPostal()); |
|
| 145 | - $this->assertEquals( $item->getCity(), $itemSaved->getCity()); |
|
| 146 | - $this->assertEquals( $item->getState(), $itemSaved->getState()); |
|
| 147 | - $this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId()); |
|
| 148 | - $this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId()); |
|
| 149 | - $this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone()); |
|
| 150 | - $this->assertEquals( $item->getEmail(), $itemSaved->getEmail()); |
|
| 151 | - $this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax()); |
|
| 152 | - $this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite()); |
|
| 153 | - $this->assertEquals( $item->getLongitude(), $itemSaved->getLongitude()); |
|
| 154 | - $this->assertEquals( $item->getLatitude(), $itemSaved->getLatitude()); |
|
| 155 | - $this->assertEquals( $item->getFlag(), $itemSaved->getFlag()); |
|
| 156 | - |
|
| 157 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
| 158 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
| 122 | + $itemExp->setPosition(1); |
|
| 123 | + $itemExp->setCity('Berlin'); |
|
| 124 | + $itemExp->setState('Berlin'); |
|
| 125 | + $resultUpd = $this->object->saveItem($itemExp); |
|
| 126 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
| 127 | + |
|
| 128 | + $this->object->deleteItem($itemSaved->getId()); |
|
| 129 | + |
|
| 130 | + |
|
| 131 | + $this->assertTrue($item->getId() !== null); |
|
| 132 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
| 133 | + $this->assertEquals($item->getParentId(), $itemSaved->getParentId()); |
|
| 134 | + $this->assertEquals($item->getPosition(), $itemSaved->getPosition()); |
|
| 135 | + $this->assertEquals($item->getCompany(), $itemSaved->getCompany()); |
|
| 136 | + $this->assertEquals($item->getVatID(), $itemSaved->getVatID()); |
|
| 137 | + $this->assertEquals($item->getSalutation(), $itemSaved->getSalutation()); |
|
| 138 | + $this->assertEquals($item->getTitle(), $itemSaved->getTitle()); |
|
| 139 | + $this->assertEquals($item->getFirstname(), $itemSaved->getFirstname()); |
|
| 140 | + $this->assertEquals($item->getLastname(), $itemSaved->getLastname()); |
|
| 141 | + $this->assertEquals($item->getAddress1(), $itemSaved->getAddress1()); |
|
| 142 | + $this->assertEquals($item->getAddress2(), $itemSaved->getAddress2()); |
|
| 143 | + $this->assertEquals($item->getAddress3(), $itemSaved->getAddress3()); |
|
| 144 | + $this->assertEquals($item->getPostal(), $itemSaved->getPostal()); |
|
| 145 | + $this->assertEquals($item->getCity(), $itemSaved->getCity()); |
|
| 146 | + $this->assertEquals($item->getState(), $itemSaved->getState()); |
|
| 147 | + $this->assertEquals($item->getCountryId(), $itemSaved->getCountryId()); |
|
| 148 | + $this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId()); |
|
| 149 | + $this->assertEquals($item->getTelephone(), $itemSaved->getTelephone()); |
|
| 150 | + $this->assertEquals($item->getEmail(), $itemSaved->getEmail()); |
|
| 151 | + $this->assertEquals($item->getTelefax(), $itemSaved->getTelefax()); |
|
| 152 | + $this->assertEquals($item->getWebsite(), $itemSaved->getWebsite()); |
|
| 153 | + $this->assertEquals($item->getLongitude(), $itemSaved->getLongitude()); |
|
| 154 | + $this->assertEquals($item->getLatitude(), $itemSaved->getLatitude()); |
|
| 155 | + $this->assertEquals($item->getFlag(), $itemSaved->getFlag()); |
|
| 156 | + |
|
| 157 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 158 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
| 159 | 159 | $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
| 160 | 160 | |
| 161 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
| 162 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId()); |
|
| 163 | - $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition()); |
|
| 164 | - $this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany()); |
|
| 165 | - $this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID()); |
|
| 166 | - $this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation()); |
|
| 167 | - $this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle()); |
|
| 168 | - $this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname()); |
|
| 169 | - $this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname()); |
|
| 170 | - $this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1()); |
|
| 171 | - $this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2()); |
|
| 172 | - $this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3()); |
|
| 173 | - $this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal()); |
|
| 174 | - $this->assertEquals( $itemExp->getCity(), $itemUpd->getCity()); |
|
| 175 | - $this->assertEquals( $itemExp->getState(), $itemUpd->getState()); |
|
| 176 | - $this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId()); |
|
| 177 | - $this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId()); |
|
| 178 | - $this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone()); |
|
| 179 | - $this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail()); |
|
| 180 | - $this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax()); |
|
| 181 | - $this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite()); |
|
| 182 | - $this->assertEquals( $itemExp->getLongitude(), $itemUpd->getLongitude()); |
|
| 183 | - $this->assertEquals( $itemExp->getLatitude(), $itemUpd->getLatitude()); |
|
| 184 | - $this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag()); |
|
| 185 | - |
|
| 186 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
| 187 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
| 188 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
| 189 | - |
|
| 190 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved ); |
|
| 191 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd ); |
|
| 161 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
| 162 | + $this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId()); |
|
| 163 | + $this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition()); |
|
| 164 | + $this->assertEquals($itemExp->getCompany(), $itemUpd->getCompany()); |
|
| 165 | + $this->assertEquals($itemExp->getVatID(), $itemUpd->getVatID()); |
|
| 166 | + $this->assertEquals($itemExp->getSalutation(), $itemUpd->getSalutation()); |
|
| 167 | + $this->assertEquals($itemExp->getTitle(), $itemUpd->getTitle()); |
|
| 168 | + $this->assertEquals($itemExp->getFirstname(), $itemUpd->getFirstname()); |
|
| 169 | + $this->assertEquals($itemExp->getLastname(), $itemUpd->getLastname()); |
|
| 170 | + $this->assertEquals($itemExp->getAddress1(), $itemUpd->getAddress1()); |
|
| 171 | + $this->assertEquals($itemExp->getAddress2(), $itemUpd->getAddress2()); |
|
| 172 | + $this->assertEquals($itemExp->getAddress3(), $itemUpd->getAddress3()); |
|
| 173 | + $this->assertEquals($itemExp->getPostal(), $itemUpd->getPostal()); |
|
| 174 | + $this->assertEquals($itemExp->getCity(), $itemUpd->getCity()); |
|
| 175 | + $this->assertEquals($itemExp->getState(), $itemUpd->getState()); |
|
| 176 | + $this->assertEquals($itemExp->getCountryId(), $itemUpd->getCountryId()); |
|
| 177 | + $this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId()); |
|
| 178 | + $this->assertEquals($itemExp->getTelephone(), $itemUpd->getTelephone()); |
|
| 179 | + $this->assertEquals($itemExp->getEmail(), $itemUpd->getEmail()); |
|
| 180 | + $this->assertEquals($itemExp->getTelefax(), $itemUpd->getTelefax()); |
|
| 181 | + $this->assertEquals($itemExp->getWebsite(), $itemUpd->getWebsite()); |
|
| 182 | + $this->assertEquals($itemExp->getLongitude(), $itemUpd->getLongitude()); |
|
| 183 | + $this->assertEquals($itemExp->getLatitude(), $itemUpd->getLatitude()); |
|
| 184 | + $this->assertEquals($itemExp->getFlag(), $itemUpd->getFlag()); |
|
| 185 | + |
|
| 186 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
| 187 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
| 188 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
| 189 | + |
|
| 190 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved); |
|
| 191 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd); |
|
| 192 | 192 | |
| 193 | 193 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
| 194 | - $this->object->getItem( $itemSaved->getId() ); |
|
| 194 | + $this->object->getItem($itemSaved->getId()); |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | public function testCreateSearch() |
| 198 | 198 | { |
| 199 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() ); |
|
| 199 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch()); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | |
@@ -205,36 +205,36 @@ discard block |
||
| 205 | 205 | $search = $this->object->createSearch(); |
| 206 | 206 | |
| 207 | 207 | $expr = []; |
| 208 | - $expr[] = $search->compare( '!=', 'customer.address.id', null ); |
|
| 209 | - $expr[] = $search->compare( '!=', 'customer.address.parentid', null ); |
|
| 210 | - $expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' ); |
|
| 211 | - $expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' ); |
|
| 212 | - $expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' ); |
|
| 213 | - $expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' ); |
|
| 214 | - $expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' ); |
|
| 215 | - $expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' ); |
|
| 216 | - $expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' ); |
|
| 217 | - $expr[] = $search->compare( '==', 'customer.address.address2', '2-4' ); |
|
| 218 | - $expr[] = $search->compare( '==', 'customer.address.address3', '' ); |
|
| 219 | - $expr[] = $search->compare( '==', 'customer.address.postal', '11099' ); |
|
| 220 | - $expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' ); |
|
| 221 | - $expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' ); |
|
| 222 | - $expr[] = $search->compare( '==', 'customer.address.languageid', 'de' ); |
|
| 223 | - $expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' ); |
|
| 224 | - $expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' ); |
|
| 225 | - $expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' ); |
|
| 226 | - $expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' ); |
|
| 227 | - $expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' ); |
|
| 228 | - $expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' ); |
|
| 229 | - $expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' ); |
|
| 230 | - $expr[] = $search->compare( '==', 'customer.address.flag', 0 ); |
|
| 231 | - $expr[] = $search->compare( '==', 'customer.address.position', 1 ); |
|
| 232 | - $expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' ); |
|
| 233 | - $expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' ); |
|
| 234 | - $expr[] = $search->compare( '==', 'customer.address.editor', $this->editor ); |
|
| 235 | - |
|
| 236 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 237 | - $this->assertEquals( 1, count( $this->object->searchItems( $search ) ) ); |
|
| 208 | + $expr[] = $search->compare('!=', 'customer.address.id', null); |
|
| 209 | + $expr[] = $search->compare('!=', 'customer.address.parentid', null); |
|
| 210 | + $expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH'); |
|
| 211 | + $expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999'); |
|
| 212 | + $expr[] = $search->compare('==', 'customer.address.salutation', 'mr'); |
|
| 213 | + $expr[] = $search->compare('==', 'customer.address.title', 'Dr.'); |
|
| 214 | + $expr[] = $search->compare('==', 'customer.address.firstname', 'Good'); |
|
| 215 | + $expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest'); |
|
| 216 | + $expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben'); |
|
| 217 | + $expr[] = $search->compare('==', 'customer.address.address2', '2-4'); |
|
| 218 | + $expr[] = $search->compare('==', 'customer.address.address3', ''); |
|
| 219 | + $expr[] = $search->compare('==', 'customer.address.postal', '11099'); |
|
| 220 | + $expr[] = $search->compare('==', 'customer.address.city', 'Berlin'); |
|
| 221 | + $expr[] = $search->compare('==', 'customer.address.state', 'Berlin'); |
|
| 222 | + $expr[] = $search->compare('==', 'customer.address.languageid', 'de'); |
|
| 223 | + $expr[] = $search->compare('==', 'customer.address.countryid', 'DE'); |
|
| 224 | + $expr[] = $search->compare('==', 'customer.address.telephone', '055544332221'); |
|
| 225 | + $expr[] = $search->compare('==', 'customer.address.email', '[email protected]'); |
|
| 226 | + $expr[] = $search->compare('==', 'customer.address.telefax', '055544333212'); |
|
| 227 | + $expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org'); |
|
| 228 | + $expr[] = $search->compare('>=', 'customer.address.longitude', '10.0'); |
|
| 229 | + $expr[] = $search->compare('>=', 'customer.address.latitude', '50.0'); |
|
| 230 | + $expr[] = $search->compare('==', 'customer.address.flag', 0); |
|
| 231 | + $expr[] = $search->compare('==', 'customer.address.position', 1); |
|
| 232 | + $expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00'); |
|
| 233 | + $expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00'); |
|
| 234 | + $expr[] = $search->compare('==', 'customer.address.editor', $this->editor); |
|
| 235 | + |
|
| 236 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 237 | + $this->assertEquals(1, count($this->object->searchItems($search))); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | |
@@ -244,20 +244,20 @@ discard block |
||
| 244 | 244 | $search = $this->object->createSearch(); |
| 245 | 245 | |
| 246 | 246 | $conditions = array( |
| 247 | - $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ), |
|
| 248 | - $search->compare( '==', 'customer.address.editor', $this->editor ) |
|
| 247 | + $search->compare('~=', 'customer.address.company', 'ABC GmbH'), |
|
| 248 | + $search->compare('==', 'customer.address.editor', $this->editor) |
|
| 249 | 249 | ); |
| 250 | 250 | |
| 251 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 252 | - $search->setSlice( 0, 1 ); |
|
| 251 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 252 | + $search->setSlice(0, 1); |
|
| 253 | 253 | |
| 254 | - $results = $this->object->searchItems( $search, [], $total ); |
|
| 254 | + $results = $this->object->searchItems($search, [], $total); |
|
| 255 | 255 | |
| 256 | - $this->assertEquals( 1, count( $results ) ); |
|
| 257 | - $this->assertEquals( 2, $total ); |
|
| 256 | + $this->assertEquals(1, count($results)); |
|
| 257 | + $this->assertEquals(2, $total); |
|
| 258 | 258 | |
| 259 | - foreach( $results as $id => $item ) { |
|
| 260 | - $this->assertEquals( $id, $item->getId() ); |
|
| 259 | + foreach ($results as $id => $item) { |
|
| 260 | + $this->assertEquals($id, $item->getId()); |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | } |
