Completed
Push — master ( 8086a8...921503 )
by Aimeos
01:52
created
controller/frontend/src/Controller/Frontend/Service/Standard.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
36 36
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
37 37
 	 */
38
-	public function checkAttributes( $serviceId, array $attributes )
38
+	public function checkAttributes($serviceId, array $attributes)
39 39
 	{
40
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
40
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
41 41
 
42
-		$item = $manager->getItem( $serviceId, [], true );
43
-		$provider = $manager->getProvider( $item, $item->getType() );
42
+		$item = $manager->getItem($serviceId, [], true);
43
+		$provider = $manager->getProvider($item, $item->getType());
44 44
 
45
-		return array_filter( $provider->checkConfigFE( $attributes ) );
45
+		return array_filter($provider->checkConfigFE($attributes));
46 46
 	}
47 47
 
48 48
 
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 	 * @param string[] $ref List of domain names whose items should be fetched too
54 54
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
55 55
 	 */
56
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
56
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
57 57
 	{
58
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
59
-		$item = $manager->getItem( $serviceId, $ref, true );
58
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
59
+		$item = $manager->getItem($serviceId, $ref, true);
60 60
 
61
-		return $manager->getProvider( $item, $item->getType() );
61
+		return $manager->getProvider($item, $item->getType());
62 62
 	}
63 63
 
64 64
 
@@ -69,25 +69,25 @@  discard block
 block discarded – undo
69 69
 	 * @param string[] $ref List of domain names whose items should be fetched too
70 70
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
71 71
 	 */
72
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
72
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
73 73
 	{
74 74
 		$list = [];
75
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
75
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
76 76
 
77
-		$search = $manager->createSearch( true );
78
-		$search->setSortations( [$search->sort( '+', 'service.position' )] );
77
+		$search = $manager->createSearch(true);
78
+		$search->setSortations([$search->sort('+', 'service.position')]);
79 79
 
80
-		if( $type != null )
80
+		if ($type != null)
81 81
 		{
82 82
 			$expr = array(
83 83
 				$search->getConditions(),
84
-				$search->compare( '==', 'service.type', $type ),
84
+				$search->compare('==', 'service.type', $type),
85 85
 			);
86
-			$search->setConditions( $search->combine( '&&', $expr ) );
86
+			$search->setConditions($search->combine('&&', $expr));
87 87
 		}
88 88
 
89
-		foreach( $manager->searchItems( $search, $ref ) as $id => $item ) {
90
-			$list[$id] = $manager->getProvider( $item, $item->getType() );
89
+		foreach ($manager->searchItems($search, $ref) as $id => $item) {
90
+			$list[$id] = $manager->getProvider($item, $item->getType());
91 91
 		}
92 92
 
93 93
 		return $list;
@@ -105,15 +105,15 @@  discard block
 block discarded – undo
105 105
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
106 106
 	 * 	or null if no form data is required
107 107
 	 */
108
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
108
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
109 109
 	{
110
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
111
-		$item = $manager->getItem( $serviceId, [], true );
110
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
111
+		$item = $manager->getItem($serviceId, [], true);
112 112
 
113
-		$provider = $manager->getProvider( $item, $item->getType() );
114
-		$provider->injectGlobalConfigBE( $urls );
113
+		$provider = $manager->getProvider($item, $item->getType());
114
+		$provider->injectGlobalConfigBE($urls);
115 115
 
116
-		return $provider->process( $orderItem, $params );
116
+		return $provider->process($orderItem, $params);
117 117
 	}
118 118
 
119 119
 
@@ -125,14 +125,14 @@  discard block
 block discarded – undo
125 125
 	 * @param string $code Unique code of the service used for the current order
126 126
 	 * @return \Psr\Http\Message\ResponseInterface Response object
127 127
 	 */
128
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code )
128
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code)
129 129
 	{
130
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
131
-		$item = $manager->findItem( $code );
130
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
131
+		$item = $manager->findItem($code);
132 132
 
133
-		$provider = $manager->getProvider( $item, $item->getType() );
133
+		$provider = $manager->getProvider($item, $item->getType());
134 134
 
135
-		return $provider->updatePush( $request, $response );
135
+		return $provider->updatePush($request, $response);
136 136
 	}
137 137
 
138 138
 
@@ -144,24 +144,24 @@  discard block
 block discarded – undo
144 144
 	 * @param string $orderid ID of the order whose payment status should be updated
145 145
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
146 146
 	 */
147
-	public function updateSync( ServerRequestInterface $request, $code, $orderid )
147
+	public function updateSync(ServerRequestInterface $request, $code, $orderid)
148 148
 	{
149 149
 		$context = $this->getContext();
150
-		$orderManager = \Aimeos\MShop::create( $context, 'order' );
151
-		$serviceManager = \Aimeos\MShop::create( $context, 'service' );
150
+		$orderManager = \Aimeos\MShop::create($context, 'order');
151
+		$serviceManager = \Aimeos\MShop::create($context, 'service');
152 152
 
153
-		$orderItem = $orderManager->getItem( $orderid );
154
-		$serviceItem = $serviceManager->findItem( $code );
153
+		$orderItem = $orderManager->getItem($orderid);
154
+		$serviceItem = $serviceManager->findItem($code);
155 155
 
156
-		$provider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
156
+		$provider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
157 157
 
158 158
 
159
-		if( ( $orderItem = $provider->updateSync( $request, $orderItem ) ) !== null )
159
+		if (($orderItem = $provider->updateSync($request, $orderItem)) !== null)
160 160
 		{
161
-			if( $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
162
-				&& $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
161
+			if ($orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
162
+				&& $provider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY)
163 163
 			) {
164
-				$provider->query( $orderItem );
164
+				$provider->query($orderItem);
165 165
 			}
166 166
 		}
167 167
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Locale/Standard.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,15 +31,15 @@  discard block
 block discarded – undo
31 31
 	public function createFilter()
32 32
 	{
33 33
 		$context = $this->getContext();
34
-		$filter = \Aimeos\MShop::create( $context, 'locale' )->createSearch( true );
34
+		$filter = \Aimeos\MShop::create($context, 'locale')->createSearch(true);
35 35
 
36 36
 		$expr = array(
37
-			$filter->compare( '==', 'locale.siteid', $context->getLocale()->getSitePath() ),
37
+			$filter->compare('==', 'locale.siteid', $context->getLocale()->getSitePath()),
38 38
 			$filter->getConditions(),
39 39
 		);
40 40
 
41
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
42
-		$filter->setSortations( array( $filter->sort( '+', 'locale.position' ) ) );
41
+		$filter->setConditions($filter->combine('&&', $expr));
42
+		$filter->setSortations(array($filter->sort('+', 'locale.position')));
43 43
 
44 44
 		return $filter;
45 45
 	}
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
54 54
 	 * @since 2017.03
55 55
 	 */
56
-	public function getItem( $id, array $domains = [] )
56
+	public function getItem($id, array $domains = [])
57 57
 	{
58
-		return \Aimeos\MShop::create( $this->getContext(), 'locale' )->getItem( $id, $domains, true );
58
+		return \Aimeos\MShop::create($this->getContext(), 'locale')->getItem($id, $domains, true);
59 59
 	}
60 60
 
61 61
 
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
69 69
 	 * @since 2017.03
70 70
 	 */
71
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null )
71
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null)
72 72
 	{
73
-		return \Aimeos\MShop::create( $this->getContext(), 'locale' )->searchItems( $filter, $domains, $total );
73
+		return \Aimeos\MShop::create($this->getContext(), 'locale')->searchItems($filter, $domains, $total);
74 74
 	}
75 75
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Category.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -36,27 +36,27 @@
 block discarded – undo
36 36
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
37 37
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
38 38
 	 */
39
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
39
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
41 41
 	{
42 42
 		$context = $this->getContext();
43
-		$catalogListManager = \Aimeos\MShop::create( $context, 'catalog/lists' );
43
+		$catalogListManager = \Aimeos\MShop::create($context, 'catalog/lists');
44 44
 
45
-		$search = $catalogListManager->createSearch( true );
45
+		$search = $catalogListManager->createSearch(true);
46 46
 		$expr = array(
47
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
48
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
47
+			$search->compare('==', 'catalog.lists.domain', 'product'),
48
+			$search->compare('==', 'catalog.lists.refid', $prodid),
49 49
 			$search->getConditions()
50 50
 		);
51
-		$search->setConditions( $search->combine( '&&', $expr ) );
52
-		$search->setSlice( 0, 1 );
51
+		$search->setConditions($search->combine('&&', $expr));
52
+		$search->setSlice(0, 1);
53 53
 
54
-		$result = $catalogListManager->searchItems( $search );
54
+		$result = $catalogListManager->searchItems($search);
55 55
 
56
-		if( reset( $result ) === false )
56
+		if (reset($result) === false)
57 57
 		{
58
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Adding product with ID "%1$s" is not allowed' );
59
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $prodid ) );
58
+			$msg = $context->getI18n()->dt('controller/frontend', 'Adding product with ID "%1$s" is not allowed');
59
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $prodid));
60 60
 		}
61 61
 
62 62
 		$this->getController()->addProduct(
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Bundle.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -36,13 +36,13 @@  discard block
 block discarded – undo
36 36
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
37 37
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
38 38
 	 */
39
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
39
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
41 41
 	{
42 42
 		$context = $this->getContext();
43
-		$productManager = \Aimeos\MShop::create( $context, 'product' );
43
+		$productManager = \Aimeos\MShop::create($context, 'product');
44 44
 
45
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'bundle' )
45
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'bundle')
46 46
 		{
47 47
 			return $this->getController()->addProduct(
48 48
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,29 +51,29 @@  discard block
 block discarded – undo
51 51
 		}
52 52
 
53 53
 		$attributeMap = [
54
-			'custom' => array_keys( $customAttributeValues ),
55
-			'config' => array_keys( $configAttributeIds ),
54
+			'custom' => array_keys($customAttributeValues),
55
+			'config' => array_keys($configAttributeIds),
56 56
 		];
57
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
57
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
58 58
 
59 59
 
60
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
61
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
62
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
60
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
61
+		$prices = $productItem->getRefItems('price', 'default', 'default');
62
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
63 63
 
64
-		$orderBaseProductItem = \Aimeos\MShop::create( $context, 'order/base/product' )->createItem();
65
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
64
+		$orderBaseProductItem = \Aimeos\MShop::create($context, 'order/base/product')->createItem();
65
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
66 66
 
67
-		$this->addBundleProducts( $orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype );
67
+		$this->addBundleProducts($orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype);
68 68
 
69
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
70
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
71
-		$attr = array_merge( $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
69
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
70
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
71
+		$attr = array_merge($custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
72 72
 
73
-		$orderBaseProductItem->setAttributeItems( $attr );
74
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
73
+		$orderBaseProductItem->setAttributeItems($attr);
74
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
75 75
 
76
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
76
+		$this->getController()->get()->addProduct($orderBaseProductItem);
77 77
 		$this->getController()->save();
78 78
 	}
79 79
 
@@ -86,43 +86,43 @@  discard block
 block discarded – undo
86 86
 	 * @param array $variantAttributeIds List of product variant attribute IDs
87 87
 	 * @param string $stocktype
88 88
 	 */
89
-	protected function addBundleProducts( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
90
-		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype )
89
+	protected function addBundleProducts(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
90
+		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype)
91 91
 	{
92 92
 		$quantity = $orderBaseProductItem->getQuantity();
93 93
 		$products = $subProductIds = $orderProducts = [];
94
-		$orderProductManager = \Aimeos\MShop::create( $this->getContext(), 'order/base/product' );
94
+		$orderProductManager = \Aimeos\MShop::create($this->getContext(), 'order/base/product');
95 95
 
96
-		foreach( $productItem->getRefItems( 'product', null, 'default' ) as $item ) {
96
+		foreach ($productItem->getRefItems('product', null, 'default') as $item) {
97 97
 			$subProductIds[] = $item->getId();
98 98
 		}
99 99
 
100
-		if( count( $subProductIds ) > 0 )
100
+		if (count($subProductIds) > 0)
101 101
 		{
102
-			$productManager = \Aimeos\MShop::create( $this->getContext(), 'product' );
102
+			$productManager = \Aimeos\MShop::create($this->getContext(), 'product');
103 103
 
104
-			$search = $productManager->createSearch( true );
104
+			$search = $productManager->createSearch(true);
105 105
 			$expr = array(
106
-				$search->compare( '==', 'product.id', $subProductIds ),
106
+				$search->compare('==', 'product.id', $subProductIds),
107 107
 				$search->getConditions(),
108 108
 			);
109
-			$search->setConditions( $search->combine( '&&', $expr ) );
109
+			$search->setConditions($search->combine('&&', $expr));
110 110
 
111
-			$products = $productManager->searchItems( $search, array( 'attribute', 'media', 'price', 'text' ) );
111
+			$products = $productManager->searchItems($search, array('attribute', 'media', 'price', 'text'));
112 112
 		}
113 113
 
114
-		foreach( $products as $product )
114
+		foreach ($products as $product)
115 115
 		{
116
-			$prices = $product->getRefItems( 'price', 'default', 'default' );
116
+			$prices = $product->getRefItems('price', 'default', 'default');
117 117
 
118 118
 			$orderProduct = $orderProductManager->createItem();
119
-			$orderProduct->copyFrom( $product );
120
-			$orderProduct->setStockType( $stocktype );
121
-			$orderProduct->setPrice( $this->calcPrice( $orderProduct, $prices, $quantity ) );
119
+			$orderProduct->copyFrom($product);
120
+			$orderProduct->setStockType($stocktype);
121
+			$orderProduct->setPrice($this->calcPrice($orderProduct, $prices, $quantity));
122 122
 
123 123
 			$orderProducts[] = $orderProduct;
124 124
 		}
125 125
 
126
-		$orderBaseProductItem->setProducts( $orderProducts );
126
+		$orderBaseProductItem->setProducts($orderProducts);
127 127
 	}
128 128
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Select.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -36,14 +36,14 @@  discard block
 block discarded – undo
36 36
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
37 37
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
38 38
 	 */
39
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
39
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
41 41
 	{
42 42
 		$context = $this->getContext();
43
-		$productManager = \Aimeos\MShop::create( $context, 'product' );
44
-		$productItem = $productManager->getItem( $prodid, [], true );
43
+		$productManager = \Aimeos\MShop::create($context, 'product');
44
+		$productItem = $productManager->getItem($prodid, [], true);
45 45
 
46
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'select' )
46
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'select')
47 47
 		{
48 48
 			return $this->getController()->addProduct(
49 49
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,30 +51,30 @@  discard block
 block discarded – undo
51 51
 			);
52 52
 		}
53 53
 
54
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
55
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
56
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
54
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
55
+		$prices = $productItem->getRefItems('price', 'default', 'default');
56
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
57 57
 
58
-		$orderBaseProductItem = \Aimeos\MShop::create( $context, 'order/base/product' )->createItem();
59
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
58
+		$orderBaseProductItem = \Aimeos\MShop::create($context, 'order/base/product')->createItem();
59
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
60 60
 
61
-		$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds );
62
-		$hidden += $productItem->getRefItems( 'attribute', null, 'hidden' );
61
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds);
62
+		$hidden += $productItem->getRefItems('attribute', null, 'hidden');
63 63
 
64 64
 		$attributeMap = [
65
-			'custom' => array_keys( $customAttributeValues ),
66
-			'config' => array_keys( $configAttributeIds ),
65
+			'custom' => array_keys($customAttributeValues),
66
+			'config' => array_keys($configAttributeIds),
67 67
 		];
68
-		$this->checkListRef( array( $prodid, $productItem->getId() ), 'attribute', $attributeMap );
68
+		$this->checkListRef(array($prodid, $productItem->getId()), 'attribute', $attributeMap);
69 69
 
70
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
71
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
72
-		$attr = array_merge( $attr, $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
70
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
71
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
72
+		$attr = array_merge($attr, $custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
73 73
 
74
-		$orderBaseProductItem->setAttributeItems( $attr );
75
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
74
+		$orderBaseProductItem->setAttributeItems($attr);
75
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
76 76
 
77
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
77
+		$this->getController()->get()->addProduct($orderBaseProductItem);
78 78
 		$this->getController()->save();
79 79
 	}
80 80
 
@@ -89,12 +89,12 @@  discard block
 block discarded – undo
89 89
 	 * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes
90 90
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found
91 91
 	 */
92
-	protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
93
-		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds )
92
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
93
+		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds)
94 94
 	{
95 95
 		$attr = [];
96 96
 		$context = $this->getContext();
97
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
97
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
98 98
 
99 99
 		/** controller/frontend/basket/require-variant
100 100
 		 * A variant of a selection product must be chosen
@@ -115,47 +115,47 @@  discard block
 block discarded – undo
115 115
 		 * @category Developer
116 116
 		 * @category User
117 117
 		 */
118
-		$requireVariant = $context->getConfig()->get( 'controller/frontend/basket/require-variant', true );
118
+		$requireVariant = $context->getConfig()->get('controller/frontend/basket/require-variant', true);
119 119
 
120 120
 
121
-		if( count( $productItems ) > 1 )
121
+		if (count($productItems) > 1)
122 122
 		{
123
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' );
124
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
123
+			$msg = $context->getI18n()->dt('controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"');
124
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
125 125
 		}
126
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
126
+		else if (($result = reset($productItems)) !== false) // count == 1
127 127
 		{
128 128
 			$productItem = $result;
129
-			$orderBaseProductItem->setProductCode( $productItem->getCode() );
129
+			$orderBaseProductItem->setProductCode($productItem->getCode());
130 130
 
131
-			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
131
+			$subprices = $productItem->getRefItems('price', 'default', 'default');
132 132
 
133
-			if( !empty( $subprices ) ) {
133
+			if (!empty($subprices)) {
134 134
 				$prices = $subprices;
135 135
 			}
136 136
 
137
-			$submedia = $productItem->getRefItems( 'media', 'default', 'default' );
137
+			$submedia = $productItem->getRefItems('media', 'default', 'default');
138 138
 
139
-			if( ( $mediaItem = reset( $submedia ) ) !== false ) {
140
-				$orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() );
139
+			if (($mediaItem = reset($submedia)) !== false) {
140
+				$orderBaseProductItem->setMediaUrl($mediaItem->getPreview());
141 141
 			}
142 142
 
143
-			$orderProductAttrManager = \Aimeos\MShop::create( $this->getContext(), 'order/base/product/attribute' );
144
-			$variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' );
143
+			$orderProductAttrManager = \Aimeos\MShop::create($this->getContext(), 'order/base/product/attribute');
144
+			$variantAttributes = $productItem->getRefItems('attribute', null, 'variant');
145 145
 
146
-			foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem )
146
+			foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem)
147 147
 			{
148 148
 				$orderAttributeItem = $orderProductAttrManager->createItem();
149
-				$orderAttributeItem->copyFrom( $attrItem );
150
-				$orderAttributeItem->setType( 'variant' );
149
+				$orderAttributeItem->copyFrom($attrItem);
150
+				$orderAttributeItem->setType('variant');
151 151
 
152 152
 				$attr[] = $orderAttributeItem;
153 153
 			}
154 154
 		}
155
-		else if( $requireVariant != false ) // count == 0
155
+		else if ($requireVariant != false) // count == 0
156 156
 		{
157
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' );
158
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
157
+			$msg = $context->getI18n()->dt('controller/frontend', 'No article found for selected attributes and product ID "%1$s"');
158
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
159 159
 		}
160 160
 
161 161
 		return $attr;
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Base.php 1 patch
Spacing   +146 added lines, -146 removed lines patch added patch discarded remove patch
@@ -31,52 +31,52 @@  discard block
 block discarded – undo
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::create( $context, 'product' );
41
-			$prices = $manager->getItem( $product->getProductId(), array( 'price' ) )->getRefItems( 'price', 'default' );
40
+			$manager = \Aimeos\MShop::create($context, 'product');
41
+			$prices = $manager->getItem($product->getProductId(), array('price'))->getRefItems('price', 'default');
42 42
 		}
43 43
 
44 44
 
45
-		$priceManager = \Aimeos\MShop::create( $context, 'price' );
46
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
45
+		$priceManager = \Aimeos\MShop::create($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 )
53
+			if (preg_match('/^[0-9]*(\.[0-9]+)?$/', $amount) !== 1 || ((double) $amount) < 0.01)
54 54
 			{
55
-				$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid price value "%1$s"' );
56
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $amount ) );
55
+				$msg = $context->getI18n()->dt('controller/frontend', 'Invalid price value "%1$s"');
56
+				throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $amount));
57 57
 			}
58 58
 
59
-			$price->setValue( $amount );
59
+			$price->setValue($amount);
60 60
 		}
61 61
 
62 62
 		$orderAttributes = $product->getAttributeItems();
63
-		$attrItems = $this->getAttributeItems( $orderAttributes );
63
+		$attrItems = $this->getAttributeItems($orderAttributes);
64 64
 
65 65
 		// add prices of (optional) attributes
66
-		foreach( $orderAttributes as $orderAttrItem )
66
+		foreach ($orderAttributes as $orderAttrItem)
67 67
 		{
68 68
 			$attrId = $orderAttrItem->getAttributeId();
69 69
 
70
-			if( isset( $attrItems[$attrId] )
71
-				&& ( $prices = $attrItems[$attrId]->getRefItems( 'price', 'default' ) ) !== []
70
+			if (isset($attrItems[$attrId])
71
+				&& ($prices = $attrItems[$attrId]->getRefItems('price', 'default')) !== []
72 72
 			) {
73
-				$attrPrice = $priceManager->getLowestPrice( $prices, $orderAttrItem->getQuantity() );
74
-				$price->addItem( $attrPrice, $orderAttrItem->getQuantity() );
73
+				$attrPrice = $priceManager->getLowestPrice($prices, $orderAttrItem->getQuantity());
74
+				$price->addItem($attrPrice, $orderAttrItem->getQuantity());
75 75
 			}
76 76
 		}
77 77
 
78 78
 		// remove product rebate of original price in favor to rebates granted for the order
79
-		$price->setRebate( '0.00' );
79
+		$price->setRebate('0.00');
80 80
 
81 81
 		return $price;
82 82
 	}
@@ -90,36 +90,36 @@  discard block
 block discarded – undo
90 90
 	 * @param array $refMap Associative list of list type codes as keys and lists of reference IDs as values
91 91
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
92 92
 	 */
93
-	protected function checkListRef( $prodId, $domain, array $refMap )
93
+	protected function checkListRef($prodId, $domain, array $refMap)
94 94
 	{
95
-		if( empty( $refMap ) ) {
95
+		if (empty($refMap)) {
96 96
 			return;
97 97
 		}
98 98
 
99 99
 		$context = $this->getContext();
100
-		$productManager = \Aimeos\MShop::create( $context, 'product' );
101
-		$search = $productManager->createSearch( true );
100
+		$productManager = \Aimeos\MShop::create($context, 'product');
101
+		$search = $productManager->createSearch(true);
102 102
 
103 103
 		$expr = array(
104
-			$search->compare( '==', 'product.id', $prodId ),
104
+			$search->compare('==', 'product.id', $prodId),
105 105
 			$search->getConditions(),
106 106
 		);
107 107
 
108
-		foreach( $refMap as $listType => $refIds )
108
+		foreach ($refMap as $listType => $refIds)
109 109
 		{
110
-			foreach( $refIds as $key => $refId )
110
+			foreach ($refIds as $key => $refId)
111 111
 			{
112
-				$cmpfunc = $search->createFunction( 'product:has', [$domain, $listType, (string) $refId] );
113
-				$expr[] = $search->compare( '!=', $cmpfunc, null );
112
+				$cmpfunc = $search->createFunction('product:has', [$domain, $listType, (string) $refId]);
113
+				$expr[] = $search->compare('!=', $cmpfunc, null);
114 114
 			}
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 = $context->getI18n()->dt( 'controller/frontend', 'Invalid "%1$s" references for product with ID %2$s' );
122
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, json_encode( $prodId ) ) );
121
+			$msg = $context->getI18n()->dt('controller/frontend', 'Invalid "%1$s" references for product with ID %2$s');
122
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, json_encode($prodId)));
123 123
 		}
124 124
 	}
125 125
 
@@ -130,40 +130,40 @@  discard block
 block discarded – undo
130 130
 	 * @param \Aimeos\MShop\Locale\Item\Iface $locale Locale object from current basket
131 131
 	 * @param string $type Basket type
132 132
 	 */
133
-	protected function checkLocale( \Aimeos\MShop\Locale\Item\Iface $locale, $type )
133
+	protected function checkLocale(\Aimeos\MShop\Locale\Item\Iface $locale, $type)
134 134
 	{
135 135
 		$errors = [];
136 136
 		$context = $this->getContext();
137 137
 		$session = $context->getSession();
138 138
 
139
-		$localeStr = $session->get( 'aimeos/basket/locale' );
139
+		$localeStr = $session->get('aimeos/basket/locale');
140 140
 		$localeKey = $locale->getSite()->getCode() . '|' . $locale->getLanguageId() . '|' . $locale->getCurrencyId();
141 141
 
142
-		if( $localeStr !== null && $localeStr !== $localeKey )
142
+		if ($localeStr !== null && $localeStr !== $localeKey)
143 143
 		{
144
-			$locParts = explode( '|', $localeStr );
145
-			$locSite = ( isset( $locParts[0] ) ? $locParts[0] : '' );
146
-			$locLanguage = ( isset( $locParts[1] ) ? $locParts[1] : '' );
147
-			$locCurrency = ( isset( $locParts[2] ) ? $locParts[2] : '' );
144
+			$locParts = explode('|', $localeStr);
145
+			$locSite = (isset($locParts[0]) ? $locParts[0] : '');
146
+			$locLanguage = (isset($locParts[1]) ? $locParts[1] : '');
147
+			$locCurrency = (isset($locParts[2]) ? $locParts[2] : '');
148 148
 
149
-			$localeManager = \Aimeos\MShop::create( $context, 'locale' );
150
-			$locale = $localeManager->bootstrap( $locSite, $locLanguage, $locCurrency, false );
149
+			$localeManager = \Aimeos\MShop::create($context, 'locale');
150
+			$locale = $localeManager->bootstrap($locSite, $locLanguage, $locCurrency, false);
151 151
 
152 152
 			$context = clone $context;
153
-			$context->setLocale( $locale );
153
+			$context->setLocale($locale);
154 154
 
155
-			$manager = \Aimeos\MShop::create( $context, 'order/base' );
156
-			$basket = $manager->getSession( $type );
155
+			$manager = \Aimeos\MShop::create($context, 'order/base');
156
+			$basket = $manager->getSession($type);
157 157
 
158
-			$this->copyAddresses( $basket, $errors, $localeKey );
159
-			$this->copyServices( $basket, $errors );
160
-			$this->copyProducts( $basket, $errors, $localeKey );
161
-			$this->copyCoupons( $basket, $errors, $localeKey );
158
+			$this->copyAddresses($basket, $errors, $localeKey);
159
+			$this->copyServices($basket, $errors);
160
+			$this->copyProducts($basket, $errors, $localeKey);
161
+			$this->copyCoupons($basket, $errors, $localeKey);
162 162
 
163
-			$manager->setSession( $basket, $type );
163
+			$manager->setSession($basket, $type);
164 164
 		}
165 165
 
166
-		$session->set( 'aimeos/basket/locale', $localeKey );
166
+		$session->set('aimeos/basket/locale', $localeKey);
167 167
 	}
168 168
 
169 169
 
@@ -175,22 +175,22 @@  discard block
 block discarded – undo
175 175
 	 * @param string $localeKey Unique identifier of the site, language and currency
176 176
 	 * @return array Associative list of errors occured
177 177
 	 */
178
-	protected function copyAddresses( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
178
+	protected function copyAddresses(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
179 179
 	{
180
-		foreach( $basket->getAddresses() as $type => $item )
180
+		foreach ($basket->getAddresses() as $type => $item)
181 181
 		{
182 182
 			try
183 183
 			{
184
-				$this->setAddress( $type, $item->toArray() );
185
-				$basket->deleteAddress( $type );
184
+				$this->setAddress($type, $item->toArray());
185
+				$basket->deleteAddress($type);
186 186
 			}
187
-			catch( \Exception $e )
187
+			catch (\Exception $e)
188 188
 			{
189 189
 				$logger = $this->getContext()->getLogger();
190 190
 				$errors['address'][$type] = $e->getMessage();
191 191
 
192 192
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
193
-				$logger->log( sprintf( $str, $type, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
193
+				$logger->log(sprintf($str, $type, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
194 194
 			}
195 195
 		}
196 196
 
@@ -206,22 +206,22 @@  discard block
 block discarded – undo
206 206
 	 * @param string $localeKey Unique identifier of the site, language and currency
207 207
 	 * @return array Associative list of errors occured
208 208
 	 */
209
-	protected function copyCoupons( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
209
+	protected function copyCoupons(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
210 210
 	{
211
-		foreach( $basket->getCoupons() as $code => $list )
211
+		foreach ($basket->getCoupons() as $code => $list)
212 212
 		{
213 213
 			try
214 214
 			{
215
-				$this->addCoupon( $code );
216
-				$basket->deleteCoupon( $code, true );
215
+				$this->addCoupon($code);
216
+				$basket->deleteCoupon($code, true);
217 217
 			}
218
-			catch( \Exception $e )
218
+			catch (\Exception $e)
219 219
 			{
220 220
 				$logger = $this->getContext()->getLogger();
221 221
 				$errors['coupon'][$code] = $e->getMessage();
222 222
 
223 223
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
224
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
224
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
225 225
 			}
226 226
 		}
227 227
 
@@ -237,11 +237,11 @@  discard block
 block discarded – undo
237 237
 	 * @param string $localeKey Unique identifier of the site, language and currency
238 238
 	 * @return array Associative list of errors occured
239 239
 	 */
240
-	protected function copyProducts( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
240
+	protected function copyProducts(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
241 241
 	{
242
-		foreach( $basket->getProducts() as $pos => $product )
242
+		foreach ($basket->getProducts() as $pos => $product)
243 243
 		{
244
-			if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) {
244
+			if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) {
245 245
 				continue;
246 246
 			}
247 247
 
@@ -249,9 +249,9 @@  discard block
 block discarded – undo
249 249
 			{
250 250
 				$variantIds = $configIds = $customIds = [];
251 251
 
252
-				foreach( $product->getAttributeItems() as $attrItem )
252
+				foreach ($product->getAttributeItems() as $attrItem)
253 253
 				{
254
-					switch( $attrItem->getType() )
254
+					switch ($attrItem->getType())
255 255
 					{
256 256
 						case 'variant': $variantIds[] = $attrItem->getAttributeId(); break;
257 257
 						case 'config': $configIds[$attrItem->getAttributeId()] = $attrItem->getQuantity(); break;
@@ -264,16 +264,16 @@  discard block
 block discarded – undo
264 264
 					$variantIds, $configIds, [], $customIds
265 265
 				);
266 266
 
267
-				$basket->deleteProduct( $pos );
267
+				$basket->deleteProduct($pos);
268 268
 			}
269
-			catch( \Exception $e )
269
+			catch (\Exception $e)
270 270
 			{
271 271
 				$code = $product->getProductCode();
272 272
 				$logger = $this->getContext()->getLogger();
273 273
 				$errors['product'][$pos] = $e->getMessage();
274 274
 
275 275
 				$str = 'Error migrating product with code "%1$s" in basket to locale "%2$s": %3$s';
276
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
276
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
277 277
 			}
278 278
 		}
279 279
 
@@ -288,24 +288,24 @@  discard block
 block discarded – undo
288 288
 	 * @param array $errors Associative list of previous errors
289 289
 	 * @return array Associative list of errors occured
290 290
 	 */
291
-	protected function copyServices( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors )
291
+	protected function copyServices(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors)
292 292
 	{
293
-		foreach( $basket->getServices() as $type => $list )
293
+		foreach ($basket->getServices() as $type => $list)
294 294
 		{
295
-			foreach( $list as $item )
295
+			foreach ($list as $item)
296 296
 			{
297 297
 				try
298 298
 				{
299 299
 					$attributes = [];
300 300
 
301
-					foreach( $item->getAttributeItems() as $attrItem ) {
301
+					foreach ($item->getAttributeItems() as $attrItem) {
302 302
 						$attributes[$attrItem->getCode()] = $attrItem->getValue();
303 303
 					}
304 304
 
305
-					$this->addService( $type, $item->getServiceId(), $attributes );
306
-					$basket->deleteService( $type );
305
+					$this->addService($type, $item->getServiceId(), $attributes);
306
+					$basket->deleteService($type);
307 307
 				}
308
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
308
+				catch (\Exception $e) {; } // Don't notify the user as appropriate services can be added automatically
309 309
 			}
310 310
 		}
311 311
 
@@ -318,28 +318,28 @@  discard block
 block discarded – undo
318 318
 	 *
319 319
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
320 320
 	 */
321
-	protected function createSubscriptions( \Aimeos\MShop\Order\Item\Base\Iface $basket )
321
+	protected function createSubscriptions(\Aimeos\MShop\Order\Item\Base\Iface $basket)
322 322
 	{
323
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'subscription' );
323
+		$manager = \Aimeos\MShop::create($this->getContext(), 'subscription');
324 324
 
325
-		foreach( $basket->getProducts() as $orderProduct )
325
+		foreach ($basket->getProducts() as $orderProduct)
326 326
 		{
327
-			if( ( $interval = $orderProduct->getAttribute( 'interval', 'config' ) ) !== null )
327
+			if (($interval = $orderProduct->getAttribute('interval', 'config')) !== null)
328 328
 			{
329 329
 				$item = $manager->createItem();
330
-				$item->setOrderBaseId( $basket->getId() );
331
-				$item->setOrderProductId( $orderProduct->getId() );
332
-				$item->setInterval( $interval );
333
-				$item->setStatus( 1 );
334
-
335
-				if( ( $end = $orderProduct->getAttribute( 'intervalend', 'custom' ) ) !== null
336
-					|| ( $end = $orderProduct->getAttribute( 'intervalend', 'config' ) ) !== null
337
-					|| ( $end = $orderProduct->getAttribute( 'intervalend', 'hidden' ) ) !== null
330
+				$item->setOrderBaseId($basket->getId());
331
+				$item->setOrderProductId($orderProduct->getId());
332
+				$item->setInterval($interval);
333
+				$item->setStatus(1);
334
+
335
+				if (($end = $orderProduct->getAttribute('intervalend', 'custom')) !== null
336
+					|| ($end = $orderProduct->getAttribute('intervalend', 'config')) !== null
337
+					|| ($end = $orderProduct->getAttribute('intervalend', 'hidden')) !== null
338 338
 				) {
339
-					$item->setDateEnd( $end );
339
+					$item->setDateEnd($end);
340 340
 				}
341 341
 
342
-				$manager->saveItem( $item, false );
342
+				$manager->saveItem($item, false);
343 343
 			}
344 344
 		}
345 345
 	}
@@ -353,32 +353,32 @@  discard block
 block discarded – undo
353 353
 	 * @return array List of items implementing \Aimeos\MShop\Attribute\Item\Iface
354 354
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the actual attribute number doesn't match the expected one
355 355
 	 */
356
-	protected function getAttributes( array $attributeIds, array $domains = array( 'price', 'text' ) )
356
+	protected function getAttributes(array $attributeIds, array $domains = array('price', 'text'))
357 357
 	{
358
-		if( empty( $attributeIds ) ) {
358
+		if (empty($attributeIds)) {
359 359
 			return [];
360 360
 		}
361 361
 
362
-		$attributeManager = \Aimeos\MShop::create( $this->getContext(), 'attribute' );
362
+		$attributeManager = \Aimeos\MShop::create($this->getContext(), 'attribute');
363 363
 
364
-		$search = $attributeManager->createSearch( true );
364
+		$search = $attributeManager->createSearch(true);
365 365
 		$expr = array(
366
-			$search->compare( '==', 'attribute.id', $attributeIds ),
366
+			$search->compare('==', 'attribute.id', $attributeIds),
367 367
 			$search->getConditions(),
368 368
 		);
369
-		$search->setConditions( $search->combine( '&&', $expr ) );
370
-		$search->setSlice( 0, count( $attributeIds ) );
369
+		$search->setConditions($search->combine('&&', $expr));
370
+		$search->setSlice(0, count($attributeIds));
371 371
 
372
-		$attrItems = $attributeManager->searchItems( $search, $domains );
372
+		$attrItems = $attributeManager->searchItems($search, $domains);
373 373
 
374
-		if( count( $attrItems ) !== count( $attributeIds ) )
374
+		if (count($attrItems) !== count($attributeIds))
375 375
 		{
376 376
 			$i18n = $this->getContext()->getI18n();
377
-			$expected = implode( ',', $attributeIds );
378
-			$actual = implode( ',', array_keys( $attrItems ) );
379
-			$msg = $i18n->dt( 'controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"' );
377
+			$expected = implode(',', $attributeIds);
378
+			$actual = implode(',', array_keys($attrItems));
379
+			$msg = $i18n->dt('controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"');
380 380
 
381
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $actual, $expected ) );
381
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $actual, $expected));
382 382
 		}
383 383
 
384 384
 		return $attrItems;
@@ -391,30 +391,30 @@  discard block
 block discarded – undo
391 391
 	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Item[] $orderAttributes List of order product attribute items
392 392
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as key and attribute items as values
393 393
 	 */
394
-	protected function getAttributeItems( array $orderAttributes )
394
+	protected function getAttributeItems(array $orderAttributes)
395 395
 	{
396
-		if( empty( $orderAttributes ) ) {
396
+		if (empty($orderAttributes)) {
397 397
 			return [];
398 398
 		}
399 399
 
400
-		$attributeManager = \Aimeos\MShop::create( $this->getContext(), 'attribute' );
401
-		$search = $attributeManager->createSearch( true );
400
+		$attributeManager = \Aimeos\MShop::create($this->getContext(), 'attribute');
401
+		$search = $attributeManager->createSearch(true);
402 402
 		$expr = [];
403 403
 
404
-		foreach( $orderAttributes as $item )
404
+		foreach ($orderAttributes as $item)
405 405
 		{
406 406
 			$tmp = array(
407
-				$search->compare( '==', 'attribute.domain', 'product' ),
408
-				$search->compare( '==', 'attribute.code', $item->getValue() ),
409
-				$search->compare( '==', 'attribute.type', $item->getCode() ),
410
-				$search->compare( '>', 'attribute.status', 0 ),
407
+				$search->compare('==', 'attribute.domain', 'product'),
408
+				$search->compare('==', 'attribute.code', $item->getValue()),
409
+				$search->compare('==', 'attribute.type', $item->getCode()),
410
+				$search->compare('>', 'attribute.status', 0),
411 411
 				$search->getConditions(),
412 412
 			);
413
-			$expr[] = $search->combine( '&&', $tmp );
413
+			$expr[] = $search->combine('&&', $tmp);
414 414
 		}
415 415
 
416
-		$search->setConditions( $search->combine( '||', $expr ) );
417
-		return $attributeManager->searchItems( $search, array( 'price' ) );
416
+		$search->setConditions($search->combine('||', $expr));
417
+		return $attributeManager->searchItems($search, array('price'));
418 418
 	}
419 419
 
420 420
 
@@ -427,24 +427,24 @@  discard block
 block discarded – undo
427 427
 	 * @param array $quantities Associative list of attribute IDs as keys and their quantities as values
428 428
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
429 429
 	 */
430
-	protected function getOrderProductAttributes( $type, array $ids, array $values = [], array $quantities = [] )
430
+	protected function getOrderProductAttributes($type, array $ids, array $values = [], array $quantities = [])
431 431
 	{
432
-		if( empty( $ids ) ) {
432
+		if (empty($ids)) {
433 433
 			return [];
434 434
 		}
435 435
 
436 436
 		$list = [];
437
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'order/base/product/attribute' );
437
+		$manager = \Aimeos\MShop::create($this->getContext(), 'order/base/product/attribute');
438 438
 
439
-		foreach( $this->getAttributes( $ids ) as $id => $attrItem )
439
+		foreach ($this->getAttributes($ids) as $id => $attrItem)
440 440
 		{
441 441
 			$item = $manager->createItem();
442
-			$item->copyFrom( $attrItem );
443
-			$item->setType( $type );
444
-			$item->setQuantity( isset( $quantities[$id] ) ? $quantities[$id] : 1 );
442
+			$item->copyFrom($attrItem);
443
+			$item->setType($type);
444
+			$item->setQuantity(isset($quantities[$id]) ? $quantities[$id] : 1);
445 445
 
446
-			if( isset( $values[$id] ) ) {
447
-				$item->setValue( $values[$id] );
446
+			if (isset($values[$id])) {
447
+				$item->setValue($values[$id]);
448 448
 			}
449 449
 
450 450
 			$list[] = $item;
@@ -461,23 +461,23 @@  discard block
 block discarded – undo
461 461
 	 * @param string $code Code of the list type
462 462
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface List type item
463 463
 	 */
464
-	protected function getProductListTypeItem( $domain, $code )
464
+	protected function getProductListTypeItem($domain, $code)
465 465
 	{
466 466
 		$context = $this->getContext();
467 467
 
468
-		if( empty( $this->listTypeItems ) )
468
+		if (empty($this->listTypeItems))
469 469
 		{
470
-			$manager = \Aimeos\MShop::create( $context, 'product/lists/type' );
470
+			$manager = \Aimeos\MShop::create($context, 'product/lists/type');
471 471
 
472
-			foreach( $manager->searchItems( $manager->createSearch( true ) ) as $item ) {
473
-				$this->listTypeItems[ $item->getDomain() ][ $item->getCode() ] = $item;
472
+			foreach ($manager->searchItems($manager->createSearch(true)) as $item) {
473
+				$this->listTypeItems[$item->getDomain()][$item->getCode()] = $item;
474 474
 			}
475 475
 		}
476 476
 
477
-		if( !isset( $this->listTypeItems[$domain][$code] ) )
477
+		if (!isset($this->listTypeItems[$domain][$code]))
478 478
 		{
479
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found' );
480
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, $code ) );
479
+			$msg = $context->getI18n()->dt('controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found');
480
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, $code));
481 481
 		}
482 482
 
483 483
 		return $this->listTypeItems[$domain][$code];
@@ -492,35 +492,35 @@  discard block
 block discarded – undo
492 492
 	 * @param array $domains Names of the domain items that should be fetched too
493 493
 	 * @return array List of products matching the given attributes
494 494
 	 */
495
-	protected function getProductVariants( \Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
496
-			array $domains = array( 'attribute', 'media', 'price', 'text' ) )
495
+	protected function getProductVariants(\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
496
+			array $domains = array('attribute', 'media', 'price', 'text'))
497 497
 	{
498 498
 		$subProductIds = [];
499
-		foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $item ) {
499
+		foreach ($productItem->getRefItems('product', 'default', 'default') as $item) {
500 500
 			$subProductIds[] = $item->getId();
501 501
 		}
502 502
 
503
-		if( count( $subProductIds ) === 0 ) {
503
+		if (count($subProductIds) === 0) {
504 504
 			return [];
505 505
 		}
506 506
 
507
-		$productManager = \Aimeos\MShop::create( $this->getContext(), 'product' );
508
-		$search = $productManager->createSearch( true );
507
+		$productManager = \Aimeos\MShop::create($this->getContext(), 'product');
508
+		$search = $productManager->createSearch(true);
509 509
 
510 510
 		$expr = array(
511
-			$search->compare( '==', 'product.id', $subProductIds ),
511
+			$search->compare('==', 'product.id', $subProductIds),
512 512
 			$search->getConditions(),
513 513
 		);
514 514
 
515
-		foreach( $variantAttributeIds as $id )
515
+		foreach ($variantAttributeIds as $id)
516 516
 		{
517
-			$cmpfunc = $search->createFunction( 'product:has', ['attribute', 'variant', (string) $id] );
518
-			$expr[] = $search->compare( '!=', $cmpfunc, null );
517
+			$cmpfunc = $search->createFunction('product:has', ['attribute', 'variant', (string) $id]);
518
+			$expr[] = $search->compare('!=', $cmpfunc, null);
519 519
 		}
520 520
 
521
-		$search->setConditions( $search->combine( '&&', $expr ) );
521
+		$search->setConditions($search->combine('&&', $expr));
522 522
 
523
-		return $productManager->searchItems( $search, $domains );
523
+		return $productManager->searchItems($search, $domains);
524 524
 	}
525 525
 
526 526
 
@@ -532,9 +532,9 @@  discard block
 block discarded – undo
532 532
 	 * @param mixed $default Default value if no value is available for the given name
533 533
 	 * @return mixed Value from the array or default value
534 534
 	 */
535
-	protected function getValue( array $values, $name, $default = null )
535
+	protected function getValue(array $values, $name, $default = null)
536 536
 	{
537
-		if( isset( $values[$name] ) ) {
537
+		if (isset($values[$name])) {
538 538
 			return $values[$name];
539 539
 		}
540 540
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function createFilter()
32 32
 	{
33
-		return \Aimeos\MShop::create( $this->getContext(), 'catalog' )->createSearch( true );
33
+		return \Aimeos\MShop::create($this->getContext(), 'catalog')->createSearch(true);
34 34
 	}
35 35
 
36 36
 
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
43 43
 	 * @since 2017.03
44 44
 	 */
45
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
45
+	public function getPath($id, array $domains = array('text', 'media'))
46 46
 	{
47
-		return \Aimeos\MShop::create( $this->getContext(), 'catalog' )->getPath( $id, $domains );
47
+		return \Aimeos\MShop::create($this->getContext(), 'catalog')->getPath($id, $domains);
48 48
 	}
49 49
 
50 50
 
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
60 60
 	 * @since 2017.03
61 61
 	 */
62
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
63
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
62
+	public function getTree($id = null, array $domains = array('text', 'media'),
63
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
64 64
 	{
65
-		return \Aimeos\MShop::create( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
65
+		return \Aimeos\MShop::create($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
66 66
 	}
67 67
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Stock/Standard.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
30 30
 	 * @since 2017.03
31 31
 	 */
32
-	public function addFilterCodes( \Aimeos\MW\Criteria\Iface $filter, array $codes )
32
+	public function addFilterCodes(\Aimeos\MW\Criteria\Iface $filter, array $codes)
33 33
 	{
34 34
 		$expr = [
35
-			$filter->compare( '==', 'stock.productcode', $codes ),
35
+			$filter->compare('==', 'stock.productcode', $codes),
36 36
 			$filter->getConditions(),
37 37
 		];
38
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
38
+		$filter->setConditions($filter->combine('&&', $expr));
39 39
 
40 40
 		return $filter;
41 41
 	}
@@ -49,15 +49,15 @@  discard block
 block discarded – undo
49 49
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
50 50
 	 * @since 2017.03
51 51
 	 */
52
-	public function addFilterTypes( \Aimeos\MW\Criteria\Iface $filter, array $codes )
52
+	public function addFilterTypes(\Aimeos\MW\Criteria\Iface $filter, array $codes)
53 53
 	{
54
-		if( !empty( $codes ) )
54
+		if (!empty($codes))
55 55
 		{
56 56
 			$expr = [
57
-				$filter->compare( '==', 'stock.type', $codes ),
57
+				$filter->compare('==', 'stock.type', $codes),
58 58
 				$filter->getConditions(),
59 59
 			];
60
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
60
+			$filter->setConditions($filter->combine('&&', $expr));
61 61
 		}
62 62
 
63 63
 		return $filter;
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	 */
74 74
 	public function createFilter()
75 75
 	{
76
-		return \Aimeos\MShop::create( $this->getContext(), 'stock' )->createSearch( true );
76
+		return \Aimeos\MShop::create($this->getContext(), 'stock')->createSearch(true);
77 77
 	}
78 78
 
79 79
 
@@ -84,9 +84,9 @@  discard block
 block discarded – undo
84 84
 	 * @return \Aimeos\MShop\Stock\Item\Iface Stock item including the referenced domains items
85 85
 	 * @since 2017.03
86 86
 	 */
87
-	public function getItem( $id )
87
+	public function getItem($id)
88 88
 	{
89
-		return \Aimeos\MShop::create( $this->getContext(), 'stock' )->getItem( $id, [], true );
89
+		return \Aimeos\MShop::create($this->getContext(), 'stock')->getItem($id, [], true);
90 90
 	}
91 91
 
92 92
 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 	 * @return array Ordered list of stock items implementing \Aimeos\MShop\Stock\Item\Iface
99 99
 	 * @since 2017.03
100 100
 	 */
101
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
101
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
102 102
 	{
103
-		return \Aimeos\MShop::create( $this->getContext(), 'stock' )->searchItems( $filter, [], $total );
103
+		return \Aimeos\MShop::create($this->getContext(), 'stock')->searchItems($filter, [], $total);
104 104
 	}
105 105
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Supplier/Standard.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function createFilter()
32 32
 	{
33
-		return \Aimeos\MShop::create( $this->getContext(), 'supplier' )->createSearch( true );
33
+		return \Aimeos\MShop::create($this->getContext(), 'supplier')->createSearch(true);
34 34
 	}
35 35
 
36 36
 
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 	 * @return \Aimeos\MShop\Supplier\Item\Iface Supplier item including the referenced domains items
43 43
 	 * @since 2018.07
44 44
 	 */
45
-	public function getItem( $id, array $domains = array( 'media', 'text' ) )
45
+	public function getItem($id, array $domains = array('media', 'text'))
46 46
 	{
47
-		return \Aimeos\MShop::create( $this->getContext(), 'supplier' )->getItem( $id, $domains, true );
47
+		return \Aimeos\MShop::create($this->getContext(), 'supplier')->getItem($id, $domains, true);
48 48
 	}
49 49
 
50 50
 
@@ -56,18 +56,18 @@  discard block
 block discarded – undo
56 56
 	 * @return \Aimeos\MShop\Supplier\Item\Iface[] Associative list of supplier item including the referenced domains items
57 57
 	 * @since 2018.07
58 58
 	 */
59
-	public function getItems( array $ids, array $domains = array( 'media', 'text' ) )
59
+	public function getItems(array $ids, array $domains = array('media', 'text'))
60 60
 	{
61
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'supplier' );
61
+		$manager = \Aimeos\MShop::create($this->getContext(), 'supplier');
62 62
 
63
-		$filter = $manager->createSearch( true );
63
+		$filter = $manager->createSearch(true);
64 64
 		$expr = [
65
-			$filter->compare( '==', 'supplier.id', $ids ),
65
+			$filter->compare('==', 'supplier.id', $ids),
66 66
 			$filter->getConditions(),
67 67
 		];
68
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
68
+		$filter->setConditions($filter->combine('&&', $expr));
69 69
 
70
-		return $manager->searchItems( $filter, $domains );
70
+		return $manager->searchItems($filter, $domains);
71 71
 	}
72 72
 
73 73
 
@@ -80,8 +80,8 @@  discard block
 block discarded – undo
80 80
 	 * @return array Ordered list of supplier items implementing \Aimeos\MShop\Supplier\Item\Iface
81 81
 	 * @since 2018.07
82 82
 	 */
83
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'text' ), &$total = null )
83
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'text'), &$total = null)
84 84
 	{
85
-		return \Aimeos\MShop::create( $this->getContext(), 'supplier' )->searchItems( $filter, $domains, $total );
85
+		return \Aimeos\MShop::create($this->getContext(), 'supplier')->searchItems($filter, $domains, $total);
86 86
 	}
87 87
 }
Please login to merge, or discard this patch.