@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
29 | 29 | * @return \Aimeos\Controller\Frontend\Attribute\Iface Controller object |
30 | 30 | */ |
31 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
31 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
32 | 32 | { |
33 | 33 | /** controller/frontend/attribute/name |
34 | 34 | * Class name of the used attribute frontend controller implementation |
@@ -63,20 +63,20 @@ discard block |
||
63 | 63 | * @since 2014.03 |
64 | 64 | * @category Developer |
65 | 65 | */ |
66 | - if( $name === null ) { |
|
67 | - $name = $context->getConfig()->get( 'controller/frontend/attribute/name', 'Standard' ); |
|
66 | + if ($name === null) { |
|
67 | + $name = $context->getConfig()->get('controller/frontend/attribute/name', 'Standard'); |
|
68 | 68 | } |
69 | 69 | |
70 | - if( ctype_alnum( $name ) === false ) |
|
70 | + if (ctype_alnum($name) === false) |
|
71 | 71 | { |
72 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Attribute\\' . $name : '<not a string>'; |
|
73 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
72 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Attribute\\' . $name : '<not a string>'; |
|
73 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | $iface = '\\Aimeos\\Controller\\Frontend\\Attribute\\Iface'; |
77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Attribute\\' . $name; |
78 | 78 | |
79 | - $manager = self::createControllerBase( $context, $classname, $iface ); |
|
79 | + $manager = self::createControllerBase($context, $classname, $iface); |
|
80 | 80 | |
81 | 81 | /** controller/frontend/attribute/decorators/excludes |
82 | 82 | * Excludes decorators added by the "common" option from the attribute frontend controllers |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * @see controller/frontend/attribute/decorators/excludes |
153 | 153 | * @see controller/frontend/attribute/decorators/global |
154 | 154 | */ |
155 | - return self::addControllerDecorators( $context, $manager, 'attribute' ); |
|
155 | + return self::addControllerDecorators($context, $manager, 'attribute'); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | } |
@@ -18,31 +18,31 @@ |
||
18 | 18 | { |
19 | 19 | $context = \TestHelperFrontend::getContext(); |
20 | 20 | |
21 | - $this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Base' ) |
|
22 | - ->setConstructorArgs( [$context] ) |
|
21 | + $this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Base') |
|
22 | + ->setConstructorArgs([$context]) |
|
23 | 23 | ->getMockForAbstractClass(); |
24 | 24 | } |
25 | 25 | |
26 | 26 | |
27 | 27 | protected function tearDown() |
28 | 28 | { |
29 | - unset( $this->object ); |
|
29 | + unset($this->object); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | |
33 | 33 | public function testGetContext() |
34 | 34 | { |
35 | - $result = $this->access( 'getContext' )->invokeArgs( $this->object, [] ); |
|
35 | + $result = $this->access('getContext')->invokeArgs($this->object, []); |
|
36 | 36 | |
37 | - $this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $result ); |
|
37 | + $this->assertInstanceOf('\Aimeos\MShop\Context\Item\Iface', $result); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
41 | - protected function access( $name ) |
|
41 | + protected function access($name) |
|
42 | 42 | { |
43 | - $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Base' ); |
|
44 | - $method = $class->getMethod( $name ); |
|
45 | - $method->setAccessible( true ); |
|
43 | + $class = new \ReflectionClass('\Aimeos\Controller\Frontend\Base'); |
|
44 | + $method = $class->getMethod($name); |
|
45 | + $method->setAccessible(true); |
|
46 | 46 | |
47 | 47 | return $method; |
48 | 48 | } |
@@ -20,245 +20,245 @@ |
||
20 | 20 | { |
21 | 21 | $this->context = \TestHelperFrontend::getContext(); |
22 | 22 | |
23 | - $this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Catalog\Standard' ) |
|
23 | + $this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Catalog\Standard') |
|
24 | 24 | ->disableOriginalConstructor() |
25 | 25 | ->getMock(); |
26 | 26 | |
27 | - $this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Catalog\Decorator\Base' ) |
|
28 | - ->setConstructorArgs( [$this->stub, $this->context] ) |
|
27 | + $this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Catalog\Decorator\Base') |
|
28 | + ->setConstructorArgs([$this->stub, $this->context]) |
|
29 | 29 | ->getMockForAbstractClass(); |
30 | 30 | } |
31 | 31 | |
32 | 32 | |
33 | 33 | protected function tearDown() |
34 | 34 | { |
35 | - unset( $this->context, $this->object, $this->stub ); |
|
35 | + unset($this->context, $this->object, $this->stub); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | 39 | public function testConstructException() |
40 | 40 | { |
41 | - $stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock(); |
|
41 | + $stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock(); |
|
42 | 42 | |
43 | - $this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' ); |
|
43 | + $this->setExpectedException('\Aimeos\Controller\Frontend\Exception'); |
|
44 | 44 | |
45 | - $this->getMockBuilder( '\Aimeos\Controller\Frontend\Catalog\Decorator\Base' ) |
|
46 | - ->setConstructorArgs( [$stub, $this->context] ) |
|
45 | + $this->getMockBuilder('\Aimeos\Controller\Frontend\Catalog\Decorator\Base') |
|
46 | + ->setConstructorArgs([$stub, $this->context]) |
|
47 | 47 | ->getMockForAbstractClass(); |
48 | 48 | } |
49 | 49 | |
50 | 50 | |
51 | 51 | public function testCall() |
52 | 52 | { |
53 | - $stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Catalog\Standard' ) |
|
53 | + $stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Catalog\Standard') |
|
54 | 54 | ->disableOriginalConstructor() |
55 | - ->setMethods( ['invalid'] ) |
|
55 | + ->setMethods(['invalid']) |
|
56 | 56 | ->getMock(); |
57 | 57 | |
58 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Catalog\Decorator\Base' ) |
|
59 | - ->setConstructorArgs( [$stub, $this->context] ) |
|
58 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Catalog\Decorator\Base') |
|
59 | + ->setConstructorArgs([$stub, $this->context]) |
|
60 | 60 | ->getMockForAbstractClass(); |
61 | 61 | |
62 | - $stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) ); |
|
62 | + $stub->expects($this->once())->method('invalid')->will($this->returnValue(true)); |
|
63 | 63 | |
64 | - $this->assertTrue( $object->invalid() ); |
|
64 | + $this->assertTrue($object->invalid()); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
68 | 68 | public function testCreateManager() |
69 | 69 | { |
70 | - $catalogManager = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' ); |
|
70 | + $catalogManager = \Aimeos\MShop\Factory::createManager($this->context, 'catalog'); |
|
71 | 71 | |
72 | - $this->stub->expects( $this->once() )->method( 'createManager' ) |
|
73 | - ->will( $this->returnValue( $catalogManager ) ); |
|
72 | + $this->stub->expects($this->once())->method('createManager') |
|
73 | + ->will($this->returnValue($catalogManager)); |
|
74 | 74 | |
75 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Manager\Iface', $this->object->createManager( 'catalog' ) ); |
|
75 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Manager\Iface', $this->object->createManager('catalog')); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | |
79 | 79 | public function testCreateFilter() |
80 | 80 | { |
81 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' )->createSearch(); |
|
81 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'catalog')->createSearch(); |
|
82 | 82 | |
83 | - $this->stub->expects( $this->once() )->method( 'createFilter' ) |
|
84 | - ->will( $this->returnValue( $search ) ); |
|
83 | + $this->stub->expects($this->once())->method('createFilter') |
|
84 | + ->will($this->returnValue($search)); |
|
85 | 85 | |
86 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() ); |
|
86 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter()); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | |
90 | 90 | public function testGetPath() |
91 | 91 | { |
92 | - $this->stub->expects( $this->once() )->method( 'getPath' ) |
|
93 | - ->will( $this->returnValue( [] ) ); |
|
92 | + $this->stub->expects($this->once())->method('getPath') |
|
93 | + ->will($this->returnValue([])); |
|
94 | 94 | |
95 | - $this->assertEquals( [], $this->object->getPath( -1 ) ); |
|
95 | + $this->assertEquals([], $this->object->getPath( -1 )); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | |
99 | 99 | public function testGetTree() |
100 | 100 | { |
101 | - $catItem = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' )->createItem(); |
|
101 | + $catItem = \Aimeos\MShop\Factory::createManager($this->context, 'catalog')->createItem(); |
|
102 | 102 | |
103 | - $this->stub->expects( $this->once() )->method( 'getTree' ) |
|
104 | - ->will( $this->returnValue( $catItem ) ); |
|
103 | + $this->stub->expects($this->once())->method('getTree') |
|
104 | + ->will($this->returnValue($catItem)); |
|
105 | 105 | |
106 | - $this->assertInstanceOf( '\Aimeos\MShop\Catalog\Item\Iface', $this->object->getTree() ); |
|
106 | + $this->assertInstanceOf('\Aimeos\MShop\Catalog\Item\Iface', $this->object->getTree()); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | |
110 | 110 | public function testCreateCatalogFilter() |
111 | 111 | { |
112 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' )->createSearch(); |
|
112 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'catalog')->createSearch(); |
|
113 | 113 | |
114 | - $this->stub->expects( $this->once() )->method( 'createCatalogFilter' ) |
|
115 | - ->will( $this->returnValue( $search ) ); |
|
114 | + $this->stub->expects($this->once())->method('createCatalogFilter') |
|
115 | + ->will($this->returnValue($search)); |
|
116 | 116 | |
117 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createCatalogFilter() ); |
|
117 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createCatalogFilter()); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | |
121 | 121 | public function testGetCatalogPath() |
122 | 122 | { |
123 | - $this->stub->expects( $this->once() )->method( 'getCatalogPath' ) |
|
124 | - ->will( $this->returnValue( [] ) ); |
|
123 | + $this->stub->expects($this->once())->method('getCatalogPath') |
|
124 | + ->will($this->returnValue([])); |
|
125 | 125 | |
126 | - $this->assertEquals( [], $this->object->getCatalogPath( -1 ) ); |
|
126 | + $this->assertEquals([], $this->object->getCatalogPath( -1 )); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | |
130 | 130 | public function testGetCatalogTree() |
131 | 131 | { |
132 | - $catItem = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' )->createItem(); |
|
132 | + $catItem = \Aimeos\MShop\Factory::createManager($this->context, 'catalog')->createItem(); |
|
133 | 133 | |
134 | - $this->stub->expects( $this->once() )->method( 'getCatalogTree' ) |
|
135 | - ->will( $this->returnValue( $catItem ) ); |
|
134 | + $this->stub->expects($this->once())->method('getCatalogTree') |
|
135 | + ->will($this->returnValue($catItem)); |
|
136 | 136 | |
137 | - $this->assertInstanceOf( '\Aimeos\MShop\Catalog\Item\Iface', $this->object->getCatalogTree() ); |
|
137 | + $this->assertInstanceOf('\Aimeos\MShop\Catalog\Item\Iface', $this->object->getCatalogTree()); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | |
141 | 141 | public function testAggregateIndex() |
142 | 142 | { |
143 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
143 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
144 | 144 | |
145 | - $this->stub->expects( $this->once() )->method( 'aggregateIndex' ) |
|
146 | - ->will( $this->returnValue( [] ) ); |
|
145 | + $this->stub->expects($this->once())->method('aggregateIndex') |
|
146 | + ->will($this->returnValue([])); |
|
147 | 147 | |
148 | - $this->assertEquals( [], $this->object->aggregateIndex( $search, 'test' ) ); |
|
148 | + $this->assertEquals([], $this->object->aggregateIndex($search, 'test')); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | |
152 | 152 | public function testAddIndexFilterCategory() |
153 | 153 | { |
154 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
154 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
155 | 155 | |
156 | - $this->stub->expects( $this->once() )->method( 'addIndexFilterCategory' ) |
|
157 | - ->will( $this->returnArgument( 0 ) ); |
|
156 | + $this->stub->expects($this->once())->method('addIndexFilterCategory') |
|
157 | + ->will($this->returnArgument(0)); |
|
158 | 158 | |
159 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->addIndexFilterCategory( $search, -1 ) ); |
|
159 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->addIndexFilterCategory($search, -1)); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | |
163 | 163 | public function testAddIndexFilterText() |
164 | 164 | { |
165 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
165 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
166 | 166 | |
167 | - $this->stub->expects( $this->once() )->method( 'addIndexFilterText' ) |
|
168 | - ->will( $this->returnArgument( 0 ) ); |
|
167 | + $this->stub->expects($this->once())->method('addIndexFilterText') |
|
168 | + ->will($this->returnArgument(0)); |
|
169 | 169 | |
170 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->addIndexFilterText( $search, 'test' ) ); |
|
170 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->addIndexFilterText($search, 'test')); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | |
174 | 174 | public function testCreateIndexFilter() |
175 | 175 | { |
176 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
176 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
177 | 177 | |
178 | - $this->stub->expects( $this->once() )->method( 'createIndexFilter' ) |
|
179 | - ->will( $this->returnValue( $search ) ); |
|
178 | + $this->stub->expects($this->once())->method('createIndexFilter') |
|
179 | + ->will($this->returnValue($search)); |
|
180 | 180 | |
181 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createIndexFilter() ); |
|
181 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createIndexFilter()); |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | |
185 | 185 | public function testCreateIndexFilterCategory() |
186 | 186 | { |
187 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
187 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
188 | 188 | |
189 | - $this->stub->expects( $this->once() )->method( 'createIndexFilterCategory' ) |
|
190 | - ->will( $this->returnValue( $search ) ); |
|
189 | + $this->stub->expects($this->once())->method('createIndexFilterCategory') |
|
190 | + ->will($this->returnValue($search)); |
|
191 | 191 | |
192 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createIndexFilterCategory( -1 ) ); |
|
192 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createIndexFilterCategory( -1 )); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | |
196 | 196 | public function testCreateIndexFilterText() |
197 | 197 | { |
198 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
198 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
199 | 199 | |
200 | - $this->stub->expects( $this->once() )->method( 'createIndexFilterText' ) |
|
201 | - ->will( $this->returnValue( $search ) ); |
|
200 | + $this->stub->expects($this->once())->method('createIndexFilterText') |
|
201 | + ->will($this->returnValue($search)); |
|
202 | 202 | |
203 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createIndexFilterText( 'test' ) ); |
|
203 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createIndexFilterText('test')); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | |
207 | 207 | public function testGetIndexItems() |
208 | 208 | { |
209 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
209 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
210 | 210 | |
211 | - $this->stub->expects( $this->once() )->method( 'getIndexItems' ) |
|
212 | - ->will( $this->returnValue( [] ) ); |
|
211 | + $this->stub->expects($this->once())->method('getIndexItems') |
|
212 | + ->will($this->returnValue([])); |
|
213 | 213 | |
214 | - $this->assertEquals( [], $this->object->getIndexItems( $search ) ); |
|
214 | + $this->assertEquals([], $this->object->getIndexItems($search)); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | |
218 | 218 | public function testGetProductItems() |
219 | 219 | { |
220 | - $this->stub->expects( $this->once() )->method( 'getProductItems' ) |
|
221 | - ->will( $this->returnValue( [] ) ); |
|
220 | + $this->stub->expects($this->once())->method('getProductItems') |
|
221 | + ->will($this->returnValue([])); |
|
222 | 222 | |
223 | - $this->assertEquals( [], $this->object->getProductItems( [-1] ) ); |
|
223 | + $this->assertEquals([], $this->object->getProductItems([-1])); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | |
227 | 227 | public function testCreateTextFilter() |
228 | 228 | { |
229 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
229 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
230 | 230 | |
231 | - $this->stub->expects( $this->once() )->method( 'createTextFilter' ) |
|
232 | - ->will( $this->returnValue( $search ) ); |
|
231 | + $this->stub->expects($this->once())->method('createTextFilter') |
|
232 | + ->will($this->returnValue($search)); |
|
233 | 233 | |
234 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createTextFilter( 'test' ) ); |
|
234 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createTextFilter('test')); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | |
238 | 238 | public function testGetTextList() |
239 | 239 | { |
240 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
240 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
241 | 241 | |
242 | - $this->stub->expects( $this->once() )->method( 'getTextList' ) |
|
243 | - ->will( $this->returnValue( [] ) ); |
|
242 | + $this->stub->expects($this->once())->method('getTextList') |
|
243 | + ->will($this->returnValue([])); |
|
244 | 244 | |
245 | - $this->assertEquals( [], $this->object->getTextList( $search ) ); |
|
245 | + $this->assertEquals([], $this->object->getTextList($search)); |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | |
249 | 249 | public function testGetController() |
250 | 250 | { |
251 | - $result = $this->access( 'getController' )->invokeArgs( $this->object, [] ); |
|
251 | + $result = $this->access('getController')->invokeArgs($this->object, []); |
|
252 | 252 | |
253 | - $this->assertSame( $this->stub, $result ); |
|
253 | + $this->assertSame($this->stub, $result); |
|
254 | 254 | } |
255 | 255 | |
256 | 256 | |
257 | - protected function access( $name ) |
|
257 | + protected function access($name) |
|
258 | 258 | { |
259 | - $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Catalog\Decorator\Base' ); |
|
260 | - $method = $class->getMethod( $name ); |
|
261 | - $method->setAccessible( true ); |
|
259 | + $class = new \ReflectionClass('\Aimeos\Controller\Frontend\Catalog\Decorator\Base'); |
|
260 | + $method = $class->getMethod($name); |
|
261 | + $method->setAccessible(true); |
|
262 | 262 | |
263 | 263 | return $method; |
264 | 264 | } |
@@ -20,150 +20,150 @@ |
||
20 | 20 | { |
21 | 21 | $this->context = \TestHelperFrontend::getContext(); |
22 | 22 | |
23 | - $this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Product\Standard' ) |
|
23 | + $this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Product\Standard') |
|
24 | 24 | ->disableOriginalConstructor() |
25 | 25 | ->getMock(); |
26 | 26 | |
27 | - $this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Product\Decorator\Base' ) |
|
28 | - ->setConstructorArgs( [$this->stub, $this->context] ) |
|
27 | + $this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Product\Decorator\Base') |
|
28 | + ->setConstructorArgs([$this->stub, $this->context]) |
|
29 | 29 | ->getMockForAbstractClass(); |
30 | 30 | } |
31 | 31 | |
32 | 32 | |
33 | 33 | protected function tearDown() |
34 | 34 | { |
35 | - unset( $this->context, $this->object, $this->stub ); |
|
35 | + unset($this->context, $this->object, $this->stub); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | 39 | public function testConstructException() |
40 | 40 | { |
41 | - $stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock(); |
|
41 | + $stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock(); |
|
42 | 42 | |
43 | - $this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' ); |
|
43 | + $this->setExpectedException('\Aimeos\Controller\Frontend\Exception'); |
|
44 | 44 | |
45 | - $this->getMockBuilder( '\Aimeos\Controller\Frontend\Product\Decorator\Base' ) |
|
46 | - ->setConstructorArgs( [$stub, $this->context] ) |
|
45 | + $this->getMockBuilder('\Aimeos\Controller\Frontend\Product\Decorator\Base') |
|
46 | + ->setConstructorArgs([$stub, $this->context]) |
|
47 | 47 | ->getMockForAbstractClass(); |
48 | 48 | } |
49 | 49 | |
50 | 50 | |
51 | 51 | public function testCall() |
52 | 52 | { |
53 | - $stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Product\Standard' ) |
|
53 | + $stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Product\Standard') |
|
54 | 54 | ->disableOriginalConstructor() |
55 | - ->setMethods( ['invalid'] ) |
|
55 | + ->setMethods(['invalid']) |
|
56 | 56 | ->getMock(); |
57 | 57 | |
58 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Product\Decorator\Base' ) |
|
59 | - ->setConstructorArgs( [$stub, $this->context] ) |
|
58 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Product\Decorator\Base') |
|
59 | + ->setConstructorArgs([$stub, $this->context]) |
|
60 | 60 | ->getMockForAbstractClass(); |
61 | 61 | |
62 | - $stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) ); |
|
62 | + $stub->expects($this->once())->method('invalid')->will($this->returnValue(true)); |
|
63 | 63 | |
64 | - $this->assertTrue( $object->invalid() ); |
|
64 | + $this->assertTrue($object->invalid()); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
68 | 68 | public function testAddFilterAttribute() |
69 | 69 | { |
70 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
70 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
71 | 71 | |
72 | - $this->stub->expects( $this->once() )->method( 'addFilterAttribute' ) |
|
73 | - ->will( $this->returnArgument( 0 ) ); |
|
72 | + $this->stub->expects($this->once())->method('addFilterAttribute') |
|
73 | + ->will($this->returnArgument(0)); |
|
74 | 74 | |
75 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->addFilterAttribute( $search, [], [], [] ) ); |
|
75 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->addFilterAttribute($search, [], [], [])); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | |
79 | 79 | public function testAddFilterCategory() |
80 | 80 | { |
81 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
81 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
82 | 82 | |
83 | - $this->stub->expects( $this->once() )->method( 'addFilterCategory' ) |
|
84 | - ->will( $this->returnArgument( 0 ) ); |
|
83 | + $this->stub->expects($this->once())->method('addFilterCategory') |
|
84 | + ->will($this->returnArgument(0)); |
|
85 | 85 | |
86 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->addFilterCategory( $search, -1 ) ); |
|
86 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->addFilterCategory($search, -1)); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | |
90 | 90 | public function testAddFilterText() |
91 | 91 | { |
92 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
92 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
93 | 93 | |
94 | - $this->stub->expects( $this->once() )->method( 'addFilterText' ) |
|
95 | - ->will( $this->returnArgument( 0 ) ); |
|
94 | + $this->stub->expects($this->once())->method('addFilterText') |
|
95 | + ->will($this->returnArgument(0)); |
|
96 | 96 | |
97 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->addFilterText( $search, 'test' ) ); |
|
97 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->addFilterText($search, 'test')); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | |
101 | 101 | public function testAggregate() |
102 | 102 | { |
103 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
103 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
104 | 104 | |
105 | - $this->stub->expects( $this->once() )->method( 'aggregate' ) |
|
106 | - ->will( $this->returnValue( [] ) ); |
|
105 | + $this->stub->expects($this->once())->method('aggregate') |
|
106 | + ->will($this->returnValue([])); |
|
107 | 107 | |
108 | - $this->assertEquals( [], $this->object->aggregate( $search, 'test' ) ); |
|
108 | + $this->assertEquals([], $this->object->aggregate($search, 'test')); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | |
112 | 112 | public function testCreateFilter() |
113 | 113 | { |
114 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
114 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
115 | 115 | |
116 | - $this->stub->expects( $this->once() )->method( 'createFilter' ) |
|
117 | - ->will( $this->returnValue( $search ) ); |
|
116 | + $this->stub->expects($this->once())->method('createFilter') |
|
117 | + ->will($this->returnValue($search)); |
|
118 | 118 | |
119 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() ); |
|
119 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter()); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | |
123 | 123 | public function testGetItem() |
124 | 124 | { |
125 | - $prodItem = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createItem(); |
|
125 | + $prodItem = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createItem(); |
|
126 | 126 | |
127 | - $this->stub->expects( $this->once() )->method( 'getItem' ) |
|
128 | - ->will( $this->returnValue( $prodItem ) ); |
|
127 | + $this->stub->expects($this->once())->method('getItem') |
|
128 | + ->will($this->returnValue($prodItem)); |
|
129 | 129 | |
130 | - $this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $this->object->getItem( -1 ) ); |
|
130 | + $this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $this->object->getItem( -1 )); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | |
134 | 134 | public function testGetItems() |
135 | 135 | { |
136 | - $this->stub->expects( $this->once() )->method( 'getItems' ) |
|
137 | - ->will( $this->returnValue( [] ) ); |
|
136 | + $this->stub->expects($this->once())->method('getItems') |
|
137 | + ->will($this->returnValue([])); |
|
138 | 138 | |
139 | - $this->assertEquals( [], $this->object->getItems( [-1] ) ); |
|
139 | + $this->assertEquals([], $this->object->getItems([-1])); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | |
143 | 143 | public function testSearchItems() |
144 | 144 | { |
145 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch(); |
|
145 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch(); |
|
146 | 146 | |
147 | - $this->stub->expects( $this->once() )->method( 'searchItems' ) |
|
148 | - ->will( $this->returnValue( [] ) ); |
|
147 | + $this->stub->expects($this->once())->method('searchItems') |
|
148 | + ->will($this->returnValue([])); |
|
149 | 149 | |
150 | - $this->assertEquals( [], $this->object->searchItems( $search ) ); |
|
150 | + $this->assertEquals([], $this->object->searchItems($search)); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | |
154 | 154 | public function testGetController() |
155 | 155 | { |
156 | - $result = $this->access( 'getController' )->invokeArgs( $this->object, [] ); |
|
156 | + $result = $this->access('getController')->invokeArgs($this->object, []); |
|
157 | 157 | |
158 | - $this->assertSame( $this->stub, $result ); |
|
158 | + $this->assertSame($this->stub, $result); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | |
162 | - protected function access( $name ) |
|
162 | + protected function access($name) |
|
163 | 163 | { |
164 | - $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Product\Decorator\Base' ); |
|
165 | - $method = $class->getMethod( $name ); |
|
166 | - $method->setAccessible( true ); |
|
164 | + $class = new \ReflectionClass('\Aimeos\Controller\Frontend\Product\Decorator\Base'); |
|
165 | + $method = $class->getMethod($name); |
|
166 | + $method->setAccessible(true); |
|
167 | 167 | |
168 | 168 | return $method; |
169 | 169 | } |
@@ -20,119 +20,119 @@ |
||
20 | 20 | { |
21 | 21 | $this->context = \TestHelperFrontend::getContext(); |
22 | 22 | |
23 | - $this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Stock\Standard' ) |
|
23 | + $this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Stock\Standard') |
|
24 | 24 | ->disableOriginalConstructor() |
25 | 25 | ->getMock(); |
26 | 26 | |
27 | - $this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Stock\Decorator\Base' ) |
|
28 | - ->setConstructorArgs( [$this->stub, $this->context] ) |
|
27 | + $this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Stock\Decorator\Base') |
|
28 | + ->setConstructorArgs([$this->stub, $this->context]) |
|
29 | 29 | ->getMockForAbstractClass(); |
30 | 30 | } |
31 | 31 | |
32 | 32 | |
33 | 33 | protected function tearDown() |
34 | 34 | { |
35 | - unset( $this->context, $this->object, $this->stub ); |
|
35 | + unset($this->context, $this->object, $this->stub); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | 39 | public function testConstructException() |
40 | 40 | { |
41 | - $stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock(); |
|
41 | + $stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock(); |
|
42 | 42 | |
43 | - $this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' ); |
|
43 | + $this->setExpectedException('\Aimeos\Controller\Frontend\Exception'); |
|
44 | 44 | |
45 | - $this->getMockBuilder( '\Aimeos\Controller\Frontend\Stock\Decorator\Base' ) |
|
46 | - ->setConstructorArgs( [$stub, $this->context] ) |
|
45 | + $this->getMockBuilder('\Aimeos\Controller\Frontend\Stock\Decorator\Base') |
|
46 | + ->setConstructorArgs([$stub, $this->context]) |
|
47 | 47 | ->getMockForAbstractClass(); |
48 | 48 | } |
49 | 49 | |
50 | 50 | |
51 | 51 | public function testCall() |
52 | 52 | { |
53 | - $stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Stock\Standard' ) |
|
53 | + $stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Stock\Standard') |
|
54 | 54 | ->disableOriginalConstructor() |
55 | - ->setMethods( ['invalid'] ) |
|
55 | + ->setMethods(['invalid']) |
|
56 | 56 | ->getMock(); |
57 | 57 | |
58 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Stock\Decorator\Base' ) |
|
59 | - ->setConstructorArgs( [$stub, $this->context] ) |
|
58 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Stock\Decorator\Base') |
|
59 | + ->setConstructorArgs([$stub, $this->context]) |
|
60 | 60 | ->getMockForAbstractClass(); |
61 | 61 | |
62 | - $stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) ); |
|
62 | + $stub->expects($this->once())->method('invalid')->will($this->returnValue(true)); |
|
63 | 63 | |
64 | - $this->assertTrue( $object->invalid() ); |
|
64 | + $this->assertTrue($object->invalid()); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
68 | 68 | public function testAddFilterCodes() |
69 | 69 | { |
70 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'stock' )->createSearch(); |
|
70 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'stock')->createSearch(); |
|
71 | 71 | |
72 | - $this->stub->expects( $this->once() )->method( 'addFilterCodes' ) |
|
73 | - ->will( $this->returnArgument( 0 ) ); |
|
72 | + $this->stub->expects($this->once())->method('addFilterCodes') |
|
73 | + ->will($this->returnArgument(0)); |
|
74 | 74 | |
75 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->addFilterCodes( $search, [] ) ); |
|
75 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->addFilterCodes($search, [])); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | |
79 | 79 | public function testAddFilterTypes() |
80 | 80 | { |
81 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'stock' )->createSearch(); |
|
81 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'stock')->createSearch(); |
|
82 | 82 | |
83 | - $this->stub->expects( $this->once() )->method( 'addFilterTypes' ) |
|
84 | - ->will( $this->returnArgument( 0 ) ); |
|
83 | + $this->stub->expects($this->once())->method('addFilterTypes') |
|
84 | + ->will($this->returnArgument(0)); |
|
85 | 85 | |
86 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->addFilterTypes( $search, [] ) ); |
|
86 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->addFilterTypes($search, [])); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | |
90 | 90 | public function testCreateFilter() |
91 | 91 | { |
92 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'stock' )->createSearch(); |
|
92 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'stock')->createSearch(); |
|
93 | 93 | |
94 | - $this->stub->expects( $this->once() )->method( 'createFilter' ) |
|
95 | - ->will( $this->returnValue( $search ) ); |
|
94 | + $this->stub->expects($this->once())->method('createFilter') |
|
95 | + ->will($this->returnValue($search)); |
|
96 | 96 | |
97 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() ); |
|
97 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter()); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | |
101 | 101 | public function testGetItem() |
102 | 102 | { |
103 | - $item = \Aimeos\MShop\Factory::createManager( $this->context, 'stock' )->createItem(); |
|
103 | + $item = \Aimeos\MShop\Factory::createManager($this->context, 'stock')->createItem(); |
|
104 | 104 | |
105 | - $this->stub->expects( $this->once() )->method( 'getItem' ) |
|
106 | - ->will( $this->returnValue( $item ) ); |
|
105 | + $this->stub->expects($this->once())->method('getItem') |
|
106 | + ->will($this->returnValue($item)); |
|
107 | 107 | |
108 | - $this->assertInstanceOf( '\Aimeos\MShop\Stock\Item\Iface', $this->object->getItem( -1 ) ); |
|
108 | + $this->assertInstanceOf('\Aimeos\MShop\Stock\Item\Iface', $this->object->getItem( -1 )); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | |
112 | 112 | public function testSearchItems() |
113 | 113 | { |
114 | - $filter = \Aimeos\MShop\Factory::createManager( $this->context, 'stock' )->createSearch(); |
|
114 | + $filter = \Aimeos\MShop\Factory::createManager($this->context, 'stock')->createSearch(); |
|
115 | 115 | |
116 | - $this->stub->expects( $this->once() )->method( 'searchItems' ) |
|
117 | - ->will( $this->returnValue( [] ) ); |
|
116 | + $this->stub->expects($this->once())->method('searchItems') |
|
117 | + ->will($this->returnValue([])); |
|
118 | 118 | |
119 | - $this->assertEquals( [], $this->object->searchItems( $filter ) ); |
|
119 | + $this->assertEquals([], $this->object->searchItems($filter)); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | |
123 | 123 | public function testGetController() |
124 | 124 | { |
125 | - $result = $this->access( 'getController' )->invokeArgs( $this->object, [] ); |
|
125 | + $result = $this->access('getController')->invokeArgs($this->object, []); |
|
126 | 126 | |
127 | - $this->assertSame( $this->stub, $result ); |
|
127 | + $this->assertSame($this->stub, $result); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | |
131 | - protected function access( $name ) |
|
131 | + protected function access($name) |
|
132 | 132 | { |
133 | - $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Stock\Decorator\Base' ); |
|
134 | - $method = $class->getMethod( $name ); |
|
135 | - $method->setAccessible( true ); |
|
133 | + $class = new \ReflectionClass('\Aimeos\Controller\Frontend\Stock\Decorator\Base'); |
|
134 | + $method = $class->getMethod($name); |
|
135 | + $method->setAccessible(true); |
|
136 | 136 | |
137 | 137 | return $method; |
138 | 138 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
28 | 28 | * @since 2017.03 |
29 | 29 | */ |
30 | - public function addFilterTypes( \Aimeos\MW\Criteria\Iface $filter, array $codes ); |
|
30 | + public function addFilterTypes(\Aimeos\MW\Criteria\Iface $filter, array $codes); |
|
31 | 31 | |
32 | 32 | |
33 | 33 | /** |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items |
48 | 48 | * @since 2017.03 |
49 | 49 | */ |
50 | - public function getItem( $id, array $domains = array( 'media', 'price', 'text' ) ); |
|
50 | + public function getItem($id, array $domains = array('media', 'price', 'text')); |
|
51 | 51 | |
52 | 52 | |
53 | 53 | /** |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute item including the referenced domains items |
59 | 59 | * @since 2017.03 |
60 | 60 | */ |
61 | - public function getItems( array $ids, array $domains = array( 'media', 'price', 'text' ) ); |
|
61 | + public function getItems(array $ids, array $domains = array('media', 'price', 'text')); |
|
62 | 62 | |
63 | 63 | |
64 | 64 | /** |
@@ -70,5 +70,5 @@ discard block |
||
70 | 70 | * @return array Ordered list of attribute items implementing \Aimeos\MShop\Attribute\Item\Iface |
71 | 71 | * @since 2017.03 |
72 | 72 | */ |
73 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null ); |
|
73 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null); |
|
74 | 74 | } |
@@ -16,13 +16,13 @@ discard block |
||
16 | 16 | |
17 | 17 | protected function setUp() |
18 | 18 | { |
19 | - $this->object = new \Aimeos\Controller\Frontend\Attribute\Standard( \TestHelperFrontend::getContext() ); |
|
19 | + $this->object = new \Aimeos\Controller\Frontend\Attribute\Standard(\TestHelperFrontend::getContext()); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | |
23 | 23 | protected function tearDown() |
24 | 24 | { |
25 | - unset( $this->object ); |
|
25 | + unset($this->object); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
@@ -30,57 +30,57 @@ discard block |
||
30 | 30 | { |
31 | 31 | $filter = $this->object->createFilter(); |
32 | 32 | |
33 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
34 | - $this->assertEquals( 1, count( $filter->getSortations() ) ); |
|
35 | - $this->assertEquals( 0, $filter->getSliceStart() ); |
|
36 | - $this->assertEquals( 100, $filter->getSliceSize() ); |
|
33 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
34 | + $this->assertEquals(1, count($filter->getSortations())); |
|
35 | + $this->assertEquals(0, $filter->getSliceStart()); |
|
36 | + $this->assertEquals(100, $filter->getSliceSize()); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
40 | 40 | public function testAddFilterTypes() |
41 | 41 | { |
42 | 42 | $filter = $this->object->createFilter(); |
43 | - $filter = $this->object->addFilterTypes( $filter, ['size'] ); |
|
43 | + $filter = $this->object->addFilterTypes($filter, ['size']); |
|
44 | 44 | |
45 | 45 | $list = $filter->getConditions()->getExpressions(); |
46 | 46 | |
47 | - if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) { |
|
48 | - throw new \RuntimeException( 'Wrong expression' ); |
|
47 | + if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) { |
|
48 | + throw new \RuntimeException('Wrong expression'); |
|
49 | 49 | } |
50 | 50 | |
51 | - $this->assertEquals( 'attribute.type.code', $list[0]->getName() ); |
|
52 | - $this->assertEquals( 1, count( $list[0]->getValue() ) ); |
|
51 | + $this->assertEquals('attribute.type.code', $list[0]->getName()); |
|
52 | + $this->assertEquals(1, count($list[0]->getValue())); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
56 | 56 | public function testGetItem() |
57 | 57 | { |
58 | 58 | $context = \TestHelperFrontend::getContext(); |
59 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' ); |
|
60 | - $id = $manager->findItem( 'xs', [], 'product', 'size' )->getId(); |
|
59 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'attribute'); |
|
60 | + $id = $manager->findItem('xs', [], 'product', 'size')->getId(); |
|
61 | 61 | |
62 | - $result = $this->object->getItem( $id, ['text'] ); |
|
62 | + $result = $this->object->getItem($id, ['text']); |
|
63 | 63 | |
64 | - $this->assertInstanceOf( '\Aimeos\MShop\Attribute\Item\Iface', $result ); |
|
65 | - $this->assertEquals( 3, count( $result->getRefItems( 'text' ) ) ); |
|
64 | + $this->assertInstanceOf('\Aimeos\MShop\Attribute\Item\Iface', $result); |
|
65 | + $this->assertEquals(3, count($result->getRefItems('text'))); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
69 | 69 | public function testGetItems() |
70 | 70 | { |
71 | 71 | $context = \TestHelperFrontend::getContext(); |
72 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' ); |
|
73 | - $id = $manager->findItem( 'xs', [], 'product', 'size' )->getId(); |
|
72 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'attribute'); |
|
73 | + $id = $manager->findItem('xs', [], 'product', 'size')->getId(); |
|
74 | 74 | |
75 | - $result = $this->object->getItems( [$id], ['text'] ); |
|
75 | + $result = $this->object->getItems([$id], ['text']); |
|
76 | 76 | |
77 | - $this->assertInternalType( 'array', $result ); |
|
78 | - $this->assertEquals( 1, count( $result ) ); |
|
77 | + $this->assertInternalType('array', $result); |
|
78 | + $this->assertEquals(1, count($result)); |
|
79 | 79 | |
80 | - foreach( $result as $attrItem ) |
|
80 | + foreach ($result as $attrItem) |
|
81 | 81 | { |
82 | - $this->assertInstanceOf( '\Aimeos\MShop\Attribute\Item\Iface', $attrItem ); |
|
83 | - $this->assertEquals( 3, count( $attrItem->getRefItems( 'text' ) ) ); |
|
82 | + $this->assertInstanceOf('\Aimeos\MShop\Attribute\Item\Iface', $attrItem); |
|
83 | + $this->assertEquals(3, count($attrItem->getRefItems('text'))); |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
@@ -88,12 +88,12 @@ discard block |
||
88 | 88 | public function testSearchItems() |
89 | 89 | { |
90 | 90 | $filter = $this->object->createFilter(); |
91 | - $filter = $this->object->addFilterTypes( $filter, ['size'] ); |
|
91 | + $filter = $this->object->addFilterTypes($filter, ['size']); |
|
92 | 92 | |
93 | 93 | $total = 0; |
94 | - $results = $this->object->searchItems( $filter, ['text'], $total ); |
|
94 | + $results = $this->object->searchItems($filter, ['text'], $total); |
|
95 | 95 | |
96 | - $this->assertEquals( 6, $total ); |
|
97 | - $this->assertEquals( 6, count( $results ) ); |
|
96 | + $this->assertEquals(6, $total); |
|
97 | + $this->assertEquals(6, count($results)); |
|
98 | 98 | } |
99 | 99 | } |
@@ -20,117 +20,117 @@ |
||
20 | 20 | { |
21 | 21 | $this->context = \TestHelperFrontend::getContext(); |
22 | 22 | |
23 | - $this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Attribute\Standard' ) |
|
23 | + $this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Attribute\Standard') |
|
24 | 24 | ->disableOriginalConstructor() |
25 | 25 | ->getMock(); |
26 | 26 | |
27 | - $this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Attribute\Decorator\Base' ) |
|
28 | - ->setConstructorArgs( [$this->stub, $this->context] ) |
|
27 | + $this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Attribute\Decorator\Base') |
|
28 | + ->setConstructorArgs([$this->stub, $this->context]) |
|
29 | 29 | ->getMockForAbstractClass(); |
30 | 30 | } |
31 | 31 | |
32 | 32 | |
33 | 33 | protected function tearDown() |
34 | 34 | { |
35 | - unset( $this->context, $this->object, $this->stub ); |
|
35 | + unset($this->context, $this->object, $this->stub); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
39 | 39 | public function testConstructException() |
40 | 40 | { |
41 | - $stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock(); |
|
41 | + $stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock(); |
|
42 | 42 | |
43 | - $this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' ); |
|
43 | + $this->setExpectedException('\Aimeos\Controller\Frontend\Exception'); |
|
44 | 44 | |
45 | - $this->getMockBuilder( '\Aimeos\Controller\Frontend\Attribute\Decorator\Base' ) |
|
46 | - ->setConstructorArgs( [$stub, $this->context] ) |
|
45 | + $this->getMockBuilder('\Aimeos\Controller\Frontend\Attribute\Decorator\Base') |
|
46 | + ->setConstructorArgs([$stub, $this->context]) |
|
47 | 47 | ->getMockForAbstractClass(); |
48 | 48 | } |
49 | 49 | |
50 | 50 | |
51 | 51 | public function testCall() |
52 | 52 | { |
53 | - $stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Attribute\Standard' ) |
|
53 | + $stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Attribute\Standard') |
|
54 | 54 | ->disableOriginalConstructor() |
55 | - ->setMethods( ['invalid'] ) |
|
55 | + ->setMethods(['invalid']) |
|
56 | 56 | ->getMock(); |
57 | 57 | |
58 | - $object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Attribute\Decorator\Base' ) |
|
59 | - ->setConstructorArgs( [$stub, $this->context] ) |
|
58 | + $object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Attribute\Decorator\Base') |
|
59 | + ->setConstructorArgs([$stub, $this->context]) |
|
60 | 60 | ->getMockForAbstractClass(); |
61 | 61 | |
62 | - $stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) ); |
|
62 | + $stub->expects($this->once())->method('invalid')->will($this->returnValue(true)); |
|
63 | 63 | |
64 | - $this->assertTrue( $object->invalid() ); |
|
64 | + $this->assertTrue($object->invalid()); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
68 | 68 | public function testAddFilterTypes() |
69 | 69 | { |
70 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' )->createSearch(); |
|
70 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'attribute')->createSearch(); |
|
71 | 71 | |
72 | - $this->stub->expects( $this->once() )->method( 'addFilterTypes' ) |
|
73 | - ->will( $this->returnArgument( 0 ) ); |
|
72 | + $this->stub->expects($this->once())->method('addFilterTypes') |
|
73 | + ->will($this->returnArgument(0)); |
|
74 | 74 | |
75 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->addFilterTypes( $search, [] ) ); |
|
75 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->addFilterTypes($search, [])); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | |
79 | 79 | public function testCreateFilter() |
80 | 80 | { |
81 | - $search = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' )->createSearch(); |
|
81 | + $search = \Aimeos\MShop\Factory::createManager($this->context, 'attribute')->createSearch(); |
|
82 | 82 | |
83 | - $this->stub->expects( $this->once() )->method( 'createFilter' ) |
|
84 | - ->will( $this->returnValue( $search ) ); |
|
83 | + $this->stub->expects($this->once())->method('createFilter') |
|
84 | + ->will($this->returnValue($search)); |
|
85 | 85 | |
86 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() ); |
|
86 | + $this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter()); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | |
90 | 90 | public function testGetItem() |
91 | 91 | { |
92 | - $item = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' )->createItem(); |
|
92 | + $item = \Aimeos\MShop\Factory::createManager($this->context, 'attribute')->createItem(); |
|
93 | 93 | |
94 | - $this->stub->expects( $this->once() )->method( 'getItem' ) |
|
95 | - ->will( $this->returnValue( $item ) ); |
|
94 | + $this->stub->expects($this->once())->method('getItem') |
|
95 | + ->will($this->returnValue($item)); |
|
96 | 96 | |
97 | - $this->assertInstanceOf( '\Aimeos\MShop\Attribute\Item\Iface', $this->object->getItem( -1 ) ); |
|
97 | + $this->assertInstanceOf('\Aimeos\MShop\Attribute\Item\Iface', $this->object->getItem( -1 )); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | |
101 | 101 | public function testGetItems() |
102 | 102 | { |
103 | - $this->stub->expects( $this->once() )->method( 'getItems' ) |
|
104 | - ->will( $this->returnValue( [] ) ); |
|
103 | + $this->stub->expects($this->once())->method('getItems') |
|
104 | + ->will($this->returnValue([])); |
|
105 | 105 | |
106 | - $this->assertEquals( [], $this->object->getItems( [-1], ['media'] ) ); |
|
106 | + $this->assertEquals([], $this->object->getItems([-1], ['media'])); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | |
110 | 110 | public function testSearchItems() |
111 | 111 | { |
112 | - $filter = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' )->createSearch(); |
|
112 | + $filter = \Aimeos\MShop\Factory::createManager($this->context, 'attribute')->createSearch(); |
|
113 | 113 | |
114 | - $this->stub->expects( $this->once() )->method( 'searchItems' ) |
|
115 | - ->will( $this->returnValue( [] ) ); |
|
114 | + $this->stub->expects($this->once())->method('searchItems') |
|
115 | + ->will($this->returnValue([])); |
|
116 | 116 | |
117 | - $this->assertEquals( [], $this->object->searchItems( $filter, ['media'] ) ); |
|
117 | + $this->assertEquals([], $this->object->searchItems($filter, ['media'])); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | |
121 | 121 | public function testGetController() |
122 | 122 | { |
123 | - $result = $this->access( 'getController' )->invokeArgs( $this->object, [] ); |
|
123 | + $result = $this->access('getController')->invokeArgs($this->object, []); |
|
124 | 124 | |
125 | - $this->assertSame( $this->stub, $result ); |
|
125 | + $this->assertSame($this->stub, $result); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | |
129 | - protected function access( $name ) |
|
129 | + protected function access($name) |
|
130 | 130 | { |
131 | - $class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Attribute\Decorator\Base' ); |
|
132 | - $method = $class->getMethod( $name ); |
|
133 | - $method->setAccessible( true ); |
|
131 | + $class = new \ReflectionClass('\Aimeos\Controller\Frontend\Attribute\Decorator\Base'); |
|
132 | + $method = $class->getMethod($name); |
|
133 | + $method->setAccessible(true); |
|
134 | 134 | |
135 | 135 | return $method; |
136 | 136 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | /** |
131 | 131 | * Returns the product item for the given ID if it's available |
132 | 132 | * |
133 | - * @param array $ids List of product IDs |
|
133 | + * @param integer[] $ids List of product IDs |
|
134 | 134 | * @param array $domains Domain names of items that are associated with the products and that should be fetched too |
135 | 135 | * @return string[] List of product items implementing \Aimeos\MShop\Product\Item\Iface |
136 | 136 | * @throws \Aimeos\Controller\Frontend\Catalog\Exception If product isn't available |
@@ -266,6 +266,7 @@ discard block |
||
266 | 266 | * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions |
267 | 267 | * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too |
268 | 268 | * @param integer &$total Parameter where the total number of found products will be stored in |
269 | + * @param integer $total |
|
269 | 270 | * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface |
270 | 271 | * @since 2015.08 |
271 | 272 | * @deprecated Use method in index controller instead |
@@ -29,9 +29,9 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 = []; |
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 |
||
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 | } |