Completed
Push — master ( 626087...4c5eea )
by Aimeos
02:22
created
controller/frontend/src/Controller/Frontend/Catalog/Standard.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -227,6 +227,7 @@
 block discarded – undo
227 227
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
228 228
 	 * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too
229 229
 	 * @param integer &$total Parameter where the total number of found products will be stored in
230
+	 * @param integer $total
230 231
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
231 232
 	 * @since 2015.08
232 233
 	 * @deprecated Use method in index controller instead
Please login to merge, or discard this patch.
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager object
30 30
 	 * @since 2015.08
31 31
 	 */
32
-	public function createManager( $name )
32
+	public function createManager($name)
33 33
 	{
34
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), $name );
34
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), $name);
35 35
 	}
36 36
 
37 37
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function createFilter()
45 45
 	{
46
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
46
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
47 47
 	}
48 48
 
49 49
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
56 56
 	 * @since 2017.03
57 57
 	 */
58
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
58
+	public function getPath($id, array $domains = array('text', 'media'))
59 59
 	{
60
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains );
60
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains);
61 61
 	}
62 62
 
63 63
 
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
73 73
 	 * @since 2017.03
74 74
 	 */
75
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
76
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
75
+	public function getTree($id = null, array $domains = array('text', 'media'),
76
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
77 77
 	{
78
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
78
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
79 79
 	}
80 80
 
81 81
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @since 2015.08
88 88
 	 * @deprecated Use createFilter() instead
89 89
 	 */
90
-	public function createCatalogFilter( $default = true )
90
+	public function createCatalogFilter($default = true)
91 91
 	{
92 92
 		return $this->createFilter();
93 93
 	}
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 	 * @since 2015.08
103 103
 	 * @deprecated Use getPath() instead
104 104
 	 */
105
-	public function getCatalogPath( $id, array $domains = array( 'text', 'media' ) )
105
+	public function getCatalogPath($id, array $domains = array('text', 'media'))
106 106
 	{
107
-		return $this->getPath( $id, $domains );
107
+		return $this->getPath($id, $domains);
108 108
 	}
109 109
 
110 110
 
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
120 120
 	 * @since 2015.08
121 121
 	 * @deprecated Use getTree() instead
122 122
 	 */
123
-	public function getCatalogTree( $id = null, array $domains = array( 'text', 'media' ),
124
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
123
+	public function getCatalogTree($id = null, array $domains = array('text', 'media'),
124
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
125 125
 	{
126
-		return $this->getTree( $id, $domains, $level, $search );
126
+		return $this->getTree($id, $domains, $level, $search);
127 127
 	}
128 128
 
129 129
 
@@ -137,10 +137,10 @@  discard block
 block discarded – undo
137 137
 	 * @since 2015.08
138 138
 	 * @deprecated Use getItems() method in index controller instead
139 139
 	 */
140
-	public function getProductItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
140
+	public function getProductItems(array $ids, array $domains = array('media', 'price', 'text'))
141 141
 	{
142
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
143
-		return $cntl->getItems( $ids, $domains );
142
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
143
+		return $cntl->getItems($ids, $domains);
144 144
 	}
145 145
 
146 146
 
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
 	 * @since 2015.08
154 154
 	 * @deprecated Use method in index controller instead
155 155
 	 */
156
-	public function aggregateIndex( \Aimeos\MW\Criteria\Iface $filter, $key )
156
+	public function aggregateIndex(\Aimeos\MW\Criteria\Iface $filter, $key)
157 157
 	{
158
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
159
-		return $cntl->aggregate( $filter, $key );
158
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
159
+		return $cntl->aggregate($filter, $key);
160 160
 	}
161 161
 
162 162
 
@@ -172,10 +172,10 @@  discard block
 block discarded – undo
172 172
 	 * @since 2015.08
173 173
 	 * @deprecated Use method in index controller instead
174 174
 	 */
175
-	public function createIndexFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
175
+	public function createIndexFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
176 176
 	{
177
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
178
-		return $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
177
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
178
+		return $cntl->createFilter($sort, $direction, $start, $size, $listtype);
179 179
 	}
180 180
 
181 181
 
@@ -192,12 +192,12 @@  discard block
 block discarded – undo
192 192
 	 * @since 2015.08
193 193
 	 * @deprecated Use createIndexFilter() and addIndexFilterCategory() instead
194 194
 	 */
195
-	public function createIndexFilterCategory( $catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
195
+	public function createIndexFilterCategory($catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
196 196
 	{
197
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
197
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
198 198
 
199
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
200
-		$filter = $cntl->addFilterCategory( $filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype );
199
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
200
+		$filter = $cntl->addFilterCategory($filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype);
201 201
 
202 202
 		return $filter;
203 203
 	}
@@ -216,12 +216,12 @@  discard block
 block discarded – undo
216 216
 	 * @since 2015.08
217 217
 	 * @deprecated Use createIndexFilter() and addIndexFilterText() instead
218 218
 	 */
219
-	public function createIndexFilterText( $input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
219
+	public function createIndexFilterText($input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
220 220
 	{
221
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
221
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
222 222
 
223
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
224
-		$filter = $cntl->addFilterText( $filter, $input, $sort, $direction, $listtype );
223
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
224
+		$filter = $cntl->addFilterText($filter, $input, $sort, $direction, $listtype);
225 225
 
226 226
 		return $filter;
227 227
 	}
@@ -236,10 +236,10 @@  discard block
 block discarded – undo
236 236
 	 * @since 2015.08
237 237
 	 * @deprecated Use method in index controller instead
238 238
 	 */
239
-	public function addIndexFilterCategory( \Aimeos\MW\Criteria\Iface $search, $catid )
239
+	public function addIndexFilterCategory(\Aimeos\MW\Criteria\Iface $search, $catid)
240 240
 	{
241
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
242
-		return $cntl->addFilterCategory( $search, $catid );
241
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
242
+		return $cntl->addFilterCategory($search, $catid);
243 243
 	}
244 244
 
245 245
 
@@ -253,10 +253,10 @@  discard block
 block discarded – undo
253 253
 	 * @since 2015.08
254 254
 	 * @deprecated Use method in index controller instead
255 255
 	 */
256
-	public function addIndexFilterText( \Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default' )
256
+	public function addIndexFilterText(\Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default')
257 257
 	{
258
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
259
-		return $cntl->addFilterText( $search, $input, $listtype );
258
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
259
+		return $cntl->addFilterText($search, $input, $listtype);
260 260
 	}
261 261
 
262 262
 
@@ -270,10 +270,10 @@  discard block
 block discarded – undo
270 270
 	 * @since 2015.08
271 271
 	 * @deprecated Use method in index controller instead
272 272
 	 */
273
-	public function getIndexItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
273
+	public function getIndexItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
274 274
 	{
275
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
276
-		return $cntl->searchItems( $filter, $domains, $total );
275
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
276
+		return $cntl->searchItems($filter, $domains, $total);
277 277
 	}
278 278
 
279 279
 
@@ -290,37 +290,37 @@  discard block
 block discarded – undo
290 290
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
291 291
 	 * @deprecated Use createFilter() method in index controller instead
292 292
 	 */
293
-	public function createTextFilter( $input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
293
+	public function createTextFilter($input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
294 294
 	{
295 295
 		$locale = $this->getContext()->getLocale();
296 296
 		$langid = $locale->getLanguageId();
297 297
 
298
-		$search = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->createSearch( true );
298
+		$search = \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->createSearch(true);
299 299
 
300 300
 		$expr = array(
301
-			$search->compare( '>', $search->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) ), 0 ),
302
-			$search->compare( '>', $search->createFunction( 'index.text.value', array( $listtype, $langid, $type, 'product' ) ), '' ),
301
+			$search->compare('>', $search->createFunction('index.text.relevance', array($listtype, $langid, $input)), 0),
302
+			$search->compare('>', $search->createFunction('index.text.value', array($listtype, $langid, $type, 'product')), ''),
303 303
 		);
304 304
 
305 305
 		$sortations = array();
306 306
 
307
-		switch( $sort )
307
+		switch ($sort)
308 308
 		{
309 309
 			case 'name':
310
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
311
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
310
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
311
+				$expr[] = $search->compare('>=', $cmpfunc, '');
312 312
 
313
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
314
-				$sortations[] = $search->sort( $direction, $sortfunc );
313
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
314
+				$sortations[] = $search->sort($direction, $sortfunc);
315 315
 				break;
316 316
 
317 317
 			case 'relevance':
318 318
 				// we don't need to sort by 'sort:index.text.relevance' because it's a boolean match (relevance is either 0 or 1)
319 319
 		}
320 320
 
321
-		$search->setConditions( $search->combine( '&&', $expr ) );
322
-		$search->setSortations( $sortations );
323
-		$search->setSlice( $start, $size );
321
+		$search->setConditions($search->combine('&&', $expr));
322
+		$search->setSortations($sortations);
323
+		$search->setSlice($start, $size);
324 324
 
325 325
 		return $search;
326 326
 	}
@@ -333,8 +333,8 @@  discard block
 block discarded – undo
333 333
 	 * @return array Associative list of the product ID as key and the product text as value
334 334
 	 * @deprecated Use searchItems() method in index controller to retrieve product items instead
335 335
 	 */
336
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
336
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
337 337
 	{
338
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->searchTexts( $filter );
338
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->searchTexts($filter);
339 339
 	}
340 340
 }
Please login to merge, or discard this patch.
controller/frontend/config/controller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 	'frontend' => array(
5 5
 		'basket' => array(
6 6
 			'decorators' => array(
7
-				'local' => array( 'Category', 'Bundle', 'Select' ),
7
+				'local' => array('Category', 'Bundle', 'Select'),
8 8
 			),
9 9
 		),
10 10
 	),
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Catalog/StandardTest.php 1 patch
Spacing   +124 added lines, -124 removed lines patch added patch discarded remove patch
@@ -17,63 +17,63 @@  discard block
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard( \TestHelperFrontend::getContext() );
20
+		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard(\TestHelperFrontend::getContext());
21 21
 	}
22 22
 
23 23
 
24 24
 	protected function tearDown()
25 25
 	{
26
-		unset( $this->object );
26
+		unset($this->object);
27 27
 	}
28 28
 
29 29
 
30 30
 	public function testCreateManager()
31 31
 	{
32
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->createManager( 'product' ) );
32
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->createManager('product'));
33 33
 	}
34 34
 
35 35
 
36 36
 	public function testCreateCatalogFilter()
37 37
 	{
38
-		$filter = $this->object->createCatalogFilter( true );
38
+		$filter = $this->object->createCatalogFilter(true);
39 39
 
40
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
41
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Expression\\Compare\\Iface', $filter->getConditions() );
42
-		$this->assertEquals( 'catalog.status', $filter->getConditions()->getName() );
40
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
41
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Expression\\Compare\\Iface', $filter->getConditions());
42
+		$this->assertEquals('catalog.status', $filter->getConditions()->getName());
43 43
 	}
44 44
 
45 45
 
46 46
 	public function testGetCatalogPath()
47 47
 	{
48
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
49
-		$item = $manager->getTree( null, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST );
48
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext());
49
+		$item = $manager->getTree(null, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST);
50 50
 
51 51
 		$list = array();
52
-		foreach( $this->object->getCatalogPath( $item->getChild( 0 )->getId(), array( 'text' ) ) as $item ) {
52
+		foreach ($this->object->getCatalogPath($item->getChild(0)->getId(), array('text')) as $item) {
53 53
 			$list[$item->getCode()] = $item;
54 54
 		}
55 55
 
56
-		$this->assertEquals( 2, count( $list ) );
57
-		$this->assertArrayHasKey( 'root', $list );
58
-		$this->assertArrayHasKey( 'categories', $list );
56
+		$this->assertEquals(2, count($list));
57
+		$this->assertArrayHasKey('root', $list);
58
+		$this->assertArrayHasKey('categories', $list);
59 59
 	}
60 60
 
61 61
 
62 62
 	public function testGetCatalogTree()
63 63
 	{
64
-		$item = $this->object->getCatalogTree( null, array( 'text' ), \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
64
+		$item = $this->object->getCatalogTree(null, array('text'), \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE);
65 65
 
66
-		$this->assertEquals( 'Root', $item->getName() );
67
-		$this->assertEquals( 0, count( $item->getChildren() ) );
66
+		$this->assertEquals('Root', $item->getName());
67
+		$this->assertEquals(0, count($item->getChildren()));
68 68
 	}
69 69
 
70 70
 
71 71
 	public function testAggregateIndex()
72 72
 	{
73 73
 		$filter = $this->object->createIndexFilter();
74
-		$list = $this->object->aggregateIndex( $filter, 'index.attribute.id' );
74
+		$list = $this->object->aggregateIndex($filter, 'index.attribute.id');
75 75
 
76
-		$this->assertGreaterThan( 0, count( $list ) );
76
+		$this->assertGreaterThan(0, count($list));
77 77
 	}
78 78
 
79 79
 
@@ -81,279 +81,279 @@  discard block
 block discarded – undo
81 81
 	{
82 82
 		$filter = $this->object->createIndexFilter();
83 83
 
84
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
85
-		$this->assertEquals( array(), $filter->getSortations() );
86
-		$this->assertEquals( 0, $filter->getSliceStart() );
87
-		$this->assertEquals( 100, $filter->getSliceSize() );
84
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
85
+		$this->assertEquals(array(), $filter->getSortations());
86
+		$this->assertEquals(0, $filter->getSliceStart());
87
+		$this->assertEquals(100, $filter->getSliceSize());
88 88
 	}
89 89
 
90 90
 
91 91
 	public function testCreateIndexFilterCategory()
92 92
 	{
93
-		$filter = $this->object->createIndexFilterCategory( 0 );
93
+		$filter = $this->object->createIndexFilterCategory(0);
94 94
 
95
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
95
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
96 96
 
97 97
 		$list = $filter->getConditions()->getExpressions();
98 98
 
99 99
 
100
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
101
-			throw new \RuntimeException( 'Wrong expression' );
100
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
101
+			throw new \RuntimeException('Wrong expression');
102 102
 		}
103
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
104
-		$this->assertEquals( array( 0 ), $list[0]->getValue() );
103
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
104
+		$this->assertEquals(array(0), $list[0]->getValue());
105 105
 
106 106
 
107
-		$this->assertEquals( array(), $filter->getSortations() );
108
-		$this->assertEquals( 0, $filter->getSliceStart() );
109
-		$this->assertEquals( 100, $filter->getSliceSize() );
107
+		$this->assertEquals(array(), $filter->getSortations());
108
+		$this->assertEquals(0, $filter->getSliceStart());
109
+		$this->assertEquals(100, $filter->getSliceSize());
110 110
 	}
111 111
 
112 112
 
113 113
 	public function testCreateIndexFilterCategoryPosition()
114 114
 	{
115
-		$filter = $this->object->createIndexFilterCategory( 0, 'relevance', '-', 1, 2, 'test' );
115
+		$filter = $this->object->createIndexFilterCategory(0, 'relevance', '-', 1, 2, 'test');
116 116
 
117
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
117
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
118 118
 
119 119
 		$sort = $filter->getSortations();
120
-		if( ( $item = reset( $sort ) ) === false ) {
121
-			throw new \RuntimeException( 'Sortation not set' );
120
+		if (($item = reset($sort)) === false) {
121
+			throw new \RuntimeException('Sortation not set');
122 122
 		}
123 123
 
124
-		$this->assertEquals( 'sort:index.catalog.position("test",["0"])', $item->getName() );
125
-		$this->assertEquals( '-', $item->getOperator() );
124
+		$this->assertEquals('sort:index.catalog.position("test",["0"])', $item->getName());
125
+		$this->assertEquals('-', $item->getOperator());
126 126
 
127
-		$this->assertEquals( 1, $filter->getSliceStart() );
128
-		$this->assertEquals( 2, $filter->getSliceSize() );
127
+		$this->assertEquals(1, $filter->getSliceStart());
128
+		$this->assertEquals(2, $filter->getSliceSize());
129 129
 	}
130 130
 
131 131
 
132 132
 	public function testCreateIndexFilterCategoryCode()
133 133
 	{
134
-		$filter = $this->object->createIndexFilterCategory( 0, 'code' );
134
+		$filter = $this->object->createIndexFilterCategory(0, 'code');
135 135
 
136
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
136
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
137 137
 
138 138
 		$sort = $filter->getSortations();
139
-		if( ( $item = reset( $sort ) ) === false ) {
140
-			throw new \RuntimeException( 'Sortation not set' );
139
+		if (($item = reset($sort)) === false) {
140
+			throw new \RuntimeException('Sortation not set');
141 141
 		}
142 142
 
143
-		$this->assertStringStartsWith( 'product.code', $item->getName() );
143
+		$this->assertStringStartsWith('product.code', $item->getName());
144 144
 	}
145 145
 
146 146
 
147 147
 	public function testCreateIndexFilterCategoryName()
148 148
 	{
149
-		$filter = $this->object->createIndexFilterCategory( 0, 'name' );
149
+		$filter = $this->object->createIndexFilterCategory(0, 'name');
150 150
 
151
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
151
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
152 152
 
153 153
 		$sort = $filter->getSortations();
154
-		if( ( $item = reset( $sort ) ) === false ) {
155
-			throw new \RuntimeException( 'Sortation not set' );
154
+		if (($item = reset($sort)) === false) {
155
+			throw new \RuntimeException('Sortation not set');
156 156
 		}
157 157
 
158
-		$this->assertEquals( 'sort:index.text.value("default","de","name")', $item->getName() );
158
+		$this->assertEquals('sort:index.text.value("default","de","name")', $item->getName());
159 159
 	}
160 160
 
161 161
 
162 162
 	public function testCreateIndexFilterCategoryPrice()
163 163
 	{
164
-		$filter = $this->object->createIndexFilterCategory( 0, 'price' );
164
+		$filter = $this->object->createIndexFilterCategory(0, 'price');
165 165
 
166
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
166
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
167 167
 
168 168
 		$sort = $filter->getSortations();
169
-		if( ( $item = reset( $sort ) ) === false ) {
170
-			throw new \RuntimeException( 'Sortation not set' );
169
+		if (($item = reset($sort)) === false) {
170
+			throw new \RuntimeException('Sortation not set');
171 171
 		}
172 172
 
173
-		$this->assertStringStartsWith( 'sort:index.price.value("default","EUR","default")', $item->getName() );
173
+		$this->assertStringStartsWith('sort:index.price.value("default","EUR","default")', $item->getName());
174 174
 	}
175 175
 
176 176
 
177 177
 	public function testCreateIndexFilterCategoryInvalidSortation()
178 178
 	{
179
-		$filter = $this->object->createIndexFilterCategory( 0, 'failure' );
179
+		$filter = $this->object->createIndexFilterCategory(0, 'failure');
180 180
 
181
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
182
-		$this->assertEquals( array(), $filter->getSortations() );
181
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
182
+		$this->assertEquals(array(), $filter->getSortations());
183 183
 	}
184 184
 
185 185
 
186 186
 	public function testAddIndexFilterCategory()
187 187
 	{
188 188
 		$filter = $this->object->createIndexFilter();
189
-		$filter = $this->object->addIndexFilterCategory( $filter, 0 );
189
+		$filter = $this->object->addIndexFilterCategory($filter, 0);
190 190
 
191 191
 		$list = $filter->getConditions()->getExpressions();
192 192
 
193
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
194
-			throw new \RuntimeException( 'Wrong expression' );
193
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
194
+			throw new \RuntimeException('Wrong expression');
195 195
 		}
196 196
 
197
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
198
-		$this->assertEquals( array( 0 ), $list[0]->getValue() );
199
-		$this->assertEquals( array(), $filter->getSortations() );
197
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
198
+		$this->assertEquals(array(0), $list[0]->getValue());
199
+		$this->assertEquals(array(), $filter->getSortations());
200 200
 	}
201 201
 
202 202
 
203 203
 	public function testCreateIndexFilterText()
204 204
 	{
205
-		$filter = $this->object->createIndexFilterText( 'Espresso' );
205
+		$filter = $this->object->createIndexFilterText('Espresso');
206 206
 
207
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
207
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
208 208
 
209 209
 		$list = $filter->getConditions()->getExpressions();
210 210
 
211 211
 
212
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
213
-			throw new \RuntimeException( 'Wrong expression' );
212
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
213
+			throw new \RuntimeException('Wrong expression');
214 214
 		}
215
-		$this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() );
216
-		$this->assertEquals( 0, $list[0]->getValue() );
215
+		$this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName());
216
+		$this->assertEquals(0, $list[0]->getValue());
217 217
 
218 218
 
219
-		$this->assertEquals( array(), $filter->getSortations() );
220
-		$this->assertEquals( 0, $filter->getSliceStart() );
221
-		$this->assertEquals( 100, $filter->getSliceSize() );
219
+		$this->assertEquals(array(), $filter->getSortations());
220
+		$this->assertEquals(0, $filter->getSliceStart());
221
+		$this->assertEquals(100, $filter->getSliceSize());
222 222
 	}
223 223
 
224 224
 
225 225
 	public function testCreateIndexFilterTextRelevance()
226 226
 	{
227
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'relevance', '-', 1, 2, 'test' );
227
+		$filter = $this->object->createIndexFilterText('Espresso', 'relevance', '-', 1, 2, 'test');
228 228
 
229
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
230
-		$this->assertEquals( array(), $filter->getSortations() );
231
-		$this->assertEquals( 1, $filter->getSliceStart() );
232
-		$this->assertEquals( 2, $filter->getSliceSize() );
229
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
230
+		$this->assertEquals(array(), $filter->getSortations());
231
+		$this->assertEquals(1, $filter->getSliceStart());
232
+		$this->assertEquals(2, $filter->getSliceSize());
233 233
 	}
234 234
 
235 235
 
236 236
 	public function testCreateIndexFilterTextCode()
237 237
 	{
238
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'code' );
238
+		$filter = $this->object->createIndexFilterText('Espresso', 'code');
239 239
 
240
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
240
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
241 241
 
242 242
 		$sort = $filter->getSortations();
243
-		if( ( $item = reset( $sort ) ) === false ) {
244
-			throw new \RuntimeException( 'Sortation not set' );
243
+		if (($item = reset($sort)) === false) {
244
+			throw new \RuntimeException('Sortation not set');
245 245
 		}
246 246
 
247
-		$this->assertEquals( 'product.code', $item->getName() );
247
+		$this->assertEquals('product.code', $item->getName());
248 248
 	}
249 249
 
250 250
 
251 251
 	public function testCreateIndexFilterTextName()
252 252
 	{
253
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'name' );
253
+		$filter = $this->object->createIndexFilterText('Espresso', 'name');
254 254
 
255
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
255
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
256 256
 
257 257
 		$sort = $filter->getSortations();
258
-		if( ( $item = reset( $sort ) ) === false ) {
259
-			throw new \RuntimeException( 'Sortation not set' );
258
+		if (($item = reset($sort)) === false) {
259
+			throw new \RuntimeException('Sortation not set');
260 260
 		}
261 261
 
262
-		$this->assertEquals( 'sort:index.text.value("default","de","name")', $item->getName() );
262
+		$this->assertEquals('sort:index.text.value("default","de","name")', $item->getName());
263 263
 	}
264 264
 
265 265
 
266 266
 	public function testCreateIndexFilterTextPrice()
267 267
 	{
268
-		$filter = $this->object->createIndexFilterCategory( 'Espresso', 'price' );
268
+		$filter = $this->object->createIndexFilterCategory('Espresso', 'price');
269 269
 
270
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
270
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
271 271
 
272 272
 		$sort = $filter->getSortations();
273
-		if( ( $item = reset( $sort ) ) === false ) {
274
-			throw new \RuntimeException( 'Sortation not set' );
273
+		if (($item = reset($sort)) === false) {
274
+			throw new \RuntimeException('Sortation not set');
275 275
 		}
276 276
 
277
-		$this->assertStringStartsWith( 'sort:index.price.value("default","EUR","default")', $item->getName() );
277
+		$this->assertStringStartsWith('sort:index.price.value("default","EUR","default")', $item->getName());
278 278
 	}
279 279
 
280 280
 
281 281
 	public function testCreateIndexFilterTextInvalidSortation()
282 282
 	{
283
-		$filter = $this->object->createIndexFilterText( '', 'failure' );
283
+		$filter = $this->object->createIndexFilterText('', 'failure');
284 284
 
285
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
286
-		$this->assertEquals( array(), $filter->getSortations() );
285
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
286
+		$this->assertEquals(array(), $filter->getSortations());
287 287
 	}
288 288
 
289 289
 
290 290
 	public function testAddIndexFilterText()
291 291
 	{
292
-		$filter = $this->object->createIndexFilterText( 'Espresso' );
293
-		$filter = $this->object->addIndexFilterText( $filter, 'Espresso' );
292
+		$filter = $this->object->createIndexFilterText('Espresso');
293
+		$filter = $this->object->addIndexFilterText($filter, 'Espresso');
294 294
 
295 295
 		$list = $filter->getConditions()->getExpressions();
296 296
 
297
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
298
-			throw new \RuntimeException( 'Wrong expression' );
297
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
298
+			throw new \RuntimeException('Wrong expression');
299 299
 		}
300 300
 
301
-		$this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() );
302
-		$this->assertEquals( 0, $list[0]->getValue() );
303
-		$this->assertEquals( array(), $filter->getSortations() );
301
+		$this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName());
302
+		$this->assertEquals(0, $list[0]->getValue());
303
+		$this->assertEquals(array(), $filter->getSortations());
304 304
 	}
305 305
 
306 306
 
307 307
 	public function testGetIndexItemsCategory()
308 308
 	{
309
-		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
309
+		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext());
310 310
 		$search = $catalogManager->createSearch();
311 311
 
312
-		$search->setConditions( $search->compare( '==', 'catalog.code', 'new' ) );
313
-		$search->setSlice( 0, 1 );
314
-		$items = $catalogManager->searchItems( $search );
312
+		$search->setConditions($search->compare('==', 'catalog.code', 'new'));
313
+		$search->setSlice(0, 1);
314
+		$items = $catalogManager->searchItems($search);
315 315
 
316
-		if( ( $item = reset( $items ) ) === false ) {
317
-			throw new \RuntimeException( 'Catalog item not found' );
316
+		if (($item = reset($items)) === false) {
317
+			throw new \RuntimeException('Catalog item not found');
318 318
 		}
319 319
 
320 320
 		$total = 0;
321
-		$filter = $this->object->createIndexFilterCategory( $item->getId(), 'position', '+', 1, 1 );
322
-		$results = $this->object->getIndexItems( $filter, array(), $total );
321
+		$filter = $this->object->createIndexFilterCategory($item->getId(), 'position', '+', 1, 1);
322
+		$results = $this->object->getIndexItems($filter, array(), $total);
323 323
 
324
-		$this->assertEquals( 3, $total );
325
-		$this->assertEquals( 1, count( $results ) );
324
+		$this->assertEquals(3, $total);
325
+		$this->assertEquals(1, count($results));
326 326
 	}
327 327
 
328 328
 
329 329
 	public function testGetIndexItemsText()
330 330
 	{
331 331
 		$total = 0;
332
-		$filter = $this->object->createIndexFilterText( 'Expresso', 'relevance', '+', 0, 1, 'unittype13' );
333
-		$results = $this->object->getIndexItems( $filter, array(), $total );
332
+		$filter = $this->object->createIndexFilterText('Expresso', 'relevance', '+', 0, 1, 'unittype13');
333
+		$results = $this->object->getIndexItems($filter, array(), $total);
334 334
 
335
-		$this->assertEquals( 2, $total );
336
-		$this->assertEquals( 1, count( $results ) );
335
+		$this->assertEquals(2, $total);
336
+		$this->assertEquals(1, count($results));
337 337
 	}
338 338
 
339 339
 
340 340
 	public function testCreateTextFilter()
341 341
 	{
342
-		$filter = $this->object->createTextFilter( 'Expresso', 'name', '+', 0, 1 );
342
+		$filter = $this->object->createTextFilter('Expresso', 'name', '+', 0, 1);
343 343
 
344
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
345
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Expression\\Combine\\Iface', $filter->getConditions() );
346
-		$this->assertEquals( 3, count( $filter->getConditions()->getExpressions() ) );
344
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
345
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Expression\\Combine\\Iface', $filter->getConditions());
346
+		$this->assertEquals(3, count($filter->getConditions()->getExpressions()));
347 347
 	}
348 348
 
349 349
 
350 350
 	public function testGetTextListName()
351 351
 	{
352
-		$filter = $this->object->createTextFilter( 'Cafe Noire', 'relevance', '-', 0, 25, 'unittype19', 'name' );
353
-		$results = $this->object->getTextList( $filter );
352
+		$filter = $this->object->createTextFilter('Cafe Noire', 'relevance', '-', 0, 25, 'unittype19', 'name');
353
+		$results = $this->object->getTextList($filter);
354 354
 
355
-		$this->assertEquals( 1, count( $results ) );
356
-		$this->assertContains( 'Cafe Noire Cappuccino', $results );
355
+		$this->assertEquals(1, count($results));
356
+		$this->assertContains('Cafe Noire Cappuccino', $results);
357 357
 	}
358 358
 
359 359
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Bundle.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -41,15 +41,15 @@  discard block
 block discarded – undo
41 41
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
42 42
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
43 43
 	 */
44
-	public function addProduct( $prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
44
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
45 45
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
46
-		$stocktype = 'default' )
46
+		$stocktype = 'default')
47 47
 	{
48 48
 		$context = $this->getContext();
49
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
50
-		$productItem = $productManager->getItem( $prodid );
49
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
50
+		$productItem = $productManager->getItem($prodid);
51 51
 
52
-		if( $productItem->getType() !== 'bundle' )
52
+		if ($productItem->getType() !== 'bundle')
53 53
 		{
54 54
 			return $this->getController()->addProduct(
55 55
 				$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -57,30 +57,30 @@  discard block
 block discarded – undo
57 57
 			);
58 58
 		}
59 59
 
60
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ) );
60
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'));
61 61
 
62
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
63
-		$orderBaseProductItem->copyFrom( $productItem );
64
-		$orderBaseProductItem->setQuantity( $quantity );
65
-		$orderBaseProductItem->setStockType( $stocktype );
62
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
63
+		$orderBaseProductItem->copyFrom($productItem);
64
+		$orderBaseProductItem->setQuantity($quantity);
65
+		$orderBaseProductItem->setStockType($stocktype);
66 66
 
67
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
68
-		$this->addBundleProducts( $orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype );
67
+		$prices = $productItem->getRefItems('price', 'default', 'default');
68
+		$this->addBundleProducts($orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype);
69 69
 
70
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
71
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
70
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
71
+		$price = $priceManager->getLowestPrice($prices, $quantity);
72 72
 
73
-		$attr = $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' );
74
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
75
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
73
+		$attr = $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config');
74
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
75
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
76 76
 
77 77
 		// remove product rebate of original price in favor to rebates granted for the order
78
-		$price->setRebate( '0.00' );
78
+		$price->setRebate('0.00');
79 79
 
80
-		$orderBaseProductItem->setPrice( $price );
81
-		$orderBaseProductItem->setAttributes( $attr );
80
+		$orderBaseProductItem->setPrice($price);
81
+		$orderBaseProductItem->setAttributes($attr);
82 82
 
83
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
83
+		$this->getController()->get()->addProduct($orderBaseProductItem);
84 84
 		$this->getController()->save();
85 85
 	}
86 86
 
@@ -93,43 +93,43 @@  discard block
 block discarded – undo
93 93
 	 * @param array $variantAttributeIds List of product variant attribute IDs
94 94
 	 * @param string $stocktype
95 95
 	 */
96
-	protected function addBundleProducts( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
97
-		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype )
96
+	protected function addBundleProducts(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
97
+		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype)
98 98
 	{
99 99
 		$quantity = $orderBaseProductItem->getQuantity();
100 100
 		$products = $subProductIds = $orderProducts = array();
101
-		$orderProductManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product' );
101
+		$orderProductManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product');
102 102
 
103
-		foreach( $productItem->getRefItems( 'product', null, 'default' ) as $item ) {
103
+		foreach ($productItem->getRefItems('product', null, 'default') as $item) {
104 104
 			$subProductIds[] = $item->getId();
105 105
 		}
106 106
 
107
-		if( count( $subProductIds ) > 0 )
107
+		if (count($subProductIds) > 0)
108 108
 		{
109
-			$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
109
+			$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
110 110
 
111
-			$search = $productManager->createSearch( true );
111
+			$search = $productManager->createSearch(true);
112 112
 			$expr = array(
113
-				$search->compare( '==', 'product.id', $subProductIds ),
113
+				$search->compare('==', 'product.id', $subProductIds),
114 114
 				$search->getConditions(),
115 115
 			);
116
-			$search->setConditions( $search->combine( '&&', $expr ) );
116
+			$search->setConditions($search->combine('&&', $expr));
117 117
 
118
-			$products = $productManager->searchItems( $search, array( 'attribute', 'media', 'price', 'text' ) );
118
+			$products = $productManager->searchItems($search, array('attribute', 'media', 'price', 'text'));
119 119
 		}
120 120
 
121
-		foreach( $products as $product )
121
+		foreach ($products as $product)
122 122
 		{
123
-			$prices = $product->getRefItems( 'price', 'default', 'default' );
123
+			$prices = $product->getRefItems('price', 'default', 'default');
124 124
 
125 125
 			$orderProduct = $orderProductManager->createItem();
126
-			$orderProduct->copyFrom( $product );
127
-			$orderProduct->setStockType( $stocktype );
128
-			$orderProduct->setPrice( $this->calcPrice( $orderProduct, $prices, $quantity ) );
126
+			$orderProduct->copyFrom($product);
127
+			$orderProduct->setStockType($stocktype);
128
+			$orderProduct->setPrice($this->calcPrice($orderProduct, $prices, $quantity));
129 129
 
130 130
 			$orderProducts[] = $orderProduct;
131 131
 		}
132 132
 
133
-		$orderBaseProductItem->setProducts( $orderProducts );
133
+		$orderBaseProductItem->setProducts($orderProducts);
134 134
 	}
135 135
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Standard.php 2 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -268,6 +268,7 @@  discard block
 block discarded – undo
268 268
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
269 269
 	 * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too
270 270
 	 * @param integer &$total Parameter where the total number of found products will be stored in
271
+	 * @param integer $total
271 272
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
272 273
 	 * @since 2017.03
273 274
 	 */
@@ -293,7 +294,7 @@  discard block
 block discarded – undo
293 294
 	 * Returns the list of catalog IDs for the given catalog tree
294 295
 	 *
295 296
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
296
-	 * @return array List of catalog IDs
297
+	 * @return integer[] List of catalog IDs
297 298
 	 */
298 299
 	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
299 300
 	{
Please login to merge, or discard this patch.
Spacing   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -31,42 +31,42 @@  discard block
 block discarded – undo
31 31
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
32 32
 	 * @since 2017.03
33 33
 	 */
34
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
34
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
35 35
 	{
36
-		if( !empty( $attrIds ) )
36
+		if (!empty($attrIds))
37 37
 		{
38
-			$attrIds = $this->validateIds( $attrIds );
38
+			$attrIds = $this->validateIds($attrIds);
39 39
 
40
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $attrIds ) );
40
+			$func = $filter->createFunction('index.attributeaggregate', array($attrIds));
41 41
 			$expr = array(
42
-				$filter->compare( '==', $func, count( $attrIds ) ),
42
+				$filter->compare('==', $func, count($attrIds)),
43 43
 				$filter->getConditions(),
44 44
 			);
45
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
45
+			$filter->setConditions($filter->combine('&&', $expr));
46 46
 		}
47 47
 
48
-		if( !empty( $optIds ) )
48
+		if (!empty($optIds))
49 49
 		{
50
-			$optIds = $this->validateIds( $optIds );
50
+			$optIds = $this->validateIds($optIds);
51 51
 
52
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $optIds ) );
52
+			$func = $filter->createFunction('index.attributeaggregate', array($optIds));
53 53
 			$expr = array(
54
-				$filter->compare( '>', $func, 0 ),
54
+				$filter->compare('>', $func, 0),
55 55
 				$filter->getConditions(),
56 56
 			);
57
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
57
+			$filter->setConditions($filter->combine('&&', $expr));
58 58
 		}
59 59
 
60
-		foreach( $oneIds as $type => $list )
60
+		foreach ($oneIds as $type => $list)
61 61
 		{
62
-			if( ( $list = $this->validateIds( (array) $list ) ) !== array() )
62
+			if (($list = $this->validateIds((array) $list)) !== array())
63 63
 			{
64
-				$func = $filter->createFunction( 'index.attributeaggregate', array( $list ) );
64
+				$func = $filter->createFunction('index.attributeaggregate', array($list));
65 65
 				$expr = array(
66
-					$filter->compare( '>', $func, 0 ),
66
+					$filter->compare('>', $func, 0),
67 67
 					$filter->getConditions(),
68 68
 				);
69
-				$filter->setConditions( $filter->combine( '&&', $expr ) );
69
+				$filter->setConditions($filter->combine('&&', $expr));
70 70
 			}
71 71
 		}
72 72
 
@@ -86,38 +86,38 @@  discard block
 block discarded – undo
86 86
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
87 87
 	 * @since 2017.03
88 88
 	 */
89
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
90
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' )
89
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
90
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default')
91 91
 	{
92
-		$catIds = ( !is_array( $catId ) ? explode( ',', $catId ) : $catId );
92
+		$catIds = (!is_array($catId) ? explode(',', $catId) : $catId);
93 93
 
94
-		if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
94
+		if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
95 95
 		{
96 96
 			$list = array();
97
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' );
97
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog');
98 98
 
99
-			foreach( $catIds as $catId )
99
+			foreach ($catIds as $catId)
100 100
 			{
101
-				$tree = $cntl->getCatalogTree( $catId, array(), $level );
102
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
101
+				$tree = $cntl->getCatalogTree($catId, array(), $level);
102
+				$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
103 103
 			}
104 104
 
105 105
 			$catIds = $list;
106 106
 		}
107 107
 
108
-		$expr = array( $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ) );
108
+		$expr = array($filter->compare('==', 'index.catalog.id', array_unique($catIds)));
109 109
 		$expr[] = $filter->getConditions();
110 110
 
111
-		if( $sort === 'relevance' )
111
+		if ($sort === 'relevance')
112 112
 		{
113
-			$cmpfunc = $filter->createFunction( 'index.catalog.position', array( $listtype, $catIds ) );
114
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
113
+			$cmpfunc = $filter->createFunction('index.catalog.position', array($listtype, $catIds));
114
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
115 115
 
116
-			$sortfunc = $filter->createFunction( 'sort:index.catalog.position', array( $listtype, $catIds ) );
117
-			$filter->setSortations( array( $filter->sort( $direction, $sortfunc ) ) );
116
+			$sortfunc = $filter->createFunction('sort:index.catalog.position', array($listtype, $catIds));
117
+			$filter->setSortations(array($filter->sort($direction, $sortfunc)));
118 118
 		}
119 119
 
120
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
120
+		$filter->setConditions($filter->combine('&&', $expr));
121 121
 
122 122
 		return $filter;
123 123
 	}
@@ -134,13 +134,13 @@  discard block
 block discarded – undo
134 134
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
135 135
 	 * @since 2017.03
136 136
 	 */
137
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' )
137
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default')
138 138
 	{
139 139
 		$langid = $this->getContext()->getLocale()->getLanguageId();
140
-		$cmpfunc = $filter->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) );
141
-		$expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() );
140
+		$cmpfunc = $filter->createFunction('index.text.relevance', array($listtype, $langid, $input));
141
+		$expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions());
142 142
 
143
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
143
+		return $filter->setConditions($filter->combine('&&', $expr));
144 144
 	}
145 145
 
146 146
 
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 	 * @return array Associative list of key values as key and the product count for this key as value
153 153
 	 * @since 2017.03
154 154
 	 */
155
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
155
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
156 156
 	{
157
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->aggregate( $filter, $key );
157
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->aggregate($filter, $key);
158 158
 	}
159 159
 
160 160
 
@@ -169,46 +169,46 @@  discard block
 block discarded – undo
169 169
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
170 170
 	 * @since 2017.03
171 171
 	 */
172
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
172
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
173 173
 	{
174 174
 		$sortations = array();
175 175
 		$context = $this->getContext();
176 176
 
177
-		$search = \Aimeos\MShop\Factory::createManager( $context, 'index' )->createSearch( true );
178
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
177
+		$search = \Aimeos\MShop\Factory::createManager($context, 'index')->createSearch(true);
178
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
179 179
 
180
-		switch( $sort )
180
+		switch ($sort)
181 181
 		{
182 182
 			case 'code':
183
-				$sortations[] = $search->sort( $direction, 'product.code' );
183
+				$sortations[] = $search->sort($direction, 'product.code');
184 184
 				break;
185 185
 
186 186
 			case 'name':
187 187
 				$langid = $context->getLocale()->getLanguageId();
188 188
 
189
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
190
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
189
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
190
+				$expr[] = $search->compare('>=', $cmpfunc, '');
191 191
 
192
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
193
-				$sortations[] = $search->sort( $direction, $sortfunc );
192
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
193
+				$sortations[] = $search->sort($direction, $sortfunc);
194 194
 				break;
195 195
 
196 196
 			case 'price':
197 197
 				$currencyid = $context->getLocale()->getCurrencyId();
198 198
 
199
-				$cmpfunc = $search->createFunction( 'index.price.value', array( $listtype, $currencyid, 'default' ) );
200
-				$expr[] = $search->compare( '>=', $cmpfunc, '0.00' );
199
+				$cmpfunc = $search->createFunction('index.price.value', array($listtype, $currencyid, 'default'));
200
+				$expr[] = $search->compare('>=', $cmpfunc, '0.00');
201 201
 
202
-				$sortfunc = $search->createFunction( 'sort:index.price.value', array( $listtype, $currencyid, 'default' ) );
203
-				$sortations[] = $search->sort( $direction, $sortfunc );
202
+				$sortfunc = $search->createFunction('sort:index.price.value', array($listtype, $currencyid, 'default'));
203
+				$sortations[] = $search->sort($direction, $sortfunc);
204 204
 				break;
205 205
 		}
206 206
 
207 207
 		$expr[] = $search->getConditions();
208 208
 
209
-		$search->setConditions( $search->combine( '&&', $expr ) );
210
-		$search->setSortations( $sortations );
211
-		$search->setSlice( $start, $size );
209
+		$search->setConditions($search->combine('&&', $expr));
210
+		$search->setSortations($sortations);
211
+		$search->setSlice($start, $size);
212 212
 
213 213
 		return $search;
214 214
 	}
@@ -222,9 +222,9 @@  discard block
 block discarded – undo
222 222
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
223 223
 	 * @since 2017.03
224 224
 	 */
225
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
225
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
226 226
 	{
227
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' )->getItem( $productId, $domains );
227
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'product')->getItem($productId, $domains);
228 228
 	}
229 229
 
230 230
 
@@ -236,19 +236,19 @@  discard block
 block discarded – undo
236 236
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
237 237
 	 * @since 2017.03
238 238
 	 */
239
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
239
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
240 240
 	{
241
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
241
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
242 242
 
243
-		$search = $manager->createSearch( true );
243
+		$search = $manager->createSearch(true);
244 244
 		$expr = array(
245
-			$search->compare( '==', 'product.id', $productIds ),
245
+			$search->compare('==', 'product.id', $productIds),
246 246
 			$search->getConditions(),
247 247
 		);
248
-		$search->setConditions( $search->combine( '&&', $expr ) );
249
-		$search->setSlice( 0, count( $productIds ) );
248
+		$search->setConditions($search->combine('&&', $expr));
249
+		$search->setSlice(0, count($productIds));
250 250
 
251
-		return $manager->searchItems( $search, $domains );
251
+		return $manager->searchItems($search, $domains);
252 252
 	}
253 253
 
254 254
 
@@ -261,9 +261,9 @@  discard block
 block discarded – undo
261 261
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
262 262
 	 * @since 2017.03
263 263
 	 */
264
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
264
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
265 265
 	{
266
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total );
266
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total);
267 267
 	}
268 268
 
269 269
 
@@ -273,12 +273,12 @@  discard block
 block discarded – undo
273 273
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
274 274
 	 * @return array List of catalog IDs
275 275
 	 */
276
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
276
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
277 277
 	{
278
-		$list = array( $item->getId() );
278
+		$list = array($item->getId());
279 279
 
280
-		foreach( $item->getChildren() as $child ) {
281
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
280
+		foreach ($item->getChildren() as $child) {
281
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
282 282
 		}
283 283
 
284 284
 		return $list;
@@ -291,13 +291,13 @@  discard block
 block discarded – undo
291 291
 	 * @param array $ids List of IDs to validate
292 292
 	 * @return array List of validated IDs
293 293
 	 */
294
-	protected function validateIds( array $ids )
294
+	protected function validateIds(array $ids)
295 295
 	{
296 296
 		$list = array();
297 297
 
298
-		foreach( $ids as $id )
298
+		foreach ($ids as $id)
299 299
 		{
300
-			if( $id != '' ) {
300
+			if ($id != '') {
301 301
 				$list[] = (int) $id;
302 302
 			}
303 303
 		}
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Iface.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
31 31
 	 * @since 2017.03
32 32
 	 */
33
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds );
33
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds);
34 34
 
35 35
 
36 36
 	/**
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
46 46
 	 * @since 2017.03
47 47
 	 */
48
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
49
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' );
48
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
49
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default');
50 50
 
51 51
 
52 52
 	/**
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
61 61
 	 * @since 2017.03
62 62
 	 */
63
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' );
63
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default');
64 64
 
65 65
 
66 66
 	/**
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 * @return array Associative list of key values as key and the product count for this key as value
72 72
 	 * @since 2017.03
73 73
 	 */
74
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key );
74
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key);
75 75
 
76 76
 
77 77
 	/**
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
86 86
 	 * @since 2017.03
87 87
 	 */
88
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' );
88
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default');
89 89
 
90 90
 
91 91
 	/**
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
97 97
 	 * @since 2017.03
98 98
 	 */
99
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) );
99
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'));
100 100
 
101 101
 
102 102
 	/**
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
108 108
 	 * @since 2017.03
109 109
 	 */
110
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) );
110
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'));
111 111
 
112 112
 
113 113
 	/**
@@ -119,5 +119,5 @@  discard block
 block discarded – undo
119 119
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
120 120
 	 * @since 2017.03
121 121
 	 */
122
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null );
122
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null);
123 123
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Product/FactoryTest.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,31 +15,31 @@
 block discarded – undo
15 15
 	{
16 16
 		$target = '\\Aimeos\\Controller\\Frontend\\Product\\Iface';
17 17
 
18
-		$controller = \Aimeos\Controller\Frontend\Product\Factory::createController( \TestHelperFrontend::getContext() );
19
-		$this->assertInstanceOf( $target, $controller );
18
+		$controller = \Aimeos\Controller\Frontend\Product\Factory::createController(\TestHelperFrontend::getContext());
19
+		$this->assertInstanceOf($target, $controller);
20 20
 
21
-		$controller = \Aimeos\Controller\Frontend\Product\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
22
-		$this->assertInstanceOf( $target, $controller );
21
+		$controller = \Aimeos\Controller\Frontend\Product\Factory::createController(\TestHelperFrontend::getContext(), 'Standard');
22
+		$this->assertInstanceOf($target, $controller);
23 23
 	}
24 24
 
25 25
 
26 26
 	public function testCreateControllerInvalidImplementation()
27 27
 	{
28
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
29
-		\Aimeos\Controller\Frontend\Product\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
29
+		\Aimeos\Controller\Frontend\Product\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid');
30 30
 	}
31 31
 
32 32
 
33 33
 	public function testCreateControllerInvalidName()
34 34
 	{
35
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
36
-		\Aimeos\Controller\Frontend\Product\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
35
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
36
+		\Aimeos\Controller\Frontend\Product\Factory::createController(\TestHelperFrontend::getContext(), '%^');
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testCreateControllerNotExisting()
41 41
 	{
42
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
43
-		\Aimeos\Controller\Frontend\Product\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
42
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
43
+		\Aimeos\Controller\Frontend\Product\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
44 44
 	}
45 45
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Base.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -212,7 +212,7 @@
 block discarded – undo
212 212
 	/**
213 213
 	 * Returns the frontend controller
214 214
 	 *
215
-	 * @return \Aimeos\Controller\Frontend\Basket\Iface Frontend controller object
215
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
216 216
 	 */
217 217
 	protected function getController()
218 218
 	{
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -30,18 +30,18 @@  discard block
 block discarded – undo
30 30
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
31 31
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
32 32
 	 */
33
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
33
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
34 34
 	{
35 35
 		$iface = '\Aimeos\Controller\Frontend\Basket\Iface';
36
-		if( !( $controller instanceof $iface ) )
36
+		if (!($controller instanceof $iface))
37 37
 		{
38
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
39
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
38
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
39
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
40 40
 		}
41 41
 
42 42
 		$this->controller = $controller;
43 43
 
44
-		parent::__construct( $context );
44
+		parent::__construct($context);
45 45
 	}
46 46
 
47 47
 
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @return mixed Returns the value of the called method
54 54
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
55 55
 	 */
56
-	public function __call( $name, array $param )
56
+	public function __call($name, array $param)
57 57
 	{
58
-		return @call_user_func_array( array( $this->controller, $name ), $param );
58
+		return @call_user_func_array(array($this->controller, $name), $param);
59 59
 	}
60 60
 
61 61
 
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
111 111
 	 * @return void
112 112
 	 */
113
-	public function addProduct( $prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
113
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
114 114
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
115
-		$stocktype = 'default' )
115
+		$stocktype = 'default')
116 116
 	{
117 117
 		$this->controller->addProduct(
118 118
 			$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 	 * @param integer $position Position number (key) of the order product item
128 128
 	 * @return void
129 129
 	 */
130
-	public function deleteProduct( $position )
130
+	public function deleteProduct($position)
131 131
 	{
132
-		$this->controller->deleteProduct( $position );
132
+		$this->controller->deleteProduct($position);
133 133
 	}
134 134
 
135 135
 
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
143 143
 	 * @return void
144 144
 	 */
145
-	public function editProduct( $position, $quantity, array $options = array(), array $configAttributeCodes = array() )
145
+	public function editProduct($position, $quantity, array $options = array(), array $configAttributeCodes = array())
146 146
 	{
147
-		$this->controller->editProduct( $position, $quantity, $options, $configAttributeCodes );
147
+		$this->controller->editProduct($position, $quantity, $options, $configAttributeCodes);
148 148
 	}
149 149
 
150 150
 
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
156 156
 	 * @return void
157 157
 	 */
158
-	public function addCoupon( $code )
158
+	public function addCoupon($code)
159 159
 	{
160
-		$this->controller->addCoupon( $code );
160
+		$this->controller->addCoupon($code);
161 161
 	}
162 162
 
163 163
 
@@ -168,9 +168,9 @@  discard block
 block discarded – undo
168 168
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
169 169
 	 * @return void
170 170
 	 */
171
-	public function deleteCoupon( $code )
171
+	public function deleteCoupon($code)
172 172
 	{
173
-		$this->controller->deleteCoupon( $code );
173
+		$this->controller->deleteCoupon($code);
174 174
 	}
175 175
 
176 176
 
@@ -183,9 +183,9 @@  discard block
 block discarded – undo
183 183
 	 * 	if one of the keys is invalid when using an array with key/value pairs
184 184
 	 * @return void
185 185
 	 */
186
-	public function setAddress( $type, $value )
186
+	public function setAddress($type, $value)
187 187
 	{
188
-		$this->controller->setAddress( $type, $value );
188
+		$this->controller->setAddress($type, $value);
189 189
 	}
190 190
 
191 191
 
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
200 200
 	 * @return void
201 201
 	 */
202
-	public function setService( $type, $id, array $attributes = array() )
202
+	public function setService($type, $id, array $attributes = array())
203 203
 	{
204
-		$this->controller->setService( $type, $id, $attributes );
204
+		$this->controller->setService($type, $id, $attributes);
205 205
 	}
206 206
 
207 207
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Catalog/Decorator/Base.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@
 block discarded – undo
278 278
 	/**
279 279
 	 * Returns the frontend controller
280 280
 	 *
281
-	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Frontend controller object
281
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
282 282
 	 */
283 283
 	protected function getController()
284 284
 	{
Please login to merge, or discard this patch.
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -30,18 +30,18 @@  discard block
 block discarded – undo
30 30
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
31 31
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
32 32
 	 */
33
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
33
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
34 34
 	{
35 35
 		$iface = '\Aimeos\Controller\Frontend\Catalog\Iface';
36
-		if( !( $controller instanceof $iface ) )
36
+		if (!($controller instanceof $iface))
37 37
 		{
38
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
39
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
38
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
39
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
40 40
 		}
41 41
 
42 42
 		$this->controller = $controller;
43 43
 
44
-		parent::__construct( $context );
44
+		parent::__construct($context);
45 45
 	}
46 46
 
47 47
 
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @return mixed Returns the value of the called method
54 54
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
55 55
 	 */
56
-	public function __call( $name, array $param )
56
+	public function __call($name, array $param)
57 57
 	{
58
-		return @call_user_func_array( array( $this->controller, $name ), $param );
58
+		return @call_user_func_array(array($this->controller, $name), $param);
59 59
 	}
60 60
 
61 61
 
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
 	 * @param string $name Name of the manager
66 66
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager object
67 67
 	 */
68
-	public function createManager( $name )
68
+	public function createManager($name)
69 69
 	{
70
-		return $this->controller->createManager( $name );
70
+		return $this->controller->createManager($name);
71 71
 	}
72 72
 
73 73
 
@@ -93,9 +93,9 @@  discard block
 block discarded – undo
93 93
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
94 94
 	 * @since 2017.03
95 95
 	 */
96
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
96
+	public function getPath($id, array $domains = array('text', 'media'))
97 97
 	{
98
-		return $this->controller->getPath( $id, $domains );
98
+		return $this->controller->getPath($id, $domains);
99 99
 	}
100 100
 
101 101
 
@@ -110,10 +110,10 @@  discard block
 block discarded – undo
110 110
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
111 111
 	 * @since 2017.03
112 112
 	 */
113
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
114
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
113
+	public function getTree($id = null, array $domains = array('text', 'media'),
114
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
115 115
 	{
116
-		return $this->controller->getTree( $id, $domains, $level, $search );
116
+		return $this->controller->getTree($id, $domains, $level, $search);
117 117
 	}
118 118
 
119 119
 
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
 	 * @since 2015.08
126 126
 	 * @deprecated Use createFilter() instead
127 127
 	 */
128
-	public function createCatalogFilter( $default = true )
128
+	public function createCatalogFilter($default = true)
129 129
 	{
130
-		return $this->controller->createCatalogFilter( $default );
130
+		return $this->controller->createCatalogFilter($default);
131 131
 	}
132 132
 
133 133
 
@@ -141,9 +141,9 @@  discard block
 block discarded – undo
141 141
 	 * @since 2015.08
142 142
 	 * @deprecated Use getPath() instead
143 143
 	 */
144
-	public function getCatalogPath( $id, array $domains = array( 'text', 'media' ) )
144
+	public function getCatalogPath($id, array $domains = array('text', 'media'))
145 145
 	{
146
-		return $this->controller->getCatalogPath( $id, $domains );
146
+		return $this->controller->getCatalogPath($id, $domains);
147 147
 	}
148 148
 
149 149
 
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
159 159
 	 * @since 2015.08
160 160
 	 * @deprecated Use getTree() instead
161 161
 	 */
162
-	public function getCatalogTree( $id = null, array $domains = array( 'text', 'media' ),
163
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
162
+	public function getCatalogTree($id = null, array $domains = array('text', 'media'),
163
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
164 164
 	{
165
-		return $this->controller->getCatalogTree( $id, $domains, $level, $search );
165
+		return $this->controller->getCatalogTree($id, $domains, $level, $search);
166 166
 	}
167 167
 
168 168
 
@@ -175,9 +175,9 @@  discard block
 block discarded – undo
175 175
 	 * @since 2015.08
176 176
 	 * @deprecated Use product controller instead
177 177
 	 */
178
-	public function aggregateIndex( \Aimeos\MW\Criteria\Iface $filter, $key )
178
+	public function aggregateIndex(\Aimeos\MW\Criteria\Iface $filter, $key)
179 179
 	{
180
-		return $this->controller->aggregateIndex( $filter, $key );
180
+		return $this->controller->aggregateIndex($filter, $key);
181 181
 	}
182 182
 
183 183
 
@@ -190,9 +190,9 @@  discard block
 block discarded – undo
190 190
 	 * @since 2015.08
191 191
 	 * @deprecated Use product controller instead
192 192
 	 */
193
-	public function addIndexFilterCategory( \Aimeos\MW\Criteria\Iface $search, $catid )
193
+	public function addIndexFilterCategory(\Aimeos\MW\Criteria\Iface $search, $catid)
194 194
 	{
195
-		return $this->controller->addIndexFilterCategory( $search, $catid );
195
+		return $this->controller->addIndexFilterCategory($search, $catid);
196 196
 	}
197 197
 
198 198
 
@@ -206,9 +206,9 @@  discard block
 block discarded – undo
206 206
 	 * @since 2015.08
207 207
 	 * @deprecated Use product controller instead
208 208
 	 */
209
-	public function addIndexFilterText( \Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default' )
209
+	public function addIndexFilterText(\Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default')
210 210
 	{
211
-		return $this->controller->addIndexFilterText( $search, $input, $listtype );
211
+		return $this->controller->addIndexFilterText($search, $input, $listtype);
212 212
 	}
213 213
 
214 214
 
@@ -224,9 +224,9 @@  discard block
 block discarded – undo
224 224
 	 * @since 2015.08
225 225
 	 * @deprecated Use product controller instead
226 226
 	 */
227
-	public function createIndexFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
227
+	public function createIndexFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
228 228
 	{
229
-		return $this->controller->createIndexFilter( $sort, $direction, $start, $size, $listtype );
229
+		return $this->controller->createIndexFilter($sort, $direction, $start, $size, $listtype);
230 230
 	}
231 231
 
232 232
 
@@ -243,9 +243,9 @@  discard block
 block discarded – undo
243 243
 	 * @since 2015.08
244 244
 	 * @deprecated Use product controller instead
245 245
 	 */
246
-	public function createIndexFilterCategory( $catid, $sort = 'position', $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
246
+	public function createIndexFilterCategory($catid, $sort = 'position', $direction = '+', $start = 0, $size = 100, $listtype = 'default')
247 247
 	{
248
-		return $this->controller->createIndexFilterCategory( $catid, $sort, $direction, $start, $size, $listtype );
248
+		return $this->controller->createIndexFilterCategory($catid, $sort, $direction, $start, $size, $listtype);
249 249
 	}
250 250
 
251 251
 
@@ -262,9 +262,9 @@  discard block
 block discarded – undo
262 262
 	 * @since 2015.08
263 263
 	 * @deprecated Use product controller instead
264 264
 	 */
265
-	public function createIndexFilterText( $input, $sort = 'relevance', $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
265
+	public function createIndexFilterText($input, $sort = 'relevance', $direction = '+', $start = 0, $size = 100, $listtype = 'default')
266 266
 	{
267
-		return $this->controller->createIndexFilterText( $input, $sort, $direction, $start, $size, $listtype );
267
+		return $this->controller->createIndexFilterText($input, $sort, $direction, $start, $size, $listtype);
268 268
 	}
269 269
 
270 270
 
@@ -278,9 +278,9 @@  discard block
 block discarded – undo
278 278
 	 * @since 2015.08
279 279
 	 * @deprecated Use product controller instead
280 280
 	 */
281
-	public function getIndexItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
281
+	public function getIndexItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
282 282
 	{
283
-		return $this->controller->getIndexItems( $filter, $domains, $total );
283
+		return $this->controller->getIndexItems($filter, $domains, $total);
284 284
 	}
285 285
 
286 286
 
@@ -293,9 +293,9 @@  discard block
 block discarded – undo
293 293
 	 * @since 2015.08
294 294
 	 * @deprecated Use product controller instead
295 295
 	 */
296
-	public function getProductItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
296
+	public function getProductItems(array $ids, array $domains = array('media', 'price', 'text'))
297 297
 	{
298
-		return $this->controller->getProductItems( $ids, $domains );
298
+		return $this->controller->getProductItems($ids, $domains);
299 299
 	}
300 300
 
301 301
 
@@ -312,9 +312,9 @@  discard block
 block discarded – undo
312 312
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
313 313
 	 * @deprecated Use product controller instead
314 314
 	 */
315
-	public function createTextFilter( $input, $sort = null, $direction = '-', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
315
+	public function createTextFilter($input, $sort = null, $direction = '-', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
316 316
 	{
317
-		return $this->controller->createTextFilter( $input, $sort, $direction, $start, $size, $listtype, $type );
317
+		return $this->controller->createTextFilter($input, $sort, $direction, $start, $size, $listtype, $type);
318 318
 	}
319 319
 
320 320
 
@@ -325,9 +325,9 @@  discard block
 block discarded – undo
325 325
 	 * @return array Associative list of the product ID as key and the product text as value
326 326
 	 * @deprecated Use product controller instead
327 327
 	 */
328
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
328
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
329 329
 	{
330
-		return $this->controller->getTextList( $filter );
330
+		return $this->controller->getTextList($filter);
331 331
 	}
332 332
 
333 333
 
Please login to merge, or discard this patch.