aimeos /
ai-laravel
@@ -19,41 +19,41 @@ discard block |
||
| 19 | 19 | { |
| 20 | 20 | $context = \TestHelper::getContext(); |
| 21 | 21 | $this->editor = $context->getEditor(); |
| 22 | - $this->object = new \Aimeos\MShop\Customer\Manager\Laravel( $context ); |
|
| 22 | + $this->object = new \Aimeos\MShop\Customer\Manager\Laravel($context); |
|
| 23 | 23 | |
| 24 | 24 | $this->fixture = array( |
| 25 | 25 | 'label' => 'unitTest', |
| 26 | 26 | 'status' => 2, |
| 27 | 27 | ); |
| 28 | 28 | |
| 29 | - $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' ); |
|
| 29 | + $this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.'); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | protected function tearDown() |
| 34 | 34 | { |
| 35 | - unset( $this->object, $this->fixture, $this->address ); |
|
| 35 | + unset($this->object, $this->fixture, $this->address); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | public function testCleanup() |
| 40 | 40 | { |
| 41 | - $this->object->cleanup( array( -1 ) ); |
|
| 41 | + $this->object->cleanup(array( -1 )); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
| 45 | 45 | public function testGetSearchAttributes() |
| 46 | 46 | { |
| 47 | - foreach( $this->object->getSearchAttributes() as $attribute ) |
|
| 47 | + foreach ($this->object->getSearchAttributes() as $attribute) |
|
| 48 | 48 | { |
| 49 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); |
|
| 49 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | public function testCreateItem() |
| 55 | 55 | { |
| 56 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() ); |
|
| 56 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem()); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | |
@@ -61,21 +61,21 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | $search = $this->object->createSearch(); |
| 63 | 63 | $conditions = array( |
| 64 | - $search->compare( '==', 'customer.code', 'unitCustomer3' ), |
|
| 65 | - $search->compare( '==', 'customer.editor', $this->editor ) |
|
| 64 | + $search->compare('==', 'customer.code', 'unitCustomer3'), |
|
| 65 | + $search->compare('==', 'customer.editor', $this->editor) |
|
| 66 | 66 | ); |
| 67 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 68 | - $items = $this->object->searchItems( $search, array( 'text' ) ); |
|
| 67 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 68 | + $items = $this->object->searchItems($search, array('text')); |
|
| 69 | 69 | |
| 70 | - if( ( $expected = reset( $items ) ) === false ) { |
|
| 71 | - throw new \RuntimeException( 'No customer item with code "unitCustomer3" found' ); |
|
| 70 | + if (($expected = reset($items)) === false) { |
|
| 71 | + throw new \RuntimeException('No customer item with code "unitCustomer3" found'); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - $actual = $this->object->getItem( $expected->getId(), array( 'text' ) ); |
|
| 74 | + $actual = $this->object->getItem($expected->getId(), array('text')); |
|
| 75 | 75 | |
| 76 | - $this->assertEquals( $expected, $actual ); |
|
| 77 | - $this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) ); |
|
| 78 | - $this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) ); |
|
| 76 | + $this->assertEquals($expected, $actual); |
|
| 77 | + $this->assertEquals(3, count($actual->getListItems('text'))); |
|
| 78 | + $this->assertEquals(3, count($actual->getRefItems('text'))); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
@@ -83,57 +83,57 @@ discard block |
||
| 83 | 83 | { |
| 84 | 84 | $item = $this->object->createItem(); |
| 85 | 85 | |
| 86 | - $item->setCode( 'unitTest' ); |
|
| 87 | - $item->setLabel( 'unitTest' ); |
|
| 88 | - $resultSaved = $this->object->saveItem( $item ); |
|
| 89 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
| 86 | + $item->setCode('unitTest'); |
|
| 87 | + $item->setLabel('unitTest'); |
|
| 88 | + $resultSaved = $this->object->saveItem($item); |
|
| 89 | + $itemSaved = $this->object->getItem($item->getId()); |
|
| 90 | 90 | |
| 91 | 91 | $itemExp = clone $itemSaved; |
| 92 | - $itemExp->setCode( 'unitTest2' ); |
|
| 93 | - $itemExp->setLabel( 'unitTest2' ); |
|
| 94 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
| 95 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
| 96 | - |
|
| 97 | - $this->object->deleteItem( $item->getId() ); |
|
| 98 | - |
|
| 99 | - $this->assertTrue( $item->getId() !== null ); |
|
| 100 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
| 101 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
| 102 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); |
|
| 103 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); |
|
| 104 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); |
|
| 105 | - $this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() ); |
|
| 106 | - $this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() ); |
|
| 107 | - $this->assertEquals( $item->getPassword(), $itemSaved->getPassword() ); |
|
| 108 | - |
|
| 109 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
| 110 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
| 111 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
| 112 | - |
|
| 113 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
| 114 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
| 115 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); |
|
| 116 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); |
|
| 117 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); |
|
| 118 | - $this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() ); |
|
| 119 | - $this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() ); |
|
| 120 | - $this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() ); |
|
| 121 | - |
|
| 122 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
| 123 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
| 124 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
| 125 | - |
|
| 126 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved ); |
|
| 127 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd ); |
|
| 128 | - |
|
| 129 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 130 | - $this->object->getItem( $item->getId() ); |
|
| 92 | + $itemExp->setCode('unitTest2'); |
|
| 93 | + $itemExp->setLabel('unitTest2'); |
|
| 94 | + $resultUpd = $this->object->saveItem($itemExp); |
|
| 95 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
| 96 | + |
|
| 97 | + $this->object->deleteItem($item->getId()); |
|
| 98 | + |
|
| 99 | + $this->assertTrue($item->getId() !== null); |
|
| 100 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
| 101 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
| 102 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); |
|
| 103 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); |
|
| 104 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); |
|
| 105 | + $this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress()); |
|
| 106 | + $this->assertEquals($item->getBirthday(), $itemSaved->getBirthday()); |
|
| 107 | + $this->assertEquals($item->getPassword(), $itemSaved->getPassword()); |
|
| 108 | + |
|
| 109 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 110 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
| 111 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
| 112 | + |
|
| 113 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
| 114 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
| 115 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); |
|
| 116 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); |
|
| 117 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); |
|
| 118 | + $this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress()); |
|
| 119 | + $this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday()); |
|
| 120 | + $this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword()); |
|
| 121 | + |
|
| 122 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
| 123 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
| 124 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
| 125 | + |
|
| 126 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved); |
|
| 127 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd); |
|
| 128 | + |
|
| 129 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 130 | + $this->object->getItem($item->getId()); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | |
| 134 | 134 | public function testCreateSearch() |
| 135 | 135 | { |
| 136 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() ); |
|
| 136 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch()); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | |
@@ -143,69 +143,69 @@ discard block |
||
| 143 | 143 | $search = $this->object->createSearch(); |
| 144 | 144 | |
| 145 | 145 | $expr = []; |
| 146 | - $expr[] = $search->compare( '!=', 'customer.id', null ); |
|
| 147 | - $expr[] = $search->compare( '==', 'customer.label', 'Erika Mustermann' ); |
|
| 148 | - $expr[] = $search->compare( '==', 'customer.code', 'unitCustomer2' ); |
|
| 149 | - |
|
| 150 | - $expr[] = $search->compare( '>=', 'customer.salutation', '' ); |
|
| 151 | - $expr[] = $search->compare( '>=', 'customer.company', '' ); |
|
| 152 | - $expr[] = $search->compare( '>=', 'customer.vatid', '' ); |
|
| 153 | - $expr[] = $search->compare( '>=', 'customer.title', '' ); |
|
| 154 | - $expr[] = $search->compare( '>=', 'customer.firstname', '' ); |
|
| 155 | - $expr[] = $search->compare( '>=', 'customer.lastname', '' ); |
|
| 156 | - $expr[] = $search->compare( '>=', 'customer.address1', '' ); |
|
| 157 | - $expr[] = $search->compare( '>=', 'customer.address2', '' ); |
|
| 158 | - $expr[] = $search->compare( '>=', 'customer.address3', '' ); |
|
| 159 | - $expr[] = $search->compare( '>=', 'customer.postal', '' ); |
|
| 160 | - $expr[] = $search->compare( '>=', 'customer.city', '' ); |
|
| 161 | - $expr[] = $search->compare( '>=', 'customer.state', '' ); |
|
| 162 | - $expr[] = $search->compare( '!=', 'customer.languageid', null ); |
|
| 163 | - $expr[] = $search->compare( '>=', 'customer.countryid', '' ); |
|
| 164 | - $expr[] = $search->compare( '>=', 'customer.telephone', '' ); |
|
| 165 | - $expr[] = $search->compare( '>=', 'customer.email', '' ); |
|
| 166 | - $expr[] = $search->compare( '>=', 'customer.telefax', '' ); |
|
| 167 | - $expr[] = $search->compare( '>=', 'customer.website', '' ); |
|
| 168 | - $expr[] = $search->compare( '>=', 'customer.longitude', '10.0' ); |
|
| 169 | - $expr[] = $search->compare( '>=', 'customer.latitude', '50.0' ); |
|
| 170 | - |
|
| 171 | - $expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' ); |
|
| 172 | - $expr[] = $search->compare( '>=', 'customer.password', '' ); |
|
| 173 | - $expr[] = $search->compare( '==', 'customer.status', 0 ); |
|
| 174 | - $expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' ); |
|
| 175 | - $expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' ); |
|
| 176 | - $expr[] = $search->compare( '==', 'customer.editor', $this->editor ); |
|
| 177 | - |
|
| 178 | - $expr[] = $search->compare( '!=', 'customer.address.id', null ); |
|
| 179 | - $expr[] = $search->compare( '!=', 'customer.address.parentid', null ); |
|
| 180 | - $expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' ); |
|
| 181 | - $expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' ); |
|
| 182 | - $expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' ); |
|
| 183 | - $expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' ); |
|
| 184 | - $expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' ); |
|
| 185 | - $expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' ); |
|
| 186 | - $expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' ); |
|
| 187 | - $expr[] = $search->compare( '==', 'customer.address.address2', '2-4' ); |
|
| 188 | - $expr[] = $search->compare( '==', 'customer.address.address3', '' ); |
|
| 189 | - $expr[] = $search->compare( '==', 'customer.address.postal', '11099' ); |
|
| 190 | - $expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' ); |
|
| 191 | - $expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' ); |
|
| 192 | - $expr[] = $search->compare( '==', 'customer.address.languageid', 'de' ); |
|
| 193 | - $expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' ); |
|
| 194 | - $expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' ); |
|
| 195 | - $expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' ); |
|
| 196 | - $expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' ); |
|
| 197 | - $expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' ); |
|
| 198 | - $expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' ); |
|
| 199 | - $expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' ); |
|
| 200 | - $expr[] = $search->compare( '==', 'customer.address.flag', 0 ); |
|
| 201 | - $expr[] = $search->compare( '==', 'customer.address.position', 1 ); |
|
| 202 | - $expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' ); |
|
| 203 | - $expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' ); |
|
| 204 | - $expr[] = $search->compare( '==', 'customer.address.editor', $this->editor ); |
|
| 205 | - |
|
| 206 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 207 | - $result = $this->object->searchItems( $search, [], $total ); |
|
| 208 | - $this->assertEquals( 1, count( $result ) ); |
|
| 146 | + $expr[] = $search->compare('!=', 'customer.id', null); |
|
| 147 | + $expr[] = $search->compare('==', 'customer.label', 'Erika Mustermann'); |
|
| 148 | + $expr[] = $search->compare('==', 'customer.code', 'unitCustomer2'); |
|
| 149 | + |
|
| 150 | + $expr[] = $search->compare('>=', 'customer.salutation', ''); |
|
| 151 | + $expr[] = $search->compare('>=', 'customer.company', ''); |
|
| 152 | + $expr[] = $search->compare('>=', 'customer.vatid', ''); |
|
| 153 | + $expr[] = $search->compare('>=', 'customer.title', ''); |
|
| 154 | + $expr[] = $search->compare('>=', 'customer.firstname', ''); |
|
| 155 | + $expr[] = $search->compare('>=', 'customer.lastname', ''); |
|
| 156 | + $expr[] = $search->compare('>=', 'customer.address1', ''); |
|
| 157 | + $expr[] = $search->compare('>=', 'customer.address2', ''); |
|
| 158 | + $expr[] = $search->compare('>=', 'customer.address3', ''); |
|
| 159 | + $expr[] = $search->compare('>=', 'customer.postal', ''); |
|
| 160 | + $expr[] = $search->compare('>=', 'customer.city', ''); |
|
| 161 | + $expr[] = $search->compare('>=', 'customer.state', ''); |
|
| 162 | + $expr[] = $search->compare('!=', 'customer.languageid', null); |
|
| 163 | + $expr[] = $search->compare('>=', 'customer.countryid', ''); |
|
| 164 | + $expr[] = $search->compare('>=', 'customer.telephone', ''); |
|
| 165 | + $expr[] = $search->compare('>=', 'customer.email', ''); |
|
| 166 | + $expr[] = $search->compare('>=', 'customer.telefax', ''); |
|
| 167 | + $expr[] = $search->compare('>=', 'customer.website', ''); |
|
| 168 | + $expr[] = $search->compare('>=', 'customer.longitude', '10.0'); |
|
| 169 | + $expr[] = $search->compare('>=', 'customer.latitude', '50.0'); |
|
| 170 | + |
|
| 171 | + $expr[] = $search->compare('==', 'customer.birthday', '1970-01-01'); |
|
| 172 | + $expr[] = $search->compare('>=', 'customer.password', ''); |
|
| 173 | + $expr[] = $search->compare('==', 'customer.status', 0); |
|
| 174 | + $expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00'); |
|
| 175 | + $expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00'); |
|
| 176 | + $expr[] = $search->compare('==', 'customer.editor', $this->editor); |
|
| 177 | + |
|
| 178 | + $expr[] = $search->compare('!=', 'customer.address.id', null); |
|
| 179 | + $expr[] = $search->compare('!=', 'customer.address.parentid', null); |
|
| 180 | + $expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH'); |
|
| 181 | + $expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999'); |
|
| 182 | + $expr[] = $search->compare('==', 'customer.address.salutation', 'mr'); |
|
| 183 | + $expr[] = $search->compare('==', 'customer.address.title', 'Dr.'); |
|
| 184 | + $expr[] = $search->compare('==', 'customer.address.firstname', 'Good'); |
|
| 185 | + $expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest'); |
|
| 186 | + $expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben'); |
|
| 187 | + $expr[] = $search->compare('==', 'customer.address.address2', '2-4'); |
|
| 188 | + $expr[] = $search->compare('==', 'customer.address.address3', ''); |
|
| 189 | + $expr[] = $search->compare('==', 'customer.address.postal', '11099'); |
|
| 190 | + $expr[] = $search->compare('==', 'customer.address.city', 'Berlin'); |
|
| 191 | + $expr[] = $search->compare('==', 'customer.address.state', 'Berlin'); |
|
| 192 | + $expr[] = $search->compare('==', 'customer.address.languageid', 'de'); |
|
| 193 | + $expr[] = $search->compare('==', 'customer.address.countryid', 'DE'); |
|
| 194 | + $expr[] = $search->compare('==', 'customer.address.telephone', '055544332221'); |
|
| 195 | + $expr[] = $search->compare('==', 'customer.address.email', '[email protected]'); |
|
| 196 | + $expr[] = $search->compare('==', 'customer.address.telefax', '055544333212'); |
|
| 197 | + $expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org'); |
|
| 198 | + $expr[] = $search->compare('>=', 'customer.address.longitude', '10.0'); |
|
| 199 | + $expr[] = $search->compare('>=', 'customer.address.latitude', '50.0'); |
|
| 200 | + $expr[] = $search->compare('==', 'customer.address.flag', 0); |
|
| 201 | + $expr[] = $search->compare('==', 'customer.address.position', 1); |
|
| 202 | + $expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00'); |
|
| 203 | + $expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00'); |
|
| 204 | + $expr[] = $search->compare('==', 'customer.address.editor', $this->editor); |
|
| 205 | + |
|
| 206 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 207 | + $result = $this->object->searchItems($search, [], $total); |
|
| 208 | + $this->assertEquals(1, count($result)); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | |
@@ -214,60 +214,60 @@ discard block |
||
| 214 | 214 | $total = 0; |
| 215 | 215 | |
| 216 | 216 | $search = $this->object->createSearch(); |
| 217 | - $search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) ); |
|
| 218 | - $search->setSlice( 0, 2 ); |
|
| 217 | + $search->setConditions($search->compare('==', 'customer.address.editor', $this->editor)); |
|
| 218 | + $search->setSlice(0, 2); |
|
| 219 | 219 | |
| 220 | - $results = $this->object->searchItems( $search, [], $total ); |
|
| 221 | - $this->assertEquals( 2, count( $results ) ); |
|
| 222 | - $this->assertEquals( 3, $total ); |
|
| 220 | + $results = $this->object->searchItems($search, [], $total); |
|
| 221 | + $this->assertEquals(2, count($results)); |
|
| 222 | + $this->assertEquals(3, $total); |
|
| 223 | 223 | |
| 224 | - foreach($results as $itemId => $item) { |
|
| 225 | - $this->assertEquals( $itemId, $item->getId() ); |
|
| 224 | + foreach ($results as $itemId => $item) { |
|
| 225 | + $this->assertEquals($itemId, $item->getId()); |
|
| 226 | 226 | } |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | |
| 230 | 230 | public function testSearchItemsBaseCriteria() |
| 231 | 231 | { |
| 232 | - $search = $this->object->createSearch( true ); |
|
| 232 | + $search = $this->object->createSearch(true); |
|
| 233 | 233 | $conditions = array( |
| 234 | - $search->compare( '==', 'customer.address.editor', $this->editor ), |
|
| 234 | + $search->compare('==', 'customer.address.editor', $this->editor), |
|
| 235 | 235 | $search->getConditions() |
| 236 | 236 | ); |
| 237 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 238 | - $this->assertEquals( 2, count( $this->object->searchItems( $search, [], $total ) ) ); |
|
| 237 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 238 | + $this->assertEquals(2, count($this->object->searchItems($search, [], $total))); |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | |
| 242 | 242 | public function testSearchItemsRef() |
| 243 | 243 | { |
| 244 | 244 | $search = $this->object->createSearch(); |
| 245 | - $search->setConditions( $search->compare( '==', 'customer.code', 'unitCustomer1' ) ); |
|
| 245 | + $search->setConditions($search->compare('==', 'customer.code', 'unitCustomer1')); |
|
| 246 | 246 | |
| 247 | - $results = $this->object->searchItems( $search, ['customer/address', 'text'] ); |
|
| 247 | + $results = $this->object->searchItems($search, ['customer/address', 'text']); |
|
| 248 | 248 | |
| 249 | - if( ( $item = reset( $results ) ) === false ) { |
|
| 250 | - throw new \Exception( 'No customer item for "unitCustomer1" available' ); |
|
| 249 | + if (($item = reset($results)) === false) { |
|
| 250 | + throw new \Exception('No customer item for "unitCustomer1" available'); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - $this->assertEquals( 1, count( $item->getRefItems( 'text' ) ) ); |
|
| 254 | - $this->assertEquals( 1, count( $item->getAddressItems() ) ); |
|
| 253 | + $this->assertEquals(1, count($item->getRefItems('text'))); |
|
| 254 | + $this->assertEquals(1, count($item->getAddressItems())); |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | |
| 258 | 258 | public function testGetSubManager() |
| 259 | 259 | { |
| 260 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) ); |
|
| 261 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) ); |
|
| 260 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address')); |
|
| 261 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard')); |
|
| 262 | 262 | |
| 263 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 264 | - $this->object->getSubManager( 'unknown' ); |
|
| 263 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 264 | + $this->object->getSubManager('unknown'); |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | |
| 268 | 268 | public function testGetSubManagerInvalidName() |
| 269 | 269 | { |
| 270 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 271 | - $this->object->getSubManager( 'address', 'unknown' ); |
|
| 270 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 271 | + $this->object->getSubManager('address', 'unknown'); |
|
| 272 | 272 | } |
| 273 | 273 | } |
@@ -5,17 +5,17 @@ |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2014-2017 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -return array ( |
|
| 9 | - 'customer' => array ( |
|
| 10 | - 'customer/unitCustomer1' => array( 'label' => 'Max Mustermann', 'code' => 'unitCustomer1', 'status' => 1, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '01234567890', 'email' => '[email protected]', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'unittest' ), |
|
| 11 | - 'customer/unitCustomer2' => array( 'label' => 'Erika Mustermann', 'code' => 'unitCustomer2', 'status' => 1, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mrs', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '09876543210', 'email' => '[email protected]', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0' ), |
|
| 12 | - 'customer/unitCustomer3' => array( 'label' => 'Franz-Xaver Gabler', 'code' => 'unitCustomer3', 'status' => 0, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => '', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '01234509876', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1' ), |
|
| 8 | +return array( |
|
| 9 | + 'customer' => array( |
|
| 10 | + 'customer/unitCustomer1' => array('label' => 'Max Mustermann', 'code' => 'unitCustomer1', 'status' => 1, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '01234567890', 'email' => '[email protected]', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'unittest'), |
|
| 11 | + 'customer/unitCustomer2' => array('label' => 'Erika Mustermann', 'code' => 'unitCustomer2', 'status' => 1, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mrs', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '09876543210', 'email' => '[email protected]', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0'), |
|
| 12 | + 'customer/unitCustomer3' => array('label' => 'Franz-Xaver Gabler', 'code' => 'unitCustomer3', 'status' => 0, 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => '', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '01234509876', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1'), |
|
| 13 | 13 | ), |
| 14 | 14 | |
| 15 | - 'customer/address' => array ( |
|
| 16 | - array ( 'parentid' => 'customer/unitCustomer1', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0' ), |
|
| 17 | - array ( 'parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1' ), |
|
| 18 | - array ( 'parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1' ), |
|
| 19 | - array ( 'parentid' => 'customer/unitCustomer3', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2' ), |
|
| 15 | + 'customer/address' => array( |
|
| 16 | + array('parentid' => 'customer/unitCustomer1', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0'), |
|
| 17 | + array('parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1'), |
|
| 18 | + array('parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1'), |
|
| 19 | + array('parentid' => 'customer/unitCustomer3', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2'), |
|
| 20 | 20 | ), |
| 21 | 21 | ); |
@@ -5,19 +5,19 @@ |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2014-2017 |
| 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/unitCustomer3', '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/unitCustomer3', '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/unitCustomer3', '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/unitCustomer1', '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/unitCustomer3', '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/unitCustomer3', '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/unitCustomer3', '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/unitCustomer1', '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 | ); |
| 24 | 24 | \ No newline at end of file |
