Completed
Push — master ( 7164bc...d21ec6 )
by Aimeos
02:07
created
controller/frontend/src/Controller/Frontend/Service/Iface.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
31 31
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
32 32
 	 */
33
-	public function checkAttributes( $serviceId, array $attributes );
33
+	public function checkAttributes($serviceId, array $attributes);
34 34
 
35 35
 	/**
36 36
 	 * Returns the service item for the given ID
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
40 40
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
41 41
 	 */
42
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
42
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
43 43
 
44 44
 	/**
45 45
 	 * Returns the service providers for the given type
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
49 49
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
50 50
 	 */
51
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] );
51
+	public function getProviders($type = null, $ref = ['media', 'price', 'text']);
52 52
 
53 53
 	/**
54 54
 	 * Processes the service for the given order, e.g. payment and delivery services
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
62 62
 	 * 	or null if no form data is required
63 63
 	 */
64
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params );
64
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params);
65 65
 
66 66
 	/**
67 67
 	 * Updates the payment or delivery status for the given request
@@ -74,5 +74,5 @@  discard block
 block discarded – undo
74 74
 	 * @param string $orderid Unique ID of the order whose payment status should be updated
75 75
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
76 76
 	 */
77
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls, $code, $orderid );
77
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls, $code, $orderid);
78 78
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Customer/Iface.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
27 27
 	 * @since 2017.04
28 28
 	 */
29
-	public function addItem( array $values );
29
+	public function addItem(array $values);
30 30
 
31 31
 
32 32
 	/**
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
36 36
 	 * @since 2017.04
37 37
 	 */
38
-	public function createItem( array $values = [] );
38
+	public function createItem(array $values = []);
39 39
 
40 40
 
41 41
 	/**
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param string $id Unique customer ID
45 45
 	 * @since 2017.04
46 46
 	 */
47
-	public function deleteItem( $id );
47
+	public function deleteItem($id);
48 48
 
49 49
 
50 50
 	/**
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
56 56
 	 * @since 2017.04
57 57
 	 */
58
-	public function editItem( $id, array $values );
58
+	public function editItem($id, array $values);
59 59
 
60 60
 
61 61
 	/**
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
67 67
 	 * @since 2017.04
68 68
 	 */
69
-	public function getItem( $id = null, array $domains = [] );
69
+	public function getItem($id = null, array $domains = []);
70 70
 
71 71
 
72 72
 	/**
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
80 80
 	 * @since 2017.04
81 81
 	 */
82
-	public function findItem( $code, array $domains = [] );
82
+	public function findItem($code, array $domains = []);
83 83
 
84 84
 
85 85
 	/**
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
90 90
 	 * @since 2017.04
91 91
 	 */
92
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item );
92
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item);
93 93
 
94 94
 
95 95
 	/**
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer address item
100 100
 	 * @since 2017.04
101 101
 	 */
102
-	public function addAddressItem( array $values );
102
+	public function addAddressItem(array $values);
103 103
 
104 104
 
105 105
 	/**
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
109 109
 	 * @since 2017.04
110 110
 	 */
111
-	public function createAddressItem( array $values = [] );
111
+	public function createAddressItem(array $values = []);
112 112
 
113 113
 
114 114
 	/**
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	 * @param string $id Unique customer address ID
118 118
 	 * @since 2017.04
119 119
 	 */
120
-	public function deleteAddressItem( $id );
120
+	public function deleteAddressItem($id);
121 121
 
122 122
 
123 123
 	/**
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer address item
129 129
 	 * @since 2017.04
130 130
 	 */
131
-	public function editAddressItem( $id, array $values );
131
+	public function editAddressItem($id, array $values);
132 132
 
133 133
 
134 134
 	/**
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
139 139
 	 * @since 2017.04
140 140
 	 */
141
-	public function getAddressItem( $id );
141
+	public function getAddressItem($id);
142 142
 
143 143
 
144 144
 	/**
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
149 149
 	 * @since 2017.04
150 150
 	 */
151
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item );
151
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item);
152 152
 
153 153
 	/**
154 154
 	 * Creates and returns a new list item object
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
158 158
 	 * @since 2017.06
159 159
 	 */
160
-	public function addListItem( array $values );
160
+	public function addListItem(array $values);
161 161
 
162 162
 	/**
163 163
 	 * Returns a new customer lists filter criteria object
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	 * @param string $id Unique customer address ID
174 174
 	 * @since 2017.06
175 175
 	 */
176
-	public function deleteListItem( $id );
176
+	public function deleteListItem($id);
177 177
 
178 178
 	/**
179 179
 	 * Saves a modified customer lists item object
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
184 184
 	 * @since 2017.06
185 185
 	 */
186
-	public function editListItem( $id, array $values );
186
+	public function editListItem($id, array $values);
187 187
 
188 188
 	/**
189 189
 	 * Returns the customer item for the given customer ID
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
193 193
 	 * @since 2017.06
194 194
 	 */
195
-	public function getListItem( $id );
195
+	public function getListItem($id);
196 196
 
197 197
 	/**
198 198
 	 * Returns the customer lists items filtered by the given criteria
@@ -202,5 +202,5 @@  discard block
 block discarded – undo
202 202
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items
203 203
 	 * @since 2017.06
204 204
 	 */
205
-	public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null );
205
+	public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null);
206 206
 }
Please login to merge, or discard this patch.
controller/frontend/tests/TestHelperFrontend.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -15,15 +15,15 @@  discard block
 block discarded – undo
15 15
 	public static function bootstrap()
16 16
 	{
17 17
 		self::getAimeos();
18
-		\Aimeos\MShop\Factory::setCache( false );
19
-		\Aimeos\Controller\Frontend\Factory::setCache( false );
18
+		\Aimeos\MShop\Factory::setCache(false);
19
+		\Aimeos\Controller\Frontend\Factory::setCache(false);
20 20
 	}
21 21
 
22 22
 
23
-	public static function getContext( $site = 'unittest' )
23
+	public static function getContext($site = 'unittest')
24 24
 	{
25
-		if( !isset( self::$context[$site] ) ) {
26
-			self::$context[$site] = self::createContext( $site );
25
+		if (!isset(self::$context[$site])) {
26
+			self::$context[$site] = self::createContext($site);
27 27
 		}
28 28
 
29 29
 		return clone self::$context[$site];
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
 
33 33
 	private static function getAimeos()
34 34
 	{
35
-		if( !isset( self::$aimeos ) )
35
+		if (!isset(self::$aimeos))
36 36
 		{
37 37
 			require_once 'Bootstrap.php';
38
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
38
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
39 39
 
40
-			$extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) );
41
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
40
+			$extdir = dirname(dirname(dirname(dirname(dirname(__FILE__)))));
41
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
42 42
 		}
43 43
 
44 44
 		return self::$aimeos;
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	/**
49 49
 	 * @param string $site
50 50
 	 */
51
-	private static function createContext( $site )
51
+	private static function createContext($site)
52 52
 	{
53 53
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
54 54
 		$aimeos = self::getAimeos();
@@ -58,38 +58,38 @@  discard block
 block discarded – undo
58 58
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
59 59
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
60 60
 
61
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
62
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
63
-		$conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file );
64
-		$ctx->setConfig( $conf );
61
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
62
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
63
+		$conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file);
64
+		$ctx->setConfig($conf);
65 65
 
66 66
 
67
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
68
-		$ctx->setDatabaseManager( $dbm );
67
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
68
+		$ctx->setDatabaseManager($dbm);
69 69
 
70 70
 
71
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $conf );
72
-		$ctx->setMessageQueueManager( $mq );
71
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($conf);
72
+		$ctx->setMessageQueueManager($mq);
73 73
 
74 74
 
75
-		$logger = new \Aimeos\MW\Logger\File( 'unittest.log', \Aimeos\MW\Logger\Base::DEBUG );
76
-		$ctx->setLogger( $logger );
75
+		$logger = new \Aimeos\MW\Logger\File('unittest.log', \Aimeos\MW\Logger\Base::DEBUG);
76
+		$ctx->setLogger($logger);
77 77
 
78 78
 
79
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
80
-		$ctx->setI18n( array( 'de' => $i18n ) );
79
+		$i18n = new \Aimeos\MW\Translation\None('de');
80
+		$ctx->setI18n(array('de' => $i18n));
81 81
 
82 82
 
83 83
 		$session = new \Aimeos\MW\Session\None();
84
-		$ctx->setSession( $session );
84
+		$ctx->setSession($session);
85 85
 
86 86
 
87
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
88
-		$locale = $localeManager->bootstrap( $site, '', '', false );
89
-		$ctx->setLocale( $locale );
87
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
88
+		$locale = $localeManager->bootstrap($site, '', '', false);
89
+		$ctx->setLocale($locale);
90 90
 
91 91
 
92
-		$ctx->setEditor( 'core:controller/frontend' );
92
+		$ctx->setEditor('core:controller/frontend');
93 93
 
94 94
 		return $ctx;
95 95
 	}
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Customer/StandardTest.php 1 patch
Spacing   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -18,121 +18,121 @@  discard block
 block discarded – undo
18 18
 	protected function setUp()
19 19
 	{
20 20
 		$this->context = \TestHelperFrontend::getContext();
21
-		$this->object = new \Aimeos\Controller\Frontend\Customer\Standard( $this->context );
21
+		$this->object = new \Aimeos\Controller\Frontend\Customer\Standard($this->context);
22 22
 	}
23 23
 
24 24
 
25 25
 	protected function tearDown()
26 26
 	{
27
-		unset( $this->context, $this->object );
27
+		unset($this->context, $this->object);
28 28
 	}
29 29
 
30 30
 
31 31
 	public function testAddEditSaveDeleteItem()
32 32
 	{
33
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
34
-		$id = $manager->findItem( 'UTC001' )->getId();
33
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
34
+		$id = $manager->findItem('UTC001')->getId();
35 35
 
36
-		$this->context->setUserId( $id );
37
-		$item = $this->object->addItem( ['customer.code' => 'unittest-ctnl', 'customer.status' => 1] );
38
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
36
+		$this->context->setUserId($id);
37
+		$item = $this->object->addItem(['customer.code' => 'unittest-ctnl', 'customer.status' => 1]);
38
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
39 39
 
40
-		$this->context->setUserId( $item->getId() );
41
-		$item = $this->object->editItem( $item->getId(), ['customer.code' => 'unittest-ctnl2'] );
42
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
40
+		$this->context->setUserId($item->getId());
41
+		$item = $this->object->editItem($item->getId(), ['customer.code' => 'unittest-ctnl2']);
42
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
43 43
 
44
-		$item->setStatus( 0 );
45
-		$item = $this->object->saveItem( $item );
46
-		$this->assertEquals( 0, $item->getStatus() );
44
+		$item->setStatus(0);
45
+		$item = $this->object->saveItem($item);
46
+		$this->assertEquals(0, $item->getStatus());
47 47
 
48
-		$this->object->deleteItem( $item->getId() );
48
+		$this->object->deleteItem($item->getId());
49 49
 
50
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
51
-		$manager->findItem( 'unittest-ctnl' );
50
+		$this->setExpectedException('\Aimeos\MShop\Exception');
51
+		$manager->findItem('unittest-ctnl');
52 52
 	}
53 53
 
54 54
 
55 55
 	public function testAddExistingItem()
56 56
 	{
57
-		$item = $this->object->addItem( ['customer.code' => 'UTC001'] );
58
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
57
+		$item = $this->object->addItem(['customer.code' => 'UTC001']);
58
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
59 59
 	}
60 60
 
61 61
 
62 62
 	public function testCreateItem()
63 63
 	{
64 64
 		$result = $this->object->createItem();
65
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
65
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
66 66
 	}
67 67
 
68 68
 
69 69
 	public function testGetItem()
70 70
 	{
71
-		$id = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' )->getId();
72
-		$this->context->setUserId( $id );
71
+		$id = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001')->getId();
72
+		$this->context->setUserId($id);
73 73
 
74
-		$result = $this->object->getItem( $id, ['customer/address', 'text'] );
74
+		$result = $this->object->getItem($id, ['customer/address', 'text']);
75 75
 
76
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
77
-		$this->assertEquals( 1, count( $result->getRefItems( 'text' ) ) );
78
-		$this->assertEquals( 1, count( $result->getAddressItems() ) );
76
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
77
+		$this->assertEquals(1, count($result->getRefItems('text')));
78
+		$this->assertEquals(1, count($result->getAddressItems()));
79 79
 	}
80 80
 
81 81
 
82 82
 	public function testFindItem()
83 83
 	{
84
-		$result = $this->object->findItem( 'UTC001' );
85
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
84
+		$result = $this->object->findItem('UTC001');
85
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
86 86
 	}
87 87
 
88 88
 
89 89
 	public function testAddEditSaveDeleteAddressItem()
90 90
 	{
91
-		$customer = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' );
92
-		$this->context->setUserId( $customer->getId() );
91
+		$customer = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001');
92
+		$this->context->setUserId($customer->getId());
93 93
 
94
-		$item = $this->object->addAddressItem( ['customer.address.lastname' => 'unittest-ctnl'] );
95
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $item );
94
+		$item = $this->object->addAddressItem(['customer.address.lastname' => 'unittest-ctnl']);
95
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $item);
96 96
 
97
-		$item = $this->object->editAddressItem( $item->getId(), ['customer.address.lastname' => 'unittest-ctnl2'] );
98
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $item );
97
+		$item = $this->object->editAddressItem($item->getId(), ['customer.address.lastname' => 'unittest-ctnl2']);
98
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $item);
99 99
 
100
-		$item->setLastName( 'test' );
101
-		$this->object->saveAddressItem( $item );
102
-		$this->assertEquals( 'test', $item->getLastName() );
100
+		$item->setLastName('test');
101
+		$this->object->saveAddressItem($item);
102
+		$this->assertEquals('test', $item->getLastName());
103 103
 
104
-		$this->object->deleteAddressItem( $item->getId() );
104
+		$this->object->deleteAddressItem($item->getId());
105 105
 	}
106 106
 
107 107
 
108 108
 	public function testCreateAddressItem()
109 109
 	{
110 110
 		$result = $this->object->createAddressItem();
111
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $result );
111
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $result);
112 112
 	}
113 113
 
114 114
 
115 115
 	public function testGetAddressItem()
116 116
 	{
117
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' );
117
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address');
118 118
 		$search = $manager->createSearch();
119
-		$search->setSlice( 0, 1 );
120
-		$result = $manager->searchItems( $search );
119
+		$search->setSlice(0, 1);
120
+		$result = $manager->searchItems($search);
121 121
 
122
-		if( ( $item = reset( $result ) ) === false ) {
123
-			throw new \RuntimeException( 'No customer address available' );
122
+		if (($item = reset($result)) === false) {
123
+			throw new \RuntimeException('No customer address available');
124 124
 		}
125 125
 
126
-		$this->context->setUserId( $item->getParentId() );
127
-		$result = $this->object->getAddressItem( $item->getId() );
128
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $result );
126
+		$this->context->setUserId($item->getParentId());
127
+		$result = $this->object->getAddressItem($item->getId());
128
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $result);
129 129
 	}
130 130
 
131 131
 
132 132
 	public function testAddEditDeleteListItem()
133 133
 	{
134
-		$customer = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' );
135
-		$this->context->setUserId( $customer->getId() );
134
+		$customer = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001');
135
+		$this->context->setUserId($customer->getId());
136 136
 
137 137
 		$values = [
138 138
 			'customer.lists.type' => 'favorite',
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
140 140
 			'customer.lists.refid' => '-1'
141 141
 		];
142 142
 
143
-		$item = $this->object->addListItem( $values );
144
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
143
+		$item = $this->object->addListItem($values);
144
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
145 145
 
146 146
 		$values = [
147 147
 			'customer.lists.type' => 'favorite',
@@ -149,46 +149,46 @@  discard block
 block discarded – undo
149 149
 			'customer.lists.refid' => '-2'
150 150
 		];
151 151
 
152
-		$item = $this->object->editListItem( $item->getId(), $values );
153
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
152
+		$item = $this->object->editListItem($item->getId(), $values);
153
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
154 154
 
155
-		$this->object->deleteListItem( $item->getId() );
155
+		$this->object->deleteListItem($item->getId());
156 156
 
157
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
158
-		$this->object->getListItem( $item->getId() );
157
+		$this->setExpectedException('\Aimeos\MShop\Exception');
158
+		$this->object->getListItem($item->getId());
159 159
 	}
160 160
 
161 161
 
162 162
 	public function testGetListItem()
163 163
 	{
164
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/lists' );
164
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/lists');
165 165
 		$search = $manager->createSearch();
166
-		$search->setSlice( 0, 1 );
167
-		$result = $manager->searchItems( $search );
166
+		$search->setSlice(0, 1);
167
+		$result = $manager->searchItems($search);
168 168
 
169
-		if( ( $item = reset( $result ) ) === false ) {
170
-			throw new \RuntimeException( 'No customer lists item available' );
169
+		if (($item = reset($result)) === false) {
170
+			throw new \RuntimeException('No customer lists item available');
171 171
 		}
172 172
 
173
-		$this->context->setUserId( $item->getParentId() );
174
-		$result = $this->object->getListItem( $item->getId() );
175
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $result );
173
+		$this->context->setUserId($item->getParentId());
174
+		$result = $this->object->getListItem($item->getId());
175
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $result);
176 176
 	}
177 177
 
178 178
 
179 179
 	public function testSearchListItem()
180 180
 	{
181
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
182
-		$customer = $manager->findItem( 'UTC001' );
183
-		$this->context->setUserId( $customer->getId() );
181
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
182
+		$customer = $manager->findItem('UTC001');
183
+		$this->context->setUserId($customer->getId());
184 184
 
185 185
 		$filter = $this->object->createListsFilter();
186
-		$result = $this->object->searchListItems( $filter );
186
+		$result = $this->object->searchListItems($filter);
187 187
 
188
-		foreach( $result as $item )
188
+		foreach ($result as $item)
189 189
 		{
190
-			$this->assertEquals( $customer->getId(), $item->getParentId() );
191
-			$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
190
+			$this->assertEquals($customer->getId(), $item->getParentId());
191
+			$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
192 192
 		}
193 193
 	}
194 194
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Order/Standard.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 	 * @param string $type Arbitrary order type (max. eight chars)
30 30
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
31 31
 	 */
32
-	public function addItem( $baseId, $type )
32
+	public function addItem($baseId, $type)
33 33
 	{
34 34
 		$total = 0;
35 35
 		$context = $this->getContext();
36
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
36
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
37 37
 
38 38
 		/** controller/frontend/order/limit-seconds
39 39
 		 * Order limitation time frame in seconds
@@ -51,24 +51,24 @@  discard block
 block discarded – undo
51 51
 		 * @see controller/frontend/basket/limit-count
52 52
 		 * @see controller/frontend/basket/limit-seconds
53 53
 		 */
54
-		$seconds = $context->getConfig()->get( 'controller/frontend/order/limit-seconds', 300 );
54
+		$seconds = $context->getConfig()->get('controller/frontend/order/limit-seconds', 300);
55 55
 
56 56
 		$search = $manager->createSearch();
57 57
 		$expr = [
58
-			$search->compare( '==', 'order.baseid', $baseId ),
59
-			$search->compare( '>=', 'order.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
58
+			$search->compare('==', 'order.baseid', $baseId),
59
+			$search->compare('>=', 'order.ctime', date('Y-m-d H:i:s', time() - $seconds)),
60 60
 		];
61
-		$search->setConditions( $search->combine( '&&', $expr ) );
62
-		$search->setSlice( 0, 0 );
61
+		$search->setConditions($search->combine('&&', $expr));
62
+		$search->setSlice(0, 0);
63 63
 
64
-		$manager->searchItems( $search, [], $total );
64
+		$manager->searchItems($search, [], $total);
65 65
 
66
-		if( $total > 0 ) {
67
-			throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'The order has already been created' ) );
66
+		if ($total > 0) {
67
+			throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('The order has already been created'));
68 68
 		}
69 69
 
70
-		$item = $manager->createItem()->setBaseId( $baseId )->setType( $type );
71
-		return $manager->saveItem( $item );
70
+		$item = $manager->createItem()->setBaseId($baseId)->setType($type);
71
+		return $manager->saveItem($item);
72 72
 	}
73 73
 
74 74
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function createFilter()
81 81
 	{
82
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' )->createSearch( true );
82
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'order')->createSearch(true);
83 83
 	}
84 84
 
85 85
 
@@ -90,30 +90,30 @@  discard block
 block discarded – undo
90 90
 	 * @param boolean $default Use default criteria to limit orders
91 91
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
92 92
 	 */
93
-	public function getItem( $id, $default = true )
93
+	public function getItem($id, $default = true)
94 94
 	{
95 95
 		$context = $this->getContext();
96
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
96
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
97 97
 
98
-		$search = $manager->createSearch( true );
98
+		$search = $manager->createSearch(true);
99 99
 		$expr = [
100
-			$search->compare( '==', 'order.id', $id ),
100
+			$search->compare('==', 'order.id', $id),
101 101
 			$search->getConditions(),
102 102
 		];
103 103
 
104
-		if( $default !== false ) {
105
-			$expr[] = $search->compare( '==', 'order.editor', $context->getEditor() );
104
+		if ($default !== false) {
105
+			$expr[] = $search->compare('==', 'order.editor', $context->getEditor());
106 106
 		}
107 107
 
108
-		$search->setConditions( $search->combine( '&&', $expr ) );
108
+		$search->setConditions($search->combine('&&', $expr));
109 109
 
110
-		$items = $manager->searchItems( $search );
110
+		$items = $manager->searchItems($search);
111 111
 
112
-		if( ( $item = reset( $items ) ) !== false ) {
112
+		if (($item = reset($items)) !== false) {
113 113
 			return $item;
114 114
 		}
115 115
 
116
-		throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'No order item for ID "%1$s" found', $id ) );
116
+		throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('No order item for ID "%1$s" found', $id));
117 117
 	}
118 118
 
119 119
 
@@ -123,10 +123,10 @@  discard block
 block discarded – undo
123 123
 	 * @param \Aimeos\MShop\Order\Item\Iface $item Order object
124 124
 	 * @return \Aimeos\MShop\Order\Item\Iface Saved order item
125 125
 	 */
126
-	public function saveItem( \Aimeos\MShop\Order\Item\Iface $item )
126
+	public function saveItem(\Aimeos\MShop\Order\Item\Iface $item)
127 127
 	{
128
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' );
129
-		return $manager->saveItem( $item );
128
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order');
129
+		return $manager->saveItem($item);
130 130
 	}
131 131
 
132 132
 
@@ -137,18 +137,18 @@  discard block
 block discarded – undo
137 137
 	 * @param integer|null &$total Variable that will contain the total number of available items
138 138
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
139 139
 	 */
140
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
140
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
141 141
 	{
142 142
 		$context = $this->getContext();
143
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
143
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
144 144
 
145 145
 		$expr = [
146 146
 			$filter->getConditions(),
147
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
147
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
148 148
 		];
149
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
149
+		$filter->setConditions($filter->combine('&&', $expr));
150 150
 
151
-		return $manager->searchItems( $filter, [], $total );
151
+		return $manager->searchItems($filter, [], $total);
152 152
 	}
153 153
 
154 154
 
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
170 170
 	 *
171 171
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
172 172
 	 */
173
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
173
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
174 174
 	{
175
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem );
175
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem);
176 176
 	}
177 177
 
178 178
 
@@ -194,9 +194,9 @@  discard block
 block discarded – undo
194 194
 	 *
195 195
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
196 196
 	 */
197
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
197
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
198 198
 	{
199
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem );
199
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem);
200 200
 	}
201 201
 
202 202
 
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 	 *
215 215
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
216 216
 	 */
217
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
217
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
218 218
 	{
219
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem );
219
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem);
220 220
 	}
221 221
 
222 222
 
@@ -231,22 +231,22 @@  discard block
 block discarded – undo
231 231
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
232 232
 	 * @deprecated 2017.04 Use store() from basket controller instead
233 233
 	 */
234
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket )
234
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket)
235 235
 	{
236 236
 		$context = $this->getContext();
237 237
 
238
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
239
-		$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
238
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
239
+		$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
240 240
 
241 241
 
242 242
 		$orderBaseManager->begin();
243
-		$orderBaseManager->store( $basket );
243
+		$orderBaseManager->store($basket);
244 244
 		$orderBaseManager->commit();
245 245
 
246 246
 		$orderItem = $orderManager->createItem();
247
-		$orderItem->setBaseId( $basket->getId() );
248
-		$orderItem->setType( \Aimeos\MShop\Order\Item\Base::TYPE_WEB );
247
+		$orderItem->setBaseId($basket->getId());
248
+		$orderItem->setType(\Aimeos\MShop\Order\Item\Base::TYPE_WEB);
249 249
 
250
-		return $orderManager->saveItem( $orderItem );
250
+		return $orderManager->saveItem($orderItem);
251 251
 	}
252 252
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Order/StandardTest.php 1 patch
Spacing   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -18,200 +18,200 @@
 block discarded – undo
18 18
 
19 19
 	protected function setUp()
20 20
 	{
21
-		\Aimeos\MShop\Factory::setCache( true );
21
+		\Aimeos\MShop\Factory::setCache(true);
22 22
 
23 23
 		$this->context = \TestHelperFrontend::getContext();
24
-		$this->object = new \Aimeos\Controller\Frontend\Order\Standard( $this->context );
24
+		$this->object = new \Aimeos\Controller\Frontend\Order\Standard($this->context);
25 25
 	}
26 26
 
27 27
 
28 28
 	protected function tearDown()
29 29
 	{
30
-		unset( $this->object, $this->context );
30
+		unset($this->object, $this->context);
31 31
 
32
-		\Aimeos\MShop\Factory::setCache( false );
32
+		\Aimeos\MShop\Factory::setCache(false);
33 33
 		\Aimeos\MShop\Factory::clear();
34 34
 	}
35 35
 
36 36
 
37 37
 	public function testAddItem()
38 38
 	{
39
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
40
-			->setConstructorArgs( [$this->context] )
41
-			->setMethods( ['saveItem'] )
39
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
40
+			->setConstructorArgs([$this->context])
41
+			->setMethods(['saveItem'])
42 42
 			->getMock();
43 43
 
44
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $manager );
44
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $manager);
45 45
 
46
-		$manager->expects( $this->once() )->method( 'saveItem' )
47
-			->will( $this->returnValue( $manager->createItem() ) );
46
+		$manager->expects($this->once())->method('saveItem')
47
+			->will($this->returnValue($manager->createItem()));
48 48
 
49
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ) );
49
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ));
50 50
 	}
51 51
 
52 52
 
53 53
 	public function testAddItemLimit()
54 54
 	{
55
-		$this->context->getConfig()->set( 'controller/frontend/order/limit-seconds', 86400 * 365 );
55
+		$this->context->getConfig()->set('controller/frontend/order/limit-seconds', 86400 * 365);
56 56
 
57
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' );
58
-		$result = $manager->searchItems( $manager->createSearch()->setSlice( 0, 1 ) );
57
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base');
58
+		$result = $manager->searchItems($manager->createSearch()->setSlice(0, 1));
59 59
 
60
-		if( ( $item = reset( $result ) ) === false ) {
61
-			throw new \RuntimeException( 'No order item found' );
60
+		if (($item = reset($result)) === false) {
61
+			throw new \RuntimeException('No order item found');
62 62
 		}
63 63
 
64
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Order\Exception' );
65
-		$this->object->addItem( $item->getId(), 'test' );
64
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Order\Exception');
65
+		$this->object->addItem($item->getId(), 'test');
66 66
 	}
67 67
 
68 68
 
69 69
 	public function testCreateFilter()
70 70
 	{
71
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
71
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
72 72
 	}
73 73
 
74 74
 
75 75
 	public function testGetItem()
76 76
 	{
77
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
78
-		$customerItem = $manager->findItem( 'UTC001' );
77
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
78
+		$customerItem = $manager->findItem('UTC001');
79 79
 
80
-		$this->context->setEditor( 'core:unittest' );
80
+		$this->context->setEditor('core:unittest');
81 81
 
82
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order' );
83
-		$search = $manager->createSearch()->setSlice( 0, 1 );
84
-		$search->setConditions( $search->compare( '==', 'order.base.customerid', $customerItem->getId() ) );
85
-		$result = $manager->searchItems( $search );
82
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order');
83
+		$search = $manager->createSearch()->setSlice(0, 1);
84
+		$search->setConditions($search->compare('==', 'order.base.customerid', $customerItem->getId()));
85
+		$result = $manager->searchItems($search);
86 86
 
87
-		if( ( $item = reset( $result ) ) === false ) {
88
-			throw new \RuntimeException( 'No order item found' );
87
+		if (($item = reset($result)) === false) {
88
+			throw new \RuntimeException('No order item found');
89 89
 		}
90 90
 
91
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->getItem( $item->getId() ) );
91
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->getItem($item->getId()));
92 92
 	}
93 93
 
94 94
 
95 95
 	public function testGetItemException()
96 96
 	{
97
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Order\Exception' );
97
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Order\Exception');
98 98
 		$this->object->getItem( -1 );
99 99
 	}
100 100
 
101 101
 
102 102
 	public function testSaveItem()
103 103
 	{
104
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
105
-			->setConstructorArgs( [$this->context] )
106
-			->setMethods( ['saveItem'] )
104
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
105
+			->setConstructorArgs([$this->context])
106
+			->setMethods(['saveItem'])
107 107
 			->getMock();
108 108
 
109
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $manager );
109
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $manager);
110 110
 
111
-		$manager->expects( $this->once() )->method( 'saveItem' )
112
-			->will( $this->returnValue( $manager->createItem() ) );
111
+		$manager->expects($this->once())->method('saveItem')
112
+			->will($this->returnValue($manager->createItem()));
113 113
 
114
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->saveItem( $manager->createItem() ) );
114
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->saveItem($manager->createItem()));
115 115
 	}
116 116
 
117 117
 
118 118
 	public function testSearchItems()
119 119
 	{
120
-		$this->assertGreaterThan( 1, $this->object->searchItems( $this->object->createFilter() ) );
120
+		$this->assertGreaterThan(1, $this->object->searchItems($this->object->createFilter()));
121 121
 	}
122 122
 
123 123
 
124 124
 	public function testStore()
125 125
 	{
126 126
 		$name = 'ControllerFrontendOrderStore';
127
-		$this->context->getConfig()->set( 'mshop/order/manager/name', $name );
127
+		$this->context->getConfig()->set('mshop/order/manager/name', $name);
128 128
 
129 129
 
130
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
131
-			->setMethods( array( 'saveItem', 'getSubManager' ) )
132
-			->setConstructorArgs( array( $this->context ) )
130
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
131
+			->setMethods(array('saveItem', 'getSubManager'))
132
+			->setConstructorArgs(array($this->context))
133 133
 			->getMock();
134 134
 
135
-		$orderBaseManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard' )
136
-			->setMethods( array( 'store' ) )
137
-			->setConstructorArgs( array( $this->context ) )
135
+		$orderBaseManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard')
136
+			->setMethods(array('store'))
137
+			->setConstructorArgs(array($this->context))
138 138
 			->getMock();
139 139
 
140
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
140
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
141 141
 
142 142
 
143 143
 		$orderBaseItem = $orderBaseManagerStub->createItem();
144
-		$orderBaseItem->setId( 1 );
144
+		$orderBaseItem->setId(1);
145 145
 
146 146
 
147
-		$orderBaseManagerStub->expects( $this->once() )->method( 'store' );
147
+		$orderBaseManagerStub->expects($this->once())->method('store');
148 148
 
149
-		$orderManagerStub->expects( $this->once() )->method( 'getSubManager' )
150
-			->will( $this->returnValue( $orderBaseManagerStub ) );
149
+		$orderManagerStub->expects($this->once())->method('getSubManager')
150
+			->will($this->returnValue($orderBaseManagerStub));
151 151
 
152
-		$orderManagerStub->expects( $this->once() )->method( 'saveItem' );
152
+		$orderManagerStub->expects($this->once())->method('saveItem');
153 153
 
154 154
 
155
-		$this->object->store( $orderBaseItem );
155
+		$this->object->store($orderBaseItem);
156 156
 	}
157 157
 
158 158
 
159 159
 	public function testBlock()
160 160
 	{
161 161
 		$name = 'ControllerFrontendOrderBlock';
162
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
162
+		$this->context->getConfig()->set('controller/common/order/name', $name);
163 163
 
164 164
 
165
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
166
-			->setMethods( array( 'block' ) )
167
-			->setConstructorArgs( array( $this->context ) )
165
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
166
+			->setMethods(array('block'))
167
+			->setConstructorArgs(array($this->context))
168 168
 			->getMock();
169 169
 
170
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
170
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
171 171
 
172
-		$orderCntlStub->expects( $this->once() )->method( 'block' );
172
+		$orderCntlStub->expects($this->once())->method('block');
173 173
 
174 174
 
175
-		$this->object->block( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
175
+		$this->object->block(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
176 176
 	}
177 177
 
178 178
 
179 179
 	public function testUnblock()
180 180
 	{
181 181
 		$name = 'ControllerFrontendOrderUnblock';
182
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
182
+		$this->context->getConfig()->set('controller/common/order/name', $name);
183 183
 
184 184
 
185
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
186
-			->setMethods( array( 'unblock' ) )
187
-			->setConstructorArgs( array( $this->context ) )
185
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
186
+			->setMethods(array('unblock'))
187
+			->setConstructorArgs(array($this->context))
188 188
 			->getMock();
189 189
 
190
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
190
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
191 191
 
192
-		$orderCntlStub->expects( $this->once() )->method( 'unblock' );
192
+		$orderCntlStub->expects($this->once())->method('unblock');
193 193
 
194 194
 
195
-		$this->object->unblock( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
195
+		$this->object->unblock(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
196 196
 	}
197 197
 
198 198
 
199 199
 	public function testUpdate()
200 200
 	{
201 201
 		$name = 'ControllerFrontendOrderUpdate';
202
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
202
+		$this->context->getConfig()->set('controller/common/order/name', $name);
203 203
 
204 204
 
205
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
206
-			->setMethods( array( 'update' ) )
207
-			->setConstructorArgs( array( $this->context ) )
205
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
206
+			->setMethods(array('update'))
207
+			->setConstructorArgs(array($this->context))
208 208
 			->getMock();
209 209
 
210
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
210
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
211 211
 
212
-		$orderCntlStub->expects( $this->once() )->method( 'update' );
212
+		$orderCntlStub->expects($this->once())->method('update');
213 213
 
214 214
 
215
-		$this->object->update( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
215
+		$this->object->update(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
216 216
 	}
217 217
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Customer/Standard.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,8 +47,7 @@
 block discarded – undo
47 47
 		try
48 48
 		{
49 49
 			$item = $manager->findItem( $list['customer.code'] );
50
-		}
51
-		catch( \Aimeos\MShop\Exception $e )
50
+		} catch( \Aimeos\MShop\Exception $e )
52 51
 		{
53 52
 			$this->checkLimit( $list );
54 53
 
Please login to merge, or discard this patch.
Spacing   +134 added lines, -134 removed lines patch added patch discarded remove patch
@@ -28,33 +28,33 @@  discard block
 block discarded – undo
28 28
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
29 29
 	 * @since 2017.04
30 30
 	 */
31
-	public function addItem( array $values )
31
+	public function addItem(array $values)
32 32
 	{
33 33
 		$list = [];
34 34
 		$context = $this->getContext();
35 35
 		$config = $context->getConfig();
36 36
 
37 37
 		// Show only generated passwords in account creation e-mails
38
-		$pass = ( isset( $values['customer.password'] ) ? false : true );
38
+		$pass = (isset($values['customer.password']) ? false : true);
39 39
 
40
-		foreach( $values as $key => $val ) {
41
-			$list[str_replace( 'order.base.address', 'customer', $key )] = $val;
40
+		foreach ($values as $key => $val) {
41
+			$list[str_replace('order.base.address', 'customer', $key)] = $val;
42 42
 		}
43 43
 
44
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
45
-		$list = $this->addItemDefaults( $list );
44
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
45
+		$list = $this->addItemDefaults($list);
46 46
 
47 47
 		try
48 48
 		{
49
-			$item = $manager->findItem( $list['customer.code'] );
49
+			$item = $manager->findItem($list['customer.code']);
50 50
 		}
51
-		catch( \Aimeos\MShop\Exception $e )
51
+		catch (\Aimeos\MShop\Exception $e)
52 52
 		{
53
-			$this->checkLimit( $list );
53
+			$this->checkLimit($list);
54 54
 
55 55
 			$item = $manager->createItem();
56
-			$item->fromArray( $list );
57
-			$item->setId( null );
56
+			$item->fromArray($list);
57
+			$item->setId(null);
58 58
 
59 59
 			/** controller/frontend/customer/groupids
60 60
 			 * List of groups new customers should be assigned to
@@ -68,14 +68,14 @@  discard block
 block discarded – undo
68 68
 			 * @category User
69 69
 			 * @category Developer
70 70
 			 */
71
-			$gids = $config->get( 'client/html/checkout/standard/order/account/standard/groupids', [] ); // @deprecated
72
-			$item->setGroups( (array) $config->get( 'controller/frontend/customer/groupids', $gids ) );
71
+			$gids = $config->get('client/html/checkout/standard/order/account/standard/groupids', []); // @deprecated
72
+			$item->setGroups((array) $config->get('controller/frontend/customer/groupids', $gids));
73 73
 
74
-			$item = $manager->saveItem( $item );
74
+			$item = $manager->saveItem($item);
75 75
 
76 76
 			$msg = $item->toArray();
77
-			$msg['customer.password'] = ( $pass ? $list['customer.password'] : null );
78
-			$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
77
+			$msg['customer.password'] = ($pass ? $list['customer.password'] : null);
78
+			$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
79 79
 		}
80 80
 
81 81
 		return $item;
@@ -87,14 +87,14 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
89 89
 	 */
90
-	public function createItem( array $values = [] )
90
+	public function createItem(array $values = [])
91 91
 	{
92
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
92
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
93 93
 
94 94
 		$item = $manager->createItem();
95
-		$item->fromArray( $values );
96
-		$item->setId( null );
97
-		$item->setStatus( 1 );
95
+		$item->fromArray($values);
96
+		$item->setId(null);
97
+		$item->setStatus(1);
98 98
 
99 99
 		return $item;
100 100
 	}
@@ -106,12 +106,12 @@  discard block
 block discarded – undo
106 106
 	 * @param string $id Unique customer ID
107 107
 	 * @since 2017.04
108 108
 	 */
109
-	public function deleteItem( $id )
109
+	public function deleteItem($id)
110 110
 	{
111
-		$this->checkUser( $id );
111
+		$this->checkUser($id);
112 112
 
113
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
114
-		$manager->deleteItem( $id );
113
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
114
+		$manager->deleteItem($id);
115 115
 	}
116 116
 
117 117
 
@@ -123,17 +123,17 @@  discard block
 block discarded – undo
123 123
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
124 124
 	 * @since 2017.04
125 125
 	 */
126
-	public function editItem( $id, array $values )
126
+	public function editItem($id, array $values)
127 127
 	{
128
-		$this->checkUser( $id );
128
+		$this->checkUser($id);
129 129
 
130
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
131
-		$item = $manager->getItem( $id, ['customer/group'], true );
130
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
131
+		$item = $manager->getItem($id, ['customer/group'], true);
132 132
 
133
-		unset( $values['customer.id'] );
134
-		$item->fromArray( $values );
133
+		unset($values['customer.id']);
134
+		$item->fromArray($values);
135 135
 
136
-		return $manager->saveItem( $item );
136
+		return $manager->saveItem($item);
137 137
 	}
138 138
 
139 139
 
@@ -145,17 +145,17 @@  discard block
 block discarded – undo
145 145
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
146 146
 	 * @since 2017.04
147 147
 	 */
148
-	public function getItem( $id = null, array $domains = [] )
148
+	public function getItem($id = null, array $domains = [])
149 149
 	{
150
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
150
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
151 151
 
152
-		if( $id == null ) {
153
-			return $manager->getItem( $this->getContext()->getUserId(), $domains, true );
152
+		if ($id == null) {
153
+			return $manager->getItem($this->getContext()->getUserId(), $domains, true);
154 154
 		}
155 155
 
156
-		$this->checkUser( $id );
156
+		$this->checkUser($id);
157 157
 
158
-		return $manager->getItem( $id, $domains, true );
158
+		return $manager->getItem($id, $domains, true);
159 159
 	}
160 160
 
161 161
 
@@ -169,9 +169,9 @@  discard block
 block discarded – undo
169 169
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
170 170
 	 * @since 2017.04
171 171
 	 */
172
-	public function findItem( $code, array $domains = [] )
172
+	public function findItem($code, array $domains = [])
173 173
 	{
174
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains );
174
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains);
175 175
 	}
176 176
 
177 177
 
@@ -181,9 +181,9 @@  discard block
 block discarded – undo
181 181
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item
182 182
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
183 183
 	 */
184
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
184
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
185 185
 	{
186
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
186
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
187 187
 	}
188 188
 
189 189
 
@@ -194,17 +194,17 @@  discard block
 block discarded – undo
194 194
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
195 195
 	 * @since 2017.04
196 196
 	 */
197
-	public function addAddressItem( array $values )
197
+	public function addAddressItem(array $values)
198 198
 	{
199 199
 		$context = $this->getContext();
200
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
200
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
201 201
 
202 202
 		$item = $manager->createItem();
203
-		$item->fromArray( $values );
204
-		$item->setId( null );
205
-		$item->setParentId( $context->getUserId() );
203
+		$item->fromArray($values);
204
+		$item->setId(null);
205
+		$item->setParentId($context->getUserId());
206 206
 
207
-		return $manager->saveItem( $item );
207
+		return $manager->saveItem($item);
208 208
 	}
209 209
 
210 210
 
@@ -213,16 +213,16 @@  discard block
 block discarded – undo
213 213
 	 *
214 214
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
215 215
 	 */
216
-	public function createAddressItem( array $values = [] )
216
+	public function createAddressItem(array $values = [])
217 217
 	{
218 218
 		$context = $this->getContext();
219
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
219
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
220 220
 
221 221
 		$item = $manager->createItem();
222
-		$item->fromArray( $values );
223
-		$item->setId( null );
222
+		$item->fromArray($values);
223
+		$item->setId(null);
224 224
 
225
-		$item->setParentId( $context->getUserId() );
225
+		$item->setParentId($context->getUserId());
226 226
 
227 227
 		return $item;
228 228
 	}
@@ -234,13 +234,13 @@  discard block
 block discarded – undo
234 234
 	 * @param string $id Unique customer address ID
235 235
 	 * @since 2017.04
236 236
 	 */
237
-	public function deleteAddressItem( $id )
237
+	public function deleteAddressItem($id)
238 238
 	{
239
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
239
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
240 240
 
241
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
241
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
242 242
 
243
-		$manager->deleteItem( $id );
243
+		$manager->deleteItem($id);
244 244
 	}
245 245
 
246 246
 
@@ -252,17 +252,17 @@  discard block
 block discarded – undo
252 252
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
253 253
 	 * @since 2017.04
254 254
 	 */
255
-	public function editAddressItem( $id, array $values )
255
+	public function editAddressItem($id, array $values)
256 256
 	{
257
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
257
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
258 258
 
259
-		$item = $manager->getItem( $id, [], true );
260
-		$this->checkUser( $item->getParentId() );
259
+		$item = $manager->getItem($id, [], true);
260
+		$this->checkUser($item->getParentId());
261 261
 
262
-		unset( $values['customer.address.id'] );
263
-		$item->fromArray( $values );
262
+		unset($values['customer.address.id']);
263
+		$item->fromArray($values);
264 264
 
265
-		return $manager->saveItem( $item );
265
+		return $manager->saveItem($item);
266 266
 	}
267 267
 
268 268
 
@@ -273,12 +273,12 @@  discard block
 block discarded – undo
273 273
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
274 274
 	 * @since 2017.04
275 275
 	 */
276
-	public function getAddressItem( $id )
276
+	public function getAddressItem($id)
277 277
 	{
278
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
278
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
279 279
 
280
-		$item = $manager->getItem( $id );
281
-		$this->checkUser( $item->getParentId() );
280
+		$item = $manager->getItem($id);
281
+		$this->checkUser($item->getParentId());
282 282
 
283 283
 		return $item;
284 284
 	}
@@ -290,9 +290,9 @@  discard block
 block discarded – undo
290 290
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface $item Customer address item
291 291
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
292 292
 	 */
293
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
293
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
294 294
 	{
295
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
295
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
296 296
 	}
297 297
 
298 298
 
@@ -303,32 +303,32 @@  discard block
 block discarded – undo
303 303
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
304 304
 	 * @since 2017.06
305 305
 	 */
306
-	public function addListItem( array $values )
306
+	public function addListItem(array $values)
307 307
 	{
308 308
 		$context = $this->getContext();
309
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
309
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
310 310
 
311
-		if( !isset( $values['customer.lists.typeid'] ) )
311
+		if (!isset($values['customer.lists.typeid']))
312 312
 		{
313
-			if( !isset( $values['customer.lists.type'] ) ) {
314
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
313
+			if (!isset($values['customer.lists.type'])) {
314
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
315 315
 			}
316 316
 
317
-			if( !isset( $values['customer.lists.domain'] ) ) {
318
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
317
+			if (!isset($values['customer.lists.domain'])) {
318
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
319 319
 			}
320 320
 
321
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
322
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
321
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
322
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
323 323
 			$values['customer.lists.typeid'] = $typeItem->getId();
324 324
 		}
325 325
 
326 326
 		$item = $manager->createItem();
327
-		$item->fromArray( $values );
328
-		$item->setId( null );
329
-		$item->setParentId( $context->getUserId() );
327
+		$item->fromArray($values);
328
+		$item->setId(null);
329
+		$item->setParentId($context->getUserId());
330 330
 
331
-		return $manager->saveItem( $item );
331
+		return $manager->saveItem($item);
332 332
 	}
333 333
 
334 334
 
@@ -341,10 +341,10 @@  discard block
 block discarded – undo
341 341
 	public function createListsFilter()
342 342
 	{
343 343
 		$context = $this->getContext();
344
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
344
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
345 345
 
346 346
 		$filter = $manager->createSearch();
347
-		$filter->setConditions( $filter->compare( '==', 'customer.lists.parentid', $context->getUserId() ) );
347
+		$filter->setConditions($filter->compare('==', 'customer.lists.parentid', $context->getUserId()));
348 348
 
349 349
 		return $filter;
350 350
 	}
@@ -356,13 +356,13 @@  discard block
 block discarded – undo
356 356
 	 * @param string $id Unique customer address ID
357 357
 	 * @since 2017.06
358 358
 	 */
359
-	public function deleteListItem( $id )
359
+	public function deleteListItem($id)
360 360
 	{
361
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
361
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
362 362
 
363
-		$this->checkUser( $manager->getItem( $id )->getParentId() );
363
+		$this->checkUser($manager->getItem($id)->getParentId());
364 364
 
365
-		$manager->deleteItem( $id );
365
+		$manager->deleteItem($id);
366 366
 	}
367 367
 
368 368
 
@@ -374,33 +374,33 @@  discard block
 block discarded – undo
374 374
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
375 375
 	 * @since 2017.06
376 376
 	 */
377
-	public function editListItem( $id, array $values )
377
+	public function editListItem($id, array $values)
378 378
 	{
379 379
 		$context = $this->getContext();
380
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
380
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
381 381
 
382
-		$item = $manager->getItem( $id, [], true );
383
-		$this->checkUser( $item->getParentId() );
382
+		$item = $manager->getItem($id, [], true);
383
+		$this->checkUser($item->getParentId());
384 384
 
385
-		if( !isset( $values['customer.lists.typeid'] ) )
385
+		if (!isset($values['customer.lists.typeid']))
386 386
 		{
387
-			if( !isset( $values['customer.lists.type'] ) ) {
388
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
387
+			if (!isset($values['customer.lists.type'])) {
388
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
389 389
 			}
390 390
 
391
-			if( !isset( $values['customer.lists.domain'] ) ) {
392
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
391
+			if (!isset($values['customer.lists.domain'])) {
392
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
393 393
 			}
394 394
 
395
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
396
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
395
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
396
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
397 397
 			$values['customer.lists.typeid'] = $typeItem->getId();
398 398
 		}
399 399
 
400
-		unset( $values['customer.lists.id'] );
401
-		$item->fromArray( $values );
400
+		unset($values['customer.lists.id']);
401
+		$item->fromArray($values);
402 402
 
403
-		return $manager->saveItem( $item );
403
+		return $manager->saveItem($item);
404 404
 	}
405 405
 
406 406
 
@@ -411,12 +411,12 @@  discard block
 block discarded – undo
411 411
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
412 412
 	 * @since 2017.06
413 413
 	 */
414
-	public function getListItem( $id )
414
+	public function getListItem($id)
415 415
 	{
416
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
417
-		$item = $manager->getItem( $id );
416
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
417
+		$item = $manager->getItem($id);
418 418
 
419
-		$this->checkUser( $item->getParentId() );
419
+		$this->checkUser($item->getParentId());
420 420
 
421 421
 		return $item;
422 422
 	}
@@ -430,11 +430,11 @@  discard block
 block discarded – undo
430 430
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items
431 431
 	 * @since 2017.06
432 432
 	 */
433
-	public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
433
+	public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
434 434
 	{
435
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
435
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
436 436
 
437
-		return $manager->searchItems( $filter, [], $total );
437
+		return $manager->searchItems($filter, [], $total);
438 438
 	}
439 439
 
440 440
 
@@ -444,37 +444,37 @@  discard block
 block discarded – undo
444 444
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
445 445
 	 * @return string[] Associative list of customer key/value pairs with default values set
446 446
 	 */
447
-	protected function addItemDefaults( array $values )
447
+	protected function addItemDefaults(array $values)
448 448
 	{
449
-		if( !isset( $values['customer.label'] ) || $values['customer.label'] == '' )
449
+		if (!isset($values['customer.label']) || $values['customer.label'] == '')
450 450
 		{
451 451
 			$label = '';
452 452
 
453
-			if( isset( $values['customer.lastname'] ) ) {
453
+			if (isset($values['customer.lastname'])) {
454 454
 				$label = $values['customer.lastname'];
455 455
 			}
456 456
 
457
-			if( isset( $values['customer.firstname'] ) && $values['customer.firstname'] != '' ) {
457
+			if (isset($values['customer.firstname']) && $values['customer.firstname'] != '') {
458 458
 				$label = $values['customer.firstname'] . ' ' . $label;
459 459
 			}
460 460
 
461
-			if( isset( $values['customer.company'] ) && $values['customer.company'] != '' ) {
461
+			if (isset($values['customer.company']) && $values['customer.company'] != '') {
462 462
 				$label .= ' (' . $values['customer.company'] . ')';
463 463
 			}
464 464
 
465 465
 			$values['customer.label'] = $label;
466 466
 		}
467 467
 
468
-		if( !isset( $values['customer.code'] ) && isset( $values['customer.email'] ) ) {
468
+		if (!isset($values['customer.code']) && isset($values['customer.email'])) {
469 469
 			$values['customer.code'] = $values['customer.email'];
470 470
 		}
471 471
 
472
-		if( !isset( $values['customer.status'] ) ) {
472
+		if (!isset($values['customer.status'])) {
473 473
 			$values['customer.status'] = 1;
474 474
 		}
475 475
 
476
-		if( !isset( $values['customer.password'] ) ) {
477
-			$values['customer.password'] = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
476
+		if (!isset($values['customer.password'])) {
477
+			$values['customer.password'] = substr(md5(microtime(true) . getmypid() . rand()), -8);
478 478
 		}
479 479
 
480 480
 		return $values;
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
488 488
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
489 489
 	 */
490
-	protected function checkLimit( array $values )
490
+	protected function checkLimit(array $values)
491 491
 	{
492 492
 		$total = 0;
493 493
 		$context = $this->getContext();
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 		 * @category Developer
509 509
 		 * @see controller/frontend/customer/limit-seconds
510 510
 		 */
511
-		$count = $config->get( 'controller/frontend/customer/limit-count', 5 );
511
+		$count = $config->get('controller/frontend/customer/limit-count', 5);
512 512
 
513 513
 		/** controller/frontend/customer/limit-seconds
514 514
 		 * Customer account limitation time frame in seconds
@@ -526,22 +526,22 @@  discard block
 block discarded – undo
526 526
 		 * @category Developer
527 527
 		 * @see controller/frontend/customer/limit-count
528 528
 		 */
529
-		$seconds = $config->get( 'controller/frontend/customer/limit-seconds', 300 );
529
+		$seconds = $config->get('controller/frontend/customer/limit-seconds', 300);
530 530
 
531
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
531
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
532 532
 
533 533
 		$search = $manager->createSearch();
534 534
 		$expr = [
535
-			$search->compare( '==', 'customer.editor', $context->getEditor() ),
536
-			$search->compare( '>=', 'customer.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
535
+			$search->compare('==', 'customer.editor', $context->getEditor()),
536
+			$search->compare('>=', 'customer.ctime', date('Y-m-d H:i:s', time() - $seconds)),
537 537
 		];
538
-		$search->setConditions( $search->combine( '&&', $expr ) );
539
-		$search->setSlice( 0, 0 );
538
+		$search->setConditions($search->combine('&&', $expr));
539
+		$search->setSlice(0, 0);
540 540
 
541
-		$manager->searchItems( $search, [], $total );
541
+		$manager->searchItems($search, [], $total);
542 542
 
543
-		if( $total > $count ) {
544
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary limit reached' ) );
543
+		if ($total > $count) {
544
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary limit reached'));
545 545
 		}
546 546
 	}
547 547
 
@@ -552,12 +552,12 @@  discard block
 block discarded – undo
552 552
 	 * @param string $id Unique customer ID
553 553
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
554 554
 	 */
555
-	protected function checkUser( $id )
555
+	protected function checkUser($id)
556 556
 	{
557
-		if( $id != $this->getContext()->getUserId() )
557
+		if ($id != $this->getContext()->getUserId())
558 558
 		{
559
-			$msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id );
560
-			throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg );
559
+			$msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id);
560
+			throw new \Aimeos\Controller\Frontend\Customer\Exception($msg);
561 561
 		}
562 562
 	}
563 563
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Standard.php 3 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -180,8 +180,7 @@  discard block
 block discarded – undo
180 180
 		{
181 181
 			$search = $manager->createSearch();
182 182
 			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
183
-		}
184
-		else
183
+		} else
185 184
 		{
186 185
 			$search = $manager->createSearch( true );
187 186
 		}
@@ -275,8 +274,7 @@  discard block
 block discarded – undo
275 274
 		{
276 275
 			$search = $manager->createSearch();
277 276
 			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
278
-		}
279
-		else
277
+		} else
280 278
 		{
281 279
 			$search = $manager->createSearch( true );
282 280
 		}
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -302,6 +302,7 @@  discard block
 block discarded – undo
302 302
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
303 303
 	 * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too
304 304
 	 * @param integer &$total Parameter where the total number of found products will be stored in
305
+	 * @param integer $total
305 306
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
306 307
 	 * @since 2017.03
307 308
 	 */
@@ -315,7 +316,7 @@  discard block
 block discarded – undo
315 316
 	 * Returns the list of catalog IDs for the given catalog tree
316 317
 	 *
317 318
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
318
-	 * @return array List of catalog IDs
319
+	 * @return string[] List of catalog IDs
319 320
 	 */
320 321
 	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
321 322
 	{
Please login to merge, or discard this patch.
Spacing   +79 added lines, -79 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 ) ) !== [] )
62
+			if (($list = $this->validateIds((array) $list)) !== [])
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 = [];
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, [], $level );
102
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
101
+				$tree = $cntl->getCatalogTree($catId, [], $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,11 +169,11 @@  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 = [];
175 175
 		$context = $this->getContext();
176
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'index' );
176
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'index');
177 177
 
178 178
 
179 179
 		/** controller/frontend/product/ignore-dates
@@ -188,55 +188,55 @@  discard block
 block discarded – undo
188 188
 		 * @since 2017.10
189 189
 		 * @category Developer
190 190
 		 */
191
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) )
191
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false))
192 192
 		{
193 193
 			$search = $manager->createSearch();
194
-			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
194
+			$search->setConditions($search->compare('>', 'product.status', 0));
195 195
 		}
196 196
 		else
197 197
 		{
198
-			$search = $manager->createSearch( true );
198
+			$search = $manager->createSearch(true);
199 199
 		}
200 200
 
201 201
 
202
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
202
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
203 203
 
204
-		switch( $sort )
204
+		switch ($sort)
205 205
 		{
206 206
 			case 'code':
207
-				$sortations[] = $search->sort( $direction, 'product.code' );
207
+				$sortations[] = $search->sort($direction, 'product.code');
208 208
 				break;
209 209
 
210 210
 			case 'ctime':
211
-				$sortations[] = $search->sort( $direction, 'product.ctime' );
211
+				$sortations[] = $search->sort($direction, 'product.ctime');
212 212
 				break;
213 213
 
214 214
 			case 'name':
215 215
 				$langid = $context->getLocale()->getLanguageId();
216 216
 
217
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
218
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
217
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
218
+				$expr[] = $search->compare('>=', $cmpfunc, '');
219 219
 
220
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
221
-				$sortations[] = $search->sort( $direction, $sortfunc );
220
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
221
+				$sortations[] = $search->sort($direction, $sortfunc);
222 222
 				break;
223 223
 
224 224
 			case 'price':
225 225
 				$currencyid = $context->getLocale()->getCurrencyId();
226 226
 
227
-				$cmpfunc = $search->createFunction( 'index.price.value', array( $listtype, $currencyid, 'default' ) );
228
-				$expr[] = $search->compare( '>=', $cmpfunc, '0.00' );
227
+				$cmpfunc = $search->createFunction('index.price.value', array($listtype, $currencyid, 'default'));
228
+				$expr[] = $search->compare('>=', $cmpfunc, '0.00');
229 229
 
230
-				$sortfunc = $search->createFunction( 'sort:index.price.value', array( $listtype, $currencyid, 'default' ) );
231
-				$sortations[] = $search->sort( $direction, $sortfunc );
230
+				$sortfunc = $search->createFunction('sort:index.price.value', array($listtype, $currencyid, 'default'));
231
+				$sortations[] = $search->sort($direction, $sortfunc);
232 232
 				break;
233 233
 		}
234 234
 
235 235
 		$expr[] = $search->getConditions();
236 236
 
237
-		$search->setConditions( $search->combine( '&&', $expr ) );
238
-		$search->setSortations( $sortations );
239
-		$search->setSlice( $start, $size );
237
+		$search->setConditions($search->combine('&&', $expr));
238
+		$search->setSortations($sortations);
239
+		$search->setSlice($start, $size);
240 240
 
241 241
 		return $search;
242 242
 	}
@@ -250,15 +250,15 @@  discard block
 block discarded – undo
250 250
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
251 251
 	 * @since 2017.03
252 252
 	 */
253
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
253
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
254 254
 	{
255
-		$items = $this->getItems( [$productId], $domains );
255
+		$items = $this->getItems([$productId], $domains);
256 256
 
257
-		if( ( $item = reset( $items ) ) !== false ) {
257
+		if (($item = reset($items)) !== false) {
258 258
 			return $item;
259 259
 		}
260 260
 
261
-		throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Product item with ID "%1$s" not found', $productId ) );
261
+		throw new \Aimeos\Controller\Frontend\Exception(sprintf('Product item with ID "%1$s" not found', $productId));
262 262
 	}
263 263
 
264 264
 
@@ -270,10 +270,10 @@  discard block
 block discarded – undo
270 270
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
271 271
 	 * @since 2017.03
272 272
 	 */
273
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
273
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
274 274
 	{
275 275
 		$context = $this->getContext();
276
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
276
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
277 277
 
278 278
 		/** controller/frontend/order/ignore-dates
279 279
 		 * Ignore start and end dates of products
@@ -287,24 +287,24 @@  discard block
 block discarded – undo
287 287
 		 * @since 2017.08
288 288
 		 * @category Developer
289 289
 		 */
290
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) )
290
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false))
291 291
 		{
292 292
 			$search = $manager->createSearch();
293
-			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
293
+			$search->setConditions($search->compare('>', 'product.status', 0));
294 294
 		}
295 295
 		else
296 296
 		{
297
-			$search = $manager->createSearch( true );
297
+			$search = $manager->createSearch(true);
298 298
 		}
299 299
 
300 300
 		$expr = array(
301
-			$search->compare( '==', 'product.id', $productIds ),
301
+			$search->compare('==', 'product.id', $productIds),
302 302
 			$search->getConditions(),
303 303
 		);
304
-		$search->setConditions( $search->combine( '&&', $expr ) );
305
-		$search->setSlice( 0, count( $productIds ) );
304
+		$search->setConditions($search->combine('&&', $expr));
305
+		$search->setSlice(0, count($productIds));
306 306
 
307
-		return $manager->searchItems( $search, $domains );
307
+		return $manager->searchItems($search, $domains);
308 308
 	}
309 309
 
310 310
 
@@ -317,9 +317,9 @@  discard block
 block discarded – undo
317 317
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
318 318
 	 * @since 2017.03
319 319
 	 */
320
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
320
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
321 321
 	{
322
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total );
322
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total);
323 323
 	}
324 324
 
325 325
 
@@ -329,12 +329,12 @@  discard block
 block discarded – undo
329 329
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
330 330
 	 * @return array List of catalog IDs
331 331
 	 */
332
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
332
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
333 333
 	{
334
-		$list = array( $item->getId() );
334
+		$list = array($item->getId());
335 335
 
336
-		foreach( $item->getChildren() as $child ) {
337
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
336
+		foreach ($item->getChildren() as $child) {
337
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
338 338
 		}
339 339
 
340 340
 		return $list;
@@ -347,13 +347,13 @@  discard block
 block discarded – undo
347 347
 	 * @param array $ids List of IDs to validate
348 348
 	 * @return array List of validated IDs
349 349
 	 */
350
-	protected function validateIds( array $ids )
350
+	protected function validateIds(array $ids)
351 351
 	{
352 352
 		$list = [];
353 353
 
354
-		foreach( $ids as $id )
354
+		foreach ($ids as $id)
355 355
 		{
356
-			if( $id != '' ) {
356
+			if ($id != '') {
357 357
 				$list[] = (int) $id;
358 358
 			}
359 359
 		}
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Product/StandardTest.php 1 patch
Spacing   +110 added lines, -110 removed lines patch added patch discarded remove patch
@@ -17,22 +17,22 @@  discard block
 block discarded – undo
17 17
 	protected function setUp()
18 18
 	{
19 19
 		$this->context = \TestHelperFrontend::getContext();
20
-		$this->object = new \Aimeos\Controller\Frontend\Product\Standard( $this->context );
20
+		$this->object = new \Aimeos\Controller\Frontend\Product\Standard($this->context);
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 testAggregate()
31 31
 	{
32 32
 		$filter = $this->object->createFilter();
33
-		$list = $this->object->aggregate( $filter, 'index.attribute.id' );
33
+		$list = $this->object->aggregate($filter, 'index.attribute.id');
34 34
 
35
-		$this->assertGreaterThan( 0, count( $list ) );
35
+		$this->assertGreaterThan(0, count($list));
36 36
 	}
37 37
 
38 38
 
@@ -40,113 +40,113 @@  discard block
 block discarded – undo
40 40
 	{
41 41
 		$filter = $this->object->createFilter();
42 42
 
43
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
44
-		$this->assertEquals( [], $filter->getSortations() );
45
-		$this->assertEquals( 0, $filter->getSliceStart() );
46
-		$this->assertEquals( 100, $filter->getSliceSize() );
43
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
44
+		$this->assertEquals([], $filter->getSortations());
45
+		$this->assertEquals(0, $filter->getSliceStart());
46
+		$this->assertEquals(100, $filter->getSliceSize());
47 47
 	}
48 48
 
49 49
 
50 50
 	public function testCreateFilterIgnoreDates()
51 51
 	{
52
-		$this->context->getConfig()->set( 'controller/frontend/product/ignore-dates', true );
52
+		$this->context->getConfig()->set('controller/frontend/product/ignore-dates', true);
53 53
 
54 54
 		$filter = $this->object->createFilter();
55 55
 
56
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
56
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
57 57
 	}
58 58
 
59 59
 
60 60
 	public function testAddFilterAttribute()
61 61
 	{
62 62
 		$filter = $this->object->createFilter();
63
-		$filter = $this->object->addFilterAttribute( $filter, array( 0, 1 ), [], [] );
63
+		$filter = $this->object->addFilterAttribute($filter, array(0, 1), [], []);
64 64
 
65 65
 		$list = $filter->getConditions()->getExpressions();
66 66
 
67
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
68
-			throw new \RuntimeException( 'Wrong expression' );
67
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
68
+			throw new \RuntimeException('Wrong expression');
69 69
 		}
70 70
 
71
-		$this->assertEquals( 'index.attributeaggregate([0,1])', $list[0]->getName() );
72
-		$this->assertEquals( 2, $list[0]->getValue() );
71
+		$this->assertEquals('index.attributeaggregate([0,1])', $list[0]->getName());
72
+		$this->assertEquals(2, $list[0]->getValue());
73 73
 	}
74 74
 
75 75
 
76 76
 	public function testAddFilterAttributeOptions()
77 77
 	{
78 78
 		$filter = $this->object->createFilter();
79
-		$filter = $this->object->addFilterAttribute( $filter, [], array( 1 ), [] );
79
+		$filter = $this->object->addFilterAttribute($filter, [], array(1), []);
80 80
 
81 81
 		$list = $filter->getConditions()->getExpressions();
82 82
 
83
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
84
-			throw new \RuntimeException( 'Wrong expression' );
83
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
84
+			throw new \RuntimeException('Wrong expression');
85 85
 		}
86 86
 
87
-		$this->assertEquals( 'index.attributeaggregate([1])', $list[0]->getName() );
88
-		$this->assertEquals( 0, $list[0]->getValue() );
87
+		$this->assertEquals('index.attributeaggregate([1])', $list[0]->getName());
88
+		$this->assertEquals(0, $list[0]->getValue());
89 89
 	}
90 90
 
91 91
 
92 92
 	public function testAddFilterAttributeOne()
93 93
 	{
94 94
 		$filter = $this->object->createFilter();
95
-		$filter = $this->object->addFilterAttribute( $filter, [], [], array( 'test' => array( 2 ) ) );
95
+		$filter = $this->object->addFilterAttribute($filter, [], [], array('test' => array(2)));
96 96
 
97 97
 		$list = $filter->getConditions()->getExpressions();
98 98
 
99
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
100
-			throw new \RuntimeException( 'Wrong expression' );
99
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
100
+			throw new \RuntimeException('Wrong expression');
101 101
 		}
102 102
 
103
-		$this->assertEquals( 'index.attributeaggregate([2])', $list[0]->getName() );
104
-		$this->assertEquals( 0, $list[0]->getValue() );
103
+		$this->assertEquals('index.attributeaggregate([2])', $list[0]->getName());
104
+		$this->assertEquals(0, $list[0]->getValue());
105 105
 	}
106 106
 
107 107
 
108 108
 	public function testAddFilterCategory()
109 109
 	{
110 110
 		$context = \TestHelperFrontend::getContext();
111
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
111
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
112 112
 
113
-		$catId = $manager->findItem( 'root' )->getId();
113
+		$catId = $manager->findItem('root')->getId();
114 114
 		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST;
115 115
 
116 116
 		$filter = $this->object->createFilter();
117
-		$filter = $this->object->addFilterCategory( $filter, $catId, $level );
117
+		$filter = $this->object->addFilterCategory($filter, $catId, $level);
118 118
 
119 119
 		$list = $filter->getConditions()->getExpressions();
120 120
 
121
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
122
-			throw new \RuntimeException( 'Wrong expression' );
121
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
122
+			throw new \RuntimeException('Wrong expression');
123 123
 		}
124 124
 
125
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
126
-		$this->assertEquals( 3, count( $list[0]->getValue() ) );
127
-		$this->assertEquals( [], $filter->getSortations() );
125
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
126
+		$this->assertEquals(3, count($list[0]->getValue()));
127
+		$this->assertEquals([], $filter->getSortations());
128 128
 	}
129 129
 
130 130
 
131 131
 	public function testAddFilterText()
132 132
 	{
133 133
 		$filter = $this->object->createFilter();
134
-		$filter = $this->object->addFilterText( $filter, 'Espresso' );
134
+		$filter = $this->object->addFilterText($filter, 'Espresso');
135 135
 
136
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
136
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
137 137
 
138 138
 		$list = $filter->getConditions()->getExpressions();
139 139
 
140 140
 
141
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
142
-			throw new \RuntimeException( 'Wrong expression' );
141
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
142
+			throw new \RuntimeException('Wrong expression');
143 143
 		}
144
-		$this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() );
145
-		$this->assertEquals( 0, $list[0]->getValue() );
144
+		$this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName());
145
+		$this->assertEquals(0, $list[0]->getValue());
146 146
 
147
-		$this->assertEquals( [], $filter->getSortations() );
148
-		$this->assertEquals( 0, $filter->getSliceStart() );
149
-		$this->assertEquals( 100, $filter->getSliceSize() );
147
+		$this->assertEquals([], $filter->getSortations());
148
+		$this->assertEquals(0, $filter->getSliceStart());
149
+		$this->assertEquals(100, $filter->getSliceSize());
150 150
 	}
151 151
 
152 152
 
@@ -155,177 +155,177 @@  discard block
 block discarded – undo
155 155
 		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
156 156
 
157 157
 		$filter = $this->object->createFilter();
158
-		$filter = $this->object->addFilterCategory( $filter, 0, $level, 'relevance', '-', 'test' );
158
+		$filter = $this->object->addFilterCategory($filter, 0, $level, 'relevance', '-', 'test');
159 159
 
160
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
160
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
161 161
 
162 162
 		$sort = $filter->getSortations();
163
-		if( ( $item = reset( $sort ) ) === false ) {
164
-			throw new \RuntimeException( 'Sortation not set' );
163
+		if (($item = reset($sort)) === false) {
164
+			throw new \RuntimeException('Sortation not set');
165 165
 		}
166 166
 
167
-		$this->assertEquals( 'sort:index.catalog.position("test",["0"])', $item->getName() );
168
-		$this->assertEquals( '-', $item->getOperator() );
167
+		$this->assertEquals('sort:index.catalog.position("test",["0"])', $item->getName());
168
+		$this->assertEquals('-', $item->getOperator());
169 169
 	}
170 170
 
171 171
 
172 172
 	public function testCreateFilterSortRelevanceText()
173 173
 	{
174
-		$filter = $this->object->createFilter( 'relevance', '-', 1, 2, 'test' );
175
-		$filter = $this->object->addFilterText( $filter, 'Espresso' );
174
+		$filter = $this->object->createFilter('relevance', '-', 1, 2, 'test');
175
+		$filter = $this->object->addFilterText($filter, 'Espresso');
176 176
 
177
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
178
-		$this->assertEquals( [], $filter->getSortations() );
179
-		$this->assertEquals( 1, $filter->getSliceStart() );
180
-		$this->assertEquals( 2, $filter->getSliceSize() );
177
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
178
+		$this->assertEquals([], $filter->getSortations());
179
+		$this->assertEquals(1, $filter->getSliceStart());
180
+		$this->assertEquals(2, $filter->getSliceSize());
181 181
 	}
182 182
 
183 183
 
184 184
 	public function testCreateFilterSortCode()
185 185
 	{
186
-		$filter = $this->object->createFilter( 'code' );
186
+		$filter = $this->object->createFilter('code');
187 187
 
188
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
188
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
189 189
 
190 190
 		$sort = $filter->getSortations();
191
-		if( ( $item = reset( $sort ) ) === false ) {
192
-			throw new \RuntimeException( 'Sortation not set' );
191
+		if (($item = reset($sort)) === false) {
192
+			throw new \RuntimeException('Sortation not set');
193 193
 		}
194 194
 
195
-		$this->assertEquals( 'product.code', $item->getName() );
195
+		$this->assertEquals('product.code', $item->getName());
196 196
 	}
197 197
 
198 198
 
199 199
 	public function testCreateFilterSortCtime()
200 200
 	{
201
-		$filter = $this->object->createFilter( 'ctime' );
201
+		$filter = $this->object->createFilter('ctime');
202 202
 
203
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
203
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
204 204
 
205 205
 		$sort = $filter->getSortations();
206
-		if( ( $item = reset( $sort ) ) === false ) {
207
-			throw new \RuntimeException( 'Sortation not set' );
206
+		if (($item = reset($sort)) === false) {
207
+			throw new \RuntimeException('Sortation not set');
208 208
 		}
209 209
 
210
-		$this->assertEquals( 'product.ctime', $item->getName() );
210
+		$this->assertEquals('product.ctime', $item->getName());
211 211
 	}
212 212
 
213 213
 
214 214
 	public function testCreateFilterSortName()
215 215
 	{
216
-		$filter = $this->object->createFilter( 'name' );
216
+		$filter = $this->object->createFilter('name');
217 217
 
218
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
218
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
219 219
 
220 220
 		$sort = $filter->getSortations();
221
-		if( ( $item = reset( $sort ) ) === false ) {
222
-			throw new \RuntimeException( 'Sortation not set' );
221
+		if (($item = reset($sort)) === false) {
222
+			throw new \RuntimeException('Sortation not set');
223 223
 		}
224 224
 
225
-		$this->assertEquals( 'sort:index.text.value("default","de","name")', $item->getName() );
225
+		$this->assertEquals('sort:index.text.value("default","de","name")', $item->getName());
226 226
 	}
227 227
 
228 228
 
229 229
 	public function testCreateFilterSortPrice()
230 230
 	{
231
-		$filter = $this->object->createFilter( 'price' );
231
+		$filter = $this->object->createFilter('price');
232 232
 
233
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
233
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
234 234
 
235 235
 		$sort = $filter->getSortations();
236
-		if( ( $item = reset( $sort ) ) === false ) {
237
-			throw new \RuntimeException( 'Sortation not set' );
236
+		if (($item = reset($sort)) === false) {
237
+			throw new \RuntimeException('Sortation not set');
238 238
 		}
239 239
 
240
-		$this->assertStringStartsWith( 'sort:index.price.value("default","EUR","default")', $item->getName() );
240
+		$this->assertStringStartsWith('sort:index.price.value("default","EUR","default")', $item->getName());
241 241
 	}
242 242
 
243 243
 
244 244
 	public function testCreateFilterSortInvalid()
245 245
 	{
246
-		$filter = $this->object->createFilter( '', 'failure' );
246
+		$filter = $this->object->createFilter('', 'failure');
247 247
 
248
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
249
-		$this->assertEquals( [], $filter->getSortations() );
248
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
249
+		$this->assertEquals([], $filter->getSortations());
250 250
 	}
251 251
 
252 252
 
253 253
 	public function testGetItem()
254 254
 	{
255 255
 		$context = \TestHelperFrontend::getContext();
256
-		$id = \Aimeos\MShop\Factory::createManager( $context, 'product' )->findItem( 'CNC' )->getId();
256
+		$id = \Aimeos\MShop\Factory::createManager($context, 'product')->findItem('CNC')->getId();
257 257
 
258
-		$result = $this->object->getItem( $id );
258
+		$result = $this->object->getItem($id);
259 259
 
260
-		$this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $result );
261
-		$this->assertGreaterThan( 0, $result->getPropertyItems() );
262
-		$this->assertGreaterThan( 0, $result->getRefItems( 'attribute' ) );
263
-		$this->assertGreaterThan( 0, $result->getRefItems( 'media' ) );
264
-		$this->assertGreaterThan( 0, $result->getRefItems( 'price' ) );
265
-		$this->assertGreaterThan( 0, $result->getRefItems( 'product' ) );
266
-		$this->assertGreaterThan( 0, $result->getRefItems( 'text' ) );
260
+		$this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $result);
261
+		$this->assertGreaterThan(0, $result->getPropertyItems());
262
+		$this->assertGreaterThan(0, $result->getRefItems('attribute'));
263
+		$this->assertGreaterThan(0, $result->getRefItems('media'));
264
+		$this->assertGreaterThan(0, $result->getRefItems('price'));
265
+		$this->assertGreaterThan(0, $result->getRefItems('product'));
266
+		$this->assertGreaterThan(0, $result->getRefItems('text'));
267 267
 	}
268 268
 
269 269
 
270 270
 	public function testGetItems()
271 271
 	{
272 272
 		$context = \TestHelperFrontend::getContext();
273
-		$context->getConfig()->set( 'controller/frontend/product/ignore-dates', true );
273
+		$context->getConfig()->set('controller/frontend/product/ignore-dates', true);
274 274
 
275
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
275
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
276 276
 
277 277
 		$search = $manager->createSearch();
278
-		$search->setConditions( $search->compare( '==', 'product.code', array( 'CNC', 'CNE' ) ) );
278
+		$search->setConditions($search->compare('==', 'product.code', array('CNC', 'CNE')));
279 279
 
280 280
 		$ids = [];
281
-		foreach( $manager->searchItems( $search ) as $productItem ) {
281
+		foreach ($manager->searchItems($search) as $productItem) {
282 282
 			$ids[] = $productItem->getId();
283 283
 		}
284 284
 
285 285
 
286
-		$result = $this->object->getItems( $ids );
286
+		$result = $this->object->getItems($ids);
287 287
 
288
-		$this->assertEquals( 2, count( $result ) );
288
+		$this->assertEquals(2, count($result));
289 289
 
290
-		foreach( $result as $productItem ) {
291
-			$this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $productItem );
290
+		foreach ($result as $productItem) {
291
+			$this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $productItem);
292 292
 		}
293 293
 	}
294 294
 
295 295
 
296 296
 	public function testSearchItemsCategory()
297 297
 	{
298
-		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
298
+		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext());
299 299
 		$search = $catalogManager->createSearch();
300 300
 
301
-		$search->setConditions( $search->compare( '==', 'catalog.code', 'new' ) );
302
-		$search->setSlice( 0, 1 );
303
-		$items = $catalogManager->searchItems( $search );
301
+		$search->setConditions($search->compare('==', 'catalog.code', 'new'));
302
+		$search->setSlice(0, 1);
303
+		$items = $catalogManager->searchItems($search);
304 304
 
305
-		if( ( $item = reset( $items ) ) === false ) {
306
-			throw new \RuntimeException( 'Product item not found' );
305
+		if (($item = reset($items)) === false) {
306
+			throw new \RuntimeException('Product item not found');
307 307
 		}
308 308
 
309
-		$filter = $this->object->createFilter( 'position', '+', 1, 1 );
310
-		$filter = $this->object->addFilterCategory( $filter, $item->getId() );
309
+		$filter = $this->object->createFilter('position', '+', 1, 1);
310
+		$filter = $this->object->addFilterCategory($filter, $item->getId());
311 311
 
312 312
 		$total = 0;
313
-		$results = $this->object->searchItems( $filter, [], $total );
313
+		$results = $this->object->searchItems($filter, [], $total);
314 314
 
315
-		$this->assertEquals( 3, $total );
316
-		$this->assertEquals( 1, count( $results ) );
315
+		$this->assertEquals(3, $total);
316
+		$this->assertEquals(1, count($results));
317 317
 	}
318 318
 
319 319
 
320 320
 	public function testSearchItemsText()
321 321
 	{
322
-		$filter = $this->object->createFilter( 'relevance', '+', 0, 1, 'unittype13' );
323
-		$filter = $this->object->addFilterText( $filter, 'Expresso', 'relevance', '+', 'unittype13' );
322
+		$filter = $this->object->createFilter('relevance', '+', 0, 1, 'unittype13');
323
+		$filter = $this->object->addFilterText($filter, 'Expresso', 'relevance', '+', 'unittype13');
324 324
 
325 325
 		$total = 0;
326
-		$results = $this->object->searchItems( $filter, [], $total );
326
+		$results = $this->object->searchItems($filter, [], $total);
327 327
 
328
-		$this->assertEquals( 2, $total );
329
-		$this->assertEquals( 1, count( $results ) );
328
+		$this->assertEquals(2, $total);
329
+		$this->assertEquals(1, count($results));
330 330
 	}
331 331
 }
Please login to merge, or discard this patch.