Completed
Push — master ( b447e5...485b69 )
by Aimeos
01:55
created
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/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   +133 added lines, -133 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,13 +68,13 @@  discard block
 block discarded – undo
68 68
 			 * @category User
69 69
 			 * @category Developer
70 70
 			 */
71
-			$item->setGroups( (array) $config->get( 'controller/frontend/customer/groupids', [] ) );
71
+			$item->setGroups((array) $config->get('controller/frontend/customer/groupids', []));
72 72
 
73
-			$item = $manager->saveItem( $item );
73
+			$item = $manager->saveItem($item);
74 74
 
75 75
 			$msg = $item->toArray();
76
-			$msg['customer.password'] = ( $pass ? $list['customer.password'] : null );
77
-			$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
76
+			$msg['customer.password'] = ($pass ? $list['customer.password'] : null);
77
+			$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
78 78
 		}
79 79
 
80 80
 		return $item;
@@ -86,14 +86,14 @@  discard block
 block discarded – undo
86 86
 	 *
87 87
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
88 88
 	 */
89
-	public function createItem( array $values = [] )
89
+	public function createItem(array $values = [])
90 90
 	{
91
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
91
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
92 92
 
93 93
 		$item = $manager->createItem();
94
-		$item->fromArray( $values );
95
-		$item->setId( null );
96
-		$item->setStatus( 1 );
94
+		$item->fromArray($values);
95
+		$item->setId(null);
96
+		$item->setStatus(1);
97 97
 
98 98
 		return $item;
99 99
 	}
@@ -105,12 +105,12 @@  discard block
 block discarded – undo
105 105
 	 * @param string $id Unique customer ID
106 106
 	 * @since 2017.04
107 107
 	 */
108
-	public function deleteItem( $id )
108
+	public function deleteItem($id)
109 109
 	{
110
-		$this->checkUser( $id );
110
+		$this->checkUser($id);
111 111
 
112
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
113
-		$manager->deleteItem( $id );
112
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
113
+		$manager->deleteItem($id);
114 114
 	}
115 115
 
116 116
 
@@ -122,17 +122,17 @@  discard block
 block discarded – undo
122 122
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
123 123
 	 * @since 2017.04
124 124
 	 */
125
-	public function editItem( $id, array $values )
125
+	public function editItem($id, array $values)
126 126
 	{
127
-		$this->checkUser( $id );
127
+		$this->checkUser($id);
128 128
 
129
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
130
-		$item = $manager->getItem( $id, ['customer/group'], true );
129
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
130
+		$item = $manager->getItem($id, ['customer/group'], true);
131 131
 
132
-		unset( $values['customer.id'] );
133
-		$item->fromArray( $values );
132
+		unset($values['customer.id']);
133
+		$item->fromArray($values);
134 134
 
135
-		return $manager->saveItem( $item );
135
+		return $manager->saveItem($item);
136 136
 	}
137 137
 
138 138
 
@@ -144,17 +144,17 @@  discard block
 block discarded – undo
144 144
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
145 145
 	 * @since 2017.04
146 146
 	 */
147
-	public function getItem( $id = null, array $domains = [] )
147
+	public function getItem($id = null, array $domains = [])
148 148
 	{
149
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
149
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
150 150
 
151
-		if( $id == null ) {
152
-			return $manager->getItem( $this->getContext()->getUserId(), $domains, true );
151
+		if ($id == null) {
152
+			return $manager->getItem($this->getContext()->getUserId(), $domains, true);
153 153
 		}
154 154
 
155
-		$this->checkUser( $id );
155
+		$this->checkUser($id);
156 156
 
157
-		return $manager->getItem( $id, $domains, true );
157
+		return $manager->getItem($id, $domains, true);
158 158
 	}
159 159
 
160 160
 
@@ -168,9 +168,9 @@  discard block
 block discarded – undo
168 168
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
169 169
 	 * @since 2017.04
170 170
 	 */
171
-	public function findItem( $code, array $domains = [] )
171
+	public function findItem($code, array $domains = [])
172 172
 	{
173
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains );
173
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains);
174 174
 	}
175 175
 
176 176
 
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item
181 181
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
182 182
 	 */
183
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
183
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
184 184
 	{
185
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
185
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
186 186
 	}
187 187
 
188 188
 
@@ -193,17 +193,17 @@  discard block
 block discarded – undo
193 193
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
194 194
 	 * @since 2017.04
195 195
 	 */
196
-	public function addAddressItem( array $values )
196
+	public function addAddressItem(array $values)
197 197
 	{
198 198
 		$context = $this->getContext();
199
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
199
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
200 200
 
201 201
 		$item = $manager->createItem();
202
-		$item->fromArray( $values );
203
-		$item->setId( null );
204
-		$item->setParentId( $context->getUserId() );
202
+		$item->fromArray($values);
203
+		$item->setId(null);
204
+		$item->setParentId($context->getUserId());
205 205
 
206
-		return $manager->saveItem( $item );
206
+		return $manager->saveItem($item);
207 207
 	}
208 208
 
209 209
 
@@ -212,16 +212,16 @@  discard block
 block discarded – undo
212 212
 	 *
213 213
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
214 214
 	 */
215
-	public function createAddressItem( array $values = [] )
215
+	public function createAddressItem(array $values = [])
216 216
 	{
217 217
 		$context = $this->getContext();
218
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
218
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
219 219
 
220 220
 		$item = $manager->createItem();
221
-		$item->fromArray( $values );
222
-		$item->setId( null );
221
+		$item->fromArray($values);
222
+		$item->setId(null);
223 223
 
224
-		$item->setParentId( $context->getUserId() );
224
+		$item->setParentId($context->getUserId());
225 225
 
226 226
 		return $item;
227 227
 	}
@@ -233,13 +233,13 @@  discard block
 block discarded – undo
233 233
 	 * @param string $id Unique customer address ID
234 234
 	 * @since 2017.04
235 235
 	 */
236
-	public function deleteAddressItem( $id )
236
+	public function deleteAddressItem($id)
237 237
 	{
238
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
238
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
239 239
 
240
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
240
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
241 241
 
242
-		$manager->deleteItem( $id );
242
+		$manager->deleteItem($id);
243 243
 	}
244 244
 
245 245
 
@@ -251,17 +251,17 @@  discard block
 block discarded – undo
251 251
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
252 252
 	 * @since 2017.04
253 253
 	 */
254
-	public function editAddressItem( $id, array $values )
254
+	public function editAddressItem($id, array $values)
255 255
 	{
256
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
256
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
257 257
 
258
-		$item = $manager->getItem( $id, [], true );
259
-		$this->checkUser( $item->getParentId() );
258
+		$item = $manager->getItem($id, [], true);
259
+		$this->checkUser($item->getParentId());
260 260
 
261
-		unset( $values['customer.address.id'] );
262
-		$item->fromArray( $values );
261
+		unset($values['customer.address.id']);
262
+		$item->fromArray($values);
263 263
 
264
-		return $manager->saveItem( $item );
264
+		return $manager->saveItem($item);
265 265
 	}
266 266
 
267 267
 
@@ -272,12 +272,12 @@  discard block
 block discarded – undo
272 272
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
273 273
 	 * @since 2017.04
274 274
 	 */
275
-	public function getAddressItem( $id )
275
+	public function getAddressItem($id)
276 276
 	{
277
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
277
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
278 278
 
279
-		$item = $manager->getItem( $id );
280
-		$this->checkUser( $item->getParentId() );
279
+		$item = $manager->getItem($id);
280
+		$this->checkUser($item->getParentId());
281 281
 
282 282
 		return $item;
283 283
 	}
@@ -289,9 +289,9 @@  discard block
 block discarded – undo
289 289
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface $item Customer address item
290 290
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
291 291
 	 */
292
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
292
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
293 293
 	{
294
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
294
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
295 295
 	}
296 296
 
297 297
 
@@ -302,32 +302,32 @@  discard block
 block discarded – undo
302 302
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
303 303
 	 * @since 2017.06
304 304
 	 */
305
-	public function addListItem( array $values )
305
+	public function addListItem(array $values)
306 306
 	{
307 307
 		$context = $this->getContext();
308
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
308
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
309 309
 
310
-		if( !isset( $values['customer.lists.typeid'] ) )
310
+		if (!isset($values['customer.lists.typeid']))
311 311
 		{
312
-			if( !isset( $values['customer.lists.type'] ) ) {
313
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
312
+			if (!isset($values['customer.lists.type'])) {
313
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
314 314
 			}
315 315
 
316
-			if( !isset( $values['customer.lists.domain'] ) ) {
317
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
316
+			if (!isset($values['customer.lists.domain'])) {
317
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
318 318
 			}
319 319
 
320
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
321
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
320
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
321
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
322 322
 			$values['customer.lists.typeid'] = $typeItem->getId();
323 323
 		}
324 324
 
325 325
 		$item = $manager->createItem();
326
-		$item->fromArray( $values );
327
-		$item->setId( null );
328
-		$item->setParentId( $context->getUserId() );
326
+		$item->fromArray($values);
327
+		$item->setId(null);
328
+		$item->setParentId($context->getUserId());
329 329
 
330
-		return $manager->saveItem( $item );
330
+		return $manager->saveItem($item);
331 331
 	}
332 332
 
333 333
 
@@ -340,10 +340,10 @@  discard block
 block discarded – undo
340 340
 	public function createListsFilter()
341 341
 	{
342 342
 		$context = $this->getContext();
343
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
343
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
344 344
 
345 345
 		$filter = $manager->createSearch();
346
-		$filter->setConditions( $filter->compare( '==', 'customer.lists.parentid', $context->getUserId() ) );
346
+		$filter->setConditions($filter->compare('==', 'customer.lists.parentid', $context->getUserId()));
347 347
 
348 348
 		return $filter;
349 349
 	}
@@ -355,13 +355,13 @@  discard block
 block discarded – undo
355 355
 	 * @param string $id Unique customer address ID
356 356
 	 * @since 2017.06
357 357
 	 */
358
-	public function deleteListItem( $id )
358
+	public function deleteListItem($id)
359 359
 	{
360
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
360
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
361 361
 
362
-		$this->checkUser( $manager->getItem( $id )->getParentId() );
362
+		$this->checkUser($manager->getItem($id)->getParentId());
363 363
 
364
-		$manager->deleteItem( $id );
364
+		$manager->deleteItem($id);
365 365
 	}
366 366
 
367 367
 
@@ -373,33 +373,33 @@  discard block
 block discarded – undo
373 373
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
374 374
 	 * @since 2017.06
375 375
 	 */
376
-	public function editListItem( $id, array $values )
376
+	public function editListItem($id, array $values)
377 377
 	{
378 378
 		$context = $this->getContext();
379
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
379
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
380 380
 
381
-		$item = $manager->getItem( $id, [], true );
382
-		$this->checkUser( $item->getParentId() );
381
+		$item = $manager->getItem($id, [], true);
382
+		$this->checkUser($item->getParentId());
383 383
 
384
-		if( !isset( $values['customer.lists.typeid'] ) )
384
+		if (!isset($values['customer.lists.typeid']))
385 385
 		{
386
-			if( !isset( $values['customer.lists.type'] ) ) {
387
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
386
+			if (!isset($values['customer.lists.type'])) {
387
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
388 388
 			}
389 389
 
390
-			if( !isset( $values['customer.lists.domain'] ) ) {
391
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
390
+			if (!isset($values['customer.lists.domain'])) {
391
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
392 392
 			}
393 393
 
394
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
395
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
394
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
395
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
396 396
 			$values['customer.lists.typeid'] = $typeItem->getId();
397 397
 		}
398 398
 
399
-		unset( $values['customer.lists.id'] );
400
-		$item->fromArray( $values );
399
+		unset($values['customer.lists.id']);
400
+		$item->fromArray($values);
401 401
 
402
-		return $manager->saveItem( $item );
402
+		return $manager->saveItem($item);
403 403
 	}
404 404
 
405 405
 
@@ -410,12 +410,12 @@  discard block
 block discarded – undo
410 410
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
411 411
 	 * @since 2017.06
412 412
 	 */
413
-	public function getListItem( $id )
413
+	public function getListItem($id)
414 414
 	{
415
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
416
-		$item = $manager->getItem( $id );
415
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
416
+		$item = $manager->getItem($id);
417 417
 
418
-		$this->checkUser( $item->getParentId() );
418
+		$this->checkUser($item->getParentId());
419 419
 
420 420
 		return $item;
421 421
 	}
@@ -429,11 +429,11 @@  discard block
 block discarded – undo
429 429
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items
430 430
 	 * @since 2017.06
431 431
 	 */
432
-	public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
432
+	public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
433 433
 	{
434
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
434
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
435 435
 
436
-		return $manager->searchItems( $filter, [], $total );
436
+		return $manager->searchItems($filter, [], $total);
437 437
 	}
438 438
 
439 439
 
@@ -443,37 +443,37 @@  discard block
 block discarded – undo
443 443
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
444 444
 	 * @return string[] Associative list of customer key/value pairs with default values set
445 445
 	 */
446
-	protected function addItemDefaults( array $values )
446
+	protected function addItemDefaults(array $values)
447 447
 	{
448
-		if( !isset( $values['customer.label'] ) || $values['customer.label'] == '' )
448
+		if (!isset($values['customer.label']) || $values['customer.label'] == '')
449 449
 		{
450 450
 			$label = '';
451 451
 
452
-			if( isset( $values['customer.lastname'] ) ) {
452
+			if (isset($values['customer.lastname'])) {
453 453
 				$label = $values['customer.lastname'];
454 454
 			}
455 455
 
456
-			if( isset( $values['customer.firstname'] ) && $values['customer.firstname'] != '' ) {
456
+			if (isset($values['customer.firstname']) && $values['customer.firstname'] != '') {
457 457
 				$label = $values['customer.firstname'] . ' ' . $label;
458 458
 			}
459 459
 
460
-			if( isset( $values['customer.company'] ) && $values['customer.company'] != '' ) {
460
+			if (isset($values['customer.company']) && $values['customer.company'] != '') {
461 461
 				$label .= ' (' . $values['customer.company'] . ')';
462 462
 			}
463 463
 
464 464
 			$values['customer.label'] = $label;
465 465
 		}
466 466
 
467
-		if( !isset( $values['customer.code'] ) && isset( $values['customer.email'] ) ) {
467
+		if (!isset($values['customer.code']) && isset($values['customer.email'])) {
468 468
 			$values['customer.code'] = $values['customer.email'];
469 469
 		}
470 470
 
471
-		if( !isset( $values['customer.status'] ) ) {
471
+		if (!isset($values['customer.status'])) {
472 472
 			$values['customer.status'] = 1;
473 473
 		}
474 474
 
475
-		if( !isset( $values['customer.password'] ) ) {
476
-			$values['customer.password'] = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
475
+		if (!isset($values['customer.password'])) {
476
+			$values['customer.password'] = substr(md5(microtime(true) . getmypid() . rand()), -8);
477 477
 		}
478 478
 
479 479
 		return $values;
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
487 487
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
488 488
 	 */
489
-	protected function checkLimit( array $values )
489
+	protected function checkLimit(array $values)
490 490
 	{
491 491
 		$total = 0;
492 492
 		$context = $this->getContext();
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 		 * @category Developer
508 508
 		 * @see controller/frontend/customer/limit-seconds
509 509
 		 */
510
-		$count = $config->get( 'controller/frontend/customer/limit-count', 5 );
510
+		$count = $config->get('controller/frontend/customer/limit-count', 5);
511 511
 
512 512
 		/** controller/frontend/customer/limit-seconds
513 513
 		 * Customer account limitation time frame in seconds
@@ -525,22 +525,22 @@  discard block
 block discarded – undo
525 525
 		 * @category Developer
526 526
 		 * @see controller/frontend/customer/limit-count
527 527
 		 */
528
-		$seconds = $config->get( 'controller/frontend/customer/limit-seconds', 300 );
528
+		$seconds = $config->get('controller/frontend/customer/limit-seconds', 300);
529 529
 
530
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
530
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
531 531
 
532 532
 		$search = $manager->createSearch();
533 533
 		$expr = [
534
-			$search->compare( '==', 'customer.editor', $context->getEditor() ),
535
-			$search->compare( '>=', 'customer.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
534
+			$search->compare('==', 'customer.editor', $context->getEditor()),
535
+			$search->compare('>=', 'customer.ctime', date('Y-m-d H:i:s', time() - $seconds)),
536 536
 		];
537
-		$search->setConditions( $search->combine( '&&', $expr ) );
538
-		$search->setSlice( 0, 0 );
537
+		$search->setConditions($search->combine('&&', $expr));
538
+		$search->setSlice(0, 0);
539 539
 
540
-		$manager->searchItems( $search, [], $total );
540
+		$manager->searchItems($search, [], $total);
541 541
 
542
-		if( $total > $count ) {
543
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary limit reached' ) );
542
+		if ($total > $count) {
543
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary limit reached'));
544 544
 		}
545 545
 	}
546 546
 
@@ -551,12 +551,12 @@  discard block
 block discarded – undo
551 551
 	 * @param string $id Unique customer ID
552 552
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
553 553
 	 */
554
-	protected function checkUser( $id )
554
+	protected function checkUser($id)
555 555
 	{
556
-		if( $id != $this->getContext()->getUserId() )
556
+		if ($id != $this->getContext()->getUserId())
557 557
 		{
558
-			$msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id );
559
-			throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg );
558
+			$msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id);
559
+			throw new \Aimeos\Controller\Frontend\Customer\Exception($msg);
560 560
 		}
561 561
 	}
562 562
 }
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->getTree( $catId, [], $level );
102
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
101
+				$tree = $cntl->getTree($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.
controller/frontend/src/Controller/Frontend/Basket/Standard.php 3 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -431,17 +431,14 @@
 block discarded – undo
431 431
 		{
432 432
 			$address->copyFrom( $value );
433 433
 			$this->get()->setAddress( $address, $type );
434
-		}
435
-		else if( is_array( $value ) )
434
+		} else if( is_array( $value ) )
436 435
 		{
437 436
 			$this->setAddressFromArray( $address, $value );
438 437
 			$this->get()->setAddress( $address, $type );
439
-		}
440
-		else if( $value === null )
438
+		} else if( $value === null )
441 439
 		{
442 440
 			$this->get()->deleteAddress( $type );
443
-		}
444
-		else
441
+		} else
445 442
 		{
446 443
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' );
447 444
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) );
Please login to merge, or discard this patch.
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,6 @@
 block discarded – undo
150 150
 	 * Adds the delivery/payment service item based on the service ID.
151 151
 	 *
152 152
 	 * @param string $type Service type code like 'payment' or 'delivery'
153
-	 * @param string $id|null Unique ID of the service item or null to remove it
154 153
 	 * @param array $attributes Associative list of key/value pairs containing the attributes selected or
155 154
 	 * 	entered by the customer when choosing one of the delivery or payment options
156 155
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
Please login to merge, or discard this patch.
Spacing   +138 added lines, -138 removed lines patch added patch discarded remove patch
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases
34 34
 	 *  connections, logger, session, etc.
35 35
 	 */
36
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
36
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
37 37
 	{
38
-		parent::__construct( $context );
38
+		parent::__construct($context);
39 39
 
40
-		$this->domainManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
40
+		$this->domainManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
41 41
 	}
42 42
 
43 43
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	public function clear()
50 50
 	{
51 51
 		$this->baskets[$this->type] = $this->domainManager->createItem();
52
-		$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
52
+		$this->domainManager->setSession($this->baskets[$this->type], $this->type);
53 53
 
54 54
 		return $this;
55 55
 	}
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function get()
64 64
 	{
65
-		if( !isset( $this->baskets[$this->type] ) )
65
+		if (!isset($this->baskets[$this->type]))
66 66
 		{
67
-			$this->baskets[$this->type] = $this->domainManager->getSession( $this->type );
68
-			$this->checkLocale( $this->type );
67
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
68
+			$this->checkLocale($this->type);
69 69
 		}
70 70
 
71 71
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function save()
81 81
 	{
82
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
83
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
82
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
83
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
84 84
 		}
85 85
 
86 86
 		return $this;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @param string $type Basket type
94 94
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
95 95
 	 */
96
-	public function setType( $type )
96
+	public function setType($type)
97 97
 	{
98 98
 		$this->type = $type;
99 99
 		return $this;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		 * @category Developer
128 128
 		 * @see controller/frontend/basket/limit-seconds
129 129
 		 */
130
-		$count = $config->get( 'controller/frontend/basket/limit-count', 5 );
130
+		$count = $config->get('controller/frontend/basket/limit-count', 5);
131 131
 
132 132
 		/** controller/frontend/basket/limit-seconds
133 133
 		 * Order limitation time frame in seconds
@@ -145,30 +145,30 @@  discard block
 block discarded – undo
145 145
 		 * @category Developer
146 146
 		 * @see controller/frontend/basket/limit-count
147 147
 		 */
148
-		$seconds = $config->get( 'controller/frontend/basket/limit-seconds', 300 );
148
+		$seconds = $config->get('controller/frontend/basket/limit-seconds', 300);
149 149
 
150 150
 		$search = $this->domainManager->createSearch();
151 151
 		$expr = [
152
-			$search->compare( '==', 'order.base.editor', $context->getEditor() ),
153
-			$search->compare( '>=', 'order.base.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
152
+			$search->compare('==', 'order.base.editor', $context->getEditor()),
153
+			$search->compare('>=', 'order.base.ctime', date('Y-m-d H:i:s', time() - $seconds)),
154 154
 		];
155
-		$search->setConditions( $search->combine( '&&', $expr ) );
156
-		$search->setSlice( 0, 0 );
155
+		$search->setConditions($search->combine('&&', $expr));
156
+		$search->setSlice(0, 0);
157 157
 
158
-		$this->domainManager->searchItems( $search, [], $total );
158
+		$this->domainManager->searchItems($search, [], $total);
159 159
 
160
-		if( $total > $count )
160
+		if ($total > $count)
161 161
 		{
162
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Temporary order limit reached' );
163
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
162
+			$msg = $context->getI18n()->dt('controller/frontend', 'Temporary order limit reached');
163
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
164 164
 		}
165 165
 
166 166
 
167 167
 		$basket = $this->get()->finish();
168
-		$basket->setCustomerId( (string) $context->getUserId() );
168
+		$basket->setCustomerId((string) $context->getUserId());
169 169
 
170 170
 		$this->domainManager->begin();
171
-		$this->domainManager->store( $basket );
171
+		$this->domainManager->store($basket);
172 172
 		$this->domainManager->commit();
173 173
 
174 174
 		return $basket;
@@ -183,9 +183,9 @@  discard block
 block discarded – undo
183 183
 	 * @param boolean $default True to add default criteria (user logged in), false if not
184 184
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
185 185
 	 */
186
-	public function load( $id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true )
186
+	public function load($id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true)
187 187
 	{
188
-		return $this->domainManager->load( $id, $parts, false, $default );
188
+		return $this->domainManager->load($id, $parts, false, $default);
189 189
 	}
190 190
 
191 191
 
@@ -204,33 +204,33 @@  discard block
 block discarded – undo
204 204
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
205 205
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
206 206
 	 */
207
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
208
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
207
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
208
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
209 209
 	{
210 210
 		$attributeMap = [
211
-			'custom' => array_keys( $customAttributeValues ),
212
-			'config' => array_keys( $configAttributeIds ),
211
+			'custom' => array_keys($customAttributeValues),
212
+			'config' => array_keys($configAttributeIds),
213 213
 			'hidden' => $hiddenAttributeIds,
214 214
 		];
215
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
215
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
216 216
 
217 217
 
218 218
 		$context = $this->getContext();
219
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
220
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
221
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
219
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
220
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
221
+		$prices = $productItem->getRefItems('price', 'default', 'default');
222 222
 
223
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
224
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
223
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
224
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
225 225
 
226
-		$attr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
227
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds ) );
228
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) );
226
+		$attr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
227
+		$attr = array_merge($attr, $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds));
228
+		$attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds));
229 229
 
230
-		$orderBaseProductItem->setAttributes( $attr );
231
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
230
+		$orderBaseProductItem->setAttributes($attr);
231
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
232 232
 
233
-		$this->get()->addProduct( $orderBaseProductItem );
233
+		$this->get()->addProduct($orderBaseProductItem);
234 234
 		$this->save();
235 235
 	}
236 236
 
@@ -240,17 +240,17 @@  discard block
 block discarded – undo
240 240
 	 *
241 241
 	 * @param integer $position Position number (key) of the order product item
242 242
 	 */
243
-	public function deleteProduct( $position )
243
+	public function deleteProduct($position)
244 244
 	{
245
-		$product = $this->get()->getProduct( $position );
245
+		$product = $this->get()->getProduct($position);
246 246
 
247
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
247
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
248 248
 		{
249
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually' );
250
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) );
249
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually');
250
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position));
251 251
 		}
252 252
 
253
-		$this->get()->deleteProduct( $position );
253
+		$this->get()->deleteProduct($position);
254 254
 		$this->save();
255 255
 	}
256 256
 
@@ -262,32 +262,32 @@  discard block
 block discarded – undo
262 262
 	 * @param integer $quantity New quantiy of the product item
263 263
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
264 264
 	 */
265
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] )
265
+	public function editProduct($position, $quantity, array $configAttributeCodes = [])
266 266
 	{
267
-		$product = $this->get()->getProduct( $position );
267
+		$product = $this->get()->getProduct($position);
268 268
 
269
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
269
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
270 270
 		{
271
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be changed' );
272
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) );
271
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be changed');
272
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position));
273 273
 		}
274 274
 
275
-		$product->setQuantity( $quantity );
275
+		$product->setQuantity($quantity);
276 276
 
277 277
 		$attributes = $product->getAttributes();
278
-		foreach( $attributes as $key => $attribute )
278
+		foreach ($attributes as $key => $attribute)
279 279
 		{
280
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
281
-				unset( $attributes[$key] );
280
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
281
+				unset($attributes[$key]);
282 282
 			}
283 283
 		}
284
-		$product->setAttributes( $attributes );
284
+		$product->setAttributes($attributes);
285 285
 
286
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
287
-		$productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ) );
288
-		$product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) );
286
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
287
+		$productItem = $manager->findItem($product->getProductCode(), array('price', 'text'));
288
+		$product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity));
289 289
 
290
-		$this->get()->editProduct( $product, $position );
290
+		$this->get()->editProduct($product, $position);
291 291
 
292 292
 		$this->save();
293 293
 	}
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 	 * @param string $code Coupon code entered by the user
300 300
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
301 301
 	 */
302
-	public function addCoupon( $code )
302
+	public function addCoupon($code)
303 303
 	{
304 304
 		$context = $this->getContext();
305 305
 
@@ -319,62 +319,62 @@  discard block
 block discarded – undo
319 319
 		 * @category User
320 320
 		 * @category Developer
321 321
 		 */
322
-		$allowed = $context->getConfig()->get( 'controller/frontend/basket/standard/coupon/allowed', 1 );
322
+		$allowed = $context->getConfig()->get('controller/frontend/basket/standard/coupon/allowed', 1);
323 323
 
324
-		if( $allowed <= count( $this->get()->getCoupons() ) )
324
+		if ($allowed <= count($this->get()->getCoupons()))
325 325
 		{
326
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Number of coupon codes exceeds the limit' );
327
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
326
+			$msg = $context->getI18n()->dt('controller/frontend', 'Number of coupon codes exceeds the limit');
327
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
328 328
 		}
329 329
 
330 330
 
331
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
332
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
331
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
332
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
333 333
 
334 334
 
335
-		$search = $codeManager->createSearch( true );
335
+		$search = $codeManager->createSearch(true);
336 336
 		$expr = array(
337
-			$search->compare( '==', 'coupon.code.code', $code ),
337
+			$search->compare('==', 'coupon.code.code', $code),
338 338
 			$search->getConditions(),
339 339
 		);
340
-		$search->setConditions( $search->combine( '&&', $expr ) );
341
-		$search->setSlice( 0, 1 );
340
+		$search->setConditions($search->combine('&&', $expr));
341
+		$search->setSlice(0, 1);
342 342
 
343
-		$result = $codeManager->searchItems( $search );
343
+		$result = $codeManager->searchItems($search);
344 344
 
345
-		if( ( $codeItem = reset( $result ) ) === false )
345
+		if (($codeItem = reset($result)) === false)
346 346
 		{
347
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid or not available any more' ), $code );
348
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
347
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid or not available any more'), $code);
348
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
349 349
 		}
350 350
 
351 351
 
352
-		$search = $manager->createSearch( true );
352
+		$search = $manager->createSearch(true);
353 353
 		$expr = array(
354
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
354
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
355 355
 			$search->getConditions(),
356 356
 		);
357
-		$search->setConditions( $search->combine( '&&', $expr ) );
358
-		$search->setSlice( 0, 1 );
357
+		$search->setConditions($search->combine('&&', $expr));
358
+		$search->setSlice(0, 1);
359 359
 
360
-		$result = $manager->searchItems( $search );
360
+		$result = $manager->searchItems($search);
361 361
 
362
-		if( ( $item = reset( $result ) ) === false )
362
+		if (($item = reset($result)) === false)
363 363
 		{
364
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Coupon for code "%1$s" is not available any more' ), $code );
365
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
364
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Coupon for code "%1$s" is not available any more'), $code);
365
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
366 366
 		}
367 367
 
368 368
 
369
-		$provider = $manager->getProvider( $item, $codeItem->getCode() );
369
+		$provider = $manager->getProvider($item, $codeItem->getCode());
370 370
 
371
-		if( $provider->isAvailable( $this->get() ) !== true )
371
+		if ($provider->isAvailable($this->get()) !== true)
372 372
 		{
373
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met' ), $code );
374
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
373
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met'), $code);
374
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
375 375
 		}
376 376
 
377
-		$provider->addCoupon( $this->get() );
377
+		$provider->addCoupon($this->get());
378 378
 		$this->save();
379 379
 	}
380 380
 
@@ -385,24 +385,24 @@  discard block
 block discarded – undo
385 385
 	 * @param string $code Coupon code entered by the user
386 386
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
387 387
 	 */
388
-	public function deleteCoupon( $code )
388
+	public function deleteCoupon($code)
389 389
 	{
390 390
 		$context = $this->getContext();
391
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'coupon' );
391
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'coupon');
392 392
 
393 393
 		$search = $manager->createSearch();
394
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
395
-		$search->setSlice( 0, 1 );
394
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
395
+		$search->setSlice(0, 1);
396 396
 
397
-		$result = $manager->searchItems( $search );
397
+		$result = $manager->searchItems($search);
398 398
 
399
-		if( ( $item = reset( $result ) ) === false )
399
+		if (($item = reset($result)) === false)
400 400
 		{
401
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid' );
402
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $code ) );
401
+			$msg = $context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid');
402
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $code));
403 403
 		}
404 404
 
405
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
405
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
406 406
 		$this->save();
407 407
 	}
408 408
 
@@ -415,30 +415,30 @@  discard block
 block discarded – undo
415 415
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
416 416
 	 * 	if one of the keys is invalid when using an array with key/value pairs
417 417
 	 */
418
-	public function setAddress( $type, $value )
418
+	public function setAddress($type, $value)
419 419
 	{
420 420
 		$context = $this->getContext();
421
-		$address = \Aimeos\MShop\Factory::createManager( $context, 'order/base/address' )->createItem();
422
-		$address->setType( $type );
421
+		$address = \Aimeos\MShop\Factory::createManager($context, 'order/base/address')->createItem();
422
+		$address->setType($type);
423 423
 
424
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
424
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
425 425
 		{
426
-			$address->copyFrom( $value );
427
-			$this->get()->setAddress( $address, $type );
426
+			$address->copyFrom($value);
427
+			$this->get()->setAddress($address, $type);
428 428
 		}
429
-		else if( is_array( $value ) )
429
+		else if (is_array($value))
430 430
 		{
431
-			$this->setAddressFromArray( $address, $value );
432
-			$this->get()->setAddress( $address, $type );
431
+			$this->setAddressFromArray($address, $value);
432
+			$this->get()->setAddress($address, $type);
433 433
 		}
434
-		else if( $value === null )
434
+		else if ($value === null)
435 435
 		{
436
-			$this->get()->deleteAddress( $type );
436
+			$this->get()->deleteAddress($type);
437 437
 		}
438 438
 		else
439 439
 		{
440
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' );
441
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) );
440
+			$msg = $context->getI18n()->dt('controller/frontend', 'Invalid value for address type "%1$s"');
441
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $type));
442 442
 		}
443 443
 
444 444
 		$this->save();
@@ -454,42 +454,42 @@  discard block
 block discarded – undo
454 454
 	 * 	entered by the customer when choosing one of the delivery or payment options
455 455
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
456 456
 	 */
457
-	public function addService( $type, $id, array $attributes = [] )
457
+	public function addService($type, $id, array $attributes = [])
458 458
 	{
459 459
 		$context = $this->getContext();
460 460
 
461
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
462
-		$serviceItem = $serviceManager->getItem( $id, array( 'media', 'price', 'text' ) );
461
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
462
+		$serviceItem = $serviceManager->getItem($id, array('media', 'price', 'text'));
463 463
 
464
-		$provider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
465
-		$result = $provider->checkConfigFE( $attributes );
466
-		$unknown = array_diff_key( $attributes, $result );
464
+		$provider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
465
+		$result = $provider->checkConfigFE($attributes);
466
+		$unknown = array_diff_key($attributes, $result);
467 467
 
468
-		if( count( $unknown ) > 0 )
468
+		if (count($unknown) > 0)
469 469
 		{
470
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Unknown attributes "%1$s"' );
471
-			$msg = sprintf( $msg, implode( '","', array_keys( $unknown ) ) );
472
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
470
+			$msg = $context->getI18n()->dt('controller/frontend', 'Unknown attributes "%1$s"');
471
+			$msg = sprintf($msg, implode('","', array_keys($unknown)));
472
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
473 473
 		}
474 474
 
475
-		foreach( $result as $key => $value )
475
+		foreach ($result as $key => $value)
476 476
 		{
477
-			if( $value !== null ) {
478
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
477
+			if ($value !== null) {
478
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
479 479
 			}
480 480
 		}
481 481
 
482
-		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
482
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
483 483
 		$orderServiceItem = $orderBaseServiceManager->createItem();
484
-		$orderServiceItem->copyFrom( $serviceItem );
484
+		$orderServiceItem->copyFrom($serviceItem);
485 485
 
486 486
 		// remove service rebate of original price
487
-		$price = $provider->calcPrice( $this->get() )->setRebate( '0.00' );
488
-		$orderServiceItem->setPrice( $price );
487
+		$price = $provider->calcPrice($this->get())->setRebate('0.00');
488
+		$orderServiceItem->setPrice($price);
489 489
 
490
-		$provider->setConfigFE( $orderServiceItem, $attributes );
490
+		$provider->setConfigFE($orderServiceItem, $attributes);
491 491
 
492
-		$this->get()->addService( $orderServiceItem, $type );
492
+		$this->get()->addService($orderServiceItem, $type);
493 493
 		$this->save();
494 494
 	}
495 495
 
@@ -499,9 +499,9 @@  discard block
 block discarded – undo
499 499
 	 *
500 500
 	 * @param string $type Service type code like 'payment' or 'delivery'
501 501
 	 */
502
-	public function deleteService( $type )
502
+	public function deleteService($type)
503 503
 	{
504
-		$this->get()->deleteService( $type );
504
+		$this->get()->deleteService($type);
505 505
 		$this->save();
506 506
 	}
507 507
 
@@ -514,18 +514,18 @@  discard block
 block discarded – undo
514 514
 	 * 	an address item.
515 515
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
516 516
 	 */
517
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
517
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
518 518
 	{
519
-		foreach( $map as $key => $value ) {
520
-			$map[$key] = strip_tags( $value ); // prevent XSS
519
+		foreach ($map as $key => $value) {
520
+			$map[$key] = strip_tags($value); // prevent XSS
521 521
 		}
522 522
 
523
-		$errors = $address->fromArray( $map );
523
+		$errors = $address->fromArray($map);
524 524
 
525
-		if( count( $errors ) > 0 )
525
+		if (count($errors) > 0)
526 526
 		{
527
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Invalid address properties, please check your input' );
528
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
527
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Invalid address properties, please check your input');
528
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
529 529
 		}
530 530
 	}
531 531
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Iface.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,6 @@
 block discarded – undo
150 150
 	 * Adds the delivery/payment service item based on the service ID.
151 151
 	 *
152 152
 	 * @param string $type Service type code like 'payment' or 'delivery'
153
-	 * @param string $id|null Unique ID of the service item or null to remove it
154 153
 	 * @param array $attributes Associative list of key/value pairs containing the attributes selected or
155 154
 	 * 	entered by the customer when choosing one of the delivery or payment options
156 155
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * @param string $type Basket type
51 51
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
52 52
 	 */
53
-	public function setType( $type );
53
+	public function setType($type);
54 54
 
55 55
 
56 56
 	/**
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 * @param boolean $default True to add default criteria (user logged in), false if not
70 70
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
71 71
 	 */
72
-	public function load( $id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true );
72
+	public function load($id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true);
73 73
 
74 74
 
75 75
 	/**
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
89 89
 	 * @return void
90 90
 	 */
91
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
92
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] );
91
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
92
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = []);
93 93
 
94 94
 
95 95
 	/**
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * @param integer $position Position number (key) of the order product item
99 99
 	 * @return void
100 100
 	 */
101
-	public function deleteProduct( $position );
101
+	public function deleteProduct($position);
102 102
 
103 103
 
104 104
 	/**
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
110 110
 	 * @return void
111 111
 	 */
112
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] );
112
+	public function editProduct($position, $quantity, array $configAttributeCodes = []);
113 113
 
114 114
 
115 115
 	/**
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
120 120
 	 * @return void
121 121
 	 */
122
-	public function addCoupon( $code );
122
+	public function addCoupon($code);
123 123
 
124 124
 
125 125
 	/**
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
130 130
 	 * @return void
131 131
 	 */
132
-	public function deleteCoupon( $code );
132
+	public function deleteCoupon($code);
133 133
 
134 134
 
135 135
 	/**
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 * 	if one of the keys is invalid when using an array with key/value pairs
142 142
 	 * @return void
143 143
 	 */
144
-	public function setAddress( $type, $value );
144
+	public function setAddress($type, $value);
145 145
 
146 146
 
147 147
 	/**
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	 * 	entered by the customer when choosing one of the delivery or payment options
154 154
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
155 155
 	 */
156
-	public function addService( $type, $id, array $attributes = [] );
156
+	public function addService($type, $id, array $attributes = []);
157 157
 
158 158
 
159 159
 	/**
@@ -161,5 +161,5 @@  discard block
 block discarded – undo
161 161
 	 *
162 162
 	 * @param string $type Service type code like 'payment' or 'delivery'
163 163
 	 */
164
-	public function deleteService( $type );
164
+	public function deleteService($type);
165 165
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Basket/Decorator/BaseTest.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -20,54 +20,54 @@  discard block
 block discarded – undo
20 20
 	{
21 21
 		$this->context = \TestHelperFrontend::getContext();
22 22
 
23
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
23
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
24 24
 			->disableOriginalConstructor()
25 25
 			->getMock();
26 26
 
27
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
28
-			->setConstructorArgs( [$this->stub, $this->context] )
27
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
28
+			->setConstructorArgs([$this->stub, $this->context])
29 29
 			->getMockForAbstractClass();
30 30
 	}
31 31
 
32 32
 
33 33
 	protected function tearDown()
34 34
 	{
35
-		unset( $this->context, $this->object, $this->stub );
35
+		unset($this->context, $this->object, $this->stub);
36 36
 	}
37 37
 
38 38
 
39 39
 	public function testConstructException()
40 40
 	{
41
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
41
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
42 42
 
43
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
43
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
44 44
 
45
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
46
-			->setConstructorArgs( [$stub, $this->context] )
45
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
46
+			->setConstructorArgs([$stub, $this->context])
47 47
 			->getMockForAbstractClass();
48 48
 	}
49 49
 
50 50
 
51 51
 	public function testCall()
52 52
 	{
53
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
53
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
54 54
 			->disableOriginalConstructor()
55
-			->setMethods( ['invalid'] )
55
+			->setMethods(['invalid'])
56 56
 			->getMock();
57 57
 
58
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
59
-			->setConstructorArgs( [$stub, $this->context] )
58
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
59
+			->setConstructorArgs([$stub, $this->context])
60 60
 			->getMockForAbstractClass();
61 61
 
62
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
62
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
63 63
 
64
-		$this->assertTrue( $object->invalid() );
64
+		$this->assertTrue($object->invalid());
65 65
 	}
66 66
 
67 67
 
68 68
 	public function testClear()
69 69
 	{
70
-		$this->stub->expects( $this->once() )->method( 'clear' );
70
+		$this->stub->expects($this->once())->method('clear');
71 71
 
72 72
 		$this->object->clear();
73 73
 	}
@@ -76,18 +76,18 @@  discard block
 block discarded – undo
76 76
 	public function testGet()
77 77
 	{
78 78
 		$context = \TestHelperFrontend::getContext();
79
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->createItem();
79
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->createItem();
80 80
 
81
-		$this->stub->expects( $this->once() )->method( 'get' )
82
-			->will( $this->returnValue( $order ) );
81
+		$this->stub->expects($this->once())->method('get')
82
+			->will($this->returnValue($order));
83 83
 
84
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get() );
84
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get());
85 85
 	}
86 86
 
87 87
 
88 88
 	public function testSave()
89 89
 	{
90
-		$this->stub->expects( $this->once() )->method( 'save' );
90
+		$this->stub->expects($this->once())->method('save');
91 91
 
92 92
 		$this->object->save();
93 93
 	}
@@ -95,15 +95,15 @@  discard block
 block discarded – undo
95 95
 
96 96
 	public function testSetType()
97 97
 	{
98
-		$this->stub->expects( $this->once() )->method( 'setType' );
98
+		$this->stub->expects($this->once())->method('setType');
99 99
 
100
-		$this->object->setType( 'test' );
100
+		$this->object->setType('test');
101 101
 	}
102 102
 
103 103
 
104 104
 	public function testStore()
105 105
 	{
106
-		$this->stub->expects( $this->once() )->method( 'store' );
106
+		$this->stub->expects($this->once())->method('store');
107 107
 
108 108
 		$this->object->store();
109 109
 	}
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
 	public function testLoad()
113 113
 	{
114
-		$this->stub->expects( $this->once() )->method( 'load' );
114
+		$this->stub->expects($this->once())->method('load');
115 115
 
116 116
 		$this->object->load( -1 );
117 117
 	}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
 	public function testAddProduct()
121 121
 	{
122
-		$this->stub->expects( $this->once() )->method( 'addProduct' );
122
+		$this->stub->expects($this->once())->method('addProduct');
123 123
 
124 124
 		$this->object->addProduct( -1 );
125 125
 	}
@@ -127,73 +127,73 @@  discard block
 block discarded – undo
127 127
 
128 128
 	public function testDeleteProduct()
129 129
 	{
130
-		$this->stub->expects( $this->once() )->method( 'deleteProduct' );
130
+		$this->stub->expects($this->once())->method('deleteProduct');
131 131
 
132
-		$this->object->deleteProduct( 0 );
132
+		$this->object->deleteProduct(0);
133 133
 	}
134 134
 
135 135
 
136 136
 	public function testEditProduct()
137 137
 	{
138
-		$this->stub->expects( $this->once() )->method( 'editProduct' );
138
+		$this->stub->expects($this->once())->method('editProduct');
139 139
 
140
-		$this->object->editProduct( 0, 1 );
140
+		$this->object->editProduct(0, 1);
141 141
 	}
142 142
 
143 143
 
144 144
 	public function testAddCoupon()
145 145
 	{
146
-		$this->stub->expects( $this->once() )->method( 'addCoupon' );
146
+		$this->stub->expects($this->once())->method('addCoupon');
147 147
 
148
-		$this->object->addCoupon( 'test' );
148
+		$this->object->addCoupon('test');
149 149
 	}
150 150
 
151 151
 
152 152
 	public function testDeleteCoupon()
153 153
 	{
154
-		$this->stub->expects( $this->once() )->method( 'deleteCoupon' );
154
+		$this->stub->expects($this->once())->method('deleteCoupon');
155 155
 
156
-		$this->object->deleteCoupon( 'test' );
156
+		$this->object->deleteCoupon('test');
157 157
 	}
158 158
 
159 159
 
160 160
 	public function testSetAddress()
161 161
 	{
162
-		$this->stub->expects( $this->once() )->method( 'setAddress' );
162
+		$this->stub->expects($this->once())->method('setAddress');
163 163
 
164
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null );
164
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null);
165 165
 	}
166 166
 
167 167
 
168 168
 	public function testAddService()
169 169
 	{
170
-		$this->stub->expects( $this->once() )->method( 'addService' );
170
+		$this->stub->expects($this->once())->method('addService');
171 171
 
172
-		$this->object->addService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1 );
172
+		$this->object->addService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1);
173 173
 	}
174 174
 
175 175
 
176 176
 	public function testDeleteService()
177 177
 	{
178
-		$this->stub->expects( $this->once() )->method( 'deleteService' );
178
+		$this->stub->expects($this->once())->method('deleteService');
179 179
 
180
-		$this->object->deleteService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT );
180
+		$this->object->deleteService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT);
181 181
 	}
182 182
 
183 183
 
184 184
 	public function testGetController()
185 185
 	{
186
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
186
+		$result = $this->access('getController')->invokeArgs($this->object, []);
187 187
 
188
-		$this->assertSame( $this->stub, $result );
188
+		$this->assertSame($this->stub, $result);
189 189
 	}
190 190
 
191 191
 
192
-	protected function access( $name )
192
+	protected function access($name)
193 193
 	{
194
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' );
195
-		$method = $class->getMethod( $name );
196
-		$method->setAccessible( true );
194
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Decorator\Base');
195
+		$method = $class->getMethod($name);
196
+		$method->setAccessible(true);
197 197
 
198 198
 		return $method;
199 199
 	}
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Base.php 2 patches
Doc Comments   +2 added lines, -7 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
 	/**
63 63
 	 * Empties the basket and removing all products, addresses, services, etc.
64
-	 * @return void
64
+	 * @return Base
65 65
 	 */
66 66
 	public function clear()
67 67
 	{
@@ -134,11 +134,6 @@  discard block
 block discarded – undo
134 134
 	 *
135 135
 	 * @param string $prodid ID of the base product to add
136 136
 	 * @param integer $quantity Amount of products that should by added
137
-	 * @param array $options Possible options are: 'stock'=>true|false and 'variant'=>true|false
138
-	 * 	The 'stock'=>false option allows adding products without being in stock.
139
-	 * 	The 'variant'=>false option allows adding the selection product to the basket
140
-	 * 	instead of the specific sub-product if the variant-building attribute IDs
141
-	 * 	doesn't match a specific sub-product or if the attribute IDs are missing.
142 137
 	 * @param array $variantAttributeIds List of variant-building attribute IDs that identify a specific product
143 138
 	 * 	in a selection products
144 139
 	 * @param array $configAttributeIds  List of attribute IDs that doesn't identify a specific product in a
@@ -257,7 +252,7 @@  discard block
 block discarded – undo
257 252
 	/**
258 253
 	 * Returns the frontend controller
259 254
 	 *
260
-	 * @return \Aimeos\Controller\Frontend\Basket\Iface Frontend controller object
255
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
261 256
 	 */
262 257
 	protected function getController()
263 258
 	{
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -30,18 +30,18 @@  discard block
 block discarded – undo
30 30
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
31 31
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
32 32
 	 */
33
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
33
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
34 34
 	{
35 35
 		$iface = '\Aimeos\Controller\Frontend\Basket\Iface';
36
-		if( !( $controller instanceof $iface ) )
36
+		if (!($controller instanceof $iface))
37 37
 		{
38
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
39
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
38
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
39
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
40 40
 		}
41 41
 
42 42
 		$this->controller = $controller;
43 43
 
44
-		parent::__construct( $context );
44
+		parent::__construct($context);
45 45
 	}
46 46
 
47 47
 
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @return mixed Returns the value of the called method
54 54
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
55 55
 	 */
56
-	public function __call( $name, array $param )
56
+	public function __call($name, array $param)
57 57
 	{
58
-		return @call_user_func_array( array( $this->controller, $name ), $param );
58
+		return @call_user_func_array(array($this->controller, $name), $param);
59 59
 	}
60 60
 
61 61
 
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 	 * @param string $type Basket type
98 98
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
99 99
 	 */
100
-	public function setType( $type )
100
+	public function setType($type)
101 101
 	{
102
-		$this->controller->setType( $type );
102
+		$this->controller->setType($type);
103 103
 		return $this;
104 104
 	}
105 105
 
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
 	 * @param boolean $default True to add default criteria (user logged in), false if not
124 124
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
125 125
 	 */
126
-	public function load( $id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true )
126
+	public function load($id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true)
127 127
 	{
128
-		return $this->controller->load( $id, $parts, $default );
128
+		return $this->controller->load($id, $parts, $default);
129 129
 	}
130 130
 
131 131
 
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
151 151
 	 * @return void
152 152
 	 */
153
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
154
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
153
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
154
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
155 155
 	{
156 156
 		$this->controller->addProduct(
157 157
 			$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
 	 * @param integer $position Position number (key) of the order product item
167 167
 	 * @return void
168 168
 	 */
169
-	public function deleteProduct( $position )
169
+	public function deleteProduct($position)
170 170
 	{
171
-		$this->controller->deleteProduct( $position );
171
+		$this->controller->deleteProduct($position);
172 172
 	}
173 173
 
174 174
 
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
181 181
 	 * @return void
182 182
 	 */
183
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] )
183
+	public function editProduct($position, $quantity, array $configAttributeCodes = [])
184 184
 	{
185
-		$this->controller->editProduct( $position, $quantity, $configAttributeCodes );
185
+		$this->controller->editProduct($position, $quantity, $configAttributeCodes);
186 186
 	}
187 187
 
188 188
 
@@ -193,9 +193,9 @@  discard block
 block discarded – undo
193 193
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
194 194
 	 * @return void
195 195
 	 */
196
-	public function addCoupon( $code )
196
+	public function addCoupon($code)
197 197
 	{
198
-		$this->controller->addCoupon( $code );
198
+		$this->controller->addCoupon($code);
199 199
 	}
200 200
 
201 201
 
@@ -206,9 +206,9 @@  discard block
 block discarded – undo
206 206
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
207 207
 	 * @return void
208 208
 	 */
209
-	public function deleteCoupon( $code )
209
+	public function deleteCoupon($code)
210 210
 	{
211
-		$this->controller->deleteCoupon( $code );
211
+		$this->controller->deleteCoupon($code);
212 212
 	}
213 213
 
214 214
 
@@ -221,9 +221,9 @@  discard block
 block discarded – undo
221 221
 	 * 	if one of the keys is invalid when using an array with key/value pairs
222 222
 	 * @return void
223 223
 	 */
224
-	public function setAddress( $type, $value )
224
+	public function setAddress($type, $value)
225 225
 	{
226
-		$this->controller->setAddress( $type, $value );
226
+		$this->controller->setAddress($type, $value);
227 227
 	}
228 228
 
229 229
 
@@ -237,9 +237,9 @@  discard block
 block discarded – undo
237 237
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
238 238
 	 * @return void
239 239
 	 */
240
-	public function addService( $type, $id, array $attributes = [] )
240
+	public function addService($type, $id, array $attributes = [])
241 241
 	{
242
-		$this->controller->addService( $type, $id, $attributes );
242
+		$this->controller->addService($type, $id, $attributes);
243 243
 	}
244 244
 
245 245
 
@@ -248,9 +248,9 @@  discard block
 block discarded – undo
248 248
 	 *
249 249
 	 * @param string $type Service type code like 'payment' or 'delivery'
250 250
 	 */
251
-	public function deleteService( $type )
251
+	public function deleteService($type)
252 252
 	{
253
-		$this->controller->deleteService( $type );
253
+		$this->controller->deleteService($type);
254 254
 	}
255 255
 
256 256
 
Please login to merge, or discard this patch.