| @@ -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( | 
| @@ -59,7 +59,7 @@ discard block | ||
| 59 | 59 | 'customer.address.siteid' => $context->getLocale()->getSiteId(), | 
| 60 | 60 | ); | 
| 61 | 61 | |
| 62 | - $this->object = $customer->getSubManager( 'address', 'FosUser' ); | |
| 62 | +		$this->object = $customer->getSubManager('address', 'FosUser'); | |
| 63 | 63 | } | 
| 64 | 64 | |
| 65 | 65 | |
| @@ -68,126 +68,126 @@ discard block | ||
| 68 | 68 | */ | 
| 69 | 69 | protected function tearDown() | 
| 70 | 70 |  	{ | 
| 71 | - unset( $this->object, $this->fixture ); | |
| 71 | + unset($this->object, $this->fixture); | |
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | |
| 75 | 75 | public function testCleanup() | 
| 76 | 76 |  	{ | 
| 77 | - $this->object->cleanup( array( -1 ) ); | |
| 77 | + $this->object->cleanup(array( -1 )); | |
| 78 | 78 | } | 
| 79 | 79 | |
| 80 | 80 | public function testGetSearchAttributes() | 
| 81 | 81 |  	{ | 
| 82 | -		foreach( $this->object->getSearchAttributes() as $attribute ) { | |
| 83 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 82 | +		foreach ($this->object->getSearchAttributes() as $attribute) { | |
| 83 | +			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); | |
| 84 | 84 | } | 
| 85 | 85 | } | 
| 86 | 86 | |
| 87 | 87 | public function testGetSubManager() | 
| 88 | 88 |  	{ | 
| 89 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 90 | - $this->object->getSubManager( 'unknown' ); | |
| 89 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 90 | +		$this->object->getSubManager('unknown'); | |
| 91 | 91 | } | 
| 92 | 92 | |
| 93 | 93 | public function testCreateItem() | 
| 94 | 94 |  	{ | 
| 95 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() ); | |
| 95 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem()); | |
| 96 | 96 | } | 
| 97 | 97 | |
| 98 | 98 | public function testGetItem() | 
| 99 | 99 |  	{ | 
| 100 | 100 | $search = $this->object->createSearch(); | 
| 101 | - $search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) ); | |
| 101 | +		$search->setConditions($search->compare('~=', 'customer.address.company', 'ABC GmbH')); | |
| 102 | 102 | |
| 103 | - $items = $this->object->searchItems( $search ); | |
| 103 | + $items = $this->object->searchItems($search); | |
| 104 | 104 | |
| 105 | -		if( ( $item = reset( $items ) ) === false ) { | |
| 106 | - throw new \RuntimeException( 'No address item with company "ABC" found' ); | |
| 105 | +		if (($item = reset($items)) === false) { | |
| 106 | +			throw new \RuntimeException('No address item with company "ABC" found'); | |
| 107 | 107 | } | 
| 108 | 108 | |
| 109 | - $this->assertEquals( $item, $this->object->getItem( $item->getId() ) ); | |
| 109 | + $this->assertEquals($item, $this->object->getItem($item->getId())); | |
| 110 | 110 | } | 
| 111 | 111 | |
| 112 | 112 | public function testSaveUpdateDeleteItem() | 
| 113 | 113 |  	{ | 
| 114 | - $item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture ); | |
| 115 | - $item->setId( null ); | |
| 116 | - $this->object->saveItem( $item ); | |
| 117 | - $itemSaved = $this->object->getItem( $item->getId() ); | |
| 114 | +		$item = new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.', $this->fixture); | |
| 115 | + $item->setId(null); | |
| 116 | + $this->object->saveItem($item); | |
| 117 | + $itemSaved = $this->object->getItem($item->getId()); | |
| 118 | 118 | |
| 119 | 119 | $itemExp = clone $itemSaved; | 
| 120 | - $itemExp->setPosition( 1 ); | |
| 121 | - $itemExp->setCity( 'Berlin' ); | |
| 122 | - $itemExp->setState( 'Berlin' ); | |
| 123 | - $this->object->saveItem( $itemExp ); | |
| 124 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); | |
| 125 | - | |
| 126 | - $this->object->deleteItem( $itemSaved->getId() ); | |
| 127 | - | |
| 128 | - | |
| 129 | - $this->assertTrue( $item->getId() !== null ); | |
| 130 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); | |
| 131 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId()); | |
| 132 | - $this->assertEquals( $item->getPosition(), $itemSaved->getPosition()); | |
| 133 | - $this->assertEquals( $item->getCompany(), $itemSaved->getCompany()); | |
| 134 | - $this->assertEquals( $item->getVatID(), $itemSaved->getVatID()); | |
| 135 | - $this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation()); | |
| 136 | - $this->assertEquals( $item->getTitle(), $itemSaved->getTitle()); | |
| 137 | - $this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname()); | |
| 138 | - $this->assertEquals( $item->getLastname(), $itemSaved->getLastname()); | |
| 139 | - $this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1()); | |
| 140 | - $this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2()); | |
| 141 | - $this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3()); | |
| 142 | - $this->assertEquals( $item->getPostal(), $itemSaved->getPostal()); | |
| 143 | - $this->assertEquals( $item->getCity(), $itemSaved->getCity()); | |
| 144 | - $this->assertEquals( $item->getState(), $itemSaved->getState()); | |
| 145 | - $this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId()); | |
| 146 | - $this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId()); | |
| 147 | - $this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone()); | |
| 148 | - $this->assertEquals( $item->getEmail(), $itemSaved->getEmail()); | |
| 149 | - $this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax()); | |
| 150 | - $this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite()); | |
| 151 | - $this->assertEquals( $item->getFlag(), $itemSaved->getFlag()); | |
| 152 | - | |
| 153 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); | |
| 154 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); | |
| 120 | + $itemExp->setPosition(1); | |
| 121 | +		$itemExp->setCity('Berlin'); | |
| 122 | +		$itemExp->setState('Berlin'); | |
| 123 | + $this->object->saveItem($itemExp); | |
| 124 | + $itemUpd = $this->object->getItem($itemExp->getId()); | |
| 125 | + | |
| 126 | + $this->object->deleteItem($itemSaved->getId()); | |
| 127 | + | |
| 128 | + | |
| 129 | + $this->assertTrue($item->getId() !== null); | |
| 130 | + $this->assertEquals($item->getId(), $itemSaved->getId()); | |
| 131 | + $this->assertEquals($item->getParentId(), $itemSaved->getParentId()); | |
| 132 | + $this->assertEquals($item->getPosition(), $itemSaved->getPosition()); | |
| 133 | + $this->assertEquals($item->getCompany(), $itemSaved->getCompany()); | |
| 134 | + $this->assertEquals($item->getVatID(), $itemSaved->getVatID()); | |
| 135 | + $this->assertEquals($item->getSalutation(), $itemSaved->getSalutation()); | |
| 136 | + $this->assertEquals($item->getTitle(), $itemSaved->getTitle()); | |
| 137 | + $this->assertEquals($item->getFirstname(), $itemSaved->getFirstname()); | |
| 138 | + $this->assertEquals($item->getLastname(), $itemSaved->getLastname()); | |
| 139 | + $this->assertEquals($item->getAddress1(), $itemSaved->getAddress1()); | |
| 140 | + $this->assertEquals($item->getAddress2(), $itemSaved->getAddress2()); | |
| 141 | + $this->assertEquals($item->getAddress3(), $itemSaved->getAddress3()); | |
| 142 | + $this->assertEquals($item->getPostal(), $itemSaved->getPostal()); | |
| 143 | + $this->assertEquals($item->getCity(), $itemSaved->getCity()); | |
| 144 | + $this->assertEquals($item->getState(), $itemSaved->getState()); | |
| 145 | + $this->assertEquals($item->getCountryId(), $itemSaved->getCountryId()); | |
| 146 | + $this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId()); | |
| 147 | + $this->assertEquals($item->getTelephone(), $itemSaved->getTelephone()); | |
| 148 | + $this->assertEquals($item->getEmail(), $itemSaved->getEmail()); | |
| 149 | + $this->assertEquals($item->getTelefax(), $itemSaved->getTelefax()); | |
| 150 | + $this->assertEquals($item->getWebsite(), $itemSaved->getWebsite()); | |
| 151 | + $this->assertEquals($item->getFlag(), $itemSaved->getFlag()); | |
| 152 | + | |
| 153 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); | |
| 154 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); | |
| 155 | 155 |  		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); | 
| 156 | 156 | |
| 157 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); | |
| 158 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId()); | |
| 159 | - $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition()); | |
| 160 | - $this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany()); | |
| 161 | - $this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID()); | |
| 162 | - $this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation()); | |
| 163 | - $this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle()); | |
| 164 | - $this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname()); | |
| 165 | - $this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname()); | |
| 166 | - $this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1()); | |
| 167 | - $this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2()); | |
| 168 | - $this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3()); | |
| 169 | - $this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal()); | |
| 170 | - $this->assertEquals( $itemExp->getCity(), $itemUpd->getCity()); | |
| 171 | - $this->assertEquals( $itemExp->getState(), $itemUpd->getState()); | |
| 172 | - $this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId()); | |
| 173 | - $this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId()); | |
| 174 | - $this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone()); | |
| 175 | - $this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail()); | |
| 176 | - $this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax()); | |
| 177 | - $this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite()); | |
| 178 | - $this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag()); | |
| 179 | - | |
| 180 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); | |
| 181 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); | |
| 182 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); | |
| 157 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); | |
| 158 | + $this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId()); | |
| 159 | + $this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition()); | |
| 160 | + $this->assertEquals($itemExp->getCompany(), $itemUpd->getCompany()); | |
| 161 | + $this->assertEquals($itemExp->getVatID(), $itemUpd->getVatID()); | |
| 162 | + $this->assertEquals($itemExp->getSalutation(), $itemUpd->getSalutation()); | |
| 163 | + $this->assertEquals($itemExp->getTitle(), $itemUpd->getTitle()); | |
| 164 | + $this->assertEquals($itemExp->getFirstname(), $itemUpd->getFirstname()); | |
| 165 | + $this->assertEquals($itemExp->getLastname(), $itemUpd->getLastname()); | |
| 166 | + $this->assertEquals($itemExp->getAddress1(), $itemUpd->getAddress1()); | |
| 167 | + $this->assertEquals($itemExp->getAddress2(), $itemUpd->getAddress2()); | |
| 168 | + $this->assertEquals($itemExp->getAddress3(), $itemUpd->getAddress3()); | |
| 169 | + $this->assertEquals($itemExp->getPostal(), $itemUpd->getPostal()); | |
| 170 | + $this->assertEquals($itemExp->getCity(), $itemUpd->getCity()); | |
| 171 | + $this->assertEquals($itemExp->getState(), $itemUpd->getState()); | |
| 172 | + $this->assertEquals($itemExp->getCountryId(), $itemUpd->getCountryId()); | |
| 173 | + $this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId()); | |
| 174 | + $this->assertEquals($itemExp->getTelephone(), $itemUpd->getTelephone()); | |
| 175 | + $this->assertEquals($itemExp->getEmail(), $itemUpd->getEmail()); | |
| 176 | + $this->assertEquals($itemExp->getTelefax(), $itemUpd->getTelefax()); | |
| 177 | + $this->assertEquals($itemExp->getWebsite(), $itemUpd->getWebsite()); | |
| 178 | + $this->assertEquals($itemExp->getFlag(), $itemUpd->getFlag()); | |
| 179 | + | |
| 180 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); | |
| 181 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); | |
| 182 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); | |
| 183 | 183 | |
| 184 | 184 |  		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | 
| 185 | - $this->object->getItem( $itemSaved->getId() ); | |
| 185 | + $this->object->getItem($itemSaved->getId()); | |
| 186 | 186 | } | 
| 187 | 187 | |
| 188 | 188 | public function testCreateSearch() | 
| 189 | 189 |  	{ | 
| 190 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() ); | |
| 190 | +		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch()); | |
| 191 | 191 | } | 
| 192 | 192 | |
| 193 | 193 | |
| @@ -196,11 +196,11 @@ discard block | ||
| 196 | 196 | $search = $this->object->createSearch(); | 
| 197 | 197 | |
| 198 | 198 | $conditions = array( | 
| 199 | - $search->compare( '==', 'customer.address.company', 'ABC' ), | |
| 200 | - $search->compare( '==', 'customer.address.editor', $this->editor ) | |
| 199 | +			$search->compare('==', 'customer.address.company', 'ABC'), | |
| 200 | +			$search->compare('==', 'customer.address.editor', $this->editor) | |
| 201 | 201 | ); | 
| 202 | - $search->setConditions( $search->combine( '&&', $conditions ) ); | |
| 203 | - $this->assertEquals( 1, count( $this->object->searchItems( $search ) ) ); | |
| 202 | +		$search->setConditions($search->combine('&&', $conditions)); | |
| 203 | + $this->assertEquals(1, count($this->object->searchItems($search))); | |
| 204 | 204 | } | 
| 205 | 205 | |
| 206 | 206 | |
| @@ -210,20 +210,20 @@ discard block | ||
| 210 | 210 | $search = $this->object->createSearch(); | 
| 211 | 211 | |
| 212 | 212 | $conditions = array( | 
| 213 | - $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ), | |
| 214 | - $search->compare( '==', 'customer.address.editor', $this->editor ) | |
| 213 | +			$search->compare('~=', 'customer.address.company', 'ABC GmbH'), | |
| 214 | +			$search->compare('==', 'customer.address.editor', $this->editor) | |
| 215 | 215 | ); | 
| 216 | 216 | |
| 217 | - $search->setConditions( $search->combine( '&&', $conditions ) ); | |
| 218 | - $search->setSlice( 0, 1 ); | |
| 217 | +		$search->setConditions($search->combine('&&', $conditions)); | |
| 218 | + $search->setSlice(0, 1); | |
| 219 | 219 | |
| 220 | - $results = $this->object->searchItems( $search, array(), $total ); | |
| 220 | + $results = $this->object->searchItems($search, array(), $total); | |
| 221 | 221 | |
| 222 | - $this->assertEquals( 1, count( $results ) ); | |
| 223 | - $this->assertEquals( 2, $total ); | |
| 222 | + $this->assertEquals(1, count($results)); | |
| 223 | + $this->assertEquals(2, $total); | |
| 224 | 224 | |
| 225 | -		foreach( $results as $id => $item ) { | |
| 226 | - $this->assertEquals( $id, $item->getId() ); | |
| 225 | +		foreach ($results as $id => $item) { | |
| 226 | + $this->assertEquals($id, $item->getId()); | |
| 227 | 227 | } | 
| 228 | 228 | } | 
| 229 | 229 | } | 
| @@ -24,8 +24,8 @@ discard block | ||
| 24 | 24 |  	{ | 
| 25 | 25 | $this->context = \TestHelper::getContext(); | 
| 26 | 26 | $this->editor = $this->context->getEditor(); | 
| 27 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' ); | |
| 28 | - $this->object = $manager->getSubManager( 'lists', 'FosUser' ); | |
| 27 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser'); | |
| 28 | +		$this->object = $manager->getSubManager('lists', 'FosUser'); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | |
| @@ -37,36 +37,36 @@ discard block | ||
| 37 | 37 | */ | 
| 38 | 38 | protected function tearDown() | 
| 39 | 39 |  	{ | 
| 40 | - unset( $this->object, $this->context ); | |
| 40 | + unset($this->object, $this->context); | |
| 41 | 41 | } | 
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | public function testCleanup() | 
| 45 | 45 |  	{ | 
| 46 | - $this->object->cleanup( array( -1 ) ); | |
| 46 | + $this->object->cleanup(array( -1 )); | |
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | public function testAggregate() | 
| 51 | 51 |  	{ | 
| 52 | - $search = $this->object->createSearch( true ); | |
| 52 | + $search = $this->object->createSearch(true); | |
| 53 | 53 | $expr = array( | 
| 54 | 54 | $search->getConditions(), | 
| 55 | - $search->compare( '==', 'customer.lists.editor', 'ai-fosuser:unittest' ), | |
| 55 | +			$search->compare('==', 'customer.lists.editor', 'ai-fosuser:unittest'), | |
| 56 | 56 | ); | 
| 57 | - $search->setConditions( $search->combine( '&&', $expr ) ); | |
| 57 | +		$search->setConditions($search->combine('&&', $expr)); | |
| 58 | 58 | |
| 59 | - $result = $this->object->aggregate( $search, 'customer.lists.domain' ); | |
| 59 | + $result = $this->object->aggregate($search, 'customer.lists.domain'); | |
| 60 | 60 | |
| 61 | - $this->assertEquals( 1, count( $result ) ); | |
| 62 | - $this->assertArrayHasKey( 'text', $result ); | |
| 63 | - $this->assertEquals( 4, $result['text'] ); | |
| 61 | + $this->assertEquals(1, count($result)); | |
| 62 | +		$this->assertArrayHasKey('text', $result); | |
| 63 | + $this->assertEquals(4, $result['text']); | |
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | public function testCreateItem() | 
| 68 | 68 |  	{ | 
| 69 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem() ); | |
| 69 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem()); | |
| 70 | 70 | } | 
| 71 | 71 | |
| 72 | 72 | |
| @@ -74,13 +74,13 @@ discard block | ||
| 74 | 74 |  	{ | 
| 75 | 75 | $search = $this->object->createSearch(); | 
| 76 | 76 | $search->setSlice(0, 1); | 
| 77 | - $results = $this->object->searchItems( $search ); | |
| 77 | + $results = $this->object->searchItems($search); | |
| 78 | 78 | |
| 79 | -		if( ( $item = reset( $results ) ) === false ) { | |
| 80 | - throw new \RuntimeException( 'No item found' ); | |
| 79 | +		if (($item = reset($results)) === false) { | |
| 80 | +			throw new \RuntimeException('No item found'); | |
| 81 | 81 | } | 
| 82 | 82 | |
| 83 | - $this->assertEquals( $item, $this->object->getItem( $item->getId() ) ); | |
| 83 | + $this->assertEquals($item, $this->object->getItem($item->getId())); | |
| 84 | 84 | } | 
| 85 | 85 | |
| 86 | 86 | |
| @@ -88,144 +88,144 @@ discard block | ||
| 88 | 88 |  	{ | 
| 89 | 89 | $search = $this->object->createSearch(); | 
| 90 | 90 | $search->setSlice(0, 1); | 
| 91 | - $items = $this->object->searchItems( $search ); | |
| 91 | + $items = $this->object->searchItems($search); | |
| 92 | 92 | |
| 93 | -		if( ( $item = reset( $items ) ) === false ) { | |
| 94 | - throw new \RuntimeException( 'No item found' ); | |
| 93 | +		if (($item = reset($items)) === false) { | |
| 94 | +			throw new \RuntimeException('No item found'); | |
| 95 | 95 | } | 
| 96 | 96 | |
| 97 | - $item->setId( null ); | |
| 98 | - $item->setDomain( 'unittest' ); | |
| 99 | - $this->object->saveItem( $item ); | |
| 100 | - $itemSaved = $this->object->getItem( $item->getId() ); | |
| 97 | + $item->setId(null); | |
| 98 | +		$item->setDomain('unittest'); | |
| 99 | + $this->object->saveItem($item); | |
| 100 | + $itemSaved = $this->object->getItem($item->getId()); | |
| 101 | 101 | |
| 102 | 102 | $itemExp = clone $itemSaved; | 
| 103 | - $itemExp->setDomain( 'unittest2' ); | |
| 104 | - $this->object->saveItem( $itemExp ); | |
| 105 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); | |
| 106 | - | |
| 107 | - $this->object->deleteItem( $itemSaved->getId() ); | |
| 108 | - | |
| 109 | - | |
| 110 | - $this->assertTrue( $item->getId() !== null ); | |
| 111 | - $this->assertTrue( $itemSaved->getType() !== null ); | |
| 112 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); | |
| 113 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); | |
| 114 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId() ); | |
| 115 | - $this->assertEquals( $item->getTypeId(), $itemSaved->getTypeId() ); | |
| 116 | - $this->assertEquals( $item->getRefId(), $itemSaved->getRefId() ); | |
| 117 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); | |
| 118 | - $this->assertEquals( $item->getDateStart(), $itemSaved->getDateStart() ); | |
| 119 | - $this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() ); | |
| 120 | - $this->assertEquals( $item->getPosition(), $itemSaved->getPosition() ); | |
| 121 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); | |
| 103 | +		$itemExp->setDomain('unittest2'); | |
| 104 | + $this->object->saveItem($itemExp); | |
| 105 | + $itemUpd = $this->object->getItem($itemExp->getId()); | |
| 106 | + | |
| 107 | + $this->object->deleteItem($itemSaved->getId()); | |
| 108 | + | |
| 109 | + | |
| 110 | + $this->assertTrue($item->getId() !== null); | |
| 111 | + $this->assertTrue($itemSaved->getType() !== null); | |
| 112 | + $this->assertEquals($item->getId(), $itemSaved->getId()); | |
| 113 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); | |
| 114 | + $this->assertEquals($item->getParentId(), $itemSaved->getParentId()); | |
| 115 | + $this->assertEquals($item->getTypeId(), $itemSaved->getTypeId()); | |
| 116 | + $this->assertEquals($item->getRefId(), $itemSaved->getRefId()); | |
| 117 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); | |
| 118 | + $this->assertEquals($item->getDateStart(), $itemSaved->getDateStart()); | |
| 119 | + $this->assertEquals($item->getDateEnd(), $itemSaved->getDateEnd()); | |
| 120 | + $this->assertEquals($item->getPosition(), $itemSaved->getPosition()); | |
| 121 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); | |
| 122 | 122 |  		$this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated()); | 
| 123 | 123 |  		$this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified()); | 
| 124 | 124 | |
| 125 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); | |
| 126 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); | |
| 127 | -		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); | |
| 128 | - | |
| 129 | - $this->assertTrue( $itemUpd->getType() !== null ); | |
| 130 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); | |
| 131 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); | |
| 132 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() ); | |
| 133 | - $this->assertEquals( $itemExp->getTypeId(), $itemUpd->getTypeId() ); | |
| 134 | - $this->assertEquals( $itemExp->getRefId(), $itemUpd->getRefId() ); | |
| 135 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); | |
| 136 | - $this->assertEquals( $itemExp->getDateStart(), $itemUpd->getDateStart() ); | |
| 137 | - $this->assertEquals( $itemExp->getDateEnd(), $itemUpd->getDateEnd() ); | |
| 138 | - $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() ); | |
| 139 | - | |
| 140 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); | |
| 141 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); | |
| 142 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); | |
| 125 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); | |
| 126 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); | |
| 127 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); | |
| 128 | + | |
| 129 | + $this->assertTrue($itemUpd->getType() !== null); | |
| 130 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); | |
| 131 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); | |
| 132 | + $this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId()); | |
| 133 | + $this->assertEquals($itemExp->getTypeId(), $itemUpd->getTypeId()); | |
| 134 | + $this->assertEquals($itemExp->getRefId(), $itemUpd->getRefId()); | |
| 135 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); | |
| 136 | + $this->assertEquals($itemExp->getDateStart(), $itemUpd->getDateStart()); | |
| 137 | + $this->assertEquals($itemExp->getDateEnd(), $itemUpd->getDateEnd()); | |
| 138 | + $this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition()); | |
| 139 | + | |
| 140 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); | |
| 141 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); | |
| 142 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); | |
| 143 | 143 | |
| 144 | 144 |  		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | 
| 145 | - $this->object->getItem( $itemSaved->getId() ); | |
| 145 | + $this->object->getItem($itemSaved->getId()); | |
| 146 | 146 | } | 
| 147 | 147 | |
| 148 | 148 | |
| 149 | 149 | public function testMoveItemLastToFront() | 
| 150 | 150 |  	{ | 
| 151 | 151 | $listItems = $this->getListItems(); | 
| 152 | - $this->assertGreaterThan( 1, count( $listItems ) ); | |
| 152 | + $this->assertGreaterThan(1, count($listItems)); | |
| 153 | 153 | |
| 154 | -		if( ( $first = reset( $listItems ) ) === false ) { | |
| 155 | - throw new \RuntimeException( 'No first customer list item' ); | |
| 154 | +		if (($first = reset($listItems)) === false) { | |
| 155 | +			throw new \RuntimeException('No first customer list item'); | |
| 156 | 156 | } | 
| 157 | 157 | |
| 158 | -		if( ( $last = end( $listItems ) ) === false ) { | |
| 159 | - throw new \RuntimeException( 'No last customer list item' ); | |
| 158 | +		if (($last = end($listItems)) === false) { | |
| 159 | +			throw new \RuntimeException('No last customer list item'); | |
| 160 | 160 | } | 
| 161 | 161 | |
| 162 | - $this->object->moveItem( $last->getId(), $first->getId() ); | |
| 162 | + $this->object->moveItem($last->getId(), $first->getId()); | |
| 163 | 163 | |
| 164 | - $newFirst = $this->object->getItem( $last->getId() ); | |
| 165 | - $newSecond = $this->object->getItem( $first->getId() ); | |
| 164 | + $newFirst = $this->object->getItem($last->getId()); | |
| 165 | + $newSecond = $this->object->getItem($first->getId()); | |
| 166 | 166 | |
| 167 | - $this->object->moveItem( $last->getId() ); | |
| 167 | + $this->object->moveItem($last->getId()); | |
| 168 | 168 | |
| 169 | - $this->assertEquals( 0, $newFirst->getPosition() ); | |
| 170 | - $this->assertEquals( 1, $newSecond->getPosition() ); | |
| 169 | + $this->assertEquals(0, $newFirst->getPosition()); | |
| 170 | + $this->assertEquals(1, $newSecond->getPosition()); | |
| 171 | 171 | } | 
| 172 | 172 | |
| 173 | 173 | |
| 174 | 174 | public function testMoveItemFirstToLast() | 
| 175 | 175 |  	{ | 
| 176 | 176 | $listItems = $this->getListItems(); | 
| 177 | - $this->assertGreaterThan( 1, count( $listItems ) ); | |
| 177 | + $this->assertGreaterThan(1, count($listItems)); | |
| 178 | 178 | |
| 179 | -		if( ( $first = reset( $listItems ) ) === false ) { | |
| 180 | - throw new \RuntimeException( 'No first customer list item' ); | |
| 179 | +		if (($first = reset($listItems)) === false) { | |
| 180 | +			throw new \RuntimeException('No first customer list item'); | |
| 181 | 181 | } | 
| 182 | 182 | |
| 183 | -		if( ( $second = next( $listItems ) ) === false ) { | |
| 184 | - throw new \RuntimeException( 'No second customer list item' ); | |
| 183 | +		if (($second = next($listItems)) === false) { | |
| 184 | +			throw new \RuntimeException('No second customer list item'); | |
| 185 | 185 | } | 
| 186 | 186 | |
| 187 | -		if( ( $last = end( $listItems ) ) === false ) { | |
| 188 | - throw new \RuntimeException( 'No last customer list item' ); | |
| 187 | +		if (($last = end($listItems)) === false) { | |
| 188 | +			throw new \RuntimeException('No last customer list item'); | |
| 189 | 189 | } | 
| 190 | 190 | |
| 191 | - $this->object->moveItem( $first->getId() ); | |
| 191 | + $this->object->moveItem($first->getId()); | |
| 192 | 192 | |
| 193 | - $newBefore = $this->object->getItem( $last->getId() ); | |
| 194 | - $newLast = $this->object->getItem( $first->getId() ); | |
| 193 | + $newBefore = $this->object->getItem($last->getId()); | |
| 194 | + $newLast = $this->object->getItem($first->getId()); | |
| 195 | 195 | |
| 196 | - $this->object->moveItem( $first->getId(), $second->getId() ); | |
| 196 | + $this->object->moveItem($first->getId(), $second->getId()); | |
| 197 | 197 | |
| 198 | - $this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() ); | |
| 199 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); | |
| 198 | + $this->assertEquals($last->getPosition() - 1, $newBefore->getPosition()); | |
| 199 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); | |
| 200 | 200 | } | 
| 201 | 201 | |
| 202 | 202 | |
| 203 | 203 | public function testMoveItemFirstUp() | 
| 204 | 204 |  	{ | 
| 205 | 205 | $listItems = $this->getListItems(); | 
| 206 | - $this->assertGreaterThan( 1, count( $listItems ) ); | |
| 206 | + $this->assertGreaterThan(1, count($listItems)); | |
| 207 | 207 | |
| 208 | -		if( ( $first = reset( $listItems ) ) === false ) { | |
| 209 | - throw new \RuntimeException( 'No first customer list item' ); | |
| 208 | +		if (($first = reset($listItems)) === false) { | |
| 209 | +			throw new \RuntimeException('No first customer list item'); | |
| 210 | 210 | } | 
| 211 | 211 | |
| 212 | -		if( ( $second = next( $listItems ) ) === false ) { | |
| 213 | - throw new \RuntimeException( 'No second customer list item' ); | |
| 212 | +		if (($second = next($listItems)) === false) { | |
| 213 | +			throw new \RuntimeException('No second customer list item'); | |
| 214 | 214 | } | 
| 215 | 215 | |
| 216 | -		if( ( $last = end( $listItems ) ) === false ) { | |
| 217 | - throw new \RuntimeException( 'No last customer list item' ); | |
| 216 | +		if (($last = end($listItems)) === false) { | |
| 217 | +			throw new \RuntimeException('No last customer list item'); | |
| 218 | 218 | } | 
| 219 | 219 | |
| 220 | - $this->object->moveItem( $first->getId(), $last->getId() ); | |
| 220 | + $this->object->moveItem($first->getId(), $last->getId()); | |
| 221 | 221 | |
| 222 | - $newLast = $this->object->getItem( $last->getId() ); | |
| 223 | - $newUp = $this->object->getItem( $first->getId() ); | |
| 222 | + $newLast = $this->object->getItem($last->getId()); | |
| 223 | + $newUp = $this->object->getItem($first->getId()); | |
| 224 | 224 | |
| 225 | - $this->object->moveItem( $first->getId(), $second->getId() ); | |
| 225 | + $this->object->moveItem($first->getId(), $second->getId()); | |
| 226 | 226 | |
| 227 | - $this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() ); | |
| 228 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); | |
| 227 | + $this->assertEquals($last->getPosition() - 1, $newUp->getPosition()); | |
| 228 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); | |
| 229 | 229 | } | 
| 230 | 230 | |
| 231 | 231 | |
| @@ -235,39 +235,39 @@ discard block | ||
| 235 | 235 | $search = $this->object->createSearch(); | 
| 236 | 236 | |
| 237 | 237 | $expr = array(); | 
| 238 | - $expr[] = $search->compare( '!=', 'customer.lists.id', null ); | |
| 239 | - $expr[] = $search->compare( '!=', 'customer.lists.siteid', null ); | |
| 240 | - $expr[] = $search->compare( '>', 'customer.lists.parentid', 0 ); | |
| 241 | - $expr[] = $search->compare( '==', 'customer.lists.domain', 'text' ); | |
| 242 | - $expr[] = $search->compare( '>', 'customer.lists.typeid', 0 ); | |
| 243 | - $expr[] = $search->compare( '>', 'customer.lists.refid', 0 ); | |
| 244 | - $expr[] = $search->compare( '==', 'customer.lists.datestart', '2010-01-01 00:00:00' ); | |
| 245 | - $expr[] = $search->compare( '==', 'customer.lists.dateend', '2100-01-01 00:00:00' ); | |
| 246 | - $expr[] = $search->compare( '!=', 'customer.lists.config', null ); | |
| 247 | - $expr[] = $search->compare( '>', 'customer.lists.position', 0 ); | |
| 248 | - $expr[] = $search->compare( '==', 'customer.lists.status', 1 ); | |
| 249 | - $expr[] = $search->compare( '>=', 'customer.lists.mtime', '1970-01-01 00:00:00' ); | |
| 250 | - $expr[] = $search->compare( '>=', 'customer.lists.ctime', '1970-01-01 00:00:00' ); | |
| 251 | - $expr[] = $search->compare( '==', 'customer.lists.editor', $this->editor ); | |
| 252 | - | |
| 253 | - $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 ); | |
| 254 | - $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null ); | |
| 255 | - $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' ); | |
| 256 | - $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' ); | |
| 257 | - $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' ); | |
| 258 | - $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 ); | |
| 259 | - $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' ); | |
| 260 | - $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' ); | |
| 261 | - $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); | |
| 262 | - | |
| 263 | - $search->setConditions( $search->combine( '&&', $expr ) ); | |
| 238 | +		$expr[] = $search->compare('!=', 'customer.lists.id', null); | |
| 239 | +		$expr[] = $search->compare('!=', 'customer.lists.siteid', null); | |
| 240 | +		$expr[] = $search->compare('>', 'customer.lists.parentid', 0); | |
| 241 | +		$expr[] = $search->compare('==', 'customer.lists.domain', 'text'); | |
| 242 | +		$expr[] = $search->compare('>', 'customer.lists.typeid', 0); | |
| 243 | +		$expr[] = $search->compare('>', 'customer.lists.refid', 0); | |
| 244 | +		$expr[] = $search->compare('==', 'customer.lists.datestart', '2010-01-01 00:00:00'); | |
| 245 | +		$expr[] = $search->compare('==', 'customer.lists.dateend', '2100-01-01 00:00:00'); | |
| 246 | +		$expr[] = $search->compare('!=', 'customer.lists.config', null); | |
| 247 | +		$expr[] = $search->compare('>', 'customer.lists.position', 0); | |
| 248 | +		$expr[] = $search->compare('==', 'customer.lists.status', 1); | |
| 249 | +		$expr[] = $search->compare('>=', 'customer.lists.mtime', '1970-01-01 00:00:00'); | |
| 250 | +		$expr[] = $search->compare('>=', 'customer.lists.ctime', '1970-01-01 00:00:00'); | |
| 251 | +		$expr[] = $search->compare('==', 'customer.lists.editor', $this->editor); | |
| 252 | + | |
| 253 | +		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0); | |
| 254 | +		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null); | |
| 255 | +		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default'); | |
| 256 | +		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text'); | |
| 257 | +		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard'); | |
| 258 | +		$expr[] = $search->compare('==', 'customer.lists.type.status', 1); | |
| 259 | +		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00'); | |
| 260 | +		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00'); | |
| 261 | +		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor); | |
| 262 | + | |
| 263 | +		$search->setConditions($search->combine('&&', $expr)); | |
| 264 | 264 | $search->setSlice(0, 2); | 
| 265 | - $results = $this->object->searchItems( $search, array(), $total ); | |
| 266 | - $this->assertEquals( 2, count( $results ) ); | |
| 267 | - $this->assertEquals( 3, $total ); | |
| 265 | + $results = $this->object->searchItems($search, array(), $total); | |
| 266 | + $this->assertEquals(2, count($results)); | |
| 267 | + $this->assertEquals(3, $total); | |
| 268 | 268 | |
| 269 | -		foreach($results as $itemId => $item) { | |
| 270 | - $this->assertEquals( $itemId, $item->getId() ); | |
| 269 | +		foreach ($results as $itemId => $item) { | |
| 270 | + $this->assertEquals($itemId, $item->getId()); | |
| 271 | 271 | } | 
| 272 | 272 | } | 
| 273 | 273 | |
| @@ -275,8 +275,8 @@ discard block | ||
| 275 | 275 | public function testSearchItemsNoCriteria() | 
| 276 | 276 |  	{ | 
| 277 | 277 | $search = $this->object->createSearch(); | 
| 278 | - $search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) ); | |
| 279 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); | |
| 278 | +		$search->setConditions($search->compare('==', 'customer.lists.editor', $this->editor)); | |
| 279 | + $this->assertEquals(4, count($this->object->searchItems($search))); | |
| 280 | 280 | } | 
| 281 | 281 | |
| 282 | 282 | |
| @@ -284,48 +284,48 @@ discard block | ||
| 284 | 284 |  	{ | 
| 285 | 285 | $search = $this->object->createSearch(true); | 
| 286 | 286 | $conditions = array( | 
| 287 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), | |
| 287 | +			$search->compare('==', 'customer.lists.editor', $this->editor), | |
| 288 | 288 | $search->getConditions() | 
| 289 | 289 | ); | 
| 290 | - $search->setConditions( $search->combine( '&&', $conditions ) ); | |
| 291 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); | |
| 290 | +		$search->setConditions($search->combine('&&', $conditions)); | |
| 291 | + $this->assertEquals(4, count($this->object->searchItems($search))); | |
| 292 | 292 | } | 
| 293 | 293 | |
| 294 | 294 | |
| 295 | 295 | public function testGetSubManager() | 
| 296 | 296 |  	{ | 
| 297 | -		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); | |
| 298 | -		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); | |
| 297 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type')); | |
| 298 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard')); | |
| 299 | 299 | |
| 300 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 301 | - $this->object->getSubManager( 'unknown' ); | |
| 300 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 301 | +		$this->object->getSubManager('unknown'); | |
| 302 | 302 | } | 
| 303 | 303 | |
| 304 | 304 | |
| 305 | 305 | protected function getListItems() | 
| 306 | 306 |  	{ | 
| 307 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' ); | |
| 307 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser'); | |
| 308 | 308 | |
| 309 | 309 | $search = $manager->createSearch(); | 
| 310 | - $search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) ); | |
| 311 | - $search->setSlice( 0, 1 ); | |
| 310 | +		$search->setConditions($search->compare('==', 'customer.code', 'UTC003')); | |
| 311 | + $search->setSlice(0, 1); | |
| 312 | 312 | |
| 313 | - $results = $manager->searchItems( $search ); | |
| 313 | + $results = $manager->searchItems($search); | |
| 314 | 314 | |
| 315 | -		if( ( $item = reset( $results ) ) === false ) { | |
| 316 | - throw new \RuntimeException( 'No customer item found' ); | |
| 315 | +		if (($item = reset($results)) === false) { | |
| 316 | +			throw new \RuntimeException('No customer item found'); | |
| 317 | 317 | } | 
| 318 | 318 | |
| 319 | 319 | $search = $this->object->createSearch(); | 
| 320 | 320 | $expr = array( | 
| 321 | - $search->compare( '==', 'customer.lists.parentid', $item->getId() ), | |
| 322 | - $search->compare( '==', 'customer.lists.domain', 'text' ), | |
| 323 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), | |
| 324 | - $search->compare( '==', 'customer.lists.type.code', 'default' ), | |
| 321 | +			$search->compare('==', 'customer.lists.parentid', $item->getId()), | |
| 322 | +			$search->compare('==', 'customer.lists.domain', 'text'), | |
| 323 | +			$search->compare('==', 'customer.lists.editor', $this->editor), | |
| 324 | +			$search->compare('==', 'customer.lists.type.code', 'default'), | |
| 325 | 325 | ); | 
| 326 | - $search->setConditions( $search->combine( '&&', $expr ) ); | |
| 327 | - $search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) ); | |
| 326 | +		$search->setConditions($search->combine('&&', $expr)); | |
| 327 | +		$search->setSortations(array($search->sort('+', 'customer.lists.position'))); | |
| 328 | 328 | |
| 329 | - return $this->object->searchItems( $search ); | |
| 329 | + return $this->object->searchItems($search); | |
| 330 | 330 | } | 
| 331 | 331 | } | 
| @@ -22,10 +22,10 @@ discard block | ||
| 22 | 22 | protected function setUp() | 
| 23 | 23 |  	{ | 
| 24 | 24 | $this->editor = \TestHelper::getContext()->getEditor(); | 
| 25 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'FosUser' ); | |
| 25 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'FosUser'); | |
| 26 | 26 | |
| 27 | - $listManager = $manager->getSubManager( 'lists', 'FosUser' ); | |
| 28 | - $this->object = $listManager->getSubManager( 'type', 'FosUser' ); | |
| 27 | +		$listManager = $manager->getSubManager('lists', 'FosUser'); | |
| 28 | +		$this->object = $listManager->getSubManager('type', 'FosUser'); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | |
| @@ -37,35 +37,35 @@ discard block | ||
| 37 | 37 | */ | 
| 38 | 38 | protected function tearDown() | 
| 39 | 39 |  	{ | 
| 40 | - unset( $this->object ); | |
| 40 | + unset($this->object); | |
| 41 | 41 | } | 
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | public function testCleanup() | 
| 45 | 45 |  	{ | 
| 46 | - $this->object->cleanup( array( -1 ) ); | |
| 46 | + $this->object->cleanup(array( -1 )); | |
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | public function testGetSearchAttributes() | 
| 51 | 51 |  	{ | 
| 52 | -		foreach( $this->object->getSearchAttributes() as $attribute ) { | |
| 53 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 52 | +		foreach ($this->object->getSearchAttributes() as $attribute) { | |
| 53 | +			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); | |
| 54 | 54 | } | 
| 55 | 55 | } | 
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | public function testGetSubManager() | 
| 59 | 59 |  	{ | 
| 60 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 61 | - $this->object->getSubManager( 'unknown' ); | |
| 60 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 61 | +		$this->object->getSubManager('unknown'); | |
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | public function testCreateItem() | 
| 66 | 66 |  	{ | 
| 67 | 67 | $item = $this->object->createItem(); | 
| 68 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item ); | |
| 68 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item); | |
| 69 | 69 | } | 
| 70 | 70 | |
| 71 | 71 | |
| @@ -75,11 +75,11 @@ discard block | ||
| 75 | 75 | $search->setSlice(0, 1); | 
| 76 | 76 | $results = $this->object->searchItems($search); | 
| 77 | 77 | |
| 78 | -		if( ( $expected = reset($results) ) === false ) { | |
| 79 | - throw new \RuntimeException( 'No list type item found' ); | |
| 78 | +		if (($expected = reset($results)) === false) { | |
| 79 | +			throw new \RuntimeException('No list type item found'); | |
| 80 | 80 | } | 
| 81 | 81 | |
| 82 | - $this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) ); | |
| 82 | + $this->assertEquals($expected, $this->object->getItem($expected->getId())); | |
| 83 | 83 | } | 
| 84 | 84 | |
| 85 | 85 | |
| @@ -89,48 +89,48 @@ discard block | ||
| 89 | 89 | $search->setSlice(0, 1); | 
| 90 | 90 | $results = $this->object->searchItems($search); | 
| 91 | 91 | |
| 92 | -		if( ( $item = reset($results) ) === false ) { | |
| 93 | - throw new \RuntimeException( 'No type item found' ); | |
| 92 | +		if (($item = reset($results)) === false) { | |
| 93 | +			throw new \RuntimeException('No type item found'); | |
| 94 | 94 | } | 
| 95 | 95 | |
| 96 | 96 | $item->setId(null); | 
| 97 | - $item->setCode( 'unitTestInit' ); | |
| 98 | - $this->object->saveItem( $item ); | |
| 99 | - $itemSaved = $this->object->getItem( $item->getId() ); | |
| 97 | +		$item->setCode('unitTestInit'); | |
| 98 | + $this->object->saveItem($item); | |
| 99 | + $itemSaved = $this->object->getItem($item->getId()); | |
| 100 | 100 | |
| 101 | 101 | $itemExp = clone $itemSaved; | 
| 102 | - $itemExp->setCode( 'unitTestSave' ); | |
| 103 | - $this->object->saveItem( $itemExp ); | |
| 104 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); | |
| 102 | +		$itemExp->setCode('unitTestSave'); | |
| 103 | + $this->object->saveItem($itemExp); | |
| 104 | + $itemUpd = $this->object->getItem($itemExp->getId()); | |
| 105 | 105 | |
| 106 | - $this->object->deleteItem( $itemSaved->getId() ); | |
| 106 | + $this->object->deleteItem($itemSaved->getId()); | |
| 107 | 107 | |
| 108 | 108 | |
| 109 | - $this->assertTrue( $item->getId() !== null ); | |
| 110 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); | |
| 111 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); | |
| 112 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); | |
| 113 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); | |
| 114 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); | |
| 115 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); | |
| 109 | + $this->assertTrue($item->getId() !== null); | |
| 110 | + $this->assertEquals($item->getId(), $itemSaved->getId()); | |
| 111 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); | |
| 112 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); | |
| 113 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); | |
| 114 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); | |
| 115 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); | |
| 116 | 116 | |
| 117 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); | |
| 118 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); | |
| 119 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); | |
| 117 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); | |
| 118 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); | |
| 119 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); | |
| 120 | 120 | |
| 121 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); | |
| 122 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); | |
| 123 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); | |
| 124 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); | |
| 125 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); | |
| 126 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); | |
| 121 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); | |
| 122 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); | |
| 123 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); | |
| 124 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); | |
| 125 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); | |
| 126 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); | |
| 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 | 132 |  		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | 
| 133 | - $this->object->getItem( $itemSaved->getId() ); | |
| 133 | + $this->object->getItem($itemSaved->getId()); | |
| 134 | 134 | } | 
| 135 | 135 | |
| 136 | 136 | |
| @@ -140,25 +140,25 @@ discard block | ||
| 140 | 140 | $search = $this->object->createSearch(); | 
| 141 | 141 | |
| 142 | 142 | $expr = array(); | 
| 143 | - $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 ); | |
| 144 | - $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null ); | |
| 145 | - $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' ); | |
| 146 | - $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' ); | |
| 147 | - $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' ); | |
| 148 | - $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 ); | |
| 149 | - $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' ); | |
| 150 | - $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' ); | |
| 151 | - $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); | |
| 152 | - | |
| 153 | - $search->setConditions( $search->combine( '&&', $expr ) ); | |
| 143 | +		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0); | |
| 144 | +		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null); | |
| 145 | +		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default'); | |
| 146 | +		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text'); | |
| 147 | +		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard'); | |
| 148 | +		$expr[] = $search->compare('==', 'customer.lists.type.status', 1); | |
| 149 | +		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00'); | |
| 150 | +		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00'); | |
| 151 | +		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor); | |
| 152 | + | |
| 153 | +		$search->setConditions($search->combine('&&', $expr)); | |
| 154 | 154 | $search->setSlice(0, 1); | 
| 155 | 155 | |
| 156 | - $results = $this->object->searchItems( $search, array(), $total ); | |
| 157 | - $this->assertEquals( 1, count( $results ) ); | |
| 158 | - $this->assertEquals( 1, $total ); | |
| 156 | + $results = $this->object->searchItems($search, array(), $total); | |
| 157 | + $this->assertEquals(1, count($results)); | |
| 158 | + $this->assertEquals(1, $total); | |
| 159 | 159 | |
| 160 | -		foreach($results as $itemId => $item) { | |
| 161 | - $this->assertEquals( $itemId, $item->getId() ); | |
| 160 | +		foreach ($results as $itemId => $item) { | |
| 161 | + $this->assertEquals($itemId, $item->getId()); | |
| 162 | 162 | } | 
| 163 | 163 | } | 
| 164 | 164 | |
| @@ -22,14 +22,14 @@ discard block | ||
| 22 | 22 |  	{ | 
| 23 | 23 | $context = \TestHelper::getContext(); | 
| 24 | 24 | $this->editor = $context->getEditor(); | 
| 25 | - $this->object = new \Aimeos\MShop\Customer\Manager\FosUser( $context ); | |
| 25 | + $this->object = new \Aimeos\MShop\Customer\Manager\FosUser($context); | |
| 26 | 26 | |
| 27 | 27 | $this->fixture = array( | 
| 28 | 28 | 'label' => 'unitTest', | 
| 29 | 29 | 'status' => 2, | 
| 30 | 30 | ); | 
| 31 | 31 | |
| 32 | - $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' ); | |
| 32 | +		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.'); | |
| 33 | 33 | } | 
| 34 | 34 | |
| 35 | 35 | |
| @@ -38,28 +38,28 @@ discard block | ||
| 38 | 38 | */ | 
| 39 | 39 | protected function tearDown() | 
| 40 | 40 |  	{ | 
| 41 | - unset( $this->object, $this->fixture, $this->address ); | |
| 41 | + unset($this->object, $this->fixture, $this->address); | |
| 42 | 42 | } | 
| 43 | 43 | |
| 44 | 44 | |
| 45 | 45 | public function testCleanup() | 
| 46 | 46 |  	{ | 
| 47 | - $this->object->cleanup( array( -1 ) ); | |
| 47 | + $this->object->cleanup(array( -1 )); | |
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | public function testGetSearchAttributes() | 
| 52 | 52 |  	{ | 
| 53 | - foreach( $this->object->getSearchAttributes() as $attribute ) | |
| 53 | + foreach ($this->object->getSearchAttributes() as $attribute) | |
| 54 | 54 |  		{ | 
| 55 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 55 | +			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); | |
| 56 | 56 | } | 
| 57 | 57 | } | 
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | public function testCreateItem() | 
| 61 | 61 |  	{ | 
| 62 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() ); | |
| 62 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem()); | |
| 63 | 63 | } | 
| 64 | 64 | |
| 65 | 65 | |
| @@ -67,21 +67,21 @@ discard block | ||
| 67 | 67 |  	{ | 
| 68 | 68 | $search = $this->object->createSearch(); | 
| 69 | 69 | $conditions = array( | 
| 70 | - $search->compare( '==', 'customer.code', 'UTC003' ), | |
| 71 | - $search->compare( '==', 'customer.editor', $this->editor ) | |
| 70 | +			$search->compare('==', 'customer.code', 'UTC003'), | |
| 71 | +			$search->compare('==', 'customer.editor', $this->editor) | |
| 72 | 72 | ); | 
| 73 | - $search->setConditions( $search->combine( '&&', $conditions ) ); | |
| 74 | - $items = $this->object->searchItems( $search, array( 'text' ) ); | |
| 73 | +		$search->setConditions($search->combine('&&', $conditions)); | |
| 74 | +		$items = $this->object->searchItems($search, array('text')); | |
| 75 | 75 | |
| 76 | -		if( ( $expected = reset( $items ) ) === false ) { | |
| 77 | - throw new \RuntimeException( 'No customer item with code "UTC003" found' ); | |
| 76 | +		if (($expected = reset($items)) === false) { | |
| 77 | +			throw new \RuntimeException('No customer item with code "UTC003" found'); | |
| 78 | 78 | } | 
| 79 | 79 | |
| 80 | - $actual = $this->object->getItem( $expected->getId(), array( 'text' ) ); | |
| 80 | +		$actual = $this->object->getItem($expected->getId(), array('text')); | |
| 81 | 81 | |
| 82 | - $this->assertEquals( $expected, $actual ); | |
| 83 | - $this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) ); | |
| 84 | - $this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) ); | |
| 82 | + $this->assertEquals($expected, $actual); | |
| 83 | +		$this->assertEquals(3, count($actual->getListItems('text'))); | |
| 84 | +		$this->assertEquals(3, count($actual->getRefItems('text'))); | |
| 85 | 85 | } | 
| 86 | 86 | |
| 87 | 87 | |
| @@ -89,56 +89,56 @@ discard block | ||
| 89 | 89 |  	{ | 
| 90 | 90 | $item = $this->object->createItem(); | 
| 91 | 91 | |
| 92 | - $item->setCode( 'unitTest' ); | |
| 93 | - $item->setLabel( 'unitTest' ); | |
| 94 | - $this->object->saveItem( $item ); | |
| 95 | - $itemSaved = $this->object->getItem( $item->getId() ); | |
| 92 | +		$item->setCode('unitTest'); | |
| 93 | +		$item->setLabel('unitTest'); | |
| 94 | + $this->object->saveItem($item); | |
| 95 | + $itemSaved = $this->object->getItem($item->getId()); | |
| 96 | 96 | |
| 97 | 97 | $itemExp = clone $itemSaved; | 
| 98 | - $itemExp->setCode( 'unitTest2' ); | |
| 99 | - $itemExp->setLabel( 'unitTest2' ); | |
| 100 | - $this->object->saveItem( $itemExp ); | |
| 101 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); | |
| 102 | - | |
| 103 | - $this->object->deleteItem( $item->getId() ); | |
| 104 | - | |
| 105 | - $this->assertTrue( $item->getId() !== null ); | |
| 106 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); | |
| 107 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); | |
| 108 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); | |
| 109 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); | |
| 110 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); | |
| 111 | - $this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() ); | |
| 112 | - $this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() ); | |
| 113 | - $this->assertEquals( $item->getPassword(), $itemSaved->getPassword() ); | |
| 114 | - $this->assertEquals( $item->getRoles(), $itemSaved->getRoles() ); | |
| 115 | - | |
| 116 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); | |
| 117 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); | |
| 118 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); | |
| 119 | - | |
| 120 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); | |
| 121 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); | |
| 122 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); | |
| 123 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); | |
| 124 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); | |
| 125 | - $this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() ); | |
| 126 | - $this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() ); | |
| 127 | - $this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() ); | |
| 128 | - $this->assertEquals( $itemExp->getRoles(), $itemUpd->getRoles() ); | |
| 129 | - | |
| 130 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); | |
| 131 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); | |
| 132 | -		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); | |
| 133 | - | |
| 134 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 135 | - $this->object->getItem( $item->getId() ); | |
| 98 | +		$itemExp->setCode('unitTest2'); | |
| 99 | +		$itemExp->setLabel('unitTest2'); | |
| 100 | + $this->object->saveItem($itemExp); | |
| 101 | + $itemUpd = $this->object->getItem($itemExp->getId()); | |
| 102 | + | |
| 103 | + $this->object->deleteItem($item->getId()); | |
| 104 | + | |
| 105 | + $this->assertTrue($item->getId() !== null); | |
| 106 | + $this->assertEquals($item->getId(), $itemSaved->getId()); | |
| 107 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); | |
| 108 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); | |
| 109 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); | |
| 110 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); | |
| 111 | + $this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress()); | |
| 112 | + $this->assertEquals($item->getBirthday(), $itemSaved->getBirthday()); | |
| 113 | + $this->assertEquals($item->getPassword(), $itemSaved->getPassword()); | |
| 114 | + $this->assertEquals($item->getRoles(), $itemSaved->getRoles()); | |
| 115 | + | |
| 116 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); | |
| 117 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); | |
| 118 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); | |
| 119 | + | |
| 120 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); | |
| 121 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); | |
| 122 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); | |
| 123 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); | |
| 124 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); | |
| 125 | + $this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress()); | |
| 126 | + $this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday()); | |
| 127 | + $this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword()); | |
| 128 | + $this->assertEquals($itemExp->getRoles(), $itemUpd->getRoles()); | |
| 129 | + | |
| 130 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); | |
| 131 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); | |
| 132 | +		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); | |
| 133 | + | |
| 134 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 135 | + $this->object->getItem($item->getId()); | |
| 136 | 136 | } | 
| 137 | 137 | |
| 138 | 138 | |
| 139 | 139 | public function testCreateSearch() | 
| 140 | 140 |  	{ | 
| 141 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() ); | |
| 141 | +		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch()); | |
| 142 | 142 | } | 
| 143 | 143 | |
| 144 | 144 | |
| @@ -148,65 +148,65 @@ discard block | ||
| 148 | 148 | $search = $this->object->createSearch(); | 
| 149 | 149 | |
| 150 | 150 | $expr = array(); | 
| 151 | - $expr[] = $search->compare( '!=', 'customer.id', null ); | |
| 152 | - $expr[] = $search->compare( '==', 'customer.label', 'UTC002' ); | |
| 153 | - $expr[] = $search->compare( '==', 'customer.code', 'UTC002' ); | |
| 154 | - | |
| 155 | - $expr[] = $search->compare( '>=', 'customer.salutation', '' ); | |
| 156 | - $expr[] = $search->compare( '>=', 'customer.company', '' ); | |
| 157 | - $expr[] = $search->compare( '>=', 'customer.vatid', '' ); | |
| 158 | - $expr[] = $search->compare( '>=', 'customer.title', '' ); | |
| 159 | - $expr[] = $search->compare( '>=', 'customer.firstname', '' ); | |
| 160 | - $expr[] = $search->compare( '>=', 'customer.lastname', '' ); | |
| 161 | - $expr[] = $search->compare( '>=', 'customer.address1', '' ); | |
| 162 | - $expr[] = $search->compare( '>=', 'customer.address2', '' ); | |
| 163 | - $expr[] = $search->compare( '>=', 'customer.address3', '' ); | |
| 164 | - $expr[] = $search->compare( '>=', 'customer.postal', '' ); | |
| 165 | - $expr[] = $search->compare( '>=', 'customer.city', '' ); | |
| 166 | - $expr[] = $search->compare( '>=', 'customer.state', '' ); | |
| 167 | - $expr[] = $search->compare( '!=', 'customer.languageid', null ); | |
| 168 | - $expr[] = $search->compare( '>=', 'customer.countryid', '' ); | |
| 169 | - $expr[] = $search->compare( '>=', 'customer.telephone', '' ); | |
| 170 | - $expr[] = $search->compare( '>=', 'customer.email', '' ); | |
| 171 | - $expr[] = $search->compare( '>=', 'customer.telefax', '' ); | |
| 172 | - $expr[] = $search->compare( '>=', 'customer.website', '' ); | |
| 173 | - | |
| 174 | - $expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' ); | |
| 175 | - $expr[] = $search->compare( '>=', 'customer.password', '' ); | |
| 176 | - $expr[] = $search->compare( '==', 'customer.status', 0 ); | |
| 177 | - $expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' ); | |
| 178 | - $expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' ); | |
| 179 | - $expr[] = $search->compare( '==', 'customer.editor', $this->editor ); | |
| 180 | - | |
| 181 | - $expr[] = $search->compare( '!=', 'customer.address.id', null ); | |
| 182 | - $expr[] = $search->compare( '!=', 'customer.address.parentid', null ); | |
| 183 | - $expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' ); | |
| 184 | - $expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' ); | |
| 185 | - $expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' ); | |
| 186 | - $expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' ); | |
| 187 | - $expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' ); | |
| 188 | - $expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' ); | |
| 189 | - $expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' ); | |
| 190 | - $expr[] = $search->compare( '==', 'customer.address.address2', '2-4' ); | |
| 191 | - $expr[] = $search->compare( '==', 'customer.address.address3', '' ); | |
| 192 | - $expr[] = $search->compare( '==', 'customer.address.postal', '11099' ); | |
| 193 | - $expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' ); | |
| 194 | - $expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' ); | |
| 195 | - $expr[] = $search->compare( '==', 'customer.address.languageid', 'de' ); | |
| 196 | - $expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' ); | |
| 197 | - $expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' ); | |
| 198 | - $expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' ); | |
| 199 | - $expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' ); | |
| 200 | - $expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' ); | |
| 201 | - $expr[] = $search->compare( '==', 'customer.address.flag', 0 ); | |
| 202 | - $expr[] = $search->compare( '==', 'customer.address.position', 1 ); | |
| 203 | - $expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' ); | |
| 204 | - $expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' ); | |
| 205 | - $expr[] = $search->compare( '==', 'customer.address.editor', $this->editor ); | |
| 206 | - | |
| 207 | - $search->setConditions( $search->combine( '&&', $expr ) ); | |
| 208 | - $result = $this->object->searchItems( $search, array(), $total ); | |
| 209 | - $this->assertEquals( 1, count( $result ) ); | |
| 151 | +		$expr[] = $search->compare('!=', 'customer.id', null); | |
| 152 | +		$expr[] = $search->compare('==', 'customer.label', 'UTC002'); | |
| 153 | +		$expr[] = $search->compare('==', 'customer.code', 'UTC002'); | |
| 154 | + | |
| 155 | +		$expr[] = $search->compare('>=', 'customer.salutation', ''); | |
| 156 | +		$expr[] = $search->compare('>=', 'customer.company', ''); | |
| 157 | +		$expr[] = $search->compare('>=', 'customer.vatid', ''); | |
| 158 | +		$expr[] = $search->compare('>=', 'customer.title', ''); | |
| 159 | +		$expr[] = $search->compare('>=', 'customer.firstname', ''); | |
| 160 | +		$expr[] = $search->compare('>=', 'customer.lastname', ''); | |
| 161 | +		$expr[] = $search->compare('>=', 'customer.address1', ''); | |
| 162 | +		$expr[] = $search->compare('>=', 'customer.address2', ''); | |
| 163 | +		$expr[] = $search->compare('>=', 'customer.address3', ''); | |
| 164 | +		$expr[] = $search->compare('>=', 'customer.postal', ''); | |
| 165 | +		$expr[] = $search->compare('>=', 'customer.city', ''); | |
| 166 | +		$expr[] = $search->compare('>=', 'customer.state', ''); | |
| 167 | +		$expr[] = $search->compare('!=', 'customer.languageid', null); | |
| 168 | +		$expr[] = $search->compare('>=', 'customer.countryid', ''); | |
| 169 | +		$expr[] = $search->compare('>=', 'customer.telephone', ''); | |
| 170 | +		$expr[] = $search->compare('>=', 'customer.email', ''); | |
| 171 | +		$expr[] = $search->compare('>=', 'customer.telefax', ''); | |
| 172 | +		$expr[] = $search->compare('>=', 'customer.website', ''); | |
| 173 | + | |
| 174 | +		$expr[] = $search->compare('==', 'customer.birthday', '1970-01-01'); | |
| 175 | +		$expr[] = $search->compare('>=', 'customer.password', ''); | |
| 176 | +		$expr[] = $search->compare('==', 'customer.status', 0); | |
| 177 | +		$expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00'); | |
| 178 | +		$expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00'); | |
| 179 | +		$expr[] = $search->compare('==', 'customer.editor', $this->editor); | |
| 180 | + | |
| 181 | +		$expr[] = $search->compare('!=', 'customer.address.id', null); | |
| 182 | +		$expr[] = $search->compare('!=', 'customer.address.parentid', null); | |
| 183 | +		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH'); | |
| 184 | +		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999'); | |
| 185 | +		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr'); | |
| 186 | +		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.'); | |
| 187 | +		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good'); | |
| 188 | +		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest'); | |
| 189 | +		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben'); | |
| 190 | +		$expr[] = $search->compare('==', 'customer.address.address2', '2-4'); | |
| 191 | +		$expr[] = $search->compare('==', 'customer.address.address3', ''); | |
| 192 | +		$expr[] = $search->compare('==', 'customer.address.postal', '11099'); | |
| 193 | +		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin'); | |
| 194 | +		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin'); | |
| 195 | +		$expr[] = $search->compare('==', 'customer.address.languageid', 'de'); | |
| 196 | +		$expr[] = $search->compare('==', 'customer.address.countryid', 'DE'); | |
| 197 | +		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221'); | |
| 198 | +		$expr[] = $search->compare('==', 'customer.address.email', '[email protected]'); | |
| 199 | +		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212'); | |
| 200 | +		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org'); | |
| 201 | +		$expr[] = $search->compare('==', 'customer.address.flag', 0); | |
| 202 | +		$expr[] = $search->compare('==', 'customer.address.position', 1); | |
| 203 | +		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00'); | |
| 204 | +		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00'); | |
| 205 | +		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor); | |
| 206 | + | |
| 207 | +		$search->setConditions($search->combine('&&', $expr)); | |
| 208 | + $result = $this->object->searchItems($search, array(), $total); | |
| 209 | + $this->assertEquals(1, count($result)); | |
| 210 | 210 | } | 
| 211 | 211 | |
| 212 | 212 | |
| @@ -215,44 +215,44 @@ discard block | ||
| 215 | 215 | $total = 0; | 
| 216 | 216 | |
| 217 | 217 | $search = $this->object->createSearch(); | 
| 218 | - $search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) ); | |
| 219 | - $search->setSlice( 0, 2 ); | |
| 218 | +		$search->setConditions($search->compare('==', 'customer.address.editor', $this->editor)); | |
| 219 | + $search->setSlice(0, 2); | |
| 220 | 220 | |
| 221 | - $results = $this->object->searchItems( $search, array(), $total ); | |
| 222 | - $this->assertEquals( 2, count( $results ) ); | |
| 223 | - $this->assertEquals( 3, $total ); | |
| 221 | + $results = $this->object->searchItems($search, array(), $total); | |
| 222 | + $this->assertEquals(2, count($results)); | |
| 223 | + $this->assertEquals(3, $total); | |
| 224 | 224 | |
| 225 | -		foreach($results as $itemId => $item) { | |
| 226 | - $this->assertEquals( $itemId, $item->getId() ); | |
| 225 | +		foreach ($results as $itemId => $item) { | |
| 226 | + $this->assertEquals($itemId, $item->getId()); | |
| 227 | 227 | } | 
| 228 | 228 | } | 
| 229 | 229 | |
| 230 | 230 | |
| 231 | 231 | public function testSearchItemsBaseCriteria() | 
| 232 | 232 |  	{ | 
| 233 | - $search = $this->object->createSearch( true ); | |
| 233 | + $search = $this->object->createSearch(true); | |
| 234 | 234 | $conditions = array( | 
| 235 | - $search->compare( '==', 'customer.address.editor', $this->editor ), | |
| 235 | +			$search->compare('==', 'customer.address.editor', $this->editor), | |
| 236 | 236 | $search->getConditions() | 
| 237 | 237 | ); | 
| 238 | - $search->setConditions( $search->combine( '&&', $conditions ) ); | |
| 239 | - $this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) ); | |
| 238 | +		$search->setConditions($search->combine('&&', $conditions)); | |
| 239 | + $this->assertEquals(2, count($this->object->searchItems($search, array(), $total))); | |
| 240 | 240 | } | 
| 241 | 241 | |
| 242 | 242 | |
| 243 | 243 | public function testGetSubManager() | 
| 244 | 244 |  	{ | 
| 245 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) ); | |
| 246 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) ); | |
| 245 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address')); | |
| 246 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard')); | |
| 247 | 247 | |
| 248 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 249 | - $this->object->getSubManager( 'unknown' ); | |
| 248 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 249 | +		$this->object->getSubManager('unknown'); | |
| 250 | 250 | } | 
| 251 | 251 | |
| 252 | 252 | |
| 253 | 253 | public function testGetSubManagerInvalidName() | 
| 254 | 254 |  	{ | 
| 255 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 256 | - $this->object->getSubManager( 'address', 'unknown' ); | |
| 255 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 256 | +		$this->object->getSubManager('address', 'unknown'); | |
| 257 | 257 | } | 
| 258 | 258 | } |