@@ -31,46 +31,46 @@ discard block |
||
| 31 | 31 | * @param integer $quantity New product quantity |
| 32 | 32 | * @return \Aimeos\MShop\Price\Item\Iface Price item with calculated price |
| 33 | 33 | */ |
| 34 | - protected function calcPrice( \Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity ) |
|
| 34 | + protected function calcPrice(\Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity) |
|
| 35 | 35 | { |
| 36 | 36 | $context = $this->getContext(); |
| 37 | 37 | |
| 38 | - if( empty( $prices ) ) |
|
| 38 | + if (empty($prices)) |
|
| 39 | 39 | { |
| 40 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' ); |
|
| 41 | - $prices = $manager->getItem( $product->getProductId(), array( 'price' ) )->getRefItems( 'price', 'default' ); |
|
| 40 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product'); |
|
| 41 | + $prices = $manager->getItem($product->getProductId(), array('price'))->getRefItems('price', 'default'); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
| 45 | - $priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' ); |
|
| 46 | - $price = $priceManager->getLowestPrice( $prices, $quantity ); |
|
| 45 | + $priceManager = \Aimeos\MShop\Factory::createManager($context, 'price'); |
|
| 46 | + $price = $priceManager->getLowestPrice($prices, $quantity); |
|
| 47 | 47 | |
| 48 | 48 | // customers can pay what they would like to pay |
| 49 | - if( ( $attr = $product->getAttributeItem( 'price', 'custom' ) ) !== null ) |
|
| 49 | + if (($attr = $product->getAttributeItem('price', 'custom')) !== null) |
|
| 50 | 50 | { |
| 51 | 51 | $amount = $attr->getValue(); |
| 52 | 52 | |
| 53 | - if( preg_match( '/^[0-9]*(\.[0-9]+)?$/', $amount ) !== 1 || ((double) $amount) < 0.01 ) { |
|
| 54 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid price value "%1$s"', $amount ) ); |
|
| 53 | + if (preg_match('/^[0-9]*(\.[0-9]+)?$/', $amount) !== 1 || ((double) $amount) < 0.01) { |
|
| 54 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid price value "%1$s"', $amount)); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - $price->setValue( $amount ); |
|
| 57 | + $price->setValue($amount); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | // add prices of (optional) attributes |
| 61 | - foreach( $this->getAttributeItems( $product->getAttributes() ) as $attrItem ) |
|
| 61 | + foreach ($this->getAttributeItems($product->getAttributes()) as $attrItem) |
|
| 62 | 62 | { |
| 63 | - $prices = $attrItem->getRefItems( 'price', 'default' ); |
|
| 63 | + $prices = $attrItem->getRefItems('price', 'default'); |
|
| 64 | 64 | |
| 65 | - if( count( $prices ) > 0 ) |
|
| 65 | + if (count($prices) > 0) |
|
| 66 | 66 | { |
| 67 | - $attrPrice = $priceManager->getLowestPrice( $prices, $quantity ); |
|
| 68 | - $price->addItem( $attrPrice ); |
|
| 67 | + $attrPrice = $priceManager->getLowestPrice($prices, $quantity); |
|
| 68 | + $price->addItem($attrPrice); |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | // remove product rebate of original price in favor to rebates granted for the order |
| 73 | - $price->setRebate( '0.00' ); |
|
| 73 | + $price->setRebate('0.00'); |
|
| 74 | 74 | |
| 75 | 75 | return $price; |
| 76 | 76 | } |
@@ -84,42 +84,42 @@ discard block |
||
| 84 | 84 | * @param array $refMap Associative list of list type codes as keys and lists of reference IDs as values |
| 85 | 85 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated |
| 86 | 86 | */ |
| 87 | - protected function checkListRef( $prodId, $domain, array $refMap ) |
|
| 87 | + protected function checkListRef($prodId, $domain, array $refMap) |
|
| 88 | 88 | { |
| 89 | - if( empty( $refMap ) ) { |
|
| 89 | + if (empty($refMap)) { |
|
| 90 | 90 | return; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - $productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' ); |
|
| 94 | - $search = $productManager->createSearch( true ); |
|
| 93 | + $productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product'); |
|
| 94 | + $search = $productManager->createSearch(true); |
|
| 95 | 95 | |
| 96 | 96 | $expr = array( |
| 97 | - $search->compare( '==', 'product.id', $prodId ), |
|
| 97 | + $search->compare('==', 'product.id', $prodId), |
|
| 98 | 98 | $search->getConditions(), |
| 99 | 99 | ); |
| 100 | 100 | |
| 101 | - foreach( $refMap as $listType => $refIds ) |
|
| 101 | + foreach ($refMap as $listType => $refIds) |
|
| 102 | 102 | { |
| 103 | - if( empty( $refIds ) ) { |
|
| 103 | + if (empty($refIds)) { |
|
| 104 | 104 | continue; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - foreach( $refIds as $key => $refId ) { |
|
| 107 | + foreach ($refIds as $key => $refId) { |
|
| 108 | 108 | $refIds[$key] = (string) $refId; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $param = array( $domain, $this->getProductListTypeItem( $domain, $listType )->getId(), $refIds ); |
|
| 112 | - $cmpfunc = $search->createFunction( 'product.contains', $param ); |
|
| 111 | + $param = array($domain, $this->getProductListTypeItem($domain, $listType)->getId(), $refIds); |
|
| 112 | + $cmpfunc = $search->createFunction('product.contains', $param); |
|
| 113 | 113 | |
| 114 | - $expr[] = $search->compare( '==', $cmpfunc, count( $refIds ) ); |
|
| 114 | + $expr[] = $search->compare('==', $cmpfunc, count($refIds)); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 117 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 118 | 118 | |
| 119 | - if( count( $productManager->searchItems( $search, [] ) ) === 0 ) |
|
| 119 | + if (count($productManager->searchItems($search, [])) === 0) |
|
| 120 | 120 | { |
| 121 | - $msg = sprintf( 'Invalid "%1$s" references for product with ID %2$s', $domain, json_encode( $prodId ) ); |
|
| 122 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
| 121 | + $msg = sprintf('Invalid "%1$s" references for product with ID %2$s', $domain, json_encode($prodId)); |
|
| 122 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
@@ -134,34 +134,34 @@ discard block |
||
| 134 | 134 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated |
| 135 | 135 | * @deprecated Use checkListRef() instead |
| 136 | 136 | */ |
| 137 | - protected function checkReferences( $prodId, $domain, $listTypeId, array $refIds ) |
|
| 137 | + protected function checkReferences($prodId, $domain, $listTypeId, array $refIds) |
|
| 138 | 138 | { |
| 139 | - $productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' ); |
|
| 140 | - $search = $productManager->createSearch( true ); |
|
| 139 | + $productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product'); |
|
| 140 | + $search = $productManager->createSearch(true); |
|
| 141 | 141 | |
| 142 | 142 | $expr = array( |
| 143 | - $search->compare( '==', 'product.id', $prodId ), |
|
| 143 | + $search->compare('==', 'product.id', $prodId), |
|
| 144 | 144 | $search->getConditions(), |
| 145 | 145 | ); |
| 146 | 146 | |
| 147 | - if( count( $refIds ) > 0 ) |
|
| 147 | + if (count($refIds) > 0) |
|
| 148 | 148 | { |
| 149 | - foreach( $refIds as $key => $refId ) { |
|
| 149 | + foreach ($refIds as $key => $refId) { |
|
| 150 | 150 | $refIds[$key] = (string) $refId; |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - $param = array( $domain, $listTypeId, $refIds ); |
|
| 154 | - $cmpfunc = $search->createFunction( 'product.contains', $param ); |
|
| 153 | + $param = array($domain, $listTypeId, $refIds); |
|
| 154 | + $cmpfunc = $search->createFunction('product.contains', $param); |
|
| 155 | 155 | |
| 156 | - $expr[] = $search->compare( '==', $cmpfunc, count( $refIds ) ); |
|
| 156 | + $expr[] = $search->compare('==', $cmpfunc, count($refIds)); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 159 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 160 | 160 | |
| 161 | - if( count( $productManager->searchItems( $search, [] ) ) === 0 ) |
|
| 161 | + if (count($productManager->searchItems($search, [])) === 0) |
|
| 162 | 162 | { |
| 163 | - $msg = sprintf( 'Invalid "%1$s" references for product with ID %2$s', $domain, json_encode( $prodId ) ); |
|
| 164 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
| 163 | + $msg = sprintf('Invalid "%1$s" references for product with ID %2$s', $domain, json_encode($prodId)); |
|
| 164 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | |
@@ -171,41 +171,41 @@ discard block |
||
| 171 | 171 | * |
| 172 | 172 | * @param string $type Basket type |
| 173 | 173 | */ |
| 174 | - protected function checkLocale( $type ) |
|
| 174 | + protected function checkLocale($type) |
|
| 175 | 175 | { |
| 176 | 176 | $errors = []; |
| 177 | 177 | $context = $this->getContext(); |
| 178 | 178 | $session = $context->getSession(); |
| 179 | 179 | $locale = $this->get()->getLocale(); |
| 180 | 180 | |
| 181 | - $localeStr = $session->get( 'aimeos/basket/locale' ); |
|
| 181 | + $localeStr = $session->get('aimeos/basket/locale'); |
|
| 182 | 182 | $localeKey = $locale->getSite()->getCode() . '|' . $locale->getLanguageId() . '|' . $locale->getCurrencyId(); |
| 183 | 183 | |
| 184 | - if( $localeStr !== null && $localeStr !== $localeKey ) |
|
| 184 | + if ($localeStr !== null && $localeStr !== $localeKey) |
|
| 185 | 185 | { |
| 186 | - $locParts = explode( '|', $localeStr ); |
|
| 187 | - $locSite = ( isset( $locParts[0] ) ? $locParts[0] : '' ); |
|
| 188 | - $locLanguage = ( isset( $locParts[1] ) ? $locParts[1] : '' ); |
|
| 189 | - $locCurrency = ( isset( $locParts[2] ) ? $locParts[2] : '' ); |
|
| 186 | + $locParts = explode('|', $localeStr); |
|
| 187 | + $locSite = (isset($locParts[0]) ? $locParts[0] : ''); |
|
| 188 | + $locLanguage = (isset($locParts[1]) ? $locParts[1] : ''); |
|
| 189 | + $locCurrency = (isset($locParts[2]) ? $locParts[2] : ''); |
|
| 190 | 190 | |
| 191 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 192 | - $locale = $localeManager->bootstrap( $locSite, $locLanguage, $locCurrency, false ); |
|
| 191 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 192 | + $locale = $localeManager->bootstrap($locSite, $locLanguage, $locCurrency, false); |
|
| 193 | 193 | |
| 194 | 194 | $context = clone $context; |
| 195 | - $context->setLocale( $locale ); |
|
| 195 | + $context->setLocale($locale); |
|
| 196 | 196 | |
| 197 | - $manager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context )->getSubManager( 'base' ); |
|
| 198 | - $basket = $manager->getSession( $type ); |
|
| 197 | + $manager = \Aimeos\MShop\Order\Manager\Factory::createManager($context)->getSubManager('base'); |
|
| 198 | + $basket = $manager->getSession($type); |
|
| 199 | 199 | |
| 200 | - $this->copyAddresses( $basket, $errors, $localeKey ); |
|
| 201 | - $this->copyServices( $basket, $errors ); |
|
| 202 | - $this->copyProducts( $basket, $errors, $localeKey ); |
|
| 203 | - $this->copyCoupons( $basket, $errors, $localeKey ); |
|
| 200 | + $this->copyAddresses($basket, $errors, $localeKey); |
|
| 201 | + $this->copyServices($basket, $errors); |
|
| 202 | + $this->copyProducts($basket, $errors, $localeKey); |
|
| 203 | + $this->copyCoupons($basket, $errors, $localeKey); |
|
| 204 | 204 | |
| 205 | - $manager->setSession( $basket, $type ); |
|
| 205 | + $manager->setSession($basket, $type); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - $session->set( 'aimeos/basket/locale', $localeKey ); |
|
| 208 | + $session->set('aimeos/basket/locale', $localeKey); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | |
@@ -217,20 +217,20 @@ discard block |
||
| 217 | 217 | * @param string $localeKey Unique identifier of the site, language and currency |
| 218 | 218 | * @return array Associative list of errors occured |
| 219 | 219 | */ |
| 220 | - protected function copyAddresses( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey ) |
|
| 220 | + protected function copyAddresses(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey) |
|
| 221 | 221 | { |
| 222 | - foreach( $basket->getAddresses() as $type => $item ) |
|
| 222 | + foreach ($basket->getAddresses() as $type => $item) |
|
| 223 | 223 | { |
| 224 | 224 | try |
| 225 | 225 | { |
| 226 | - $this->setAddress( $type, $item->toArray() ); |
|
| 227 | - $basket->deleteAddress( $type ); |
|
| 226 | + $this->setAddress($type, $item->toArray()); |
|
| 227 | + $basket->deleteAddress($type); |
|
| 228 | 228 | } |
| 229 | - catch( \Exception $e ) |
|
| 229 | + catch (\Exception $e) |
|
| 230 | 230 | { |
| 231 | 231 | $logger = $this->getContext()->getLogger(); |
| 232 | 232 | $str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s'; |
| 233 | - $logger->log( sprintf( $str, $type, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO ); |
|
| 233 | + $logger->log(sprintf($str, $type, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO); |
|
| 234 | 234 | $errors['address'][$type] = $e->getMessage(); |
| 235 | 235 | } |
| 236 | 236 | } |
@@ -247,20 +247,20 @@ discard block |
||
| 247 | 247 | * @param string $localeKey Unique identifier of the site, language and currency |
| 248 | 248 | * @return array Associative list of errors occured |
| 249 | 249 | */ |
| 250 | - protected function copyCoupons( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey ) |
|
| 250 | + protected function copyCoupons(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey) |
|
| 251 | 251 | { |
| 252 | - foreach( $basket->getCoupons() as $code => $list ) |
|
| 252 | + foreach ($basket->getCoupons() as $code => $list) |
|
| 253 | 253 | { |
| 254 | 254 | try |
| 255 | 255 | { |
| 256 | - $this->addCoupon( $code ); |
|
| 257 | - $basket->deleteCoupon( $code, true ); |
|
| 256 | + $this->addCoupon($code); |
|
| 257 | + $basket->deleteCoupon($code, true); |
|
| 258 | 258 | } |
| 259 | - catch( \Exception $e ) |
|
| 259 | + catch (\Exception $e) |
|
| 260 | 260 | { |
| 261 | 261 | $logger = $this->getContext()->getLogger(); |
| 262 | 262 | $str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s'; |
| 263 | - $logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO ); |
|
| 263 | + $logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO); |
|
| 264 | 264 | $errors['coupon'][$code] = $e->getMessage(); |
| 265 | 265 | } |
| 266 | 266 | } |
@@ -277,11 +277,11 @@ discard block |
||
| 277 | 277 | * @param string $localeKey Unique identifier of the site, language and currency |
| 278 | 278 | * @return array Associative list of errors occured |
| 279 | 279 | */ |
| 280 | - protected function copyProducts( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey ) |
|
| 280 | + protected function copyProducts(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey) |
|
| 281 | 281 | { |
| 282 | - foreach( $basket->getProducts() as $pos => $product ) |
|
| 282 | + foreach ($basket->getProducts() as $pos => $product) |
|
| 283 | 283 | { |
| 284 | - if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) { |
|
| 284 | + if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) { |
|
| 285 | 285 | continue; |
| 286 | 286 | } |
| 287 | 287 | |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | { |
| 290 | 290 | $attrIds = []; |
| 291 | 291 | |
| 292 | - foreach( $product->getAttributes() as $attrItem ) { |
|
| 292 | + foreach ($product->getAttributes() as $attrItem) { |
|
| 293 | 293 | $attrIds[$attrItem->getType()][] = $attrItem->getAttributeId(); |
| 294 | 294 | } |
| 295 | 295 | |
@@ -297,23 +297,23 @@ discard block |
||
| 297 | 297 | $product->getProductId(), |
| 298 | 298 | $product->getQuantity(), |
| 299 | 299 | [], |
| 300 | - $this->getValue( $attrIds, 'variant', [] ), |
|
| 301 | - $this->getValue( $attrIds, 'config', [] ), |
|
| 302 | - $this->getValue( $attrIds, 'hidden', [] ), |
|
| 303 | - $this->getValue( $attrIds, 'custom', [] ), |
|
| 300 | + $this->getValue($attrIds, 'variant', []), |
|
| 301 | + $this->getValue($attrIds, 'config', []), |
|
| 302 | + $this->getValue($attrIds, 'hidden', []), |
|
| 303 | + $this->getValue($attrIds, 'custom', []), |
|
| 304 | 304 | $product->getStockType() |
| 305 | 305 | ); |
| 306 | 306 | |
| 307 | - $basket->deleteProduct( $pos ); |
|
| 307 | + $basket->deleteProduct($pos); |
|
| 308 | 308 | } |
| 309 | - catch( \Exception $e ) |
|
| 309 | + catch (\Exception $e) |
|
| 310 | 310 | { |
| 311 | 311 | $code = $product->getProductCode(); |
| 312 | 312 | $logger = $this->getContext()->getLogger(); |
| 313 | 313 | $errors['product'][$pos] = $e->getMessage(); |
| 314 | 314 | |
| 315 | 315 | $str = 'Error migrating product with code "%1$s" in basket to locale "%2$s": %3$s'; |
| 316 | - $logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO ); |
|
| 316 | + $logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO); |
|
| 317 | 317 | } |
| 318 | 318 | } |
| 319 | 319 | |
@@ -328,22 +328,22 @@ discard block |
||
| 328 | 328 | * @param array $errors Associative list of previous errors |
| 329 | 329 | * @return array Associative list of errors occured |
| 330 | 330 | */ |
| 331 | - protected function copyServices( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors ) |
|
| 331 | + protected function copyServices(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors) |
|
| 332 | 332 | { |
| 333 | - foreach( $basket->getServices() as $type => $item ) |
|
| 333 | + foreach ($basket->getServices() as $type => $item) |
|
| 334 | 334 | { |
| 335 | 335 | try |
| 336 | 336 | { |
| 337 | 337 | $attributes = []; |
| 338 | 338 | |
| 339 | - foreach( $item->getAttributes() as $attrItem ) { |
|
| 339 | + foreach ($item->getAttributes() as $attrItem) { |
|
| 340 | 340 | $attributes[$attrItem->getCode()] = $attrItem->getValue(); |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | - $this->setService( $type, $item->getServiceId(), $attributes ); |
|
| 344 | - $basket->deleteService( $type ); |
|
| 343 | + $this->setService($type, $item->getServiceId(), $attributes); |
|
| 344 | + $basket->deleteService($type); |
|
| 345 | 345 | } |
| 346 | - catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically |
|
| 346 | + catch (\Exception $e) {; } // Don't notify the user as appropriate services can be added automatically |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | return $errors; |
@@ -362,36 +362,36 @@ discard block |
||
| 362 | 362 | * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface |
| 363 | 363 | * @deprecated Use getOrderProductAttributes(), checkReferences() and calcPrice() instead |
| 364 | 364 | */ |
| 365 | - protected function createOrderProductAttributes( \Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity, |
|
| 366 | - array $attributeIds, $type, array $attributeValues = [] ) |
|
| 365 | + protected function createOrderProductAttributes(\Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity, |
|
| 366 | + array $attributeIds, $type, array $attributeValues = []) |
|
| 367 | 367 | { |
| 368 | - if( empty( $attributeIds ) ) { |
|
| 368 | + if (empty($attributeIds)) { |
|
| 369 | 369 | return []; |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | - $attrTypeId = $this->getProductListTypeItem( 'attribute', $type )->getId(); |
|
| 373 | - $this->checkReferences( $prodid, 'attribute', $attrTypeId, $attributeIds ); |
|
| 372 | + $attrTypeId = $this->getProductListTypeItem('attribute', $type)->getId(); |
|
| 373 | + $this->checkReferences($prodid, 'attribute', $attrTypeId, $attributeIds); |
|
| 374 | 374 | |
| 375 | 375 | $list = []; |
| 376 | 376 | $context = $this->getContext(); |
| 377 | 377 | |
| 378 | - $priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' ); |
|
| 379 | - $orderProductAttributeManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product/attribute' ); |
|
| 378 | + $priceManager = \Aimeos\MShop\Factory::createManager($context, 'price'); |
|
| 379 | + $orderProductAttributeManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product/attribute'); |
|
| 380 | 380 | |
| 381 | - foreach( $this->getAttributes( $attributeIds ) as $id => $attrItem ) |
|
| 381 | + foreach ($this->getAttributes($attributeIds) as $id => $attrItem) |
|
| 382 | 382 | { |
| 383 | - $prices = $attrItem->getRefItems( 'price', 'default', 'default' ); |
|
| 383 | + $prices = $attrItem->getRefItems('price', 'default', 'default'); |
|
| 384 | 384 | |
| 385 | - if( !empty( $prices ) ) { |
|
| 386 | - $price->addItem( $priceManager->getLowestPrice( $prices, $quantity ) ); |
|
| 385 | + if (!empty($prices)) { |
|
| 386 | + $price->addItem($priceManager->getLowestPrice($prices, $quantity)); |
|
| 387 | 387 | } |
| 388 | 388 | |
| 389 | 389 | $item = $orderProductAttributeManager->createItem(); |
| 390 | - $item->copyFrom( $attrItem ); |
|
| 391 | - $item->setType( $type ); |
|
| 390 | + $item->copyFrom($attrItem); |
|
| 391 | + $item->setType($type); |
|
| 392 | 392 | |
| 393 | - if( isset( $attributeValues[$id] ) ) { |
|
| 394 | - $item->setValue( $attributeValues[$id] ); |
|
| 393 | + if (isset($attributeValues[$id])) { |
|
| 394 | + $item->setValue($attributeValues[$id]); |
|
| 395 | 395 | } |
| 396 | 396 | |
| 397 | 397 | $list[] = $item; |
@@ -409,31 +409,31 @@ discard block |
||
| 409 | 409 | * @return array List of items implementing \Aimeos\MShop\Attribute\Item\Iface |
| 410 | 410 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If the actual attribute number doesn't match the expected one |
| 411 | 411 | */ |
| 412 | - protected function getAttributes( array $attributeIds, array $domains = array( 'price', 'text' ) ) |
|
| 412 | + protected function getAttributes(array $attributeIds, array $domains = array('price', 'text')) |
|
| 413 | 413 | { |
| 414 | - if( empty( $attributeIds ) ) { |
|
| 414 | + if (empty($attributeIds)) { |
|
| 415 | 415 | return []; |
| 416 | 416 | } |
| 417 | 417 | |
| 418 | - $attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' ); |
|
| 418 | + $attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute'); |
|
| 419 | 419 | |
| 420 | - $search = $attributeManager->createSearch( true ); |
|
| 420 | + $search = $attributeManager->createSearch(true); |
|
| 421 | 421 | $expr = array( |
| 422 | - $search->compare( '==', 'attribute.id', $attributeIds ), |
|
| 422 | + $search->compare('==', 'attribute.id', $attributeIds), |
|
| 423 | 423 | $search->getConditions(), |
| 424 | 424 | ); |
| 425 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 426 | - $search->setSlice( 0, 0x7fffffff ); |
|
| 425 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 426 | + $search->setSlice(0, 0x7fffffff); |
|
| 427 | 427 | |
| 428 | - $attrItems = $attributeManager->searchItems( $search, $domains ); |
|
| 428 | + $attrItems = $attributeManager->searchItems($search, $domains); |
|
| 429 | 429 | |
| 430 | - if( count( $attrItems ) !== count( $attributeIds ) ) |
|
| 430 | + if (count($attrItems) !== count($attributeIds)) |
|
| 431 | 431 | { |
| 432 | - $expected = implode( ',', $attributeIds ); |
|
| 433 | - $actual = implode( ',', array_keys( $attrItems ) ); |
|
| 434 | - $msg = sprintf( 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"', $actual, $expected ); |
|
| 432 | + $expected = implode(',', $attributeIds); |
|
| 433 | + $actual = implode(',', array_keys($attrItems)); |
|
| 434 | + $msg = sprintf('Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"', $actual, $expected); |
|
| 435 | 435 | |
| 436 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
| 436 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | return $attrItems; |
@@ -446,31 +446,31 @@ discard block |
||
| 446 | 446 | * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Item[] $orderAttributes List of order product attribute items |
| 447 | 447 | * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as key and attribute items as values |
| 448 | 448 | */ |
| 449 | - protected function getAttributeItems( array $orderAttributes ) |
|
| 449 | + protected function getAttributeItems(array $orderAttributes) |
|
| 450 | 450 | { |
| 451 | - if( empty( $orderAttributes ) ) { |
|
| 451 | + if (empty($orderAttributes)) { |
|
| 452 | 452 | return []; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - $attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' ); |
|
| 456 | - $search = $attributeManager->createSearch( true ); |
|
| 455 | + $attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute'); |
|
| 456 | + $search = $attributeManager->createSearch(true); |
|
| 457 | 457 | $expr = []; |
| 458 | 458 | |
| 459 | - foreach( $orderAttributes as $item ) |
|
| 459 | + foreach ($orderAttributes as $item) |
|
| 460 | 460 | { |
| 461 | 461 | $tmp = array( |
| 462 | - $search->compare( '==', 'attribute.domain', 'product' ), |
|
| 463 | - $search->compare( '==', 'attribute.code', $item->getValue() ), |
|
| 464 | - $search->compare( '==', 'attribute.type.domain', 'product' ), |
|
| 465 | - $search->compare( '==', 'attribute.type.code', $item->getCode() ), |
|
| 466 | - $search->compare( '>', 'attribute.type.status', 0 ), |
|
| 462 | + $search->compare('==', 'attribute.domain', 'product'), |
|
| 463 | + $search->compare('==', 'attribute.code', $item->getValue()), |
|
| 464 | + $search->compare('==', 'attribute.type.domain', 'product'), |
|
| 465 | + $search->compare('==', 'attribute.type.code', $item->getCode()), |
|
| 466 | + $search->compare('>', 'attribute.type.status', 0), |
|
| 467 | 467 | $search->getConditions(), |
| 468 | 468 | ); |
| 469 | - $expr[] = $search->combine( '&&', $tmp ); |
|
| 469 | + $expr[] = $search->combine('&&', $tmp); |
|
| 470 | 470 | } |
| 471 | 471 | |
| 472 | - $search->setConditions( $search->combine( '||', $expr ) ); |
|
| 473 | - return $attributeManager->searchItems( $search, array( 'price' ) ); |
|
| 472 | + $search->setConditions($search->combine('||', $expr)); |
|
| 473 | + return $attributeManager->searchItems($search, array('price')); |
|
| 474 | 474 | } |
| 475 | 475 | |
| 476 | 476 | |
@@ -485,23 +485,23 @@ discard block |
||
| 485 | 485 | * @throws \Aimeos\Controller\Frontend\Basket\Exception |
| 486 | 486 | * @deprecated Use getItem() or findItem() instead |
| 487 | 487 | */ |
| 488 | - protected function getDomainItem( $domain, $key, $value, array $ref ) |
|
| 488 | + protected function getDomainItem($domain, $key, $value, array $ref) |
|
| 489 | 489 | { |
| 490 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $domain ); |
|
| 490 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $domain); |
|
| 491 | 491 | |
| 492 | - $search = $manager->createSearch( true ); |
|
| 492 | + $search = $manager->createSearch(true); |
|
| 493 | 493 | $expr = array( |
| 494 | - $search->compare( '==', $key, $value ), |
|
| 494 | + $search->compare('==', $key, $value), |
|
| 495 | 495 | $search->getConditions(), |
| 496 | 496 | ); |
| 497 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 497 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 498 | 498 | |
| 499 | - $result = $manager->searchItems( $search, $ref ); |
|
| 499 | + $result = $manager->searchItems($search, $ref); |
|
| 500 | 500 | |
| 501 | - if( ( $item = reset( $result ) ) === false ) |
|
| 501 | + if (($item = reset($result)) === false) |
|
| 502 | 502 | { |
| 503 | - $msg = sprintf( 'No item for "%1$s" (%2$s) found', $value, $key ); |
|
| 504 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
| 503 | + $msg = sprintf('No item for "%1$s" (%2$s) found', $value, $key); |
|
| 504 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
| 505 | 505 | } |
| 506 | 506 | |
| 507 | 507 | return $item; |
@@ -516,27 +516,27 @@ discard block |
||
| 516 | 516 | * @param array $attributeValues Associative list of attribute IDs as keys and their codes as values |
| 517 | 517 | * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface |
| 518 | 518 | */ |
| 519 | - protected function getOrderProductAttributes( $type, array $attributeIds, array $attributeValues = [] ) |
|
| 519 | + protected function getOrderProductAttributes($type, array $attributeIds, array $attributeValues = []) |
|
| 520 | 520 | { |
| 521 | - if( empty( $attributeIds ) ) { |
|
| 521 | + if (empty($attributeIds)) { |
|
| 522 | 522 | return []; |
| 523 | 523 | } |
| 524 | 524 | |
| 525 | - foreach( $attributeValues as $key => $value ) { |
|
| 525 | + foreach ($attributeValues as $key => $value) { |
|
| 526 | 526 | $attributeValues[(string) $key] = $value; // Workaround for PHP bug #74739 |
| 527 | 527 | } |
| 528 | 528 | |
| 529 | 529 | $list = []; |
| 530 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' ); |
|
| 530 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute'); |
|
| 531 | 531 | |
| 532 | - foreach( $this->getAttributes( $attributeIds ) as $id => $attrItem ) |
|
| 532 | + foreach ($this->getAttributes($attributeIds) as $id => $attrItem) |
|
| 533 | 533 | { |
| 534 | 534 | $item = $manager->createItem(); |
| 535 | - $item->copyFrom( $attrItem ); |
|
| 536 | - $item->setType( $type ); |
|
| 535 | + $item->copyFrom($attrItem); |
|
| 536 | + $item->setType($type); |
|
| 537 | 537 | |
| 538 | - if( isset( $attributeValues[$id] ) ) { |
|
| 539 | - $item->setValue( $attributeValues[$id] ); |
|
| 538 | + if (isset($attributeValues[$id])) { |
|
| 539 | + $item->setValue($attributeValues[$id]); |
|
| 540 | 540 | } |
| 541 | 541 | |
| 542 | 542 | $list[] = $item; |
@@ -553,21 +553,21 @@ discard block |
||
| 553 | 553 | * @param string $code Code of the list type |
| 554 | 554 | * @return \Aimeos\MShop\Common\Item\Type\Iface List type item |
| 555 | 555 | */ |
| 556 | - protected function getProductListTypeItem( $domain, $code ) |
|
| 556 | + protected function getProductListTypeItem($domain, $code) |
|
| 557 | 557 | { |
| 558 | - if( empty( $this->listTypeItems ) ) |
|
| 558 | + if (empty($this->listTypeItems)) |
|
| 559 | 559 | { |
| 560 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists/type' ); |
|
| 560 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists/type'); |
|
| 561 | 561 | |
| 562 | - foreach( $manager->searchItems( $manager->createSearch( true ) ) as $item ) { |
|
| 563 | - $this->listTypeItems[ $item->getDomain() ][ $item->getCode() ] = $item; |
|
| 562 | + foreach ($manager->searchItems($manager->createSearch(true)) as $item) { |
|
| 563 | + $this->listTypeItems[$item->getDomain()][$item->getCode()] = $item; |
|
| 564 | 564 | } |
| 565 | 565 | } |
| 566 | 566 | |
| 567 | - if( !isset( $this->listTypeItems[$domain][$code] ) ) |
|
| 567 | + if (!isset($this->listTypeItems[$domain][$code])) |
|
| 568 | 568 | { |
| 569 | - $msg = sprintf( 'List type for domain "%1$s" and code "%2$s" not found', $domain, $code ); |
|
| 570 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
| 569 | + $msg = sprintf('List type for domain "%1$s" and code "%2$s" not found', $domain, $code); |
|
| 570 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
| 571 | 571 | } |
| 572 | 572 | |
| 573 | 573 | return $this->listTypeItems[$domain][$code]; |
@@ -582,43 +582,43 @@ discard block |
||
| 582 | 582 | * @param array $domains Names of the domain items that should be fetched too |
| 583 | 583 | * @return array List of products matching the given attributes |
| 584 | 584 | */ |
| 585 | - protected function getProductVariants( \Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, |
|
| 586 | - array $domains = array( 'attribute', 'media', 'price', 'text' ) ) |
|
| 585 | + protected function getProductVariants(\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, |
|
| 586 | + array $domains = array('attribute', 'media', 'price', 'text')) |
|
| 587 | 587 | { |
| 588 | 588 | $subProductIds = []; |
| 589 | - foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $item ) { |
|
| 589 | + foreach ($productItem->getRefItems('product', 'default', 'default') as $item) { |
|
| 590 | 590 | $subProductIds[] = $item->getId(); |
| 591 | 591 | } |
| 592 | 592 | |
| 593 | - if( count( $subProductIds ) === 0 ) { |
|
| 593 | + if (count($subProductIds) === 0) { |
|
| 594 | 594 | return []; |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | - $productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' ); |
|
| 598 | - $search = $productManager->createSearch( true ); |
|
| 597 | + $productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product'); |
|
| 598 | + $search = $productManager->createSearch(true); |
|
| 599 | 599 | |
| 600 | 600 | $expr = array( |
| 601 | - $search->compare( '==', 'product.id', $subProductIds ), |
|
| 601 | + $search->compare('==', 'product.id', $subProductIds), |
|
| 602 | 602 | $search->getConditions(), |
| 603 | 603 | ); |
| 604 | 604 | |
| 605 | - if( count( $variantAttributeIds ) > 0 ) |
|
| 605 | + if (count($variantAttributeIds) > 0) |
|
| 606 | 606 | { |
| 607 | - foreach( $variantAttributeIds as $key => $id ) { |
|
| 607 | + foreach ($variantAttributeIds as $key => $id) { |
|
| 608 | 608 | $variantAttributeIds[$key] = (string) $id; |
| 609 | 609 | } |
| 610 | 610 | |
| 611 | - $listTypeItem = $this->getProductListTypeItem( 'attribute', 'variant' ); |
|
| 611 | + $listTypeItem = $this->getProductListTypeItem('attribute', 'variant'); |
|
| 612 | 612 | |
| 613 | - $param = array( 'attribute', $listTypeItem->getId(), $variantAttributeIds ); |
|
| 614 | - $cmpfunc = $search->createFunction( 'product.contains', $param ); |
|
| 613 | + $param = array('attribute', $listTypeItem->getId(), $variantAttributeIds); |
|
| 614 | + $cmpfunc = $search->createFunction('product.contains', $param); |
|
| 615 | 615 | |
| 616 | - $expr[] = $search->compare( '==', $cmpfunc, count( $variantAttributeIds ) ); |
|
| 616 | + $expr[] = $search->compare('==', $cmpfunc, count($variantAttributeIds)); |
|
| 617 | 617 | } |
| 618 | 618 | |
| 619 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 619 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 620 | 620 | |
| 621 | - return $productManager->searchItems( $search, $domains ); |
|
| 621 | + return $productManager->searchItems($search, $domains); |
|
| 622 | 622 | } |
| 623 | 623 | |
| 624 | 624 | |
@@ -630,9 +630,9 @@ discard block |
||
| 630 | 630 | * @param mixed $default Default value if no value is available for the given name |
| 631 | 631 | * @return mixed Value from the array or default value |
| 632 | 632 | */ |
| 633 | - protected function getValue( array $values, $name, $default = null ) |
|
| 633 | + protected function getValue(array $values, $name, $default = null) |
|
| 634 | 634 | { |
| 635 | - if( isset( $values[$name] ) ) { |
|
| 635 | + if (isset($values[$name])) { |
|
| 636 | 636 | return $values[$name]; |
| 637 | 637 | } |
| 638 | 638 | |
@@ -21,46 +21,46 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | protected function tearDown() |
| 23 | 23 | { |
| 24 | - $this->context->getSession()->set( 'aimeos', [] ); |
|
| 24 | + $this->context->getSession()->set('aimeos', []); |
|
| 25 | 25 | |
| 26 | - unset( $this->context ); |
|
| 26 | + unset($this->context); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | public function testCheckLocale() |
| 31 | 31 | { |
| 32 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 33 | - ->setConstructorArgs( [$this->context] ) |
|
| 34 | - ->setMethods( null ) |
|
| 32 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 33 | + ->setConstructorArgs([$this->context]) |
|
| 34 | + ->setMethods(null) |
|
| 35 | 35 | ->getMock(); |
| 36 | 36 | |
| 37 | - $this->context->getSession()->set( 'aimeos/basket/locale', 'unittest|en|EUR' ); |
|
| 38 | - $this->access( 'checkLocale' )->invokeArgs( $object, ['unittest'] ); |
|
| 37 | + $this->context->getSession()->set('aimeos/basket/locale', 'unittest|en|EUR'); |
|
| 38 | + $this->access('checkLocale')->invokeArgs($object, ['unittest']); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | public function testCopyAddresses() |
| 43 | 43 | { |
| 44 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 44 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 45 | 45 | $ordBaseItem = $manager->createItem(); |
| 46 | 46 | |
| 47 | - $address = $this->getAddress( 'Example company' ); |
|
| 48 | - $ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT ); |
|
| 47 | + $address = $this->getAddress('Example company'); |
|
| 48 | + $ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT); |
|
| 49 | 49 | |
| 50 | 50 | |
| 51 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 52 | - ->setConstructorArgs( [$this->context] ) |
|
| 53 | - ->setMethods( null ) |
|
| 51 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 52 | + ->setConstructorArgs([$this->context]) |
|
| 53 | + ->setMethods(null) |
|
| 54 | 54 | ->getMock(); |
| 55 | 55 | |
| 56 | - $result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] ); |
|
| 56 | + $result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']); |
|
| 57 | 57 | |
| 58 | 58 | |
| 59 | - $this->assertEquals( ['test'], $result ); |
|
| 60 | - $this->assertEquals( 1, count( $object->get()->getAddresses() ) ); |
|
| 59 | + $this->assertEquals(['test'], $result); |
|
| 60 | + $this->assertEquals(1, count($object->get()->getAddresses())); |
|
| 61 | 61 | |
| 62 | - $addr = $object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT ); |
|
| 63 | - $this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr ); |
|
| 62 | + $addr = $object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT); |
|
| 63 | + $this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr); |
|
| 64 | 64 | |
| 65 | 65 | $object->clear(); |
| 66 | 66 | } |
@@ -68,54 +68,54 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | public function testCopyAddressesException() |
| 70 | 70 | { |
| 71 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 71 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 72 | 72 | $ordBaseItem = $manager->createItem(); |
| 73 | 73 | |
| 74 | - $address = $this->getAddress( 'Example company' ); |
|
| 75 | - $ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT ); |
|
| 74 | + $address = $this->getAddress('Example company'); |
|
| 75 | + $ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT); |
|
| 76 | 76 | |
| 77 | 77 | |
| 78 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 79 | - ->setConstructorArgs( [$this->context] ) |
|
| 80 | - ->setMethods( ['setAddress'] ) |
|
| 78 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 79 | + ->setConstructorArgs([$this->context]) |
|
| 80 | + ->setMethods(['setAddress']) |
|
| 81 | 81 | ->getMock(); |
| 82 | 82 | |
| 83 | - $object->expects( $this->once() )->method( 'setAddress' )->will( $this->throwException( new \Exception() ) ); |
|
| 83 | + $object->expects($this->once())->method('setAddress')->will($this->throwException(new \Exception())); |
|
| 84 | 84 | |
| 85 | - $result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] ); |
|
| 85 | + $result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']); |
|
| 86 | 86 | |
| 87 | - $this->assertEquals( 1, count( $result ) ); |
|
| 88 | - $this->assertArrayHasKey( 'address', $result ); |
|
| 87 | + $this->assertEquals(1, count($result)); |
|
| 88 | + $this->assertArrayHasKey('address', $result); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 | public function testCopyCoupon() |
| 93 | 93 | { |
| 94 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 94 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 95 | 95 | $ordBaseItem = $manager->createItem(); |
| 96 | 96 | |
| 97 | - $product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC', ['price'] ); |
|
| 98 | - $ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' ); |
|
| 99 | - $ordProdItem = $ordProdManager->createItem()->copyFrom( $product ); |
|
| 97 | + $product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC', ['price']); |
|
| 98 | + $ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product'); |
|
| 99 | + $ordProdItem = $ordProdManager->createItem()->copyFrom($product); |
|
| 100 | 100 | |
| 101 | - $priceItems = $product->getRefItems( 'price' ); |
|
| 102 | - $ordProdItem->setPrice( reset( $priceItems ) ); |
|
| 101 | + $priceItems = $product->getRefItems('price'); |
|
| 102 | + $ordProdItem->setPrice(reset($priceItems)); |
|
| 103 | 103 | |
| 104 | - $ordBaseItem->addProduct( $ordProdItem ); |
|
| 105 | - $ordBaseItem->addCoupon( 'OPQR', [] ); |
|
| 104 | + $ordBaseItem->addProduct($ordProdItem); |
|
| 105 | + $ordBaseItem->addCoupon('OPQR', []); |
|
| 106 | 106 | |
| 107 | 107 | |
| 108 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 109 | - ->setConstructorArgs( [$this->context] ) |
|
| 110 | - ->setMethods( null ) |
|
| 108 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 109 | + ->setConstructorArgs([$this->context]) |
|
| 110 | + ->setMethods(null) |
|
| 111 | 111 | ->getMock(); |
| 112 | 112 | |
| 113 | - $object->addProduct( $product->getId() ); |
|
| 113 | + $object->addProduct($product->getId()); |
|
| 114 | 114 | |
| 115 | - $result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] ); |
|
| 115 | + $result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']); |
|
| 116 | 116 | |
| 117 | 117 | |
| 118 | - $this->assertEquals( ['test'], $result ); |
|
| 118 | + $this->assertEquals(['test'], $result); |
|
| 119 | 119 | |
| 120 | 120 | $object->clear(); |
| 121 | 121 | } |
@@ -123,48 +123,48 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | public function testCopyCouponException() |
| 125 | 125 | { |
| 126 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 126 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 127 | 127 | $ordBaseItem = $manager->createItem(); |
| 128 | 128 | |
| 129 | - $ordBaseItem->addCoupon( '90AB', [] ); |
|
| 129 | + $ordBaseItem->addCoupon('90AB', []); |
|
| 130 | 130 | |
| 131 | 131 | |
| 132 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 133 | - ->setConstructorArgs( [$this->context] ) |
|
| 134 | - ->setMethods( ['addCoupon'] ) |
|
| 132 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 133 | + ->setConstructorArgs([$this->context]) |
|
| 134 | + ->setMethods(['addCoupon']) |
|
| 135 | 135 | ->getMock(); |
| 136 | 136 | |
| 137 | - $object->expects( $this->once() )->method( 'addCoupon' )->will( $this->throwException( new \Exception() ) ); |
|
| 137 | + $object->expects($this->once())->method('addCoupon')->will($this->throwException(new \Exception())); |
|
| 138 | 138 | |
| 139 | - $result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] ); |
|
| 139 | + $result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']); |
|
| 140 | 140 | |
| 141 | - $this->assertEquals( 1, count( $result ) ); |
|
| 142 | - $this->assertArrayHasKey( 'coupon', $result ); |
|
| 141 | + $this->assertEquals(1, count($result)); |
|
| 142 | + $this->assertArrayHasKey('coupon', $result); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | |
| 146 | 146 | public function testCopyProduct() |
| 147 | 147 | { |
| 148 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 148 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 149 | 149 | $ordBaseItem = $manager->createItem(); |
| 150 | 150 | |
| 151 | - $product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' ); |
|
| 152 | - $ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' ); |
|
| 153 | - $ordProdItem = $ordProdManager->createItem()->copyFrom( $product ); |
|
| 154 | - $ordBaseItem->addProduct( $ordProdItem ); |
|
| 151 | + $product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC'); |
|
| 152 | + $ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product'); |
|
| 153 | + $ordProdItem = $ordProdManager->createItem()->copyFrom($product); |
|
| 154 | + $ordBaseItem->addProduct($ordProdItem); |
|
| 155 | 155 | |
| 156 | 156 | |
| 157 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 158 | - ->setConstructorArgs( [$this->context] ) |
|
| 159 | - ->setMethods( null ) |
|
| 157 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 158 | + ->setConstructorArgs([$this->context]) |
|
| 159 | + ->setMethods(null) |
|
| 160 | 160 | ->getMock(); |
| 161 | 161 | |
| 162 | - $result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] ); |
|
| 162 | + $result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']); |
|
| 163 | 163 | |
| 164 | 164 | |
| 165 | - $this->assertEquals( ['test'], $result ); |
|
| 166 | - $this->assertEquals( 1, count( $object->get()->getProducts() ) ); |
|
| 167 | - $this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct( 0 ) ); |
|
| 165 | + $this->assertEquals(['test'], $result); |
|
| 166 | + $this->assertEquals(1, count($object->get()->getProducts())); |
|
| 167 | + $this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct(0)); |
|
| 168 | 168 | |
| 169 | 169 | $object->clear(); |
| 170 | 170 | } |
@@ -172,56 +172,56 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | public function testCopyProductException() |
| 174 | 174 | { |
| 175 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 175 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 176 | 176 | $ordBaseItem = $manager->createItem(); |
| 177 | 177 | |
| 178 | - $product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' ); |
|
| 179 | - $ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' ); |
|
| 180 | - $ordProdItem = $ordProdManager->createItem()->copyFrom( $product ); |
|
| 181 | - $ordBaseItem->addProduct( $ordProdItem ); |
|
| 178 | + $product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC'); |
|
| 179 | + $ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product'); |
|
| 180 | + $ordProdItem = $ordProdManager->createItem()->copyFrom($product); |
|
| 181 | + $ordBaseItem->addProduct($ordProdItem); |
|
| 182 | 182 | |
| 183 | 183 | |
| 184 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 185 | - ->setConstructorArgs( [$this->context] ) |
|
| 186 | - ->setMethods( ['addProduct'] ) |
|
| 184 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 185 | + ->setConstructorArgs([$this->context]) |
|
| 186 | + ->setMethods(['addProduct']) |
|
| 187 | 187 | ->getMock(); |
| 188 | 188 | |
| 189 | - $object->expects( $this->once() )->method( 'addProduct' )->will( $this->throwException( new \Exception() ) ); |
|
| 189 | + $object->expects($this->once())->method('addProduct')->will($this->throwException(new \Exception())); |
|
| 190 | 190 | |
| 191 | - $result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] ); |
|
| 191 | + $result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']); |
|
| 192 | 192 | |
| 193 | - $this->assertEquals( 1, count( $result ) ); |
|
| 194 | - $this->assertArrayHasKey( 'product', $result ); |
|
| 193 | + $this->assertEquals(1, count($result)); |
|
| 194 | + $this->assertArrayHasKey('product', $result); |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | |
| 198 | 198 | public function testCopyServices() |
| 199 | 199 | { |
| 200 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 200 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 201 | 201 | $ordBaseItem = $manager->createItem(); |
| 202 | 202 | |
| 203 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' ); |
|
| 204 | - $ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' ); |
|
| 203 | + $serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service'); |
|
| 204 | + $ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service'); |
|
| 205 | 205 | |
| 206 | - $serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' ); |
|
| 207 | - $ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem ); |
|
| 206 | + $serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery'); |
|
| 207 | + $ordServItem = $ordServManager->createItem()->copyFrom($serviceItem); |
|
| 208 | 208 | |
| 209 | - $ordBaseItem->setService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY ); |
|
| 209 | + $ordBaseItem->setService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY); |
|
| 210 | 210 | |
| 211 | 211 | |
| 212 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 213 | - ->setConstructorArgs( [$this->context] ) |
|
| 214 | - ->setMethods( null ) |
|
| 212 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 213 | + ->setConstructorArgs([$this->context]) |
|
| 214 | + ->setMethods(null) |
|
| 215 | 215 | ->getMock(); |
| 216 | 216 | |
| 217 | - $result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] ); |
|
| 217 | + $result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']); |
|
| 218 | 218 | |
| 219 | 219 | |
| 220 | - $this->assertEquals( ['test'], $result ); |
|
| 221 | - $this->assertEquals( 1, count( $object->get()->getServices() ) ); |
|
| 220 | + $this->assertEquals(['test'], $result); |
|
| 221 | + $this->assertEquals(1, count($object->get()->getServices())); |
|
| 222 | 222 | |
| 223 | - $service = $object->get()->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY ); |
|
| 224 | - $this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Service\Iface', $service ); |
|
| 223 | + $service = $object->get()->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY); |
|
| 224 | + $this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Service\Iface', $service); |
|
| 225 | 225 | |
| 226 | 226 | $object->clear(); |
| 227 | 227 | } |
@@ -229,77 +229,77 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | public function testCopyServicesException() |
| 231 | 231 | { |
| 232 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' ); |
|
| 232 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base'); |
|
| 233 | 233 | $ordBaseItem = $manager->createItem(); |
| 234 | 234 | |
| 235 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' ); |
|
| 236 | - $ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' ); |
|
| 235 | + $serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service'); |
|
| 236 | + $ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service'); |
|
| 237 | 237 | |
| 238 | - $serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' ); |
|
| 239 | - $ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem ); |
|
| 238 | + $serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery'); |
|
| 239 | + $ordServItem = $ordServManager->createItem()->copyFrom($serviceItem); |
|
| 240 | 240 | |
| 241 | - $ordBaseItem->setService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY ); |
|
| 241 | + $ordBaseItem->setService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY); |
|
| 242 | 242 | |
| 243 | 243 | |
| 244 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 245 | - ->setConstructorArgs( [$this->context] ) |
|
| 246 | - ->setMethods( ['setService'] ) |
|
| 244 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 245 | + ->setConstructorArgs([$this->context]) |
|
| 246 | + ->setMethods(['setService']) |
|
| 247 | 247 | ->getMock(); |
| 248 | 248 | |
| 249 | - $object->expects( $this->once() )->method( 'setService' )->will( $this->throwException( new \Exception() ) ); |
|
| 249 | + $object->expects($this->once())->method('setService')->will($this->throwException(new \Exception())); |
|
| 250 | 250 | |
| 251 | - $result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] ); |
|
| 251 | + $result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']); |
|
| 252 | 252 | |
| 253 | - $this->assertEquals( 0, count( $result ) ); |
|
| 253 | + $this->assertEquals(0, count($result)); |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | |
| 257 | 257 | public function testGetOrderProductAttributes() |
| 258 | 258 | { |
| 259 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' ) |
|
| 260 | - ->setConstructorArgs( [$this->context] ) |
|
| 261 | - ->setMethods( ['getAttributes'] ) |
|
| 259 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard') |
|
| 260 | + ->setConstructorArgs([$this->context]) |
|
| 261 | + ->setMethods(['getAttributes']) |
|
| 262 | 262 | ->getMock(); |
| 263 | 263 | |
| 264 | - $list = [1 => new \Aimeos\MShop\Attribute\Item\Standard( ['attribute.code' => 'special_instructions'] )]; |
|
| 265 | - $object->expects( $this->once() )->method( 'getAttributes' )->will( $this->returnValue( $list ) ); |
|
| 264 | + $list = [1 => new \Aimeos\MShop\Attribute\Item\Standard(['attribute.code' => 'special_instructions'])]; |
|
| 265 | + $object->expects($this->once())->method('getAttributes')->will($this->returnValue($list)); |
|
| 266 | 266 | |
| 267 | 267 | $values = new \stdClass(); // test for PHP bug |
| 268 | 268 | $values->{'1'} = 'test'; |
| 269 | - $result = $this->access( 'getOrderProductAttributes' )->invokeArgs( $object, ['test', ['1'], (array) $values] ); |
|
| 269 | + $result = $this->access('getOrderProductAttributes')->invokeArgs($object, ['test', ['1'], (array) $values]); |
|
| 270 | 270 | |
| 271 | - $this->assertEquals( 1, count( $result ) ); |
|
| 272 | - $this->assertEquals( 'test', $result[0]->getValue() ); |
|
| 271 | + $this->assertEquals(1, count($result)); |
|
| 272 | + $this->assertEquals('test', $result[0]->getValue()); |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | |
| 276 | 276 | /** |
| 277 | 277 | * @param string $company |
| 278 | 278 | */ |
| 279 | - protected function getAddress( $company ) |
|
| 279 | + protected function getAddress($company) |
|
| 280 | 280 | { |
| 281 | - $manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'customer/address' ); |
|
| 281 | + $manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'customer/address'); |
|
| 282 | 282 | |
| 283 | 283 | $search = $manager->createSearch(); |
| 284 | - $search->setConditions( $search->compare( '==', 'customer.address.company', $company ) ); |
|
| 285 | - $items = $manager->searchItems( $search ); |
|
| 284 | + $search->setConditions($search->compare('==', 'customer.address.company', $company)); |
|
| 285 | + $items = $manager->searchItems($search); |
|
| 286 | 286 | |
| 287 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 288 | - throw new \RuntimeException( sprintf( 'No address item with company "%1$s" found', $company ) ); |
|
| 287 | + if (($item = reset($items)) === false) { |
|
| 288 | + throw new \RuntimeException(sprintf('No address item with company "%1$s" found', $company)); |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | - $ordAddrManager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base/address' ); |
|
| 292 | - $ordAddrItem = $ordAddrManager->createItem()->copyFrom( $item ); |
|
| 291 | + $ordAddrManager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base/address'); |
|
| 292 | + $ordAddrItem = $ordAddrManager->createItem()->copyFrom($item); |
|
| 293 | 293 | |
| 294 | 294 | return $ordAddrItem; |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | |
| 298 | - protected function access( $name ) |
|
| 298 | + protected function access($name) |
|
| 299 | 299 | { |
| 300 | - $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Base' ); |
|
| 301 | - $method = $class->getMethod( $name ); |
|
| 302 | - $method->setAccessible( true ); |
|
| 300 | + $class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Base'); |
|
| 301 | + $method = $class->getMethod($name); |
|
| 302 | + $method->setAccessible(true); |
|
| 303 | 303 | |
| 304 | 304 | return $method; |
| 305 | 305 | } |